Changeset 12465

Timestamp:

2020-02-26T10:27:04+01:00 (4 years ago)

Author:

jcastill

Message:

Changes as in the original branch but updated to vn4.1

Location:

NEMO/branches/UKMO/r12083_coupling_sequence/src/OCE

Files:

• DIA/diawri.F90 (modified) (1 diff)
• LBC/lib_mpp.F90 (modified) (2 diffs)
• SBC/sbccpl.F90 (modified) (2 diffs)
• SBC/sbcice_cice.F90 (modified) (2 diffs)
• SBC/sbcmod.F90 (modified) (1 diff)
• nemogcm.F90 (modified) (5 diffs)
• step.F90 (modified) (2 diffs)

NEMO/branches/UKMO/r12083_coupling_sequence/src/OCE/DIA/diawri.F90

@@ -932 +932 @@
       ENDIF
 #endif
+
+      IF (cdfile_name == "output.abort") THEN  
+         CALL ctl_stop('STOP', 'NEMO abort from dia_wri_state')  
+      END IF
       !
       CALL iom_close( inum )

NEMO/branches/UKMO/r12083_coupling_sequence/src/OCE/LBC/lib_mpp.F90

@@ -670 +670 @@
       !!
       !!----------------------------------------------------------------------
+#if defined key_oasis3
+      USE mod_oasis      ! coupling routines
+#endif
+
       LOGICAL, OPTIONAL, INTENT(in) :: ld_abort    ! source process number
       LOGICAL ::   ll_abort
@@ -681 +685 @@
          CALL mpi_abort( MPI_COMM_WORLD )
       ELSE
+#if defined key_oasis3  
+      ! 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.  
+        CALL oasis_abort(nproc,"mppstop","NEMO initiated abort")  
+#else
          CALL mppsync
          CALL mpi_finalize( info )
-      ENDIF
-#endif
-      IF( ll_abort ) STOP 123
+#endif
+      ENDIF
+#endif
+      IF( ll_abort ) CALL ctl_stop ('STOP', 'NEMO abort mppstop') 
       !
    END SUBROUTINE mppstop

NEMO/branches/UKMO/r12083_coupling_sequence/src/OCE/SBC/sbccpl.F90

@@ -219 +219 @@
       ALLOCATE( a_i(jpi,jpj,1) , STAT=ierr(2) )  ! used in sbcice_if.F90 (done here as there is no sbc_ice_if_init)
 #endif
-      ALLOCATE( xcplmask(jpi,jpj,0:nn_cplmodel) , STAT=ierr(3) )
+      !ALLOCATE( xcplmask(jpi,jpj,nn_cplmodel) , STAT=ierr(3) )    
+      ! Hardwire three models as nn_cplmodel has not been read in from the namelist yet.    
+      ALLOCATE( xcplmask(jpi,jpj,0:3) , STAT=ierr(3) )
       !
       IF( .NOT. ln_apr_dyn ) ALLOCATE( ssh_ib(jpi,jpj), ssh_ibb(jpi,jpj), apr(jpi, jpj), STAT=ierr(4) ) 
@@ -333 +335 @@
 
       !                                   ! allocate sbccpl arrays
-      IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )
+!      IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )
      
       ! ================================ !

NEMO/branches/UKMO/r12083_coupling_sequence/src/OCE/SBC/sbcice_cice.F90

@@ -269 +269 @@
       ENDIF
       !
+      ! In coupled mode get extra fields from CICE for passing back to atmosphere  
+      IF ( ksbc == jp_purecpl ) CALL cice_sbc_hadgam(nit000)  
+      !
    END SUBROUTINE cice_sbc_init
 
@@ -664 +667 @@
       !!---------------------------------------------------------------------
       !
-      IF( kt == nit000 )  THEN
-         IF(lwp) WRITE(numout,*)'cice_sbc_hadgam'
-         IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )
-      ENDIF
-
       !                                         ! =========================== !
       !                                         !   Prepare Coupling fields   !

NEMO/branches/UKMO/r12083_coupling_sequence/src/OCE/SBC/sbcmod.F90

@@ -291 +291 @@
       !                             !* OASIS initialization
       !
-      IF( lk_oasis )   CALL sbc_cpl_init( nn_ice )   ! Must be done before: (1) first time step
-      !                                              !                      (2) the use of nn_fsbc
+      IF( lk_oasis ) THEN  
+         IF( sbc_cpl_alloc() /= 0 )   CALL ctl_stop( 'STOP', 'sbc_cpl_alloc : unable to allocate arrays' )   
+         CALL sbc_cpl_init( nn_ice )   ! Must be done before: (1) first time step  
+                                       ! (2) the use of nn_fsbc  
+      ENDIF
       !     nn_fsbc initialization if OPA-SAS coupling via OASIS
       !     SAS time-step has to be declared in OASIS (mandatory) -> nn_fsbc has to be modified accordingly

NEMO/branches/UKMO/r12083_coupling_sequence/src/OCE/nemogcm.F90

@@ -87 +87 @@
    USE lbcnfd  , ONLY : isendto, nsndto, nfsloop, nfeloop   ! Setup of north fold exchanges 
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)
+   USE sbccpl
 #if defined key_iomput
    USE xios           ! xIOserver
@@ -199 +200 @@
             ENDIF
             
+            IF (lk_oasis) CALL sbc_cpl_snd( istp )  ! Coupling to atmos
             CALL stp        ( istp ) 
+            ! We don't couple on the final timestep because  
+            ! our restart file has already been written  
+            ! and contains all the necessary data for a  
+            ! restart. sbc_cpl_snd could be called here  
+            ! but it would require  
+            ! a) A test to ensure it was not performed  
+            !    on the very last time-step  
+            ! b) the presence of another call to  
+            !    sbc_cpl_snd call prior to the main DO loop  
+            ! This solution produces identical results  
+            ! with fewer lines of code.
             istp = istp + 1
 
@@ -279 +292 @@
       IF( Agrif_Root() ) THEN
          IF( lk_oasis ) THEN
-            CALL cpl_init( "oceanx", ilocal_comm )                               ! nemo local communicator given by oasis
+            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
@@ -289 +302 @@
       IF( lk_oasis ) THEN
          IF( Agrif_Root() ) THEN
-            CALL cpl_init( "oceanx", ilocal_comm )          ! nemo local communicator given by oasis
+            CALL cpl_init( "toyoce", ilocal_comm )          ! nemo local communicator given by oasis
          ENDIF
          CALL mpp_start( ilocal_comm )
@@ -493 +506 @@
       !
       IF(lwp) WRITE(numout,cform_aaa)           ! Flag AAAAAAA
+      !
+      IF (nstop > 0) THEN  
+        CALL CTL_STOP('STOP','Critical errors in NEMO initialisation')  
+      END IF
       !
       IF( ln_timing    )   CALL timing_stop( 'nemo_init')

NEMO/branches/UKMO/r12083_coupling_sequence/src/OCE/step.F90

@@ -295 +295 @@
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
                          CALL stp_ctl      ( kstp, indic )
+
+      IF( indic < 0  ) THEN
+                         CALL ctl_stop('STOP','NEMO failure in stp')
+      ENDIF
                          
       IF( kstp == nit000 ) THEN                          ! 1st time step only
@@ -305 +309 @@
       ! Coupled mode
       !<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<
-!!gm why lk_oasis and not lk_cpl ????
-      IF( lk_oasis   )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges
+      !IF( lk_oasis   )   CALL sbc_cpl_snd( kstp )     ! coupled mode : field exchanges
       !
 #if defined key_iomput