Changeset 14018 for NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/DOM/domain.F90

Timestamp:

2020-12-02T18:22:24+01:00 (3 years ago)

Author:

techene

Message:

#2385 branch updated with trunk 13970

Location:

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3

Files:

• . (modified) (1 prop)
• src/OCE/DOM/domain.F90 (modified) (12 diffs)

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette@13795        sette

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette@13795        sette

NEMO/branches/2020/dev_r13327_KERNEL-06_2_techene_e3/src/OCE/DOM/domain.F90

@@ -67 +67 @@
 CONTAINS
 
-   SUBROUTINE dom_init( Kbb, Kmm, Kaa, cdstr )
+   SUBROUTINE dom_init( Kbb, Kmm, Kaa )
       !!----------------------------------------------------------------------
       !!                  ***  ROUTINE dom_init  ***
@@ -83 +83 @@
       !!----------------------------------------------------------------------
       INTEGER          , INTENT(in) :: Kbb, Kmm, Kaa          ! ocean time level indices
-      CHARACTER (len=*), INTENT(in) :: cdstr                  ! model: NEMO or SAS. Determines core restart variables
       !
       INTEGER ::   ji, jj, jk, jt   ! dummy loop indices
@@ -129 +128 @@
       !           !==  Reference coordinate system  ==!
       !
-      CALL dom_glo                     ! global domain versus local domain
-      CALL dom_nam( cdstr )                     ! read namelist ( namrun, namdom )
+      CALL dom_glo                      ! global domain versus local domain
+      CALL dom_nam                      ! read namelist ( namrun, namdom )
       !
       CALL dom_hgr                      ! Horizontal mesh
@@ -175 +174 @@
       !
       !                                 != ssh initialization
-      IF( cdstr /= 'SAS' ) THEN
+      IF( .NOT.l_offline .AND. .NOT.l_SAS ) THEN
          CALL ssh_init_rst( Kbb, Kmm, Kaa )
+      ELSE
+         ssh(:,:,:) = 0._wp
       ENDIF
       !
@@ -296 +297 @@
 
 
-   SUBROUTINE dom_nam( cdstr )
+   SUBROUTINE dom_nam
       !!----------------------------------------------------------------------
       !!                     ***  ROUTINE dom_nam  ***
@@ -308 +309 @@
       USE ioipsl
       !!
-      CHARACTER (len=*), INTENT(in) ::   cdstr   ! model: NEMO or SAS. Determines core restart variables
-      !
       INTEGER ::   ios   ! Local integer
       REAL(wp)::   zrdt
@@ -360 +359 @@
       rDt   = 2._wp * rn_Dt
       r1_Dt = 1._wp / rDt
+      !
+      IF( l_SAS .AND. .NOT.ln_linssh ) THEN
+         CALL ctl_warn( 'SAS requires linear ssh : force ln_linssh = T' )
+         ln_linssh = .TRUE.
+      ENDIF
       !
 #if defined key_qco
@@ -429 +433 @@
       !
       !                                        !==  Set parameters for restart reading using xIOS  ==!
-      lwxios = .FALSE.
       !
       IF( TRIM(Agrif_CFixed()) == '0' ) THEN
@@ -436 +439 @@
          nxioso = nn_wxios
       ENDIF
-      !
-      IF( lwxios ) THEN                                 !*  define names for restart write and set core output (restart.F90)
-         CALL iom_set_rst_vars ( rst_wfields )
-         CALL iom_set_rstw_core( cdstr )
-      ENDIF
-      !
-      IF( cdstr == 'SAS' ) THEN                         !*  reset namelist for SAS
-         IF( lrxios ) THEN
-            IF(lwp) WRITE(numout,*) 'Disable reading restart file using XIOS for SAS'
-            lrxios = .FALSE.
-         ENDIF
-      ENDIF
-      !
       !                                        !==  Check consistency between ln_rstart and ln_1st_euler  ==!   (i.e. set l_1st_euler)
       l_1st_euler = ln_1st_euler
@@ -459 +449 @@
          !
          IF( iom_varid( numror, 'rdt', ldstop = .FALSE. ) > 0 ) THEN     !- Check time-step consistency and force Euler restart if changed
-            CALL iom_get( numror, 'rdt', zrdt, ldxios = lrxios )
+            CALL iom_get( numror, 'rdt', zrdt )
             IF( zrdt /= rn_Dt ) THEN
                IF(lwp) WRITE( numout,*)
@@ -469 +459 @@
          ENDIF
          !
-         IF( iom_varid( numror, 'sshb', ldstop = .FALSE. ) <= 0 ) THEN   !- Check absence of one of the Kbb field (here sshb)
-            !                                                            !  (any Kbb field is missing ==> all Kbb fields are missing) 
+         IF( .NOT.l_SAS .AND. iom_varid( numror, 'sshb', ldstop = .FALSE. ) <= 0 ) THEN   !- Check absence of one of the Kbb field (here sshb)
+            !                                                                             !  (any Kbb field is missing ==> all Kbb fields are missing) 
             IF( .NOT.l_1st_euler ) THEN
                CALL ctl_warn('dom_nam : ssh at Kbb not found in restart files ',   &
@@ -484 +474 @@
          l_1st_euler = .TRUE.
       ENDIF
-      
       !
       !                                        !==  control of output frequency  ==!

@@ -8 +8 @@
 
 # SETTE
-^/utils/CI/sette@13559        sette
+^/utils/CI/sette@13795        sette