Changeset 13311 for NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_pkg/src/OCE/nemogcm.F90

Timestamp:

2020-07-16T15:27:24+02:00 (4 years ago)

Author:

frrh

Message:

Save dev changes for concurrent LFRIC + GO8 running

File:

• NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_pkg/src/OCE/nemogcm.F90 (modified) (10 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_pkg/src/OCE/nemogcm.F90

@@ -41 +41 @@
    !!   nemo_alloc    : dynamical allocation
    !!----------------------------------------------------------------------
+   USE mod_oasis ! RSRH temp
    USE step_oce       ! module used in the ocean time stepping module (step.F90)
    USE phycst         ! physical constant                  (par_cst routine)
@@ -130 +131 @@
       !!              Madec, 2008, internal report, IPSL.
       !!----------------------------------------------------------------------
-      INTEGER ::   istp   ! time step index
+      INTEGER ::   istp, nerror   ! time step index
       REAL(wp)::   zstptiming   ! elapsed time for 1 time step
       !!----------------------------------------------------------------------
@@ -200 +201 @@
             ENDIF
             
-            IF (lk_oasis) THEN
-               CALL sbc_cpl_snd( istp )  ! Coupling to atmos
-            ENDIF
+            ! RSRH. You can compile with OASIS but not want to do any
+            ! coupling. We need to cater for that properly!
+            IF (ln_cpl) CALL sbc_cpl_snd( istp )  ! Coupling to atmos
+
             CALL stp        ( istp ) 
             istp = istp + 1
@@ -239 +241 @@
       IF( ln_timing )   CALL timing_finalize
       !
+      write(numout,*) "RSRH calling nemo_closefile " , lk_oasis; flush(numout)
       CALL nemo_closefile
+      write(numout,*) "RSRH done closefiles " , lk_oasis; flush(numout)
       !
 #if defined key_iomput
-                                    CALL xios_finalize  ! end mpp communications with xios
-      IF( lk_oasis     )            CALL cpl_finalize   ! end coupling and mpp communications with OASIS
+      CALL xios_finalize()  ! end mpp communications with xios
+
+      IF (lk_oasis)  CALL oasis_terminate(nerror)
+      CALL mppstop ! RSRH temp for development
+      !IF( lk_oasis     )            CALL cpl_finalize()   ! end coupling and mpp communications with OASIS
 #else
-      IF    ( lk_oasis ) THEN   ;   CALL cpl_finalize   ! end coupling and mpp communications with OASIS
-      ELSEIF( lk_mpp   ) THEN   ;   CALL mppstop      ! end mpp communications
+      IF    ( lk_oasis ) THEN   
+          CALL cpl_finalize()   ! end coupling and mpp communications with OASIS
+      ELSEIF( lk_mpp   ) THEN 
+          CALL mppstop      ! end mpp communications
       ENDIF
 #endif
       !
       IF(lwm) THEN
-         IF( nstop == 0 ) THEN   ;   STOP 0
-         ELSE                    ;   STOP 123
+         IF( nstop == 0 ) THEN   
+                STOP 0
+         ELSE        
+                STOP 123
          ENDIF
       ENDIF
@@ -265 +276 @@
       !! ** Purpose :   initialization of the NEMO GCM
       !!----------------------------------------------------------------------
-      INTEGER ::   ios, ilocal_comm   ! local integers
+      INTEGER ::   ios, ilocal_comm, nerror, ncomp_id, llmpi_init, ierr  ! local integers
       !!
       NAMELIST/namctl/ ln_ctl   , sn_cfctl, nn_print, nn_ictls, nn_ictle,   &
@@ -281 +292 @@
       !
 #if defined key_iomput
-      IF( Agrif_Root() ) THEN
-         IF( lk_oasis ) THEN
-            CALL cpl_init( "toyoce", ilocal_comm )                     ! nemo local communicator given by oasis
-            CALL xios_initialize( "not used"       , local_comm =ilocal_comm )   ! send nemo communicator to xios
-         ELSE
-            CALL xios_initialize( "for_xios_mpi_id", return_comm=ilocal_comm )   ! nemo local communicator given by xios
-         ENDIF
+!      IF( Agrif_Root() ) THEN
+!         IF( lk_oasis ) THEN
+!            CALL cpl_init( "toyoce", ilocal_comm )                     ! nemo local communicator given by oasis
+!            CALL xios_initialize( "not used"       , local_comm =ilocal_comm )   ! send nemo communicator to xios
+!         ELSE
+!            CALL xios_initialize( "for_xios_mpi_id", return_comm=ilocal_comm )   ! nemo local communicator given by xios
+!         ENDIF
+!      ENDIF
+! RSRH simplify initialisaton for test
+      IF( lk_oasis ) THEN
+          CALL mpi_init(nerror)
+          CALL oasis_init_comp ( ncomp_id, "toyoce", nerror, .FALSE. )
+!          CALL cpl_init( "toyoce", ilocal_comm ) 
+          CALL oasis_get_localcomm ( ilocal_comm , nerror )
+          CALL xios_initialize( "toyoce", local_comm =ilocal_comm )
       ENDIF
       CALL mpp_start( ilocal_comm )
@@ -330 +349 @@
       lwp = (narea == 1) .OR. ln_ctl    ! control of all listing output print
       !
+WRITE(numout,*) "RSRH NEMO start local com=",ilocal_comm ; flush(numout) 
+WRITE(numout,*) "RSRH NEMO my rank=",mpprank ; flush(numout) 
       IF(lwp) THEN                      ! open listing units
          !
@@ -335 +356 @@
             &            CALL ctl_opn( numout, 'ocean.output', 'REPLACE', 'FORMATTED', 'SEQUENTIAL', -1, -1, .FALSE., narea )
          !
+
+WRITE(numout,*) "RSRH NEMO start local com=",ilocal_comm ; flush(numout) 
+WRITE(numout,*) "RSRH NEMO my rank=",mpprank ; flush(numout) 
+
          WRITE(numout,*)
          WRITE(numout,*) '   CNRS - NERC - Met OFFICE - MERCATOR-ocean - CMCC'
@@ -625 +650 @@
       !
       CALL iom_close                                 ! close all input/output files managed by iom_*
+
+write(numout,*) "RSRH after iom_close";flush(numout)
       !
       IF( numstp          /= -1 )   CLOSE( numstp          )   ! time-step file
@@ -640 +667 @@
       IF( numdct_salt     /= -1 )   CLOSE( numdct_salt     )   ! salt transports
       !
-      numout = 6                                     ! redefine numout in case it is used after this point...
+!      numout = 6                                     ! redefine numout in case it is used after this point...
       !
    END SUBROUTINE nemo_closefile