Changeset 22681

Timestamp:

04/09/18 11:42:27 (7 years ago)

Author:

dmenemen

Message:

Adding runtime variable, which will allow running
MITgcm with and without ISSM coupler!

Location:

issm/trunk-jpl/test/MITgcm/code

Files:

• CPP_EEOPTIONS.h (added)
• cpl_issm.F (modified) (1 diff)
• do_oceanic_phys.F (modified) (1 diff)
• eeboot_minimal.F (modified) (3 diffs)
• eedie.F (modified) (2 diffs)

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

@@ -1 +1 @@
 #include "PACKAGES_CONFIG.h"
 #include "CPP_OPTIONS.h"
-
-#define ALLOW_CPL_ISSM
 
 CBOP

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

@@ -534 +534 @@
 #endif /* OLD_THSICE_CALL_SEQUENCE */
 
-#define ALLOW_CPL_ISSM
 #ifdef ALLOW_CPL_ISSM
-      CALL CPL_ISSM( myTime, myIter, myThid )
+      IF ( useCoupler) CALL CPL_ISSM( myTime, myIter, myThid )
 #endif
 

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

@@ -4 +4 @@
 #include "PACKAGES_CONFIG.h"
 #include "CPP_EEOPTIONS.h"
-
-#define ALLOW_CPL_ISSM
 
 CBOP
@@ -69 +67 @@
       INTEGER             mpiMyWid, toissmcomm
       INTEGER my_local_rank,my_local_size, numprocsworld
-      INTEGER dummy1(1),dummy2(1)
       INTEGER status(MPI_STATUS_SIZE)
 #endif /* ALLOW_CPL_ISSM */
@@ -183 +180 @@
 
 #ifdef ALLOW_CPL_ISSM
-       call MPI_COMM_RANK(MPI_COMM_WORLD, mpiMyWid, mpiRC)
-       call MPI_COMM_SIZE(MPI_COMM_WORLD, numprocsworld, mpiRC)
+C     add a 1rst preliminary call EESET_PARAMS to set useCoupler
+       CALL MPI_COMM_RANK(MPI_COMM_WORLD, mpiMyWid, mpiRC)
+       CALL EESET_PARMS ( mpiMyWId, doReport )
+
+       IF ( useCoupler ) THEN
+          CALL MPI_COMM_SIZE(MPI_COMM_WORLD, numprocsworld, mpiRC)
 
 c     Split world into sub-communicators for each and every model:*/
-      call MPI_COMM_SPLIT(MPI_COMM_WORLD,1,MPIMYWID,
-     &                    MPI_COMM_MODEL,mpiRC)
-
-      print*,'Oc My global rank',mpiMyWid
-      print*,'Oc My world size:',numprocsworld
-
-      call MPI_INTERCOMM_CREATE(MPI_COMM_MODEL,0,MPI_COMM_WORLD,
-     &                          0,0,toissmcomm,mpiRC)
-      
-      call MPI_COMM_RANK(MPI_COMM_MODEL, my_local_rank, mpiRC)
-      call MPI_COMM_SIZE(MPI_COMM_MODEL, my_local_size, mpiRC)
-
-      print*,'Oc My global rank',mpiMyWid,'MyLocal rank: ',my_local_rank
-      print*,'Oc My world size:',numprocsworld,'My local size: ',
-     &     my_local_size
-
-
-c     receive and send an integer:
-      dummy1(1)=4; dummy2(1)=2;
-         
-      if (my_local_rank .eq. 0) then
-cdb          call MPI_Send(dummy2,1,MPI_INT,0,1,toissmcomm,mpiRC)
-cdb          call MPI_Recv(dummy1,1,MPI_INT,0,1,toissmcomm,status,mpiRC)
-      end if
-      
-cdb      call MPI_Bcast(dummy1,1,MPI_INT,0,MPI_COMM_MODEL,mpiRC)
-cdb      print*, 'Ocean : dummy received:',dummy1
-
+          CALL MPI_COMM_SPLIT(MPI_COMM_WORLD,1,MPIMYWID,
+     &         MPI_COMM_MODEL,mpiRC)
+
+          print*,'Oc My global rank',mpiMyWid
+          print*,'Oc My world size:',numprocsworld
+
+          CALL MPI_INTERCOMM_CREATE(MPI_COMM_MODEL,0,MPI_COMM_WORLD,
+     &         0,0,toissmcomm,mpiRC)
+
+          CALL MPI_COMM_RANK(MPI_COMM_MODEL, my_local_rank, mpiRC)
+          CALL MPI_COMM_SIZE(MPI_COMM_MODEL, my_local_size, mpiRC)
+
+          print*,'Oc My global rank',mpiMyWid,'MyLocal rank: ',
+     &         my_local_rank
+          print*,'Oc My world size:',numprocsworld,'My local size: ',
+     &         my_local_size
+       ENDIF
 #endif /* ALLOW_CPL_ISSM */
 

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

@@ -88 +88 @@
 C--   MPI style multiple-process termination
 C--   ======================================
-#ifdef COMPONENT_MODULE
+#if (defined COMPONENT_MODULE) || (defined ALLOW_CPL_ISSM)
        IF ( useCoupler) CALL MPI_BARRIER( MPI_COMM_WORLD, mpiRC )
 #endif
@@ -94 +94 @@
        IF ( useOASIS ) CALL OASIS_FINALIZE
 #endif
-       CALL MPI_BARRIER( MPI_COMM_WORLD, mpiRC )
        CALL MPI_FINALIZE  ( mpiRC )
        IF ( mpiRC .NE. MPI_SUCCESS ) THEN