Changeset 4370 for branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

Timestamp:

2014-01-23T18:13:16+01:00 (10 years ago)

Author:

jchanut

Message:

Time split cleaning / AMM12 restart / BDY and Agrif. See tickets #1228, #1227, #1225 and #1133

File:

• branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90 (modified) (6 diffs)

branches/2013/dev_MERGE_2013/NEMOGCM/NEMO/OPA_SRC/DOM/domain.F90

@@ -91 +91 @@
       IF( lk_c1d         )   CALL cor_c1d      ! 1D configuration: Coriolis set at T-point
       !
-      hu(:,:) = 0._wp                          ! Ocean depth at U- and V-points
-      hv(:,:) = 0._wp
-      DO jk = 1, jpk
+      !
+      hu(:,:) = 0._wp                          ! Ocean depth at U-points
+      hv(:,:) = 0._wp                          ! Ocean depth at V-points
+      ht(:,:) = 0._wp                          ! Ocean depth at T-points
+      DO jk = 1, jpkm1
          hu(:,:) = hu(:,:) + fse3u_n(:,:,jk) * umask(:,:,jk)
          hv(:,:) = hv(:,:) + fse3v_n(:,:,jk) * vmask(:,:,jk)
+         ht(:,:) = ht(:,:) + fse3t_n(:,:,jk) * tmask(:,:,jk)
       END DO
       !                                        ! Inverse of the local depth
@@ -124 +127 @@
       NAMELIST/namrun/ nn_no   , cn_exp    , cn_ocerst_in, cn_ocerst_out, ln_rstart , nn_rstctl,   &
          &             nn_it000, nn_itend  , nn_date0    , nn_leapy     , nn_istate , nn_stock ,   &
-         &             nn_write, ln_dimgnnn, ln_mskland  , ln_clobber   , nn_chunksz
+         &             nn_write, ln_dimgnnn, ln_mskland  , ln_clobber   , nn_chunksz, nn_euler
       NAMELIST/namdom/ nn_bathy, rn_bathy , rn_e3zps_min, rn_e3zps_rat, nn_msh, rn_hmin,   &
          &             nn_acc   , rn_atfp     , rn_rdt      , rn_rdtmin ,                  &
-         &             rn_rdtmax, rn_rdth     , nn_baro     , nn_closea , ln_crs,    &
+         &             rn_rdtmax, rn_rdth     , nn_closea , ln_crs,    &
          &             jphgr_msh, &
          &             ppglam0, ppgphi0, ppe1_deg, ppe2_deg, ppe1_m, ppe2_m, &
@@ -158 +161 @@
          WRITE(numout,*) '      file prefix restart output      cn_ocerst_out= ', cn_ocerst_out
          WRITE(numout,*) '      restart logical                 ln_rstart  = ', ln_rstart
+         WRITE(numout,*) '      start with forward time step    nn_euler   = ', nn_euler
          WRITE(numout,*) '      control of time step            nn_rstctl  = ', nn_rstctl
          WRITE(numout,*) '      number of the first time step   nn_it000   = ', nn_it000
@@ -182 +186 @@
       nstock = nn_stock
       nwrite = nn_write
-
+      neuler = nn_euler
+      IF ( neuler == 1 .AND. .NOT.ln_rstart ) THEN
+         WRITE(ctmp1,*) 'ln_rstart =.FALSE., nn_euler is forced to 0 '
+         CALL ctl_warn( ctmp1 )
+         neuler = 0
+      ENDIF
 
       !                             ! control of output frequency
@@ -240 +249 @@
          WRITE(numout,*) '      ocean time step                       rn_rdt    = ', rn_rdt
          WRITE(numout,*) '      asselin time filter parameter         rn_atfp   = ', rn_atfp
-         WRITE(numout,*) '      time-splitting: nb of sub time-step   nn_baro   = ', nn_baro
          WRITE(numout,*) '      acceleration of converge              nn_acc    = ', nn_acc
          WRITE(numout,*) '        nn_acc=1: surface tracer rdt        rn_rdtmin = ', rn_rdtmin
@@ -447 +455 @@
    !!======================================================================
 END MODULE domain
-