Changeset 15262

Timestamp:

2021-09-15T16:41:33+02:00 (3 years ago)

Author:

acc

Message:

Fix restartability issue for ORCA2_ICE_PISCES with GEOMETRIC parameterisation and ln_adv_wave=.true.. Also remove redundant restart variable (zc1). SETTE restartability is now ok for an ORCA2_ICE_PISCES-based test. Still an issue with reproducibility. #2722

Location:

NEMO/branches/NERC/dev_r4.0.6_GEOMETRIC

Files:

• cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg (modified) (1 diff)
• src/OCE/LDF/ldfeke.F90 (modified) (7 diffs)

NEMO/branches/NERC/dev_r4.0.6_GEOMETRIC/cfgs/ORCA2_ICE_PISCES/EXPREF/namelist_cfg

@@ -288 +288 @@
       ln_ldfeiv_dia =.true.   ! diagnose eiv stream function and velocities
 /
+!----------------------------------------------------------------------------------
+&namldf_eke !   GEOMETRIC param. (total EKE equation)                           (nn_aei_ijk_t = 32)
+!----------------------------------------------------------------------------------
+/
 !-----------------------------------------------------------------------
 &namtra_dmp    !   tracer: T & S newtonian damping                      (default: OFF)

NEMO/branches/NERC/dev_r4.0.6_GEOMETRIC/src/OCE/LDF/ldfeke.F90

@@ -258 +258 @@
          END DO
          !
+         CALL lbc_lnk( 'ldfeke', zc_ros, 'W', 1. )
          zwx(:,:) = 0._wp ! wipe the advective contribution from above
          !
@@ -422 +423 @@
          &                zadv_ubt, 'T', 1. , zadv_wav, 'T', 1. , zdis, 'T', 1. ,   &
          &                zlap    , 'T', 1. , zeke_peS, 'T', 1. ,                   & 
-         &                zc1     , 'W', 1. , zc_ros  , 'W', 1. )      
+         &                zc1     , 'W', 1. )      
       !
       CALL iom_put( "eke"            , eke_n )         ! parameterized total EKE (EPE+ EKE)
@@ -477 +478 @@
       !
       !
-! note: GEOMETRIC is *** off *** by default (so no ref list) 
-!      REWIND( numnam_ref )              ! Namelist namldf_eke in reference namelist : Turbulent Kinetic Energy
-!      READ  ( numnam_ref, namldf_eke, IOSTAT = ios, ERR = 901)
-!901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namldf_eke in reference namelist' )
+      REWIND( numnam_ref )              ! Namelist namldf_eke in reference namelist : GEOMETRIC parameterization
+      READ  ( numnam_ref, namldf_eke, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namldf_eke in reference namelist' )
 
       REWIND( numnam_cfg )              ! Namelist namldf_eke in configuration namelist : GEOMETRIC parameterization
@@ -557 +557 @@
       CALL eke_rst( nit000, 'READ' )   !* read or initialize all required files
       !
-      ! tidy up the initilisation of zc1
+      ! initialise some optional arrays (ln_adv_wave related)
+      zc1(:,:)      = 0._wp
       zc_ros(:,:)   = 0._wp
-      zadv_wav(:,:) = 0._wp
-      IF ( ln_adv_wav ) THEN
-         DO jj = 2, jpjm1
-            DO ji = 1, fs_jpim1
-               ! set the ones that are not deep enough to be zero
-               IF ( ht_0(ji,jj) < 300._wp ) THEN   ! jm: should use something like ht_b really...
-                  zc1(ji,jj) = 0._wp
-               END IF
-            END DO
-         END DO
-      END IF
+      !
       ! if using beta_plane, compute beta and f0 locally
       IF ( ln_beta_plane ) THEN
@@ -623 +614 @@
               aeiv(:,:,:) = 10._wp * vmask(:,:,:)
            ENDIF
-           ! ln_wav_adv restarts + initialisations
-           IF( ln_adv_wav ) THEN
-!              id5 = iom_varid( numror, 'zc1' , ldstop = .FALSE. )
-!              IF( id5 > 0 ) THEN
-!                 IF(lwp) write(numout,*) '    ln_adv_wav on and found zc1 variable, loading ...'
-!                 CALL iom_get( numror, jpdom_autoglo, 'zc1'  , zc1 )
-!              ELSE
-                 IF(lwp) write(numout,*) '    ln_adv_wav on but not found zc1 variable, initialising ...'
-                 zc1(:,:)    =  4._wp  ! set it to something everywhere but some are set to zero in ldf_eke_init
-!              END IF
-           END IF
         ELSE                                          !* Start from rest with a non zero value (required)
             IF(lwp) write(numout,*) ' ldfeke init restart from namelist'
@@ -640 +620 @@
             aeiu(:,:,:) = 10._wp * umask(:,:,:)       ! bottom eddy coeff set to zero at last level
             aeiv(:,:,:) = 10._wp * vmask(:,:,:)
-            zc1(:,:)    =  4._wp
             !                              
         ENDIF
@@ -651 +630 @@
         CALL iom_rstput( kt, nitrst, numrow, 'aeiu' , aeiu )
         CALL iom_rstput( kt, nitrst, numrow, 'aeiv' , aeiv )
-        CALL iom_rstput( kt, nitrst, numrow, 'zc1'  , zc1 )
         !
      ENDIF