Changeset 23070

Timestamp:

08/07/18 12:18:38 (7 years ago)

Author:

dmenemen

Message:

MITgcm uses "base" sent by ISSM
code includes some diagnostics write statements, which will eventually
be commented out, and a manual check and removal of 1-m ice shelf
thickness, which will eventually be replaced to check for NaN value.
Verification output changes because there are truncation differences
at the <1e-5 level.

File:

• issm/trunk-jpl/test/MITgcm/code/cpl_issm.F (modified) (5 diffs)

issm/trunk-jpl/test/MITgcm/code/cpl_issm.F

@@ -66 +66 @@
      &        MPI_COMM_MODEL,mpiRC)
          _END_MASTER( myThid )
-         print*, 'Ocean received CouplingTime: ', CouplingTime
+C        print*, 'Ocean received CouplingTime: ', CouplingTime
 
 C   I2. MITgcm sends grid size (NX and NY)
@@ -134 +134 @@
             call MPI_Recv(IceModelTime,1,MPI_DOUBLE,0,10001001,
      &           toissmcomm,mpistatus,mpiRC)
-            print*, 'Ocean received IceModelTime: ', IceModelTime
+C           print*, 'Ocean received IceModelTime: ', IceModelTime
             _END_MASTER( myThid )
          ENDIF
@@ -175 +175 @@
          ENDIF
          CALL BAR2( myThid )
-         print*,'Done Sending shelficeFreshWaterFlux array.'
+C        print*,'Done Sending shelficeFreshWaterFlux array.'
          
       ENDIF
@@ -182 +182 @@
 C Recurring step C4 except during Termination:
 C  C4. ISSM sends IceModelTime=(N-1)*CouplingTime base to MITgcm
-      IF( myTime .NE. endtime .AND.
-     &     MOD(myTime,CouplingTime) .LT. deltaT/2. ) THEN         
+CDM   IF( myTime .NE. endtime .AND.
+      IF( myTime .EQ. startTime .AND.
+     &     MOD(myTime,CouplingTime) .LT. deltaT/2. ) THEN
+         CALL WRITE_FLD_XY_RS( 'R_shelfIce_1',' ',R_shelfIce,-1,myThid)
          IF( myProcId .EQ. 0 ) THEN
             _BEGIN_MASTER( myThid )         
@@ -190 +192 @@
             _END_MASTER( myThid )
          ENDIF
+         CALL BAR2( myThid ) 
+         CALL SCATTER_2D_R8( xfer_array, local, Nx, Ny,
+     &        .FALSE., .FALSE., myThid )
+         DO bj = myByLo(myThid), myByHi(myThid)
+            DO bi = myBxLo(myThid), myBxHi(myThid)
+               DO j=1,sNy
+                  DO i=1,sNx
+                     IF( ABS(local(i,j,bi,bj)+
+     &                    0.89190188 ).GT.1E-5 ) THEN
+                        R_shelfIce(i,j,bi,bj) = local(i,j,bi,bj)
+                     ENDIF
+                  ENDDO
+               ENDDO
+            ENDDO
+         ENDDO
+C- fill in the overlap (+ BARRIER):
+         _EXCH_XY_RS( R_shelfIce, myThid )
+         CALL WRITE_FLD_XY_RS( 'R_shelfIce_2',' ',R_shelfIce,-1,myThid)
       ENDIF
 C End recurring step C4.