Changeset 15261 for NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3

Timestamp:

2021-09-15T13:10:27+02:00 (3 years ago)

Author:

frrh

Message:

Update with latest changes to ensure NEMO will run satnd alone AND
in coupled mode from the same suite, subject to appropriate
cpp key and other adjusted settings.

Location:

NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3/src/OCE

Files:

• LBC/lib_mpp.F90 (modified) (2 diffs)
• SBC/sbccpl.F90 (modified) (1 diff)
• nemogcm.F90 (modified) (8 diffs)

NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3/src/OCE/LBC/lib_mpp.F90

@@ -665 +665 @@
    SUBROUTINE mppstop( ld_abort ) 
 
-      USE mod_oasis      ! coupling routines
-
+#if defined key_oasis3
+      USE mod_oasis, only:  oasis_abort     ! coupling routines
+#endif
       !!----------------------------------------------------------------------
       !!                  ***  routine mppstop  ***
@@ -684 +685 @@
       ! If we're trying to shut down cleanly then we need to consider the fact
       ! that this could be part of an MPMD configuration - we don't want to
-      ! leave other components deadlocked.
-
-! RSRH No! 
+      ! leave other components deadlocked. Hence, if aborting we need to use 
+      ! oasis_abort not mpi_abort directly!
+
       IF(ll_abort) THEN
          !CALL mpi_abort( MPI_COMM_WORLD )

NEMO/branches/UKMO/NEMO_4.0.1_NGMS_couple_stage3/src/OCE/SBC/sbccpl.F90

@@ -2683 +2683 @@
       IF ( ssnd(jps_dummy_t)%laction ) THEN
          ! RSRH Just set up some arbitrary test pattern for now
+         ztmp1(:,:) = 1.e+20
          DO jj = 1, jpj
             DO ji = 1, jpi
-               ztmp1(ji,jj) = kt + (glamt(ji,jj) * gphit(ji,jj))
+               IF (tmask(ji,jj,1) > 0.5) THEN
+                  ztmp1(ji,jj) = kt + (glamt(ji,jj) * gphit(ji,jj)) 
+               ENDIF
             ENDDO
          ENDDO

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

@@ -41 +41 @@
    !!   nemo_alloc    : dynamical allocation
    !!----------------------------------------------------------------------
-   USE mod_oasis ! RSRH temp
+#if defined key_oasis3
+   USE mod_oasis      ! For coupling
+#endif
    USE step_oce       ! module used in the ocean time stepping module (step.F90)
    USE phycst         ! physical constant                  (par_cst routine)
@@ -156 +158 @@
 
       IF(lwp) WRITE(numout,cform_aaa)   ! Flag AAAAAAA
+      WRITE(numout,*)"RSRH at time stepping" ; flush(numout)
+
 
       !                            !-----------------------!
@@ -235 +239 @@
       !                            !==  finalize the run  ==!
       !                            !------------------------!
+      WRITE(numout,*)"RSRH at finalize" ; flush(numout)
       IF(lwp) WRITE(numout,cform_aaa)        ! Flag AAAAAAA
       !
@@ -246 +251 @@
       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 oasis_terminate(nerror)
-      CALL mppstop ! RSRH temp for development
-      !IF( lk_oasis     )            CALL cpl_finalize()   ! end coupling and mpp communications with OASIS
+#if defined key_oasis3
+      IF (lk_oasis)  THEN
+         CALL oasis_terminate(nerror)
+         CALL mppstop      ! end mpp communications
+      ELSEIF( lk_mpp   ) THEN
+         CALL mppstop ! RSRH temp for development
+      ENDIF
+#endif
+
 #else
+      ! RSRH It's unclear if the following will work 
+      ! since we never compile w/o key_iomput
       IF    ( lk_oasis ) THEN   
           CALL cpl_finalize()   ! end coupling and mpp communications with OASIS
@@ -294 +306 @@
       !                             !-------------------------------------------------!
       !
+
 #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
-!      ENDIF
-! RSRH simplify initialisaton for test
+      IF( Agrif_Root() ) THEN
+        IF(.not.lk_oasis) THEN
+          CALL xios_initialize( "for_xios_mpi_id", return_comm=ilocal_comm )   ! nemo local communicator given by xios
+        ENDIF
+      ENDIF 
+
+#if defined key_oasis3
       IF( lk_oasis ) THEN
           CALL mpi_init(nerror)
           CALL oasis_init_comp ( ncomp_id, "toyoce", nerror, .TRUE. )
-!          CALL cpl_init( "toyoce", ilocal_comm ) 
           CALL oasis_get_localcomm ( ilocal_comm , nerror )
           CALL xios_initialize( "toyoce", local_comm =ilocal_comm )
       ENDIF
+#endif
+
       CALL mpp_start( ilocal_comm )
-#else
-      IF( lk_oasis ) THEN
-         IF( Agrif_Root() ) THEN
-            CALL cpl_init( "toyoce", ilocal_comm )                      ! nemo local communicator given by oasis
-         ENDIF
-         CALL mpp_start( ilocal_comm )
-      ELSE
-         CALL mpp_start( )
-      ENDIF
-#endif
+#endif
+
       !
       narea = mpprank + 1               ! mpprank: the rank of proc (0 --> mppsize -1 )
@@ -352 +356 @@
       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
          !
@@ -359 +361 @@
             &            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,*)
@@ -654 +653 @@
       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