Changeset 1056 for codes/icosagcm/trunk/src/parallel

Timestamp:

10/29/20 15:43:28 (3 years ago)

Author:

aclsce

Message:

Added handling of the use of oasis coupler (to be used in ocean-atmopshere mode).

File:

• codes/icosagcm/trunk/src/parallel/mpipara.F90 (modified) (4 diffs)

codes/icosagcm/trunk/src/parallel/mpipara.F90

@@ -10 +10 @@
   LOGICAL,SAVE :: is_mpi_root
   LOGICAL,SAVE :: is_mpi_master
+  CHARACTER(LEN=256),SAVE :: using_oasis
   INTEGER,SAVE :: mpi_master
   
@@ -61 +62 @@
     IF (using_mpi) THEN
     
+      using_oasis='n'
+      CALL getin('using_oasis',using_oasis)
+
+      IF (using_oasis == 'n') THEN
+
       required_mode_str='funneled'
       CALL getin('mpi_threading_mode',required_mode_str)
@@ -104 +110 @@
       IF (mpi_threading_mode==MPI_THREAD_MULTIPLE)   PRINT*,'MPI_INIT_THREAD : MPI_THREAD_MULTIPLE used'
           
-#ifdef CPP_USING_XIOS
-      CALL xios_initialize("icosagcm",return_comm=comm_icosa)
+      ENDIF
+
+#ifdef CPP_USING_XIOS
+      CALL xios_initialize("icosa",return_comm=comm_icosa)
 #else
      comm_icosa=MPI_COMM_WORLD
@@ -143 +151 @@
       CALL xios_finalize
 #endif
-    IF (using_mpi) CALL MPI_FINALIZE(ierr)
+    IF (using_mpi) THEN
+      IF (using_oasis == 'n') CALL MPI_FINALIZE(ierr)
+    ENDIF
     
    END SUBROUTINE  finalize_mpipara