Changeset 10009 for NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/DOM/domain.F90

Timestamp:

2018-07-29T11:23:51+02:00 (6 years ago)

Author:

gm

Message:

#1911 (ENHANCE-04): RK3 branch - step II.1 time-level dimension on ssh

File:

• NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/DOM/domain.F90 (modified) (8 diffs)

NEMO/branches/2018/dev_r9838_ENHANCE04_RK3/src/OCE/DOM/domain.F90

@@ -15 +15 @@
    !!            3.7  !  2015-11  (G. Madec, A. Coward)  time varying zgr by default
    !!            4.0  !  2016-10  (G. Madec, S. Flavoni)  domain configuration / user defined interface
+   !!            5.0  !  2018-07  (G. Madec)  RK3: add a time-level dimension to time-varying variables
    !!----------------------------------------------------------------------
    
@@ -48 +49 @@
    PRIVATE
 
+   PUBLIC   dom_nam      ! called by nemogcm.F90
    PUBLIC   dom_init     ! called by nemogcm.F90
    PUBLIC   domain_cfg   ! called by nemogcm.F90
@@ -118 +120 @@
       !
       CALL dom_glo                     ! global domain versus local domain
-      CALL dom_nam                     ! read namelist ( namrun, namdom )
-      !
-      IF( lwxios ) THEN
-!define names for restart write and set core output (restart.F90)
+      !
+      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
-!reset namelist for SAS
-      IF(cdstr == 'SAS') THEN
+      IF( cdstr == 'SAS' ) THEN        ! reset namelist for SAS
          IF(lrxios) THEN
                IF(lwp) write(numout,*) 'Disable reading restart file using XIOS for SAS'
@@ -184 +183 @@
          r1_hu_b = r1_hu_0   ;   r1_hu_n = r1_hu_0   ; r1_hu_a = r1_hu_0   ! 1 / water column
          r1_hv_b = r1_hv_0   ;   r1_hv_n = r1_hv_0   ; r1_hv_a = r1_hv_0   !       thickness
-         !
          !
       ELSE                       != time varying : initialize before/now/after variables
@@ -307 +305 @@
       ENDIF
       !
-      REWIND( numnam_ref )              ! Namelist namdom in reference namelist : space & time domain (bathymetry, mesh, timestep)
+      REWIND( numnam_ref )                ! Namelist namdom in reference namelist : space & time domain (bathymetry, mesh, timestep)
       READ  ( numnam_ref, namdom, IOSTAT = ios, ERR = 903)
 903   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namdom in reference namelist', lwp )
-      REWIND( numnam_cfg )              ! Namelist namdom in configuration namelist : space & time domain (bathymetry, mesh, timestep)
+      REWIND( numnam_cfg )                ! Namelist namdom in configuration namelist : space & time domain (bathymetry, mesh, timestep)
       READ  ( numnam_cfg, namdom, IOSTAT = ios, ERR = 904 )
 904   IF( ios >  0 )   CALL ctl_nam ( ios , 'namdom in configuration namelist', lwp )
@@ -316 +314 @@
       !
       IF(lwp) THEN
-         WRITE(numout,*)
          WRITE(numout,*) '   Namelist : namdom   ---   space & time domain'
          WRITE(numout,*) '      3rd order Runge-Kutta scheme            ln_RK3      = ', ln_RK3
@@ -337 +334 @@
       ENDIF
       !
-      REWIND( numnam_ref )              ! Namelist namrun in reference namelist : Parameters of the run
+      !                                   ! Set the number of time-level
+      !
+      IF    ( ln_RK3 ) THEN                  ! two-level time-stepping scheme
+         Nt = 2                                    ! number of time-level
+         Nbb = 1     ! before=now                  ! time indexes
+         Nnn = 1     ! now   (n  )
+         Naa = 2     ! after (n+1)
+         !
+      ELSEIF( ln_MLF ) THEN                  ! three-level time-stepping scheme
+         Nt = 3                                    ! number of time-level
+         Nbb = 1     ! before (n-1)
+         Nnn = 2     ! now    (n  )
+         Naa = 3     ! after  (n+1)
+      ENDIF
+      !
+      REWIND( numnam_ref )                ! Namelist namrun in reference namelist : Parameters of the run
       READ  ( numnam_ref, namrun, IOSTAT = ios, ERR = 901)
 901   IF( ios /= 0 )   CALL ctl_nam ( ios , 'namrun in reference namelist', lwp )
-      REWIND( numnam_cfg )              ! Namelist namrun in configuration namelist : Parameters of the run
+      REWIND( numnam_cfg )                ! Namelist namrun in configuration namelist : Parameters of the run
       READ  ( numnam_cfg, namrun, IOSTAT = ios, ERR = 902 )
 902   IF( ios >  0 )   CALL ctl_nam ( ios , 'namrun in configuration namelist', lwp )
       IF(lwm) WRITE ( numond, namrun )
       !
-      IF(lwp) THEN                  ! control print
+      IF(lwp) THEN                        ! control print
          WRITE(numout,*)
          WRITE(numout,*) '   Namelist : namrun   ---   run parameters'
@@ -383 +395 @@
       ENDIF
 
-      cexper = cn_exp         ! conversion DOCTOR names into model names (this should disappear soon)
+      cexper = cn_exp         ! conversion from namelist names to model names (this should disappear)
       nrstdt = nn_rstctl
       nit000 = nn_it000