ww3_gse2: some checks due to grid related issues ... to be continued

Author: aronroland

model/src/w3gridmd.F90

@@ -7153,7 +7153,7 @@ SUBROUTINE W3GRID()
          '       Number of longitudes      :',I10/              &
          '       Number of latitudes       :',I10/              &
          '       Number of grid points     :',I10/              &
-         '       Number of sea points      :',I10,' (',F4.1,'%)'/&
+         '       Number of sea points      :',I10,' (',F15.4,'%)'/&
          '       Number of input b. points :',I10/              &
          '       Number of land points     :',I10/              &
          '       Number of excluded points :',I10/)
@@ -7162,7 +7162,7 @@ SUBROUTINE W3GRID()
          '       Number of longitudes      :',I10/              &
          '       Number of latitudes       :',I10/              &
          '       Number of grid points     :',I10/              &
-         '       Number of sea points      :',I10,' (100%)'/    &
+         '       Number of sea points      :',I10,' (test)'/    &
          '       Number of input b. points :',I10/              &
          '       Number of land points     :',I10/              &
          '       Number of excluded points :',I10/)

model/src/w3profsmd_pdlib.F90

@@ -751,7 +751,9 @@ SUBROUTINE PDLIB_W3XYPUG ( ISP, FACX, FACY, DTG, VGX, VGY, LCALC )
 
     IF (ITH == 1) THEN ! Compute indices for computation of ith,isp for gse
       ITHL = NTH 
+      ITHR = 2
     ELSE IF (ITH == NTH) THEN
+      ITHL = NTH - 1
       ITHR = 1 
     ELSE
       ITHL = ITH - 1 
@@ -766,11 +768,6 @@ SUBROUTINE PDLIB_W3XYPUG ( ISP, FACX, FACY, DTG, VGX, VGY, LCALC )
     CCOSR  = FACX * ECOS(ITHR)
     CSINR  = FACY * ESIN(ITHR)
 
-    CCOSL  = 0.5 * (CCOSL + CCOS)
-    CSINL  = 0.5 * (CSINL + CSIN)
-    CCOSR  = 0.5 * (CCOSR + CCOS)
-    CSINR  = 0.5 * (CSINR + CSIN)
-
     CCURX  = FACX
     CCURY  = FACY
     !
@@ -837,6 +834,10 @@ SUBROUTINE PDLIB_W3XYPUG ( ISP, FACX, FACY, DTG, VGX, VGY, LCALC )
 
     CR(:,1) = VLCFLXR(:) * IOBDP_LOC
     CR(:,2) = VLCFLYR(:) * IOBDP_LOC
+
+    CL      = 0.5 * (C + CL)
+    CR      = 0.5 * (C + CR) 
+
     !
     ! 4. Prepares boundary update
     !
@@ -868,10 +869,11 @@ SUBROUTINE PDLIB_W3XYPUG ( ISP, FACX, FACY, DTG, VGX, VGY, LCALC )
     ELSE IF (FSPSI) THEN
       CALL PDLIB_W3XYPFSPSI2(ISP, C, LCALC, RD1, RD2, DTG, AC)
     ELSE IF (FSFCT) THEN
-      CALL PDLIB_W3XYPFSFCT2(ISP, CL, LCALC, RD1, RD2, DTG, 0.25 * AC, ACL)
-      CALL PDLIB_W3XYPFSFCT2(ISP, C, LCALC, RD1, RD2, DTG, 0.5 * AC, ACM)
-      CALL PDLIB_W3XYPFSFCT2(ISP, CR, LCALC, RD1, RD2, DTG, 0.25 * AC, ACR)
-      AC = ACL + ACM + ACR
+      !CALL PDLIB_W3XYPFSFCT2(ISP, CL, LCALC, RD1, RD2, DTG, 0.25 * AC, ACL)
+      !CALL PDLIB_W3XYPFSFCT2(ISP, C, LCALC, RD1, RD2, DTG, 0.5 * AC, ACM)
+      !CALL PDLIB_W3XYPFSFCT2(ISP, CR, LCALC, RD1, RD2, DTG, 0.25 * AC, ACR)
+      !AC = ACL + ACM + ACR
+      CALL PDLIB_W3XYPFSFCT2(ISP, C, LCALC, RD1, RD2, DTG, AC, AC)
     ELSE IF (FSNIMP) THEN
       STOP 'For PDLIB and FSNIMP, no function has been programmed yet'
     ENDIF
@@ -7867,8 +7869,8 @@ SUBROUTINE BLOCK_SOLVER_DIFFUSION(DTG)
         DT_DIFF = DTG/NB_ITER
         PHI_V = 0.
 
-        WRITE(5000+myrank,*) 'NUMBER OF SUB ITERATIONS', ITH, IK, NB_ITER, DT_DIFF, DeltaTmax
-        CALL FLUSH(5000+myrank)
+        !WRITE(5000+myrank,*) 'NUMBER OF SUB ITERATIONS', ITH, IK, NB_ITER, DT_DIFF, DeltaTmax
+        !CALL FLUSH(5000+myrank)
 
         DO IT = 1, NB_ITER
           DO IE = 1, NE
@@ -7899,7 +7901,7 @@ SUBROUTINE BLOCK_SOLVER_DIFFUSION(DTG)
           CALL PDLIB_exchange1DREAL(PHI_V)
           DO JSEA =1, NSEAL
             IF (IOBP_LOC(JSEA) .EQ. 1) THEN
-              DIFFTOT      = - DT_DIFF * DFAC * ( PHI_V(JSEA) / PDLIB_SI(JSEA) + 2 * DV2DXY(IP) * DIFFVEC(3,IP) ) 
+              DIFFTOT      = - DT_DIFF * DFAC * ( PHI_V(JSEA) / PDLIB_SI(JSEA) + 2 * DV2DXY(JSEA) * DIFFVEC(3,JSEA) ) 
             ELSE
               DIFFTOT      = 0
             ENDIF

model/src/w3triamd.F90

@@ -249,6 +249,7 @@ SUBROUTINE READMSH(NDS,FNAME)
     DO I= 1, NODES
       READ(NDS,*) j, XYBTMP1(1,I), XYBTMP1(2,I), XYBTMP1(3,I)
     END DO
+    WRITE(*,*) 'TEST NUMBER OF NODES', NODES
     !
     ! read number of elements and elements from Gmsh files
     !
@@ -321,6 +322,8 @@ SUBROUTINE READMSH(NDS,FNAME)
     !
     ! Number of nodes after clean up
     !
+    WRITE(*,*) 'TEST NUMBER OF NODES AFTER CLEAN UP', J
+ 
     NX = J
     !
     DO I = 1, NTRI