v5.0.1

Author: jianhuaqi

src/mod_input.F

@@ -4130,8 +4130,12 @@ SUBROUTINE READ_COLDSTART_COORDS(GRIDUNIT,MGL,XG2,YG2)
     END if
 
     IF(MSR)THEN
-      X_CW(1:3)=XG2(NVG(1,1:3))
-      Y_CW(1:3)=YG2(NVG(1,1:3))
+!---> Siqi Li, 20230221
+      X_CW(1:3)=reshape(XG2(NVG(1,1:3)), (/3/))
+      Y_CW(1:3)=reshape(YG2(NVG(1,1:3)), (/3/))
+!      X_CW(1:3)=XG2(NVG(1,1:3))
+!      Y_CW(1:3)=YG2(NVG(1,1:3))
+!<--- Siqi Li
       CALL IS_TRI_CW(X_CW,Y_CW,IS_CW)
       IF(IS_CW /= 1) CALL FATAL_ERROR('Three nodes on each triangular cell in file *_grd.dat should be identified', &
                                       & 'counter-clockwise...')

src/mod_ncdio.F

@@ -9749,15 +9749,17 @@ SUBROUTINE SET_FVCOM_GRID(G)
            IF(STATUS /=0) CALL FATAL_ERROR("FVCOM2GRID: COULD NOT ALLOCATE G%NV")
            G%NV=0
            DO I = 1,G%NT
-              G%NV(I,:) = G%NGID_X(NV(I,1:3))
+              G%NV(I,:) = G%NGID_X( reshape(NV(I,1:3),(/3/)) ) ! Siqi Li, 20230221
+              ! G%NV(I,:) = G%NGID_X(NV(I,1:3))
            END DO
         
 
            ALLOCATE(G%NBE(0:N,3), STAT=STATUS)
            IF(STATUS /=0) CALL FATAL_ERROR("FVCOM2GRID: COULD NOT ALLOCATE G%NBE")
            G%NBE = 0
            DO I = 1,N
-              G%NBE(I,:) = G%EGID_X(NBE(I,:))
+              G%NBE(I,:) = G%EGID_X( reshape(NBE(I,:),(/3/)) ) ! Siqi Li, 20230221
+              ! G%NBE(I,:) = G%EGID_X(NBE(I,:))
            END DO
 
 
@@ -9770,9 +9772,11 @@ SUBROUTINE SET_FVCOM_GRID(G)
            G%NBVE = 0
 
            DO I = 1,M
-              G%NBVE(I,:) = G%EGID_X(NBVE(I,:))
+              G%NBVE(I,:) = G%EGID_X( reshape(NBVE(I,:),(/MX_NBR_ELEM+1/)) ) ! Siqi Li, 20230221
+              ! G%NBVE(I,:) = G%EGID_X(NBVE(I,:))
 
-              G%NBSN(I,:) = G%NGID_X(NBSN(I,:))
+              G%NBSN(I,:) = G%NGID_X( reshape(NBSN(I,:),(/MX_NBR_ELEM+3/)) ) ! Siqi Li, 20230221
+              ! G%NBSN(I,:) = G%NGID_X(NBSN(I,:))
            END DO
 
 

src/mod_utils.F

@@ -2134,8 +2134,12 @@ logical function isintriangle(i,x0,y0)
 
    isintriangle = .false. 
 
-   xt = vx(nv(i,1:3))
-   yt = vy(nv(i,1:3))
+!---> Siqi Li, 20230221
+   xt = reshape(vx(nv(i,1:3)), (/3/))
+   yt = reshape(vy(nv(i,1:3)), (/3/))
+!   xt = vx(nv(i,1:3))
+!   yt = vy(nv(i,1:3))
+!<--- Siqi Li
 
    isintriangle = ISINTRI(X0,Y0,Xt,Yt)
 

src/setup_domain.F

@@ -48,7 +48,7 @@ SUBROUTINE SETUP_DOMAIN
   IMPLICIT NONE
   INTEGER :: SENDER,STATUS
   INTEGER :: nvals, IERR, I, EGL
-  
+  INTEGER :: J   ! Siqi Li, 20230221
 
      if (dbg_set(dbg_log)) &
           & write(IPT,*) "! SETTING UP FVCOM PROCESSOR ENVIRONMENT"
@@ -133,7 +133,13 @@ SUBROUTINE SETUP_DOMAIN
 
         DO I=1,NT
            !(MUST HAVE GLOBAL NODE NUMBERING)
-           NV(I,1:4) = NLID_X(NVG(EGID_X(I),1:4))! NV is the local connectivity
+!---> Siqi Li, 20230221
+           DO J = 1, 4
+             NV(I,J) = NLID_X(NVG(EGID_X(I),J))! NV is the local connectivity
+           END DO
+!           NV(I,1:4) = NLID_X(NVG(EGID_X(I),1:4))! NV is the local connectivity
+!<--- Siqi Li
+
         END DO
         NV(0,:) = 0