Changeset 7523 for branches/2015/nemo_v3_6_STABLE

Timestamp:

2017-01-03T11:06:57+01:00 (7 years ago)

Author:

cetlod

Message:

3.6stable: minor bugfix for Offline configuration with vvl

File:

• branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90 (modified) (5 diffs)

branches/2015/nemo_v3_6_STABLE/NEMOGCM/NEMO/OFF_SRC/dtadyn.F90

@@ -52 +52 @@
    PUBLIC   dta_dyn_swp   ! called by step.F90
 
-   CHARACTER(len=100) ::   cn_dir          !: Root directory for location of ssr files
-   LOGICAL            ::   ln_dynrnf       !: read runoff data in file (T) or set to zero (F)
-   LOGICAL            ::   ln_dynrnf_depth       !: read runoff data in file (T) or set to zero (F)
+   CHARACTER(len=100) ::   cn_dir           !: Root directory for location of ssr files
+   LOGICAL            ::   ln_ssh_ini       !: initial ssh from dyn file (T) or not (F) - ssh is then read from passive tracer restart
+   LOGICAL            ::   ln_dynrnf        !: read runoff data in file (T) or set to zero (F)
+   LOGICAL            ::   ln_dynrnf_depth  !: read runoff data in file (T) or set to zero (F)
    REAL(wp)           ::   fwbcorr
 
@@ -231 +232 @@
       !!----------------------------------------------------------------------
 
-      NAMELIST/namdta_dyn/cn_dir, ln_dynrnf, ln_dynrnf_depth,  fwbcorr, &
+      NAMELIST/namdta_dyn/cn_dir, ln_dynrnf, ln_dynrnf_depth,  ln_ssh_ini, fwbcorr, &
          &                sn_uwd, sn_vwd, sn_wwd, sn_emp,    &
          &                sn_avt, sn_tem, sn_sal, sn_mld , sn_qsr ,   &
@@ -253 +254 @@
          WRITE(numout,*) '~~~~~~~ '
          WRITE(numout,*) '   Namelist namdta_dyn'
+         WRITE(numout,*) '      ssh initialised from dyn file (T) or not (F)     ln_ssh_ini       = ', ln_ssh_ini
          WRITE(numout,*) '      runoffs option enabled (T) or not (F)            ln_dynrnf        = ', ln_dynrnf
          WRITE(numout,*) '      runoffs is spread in vertical                    ln_dynrnf_depth  = ', ln_dynrnf_depth
@@ -279 +281 @@
       !
       IF( lk_trabbl ) THEN
-                 jf_ubl  = jfld + 1    ;         jf_vbl  = jfld + 2     ;      jfld = jf_vbl
+                 jf_ubl  = jfld + 1    ;         jf_vbl  = jfld + 2       ;      jfld = jf_vbl
            slf_d(jf_ubl) = sn_ubl      ;   slf_d(jf_vbl) = sn_vbl
       ENDIF
@@ -329 +331 @@
       !
       IF( lk_vvl ) THEN
-        IF( .NOT. sf_dyn(jf_uwd)%ln_clim .AND. ln_rsttr .AND.    &                     ! Restart: read in restart file
-           iom_varid( numrtr, 'sshn', ldstop = .FALSE. ) > 0 ) THEN
-           IF(lwp) WRITE(numout,*) ' sshn forcing fields read in the restart file for initialisation'
-           CALL iom_get( numrtr, jpdom_autoglo, 'sshn', sshn(:,:)   )
-           CALL iom_get( numrtr, jpdom_autoglo, 'sshb', sshb(:,:)   )
-        ELSE
-           IF(lwp) WRITE(numout,*) ' sshn forcing fields read in the restart file for initialisation'
+        IF( ln_ssh_ini ) THEN                     ! Restart: read in restart file
+           IF(lwp) WRITE(numout,*) ' sshn forcing fields read in the dynamics restart file for initialisation'
            CALL iom_open( 'restart', inum )
            CALL iom_get( inum, jpdom_autoglo, 'sshn', sshn(:,:)   )
            CALL iom_get( inum, jpdom_autoglo, 'sshb', sshb(:,:)   )
            CALL iom_close( inum )                                        ! close file
+        ELSE
+           IF(lwp) WRITE(numout,*) ' sshn forcing fields read in passive tracers restart file for initialisation'
+           CALL iom_get( numrtr, jpdom_autoglo, 'sshn', sshn(:,:)   )
+           CALL iom_get( numrtr, jpdom_autoglo, 'sshb', sshb(:,:)   )
         ENDIF
         !