Changeset 3875 for branches/2013/dev_r3853_CNRS9_ConfSetting/NEMOGCM/NEMO/OPA_SRC/DYN

Timestamp:

2013-04-18T16:38:06+02:00 (11 years ago)

Author:

clevy

Message:

Configuration Setting/Step? 1, see ticket:#1074

Location:

branches/2013/dev_r3853_CNRS9_ConfSetting/NEMOGCM/NEMO/OPA_SRC/DYN

Files:

• dynadv.F90 (modified) (1 diff)
• dynhpg.F90 (modified) (2 diffs)
• dynnept.F90 (modified) (1 diff)
• dynvor.F90 (modified) (2 diffs)

branches/2013/dev_r3853_CNRS9_ConfSetting/NEMOGCM/NEMO/OPA_SRC/DYN/dynadv.F90

@@ -89 +89 @@
       !!----------------------------------------------------------------------
       INTEGER ::   ioptio
+      INTEGER  ::   ios                 ! Local integer output status for namelist read
       !!
       NAMELIST/namdyn_adv/ ln_dynadv_vec, ln_dynadv_cen2 , ln_dynadv_ubs
       !!----------------------------------------------------------------------
 
-      REWIND ( numnam )               ! Read Namelist namdyn_adv : momentum advection scheme
-      READ   ( numnam, namdyn_adv )
+      REWIND( numnam_ref )              ! Namelist namdyn_adv in reference namelist : Momentum advection scheme
+      READ  ( numnam_ref, namdyn_adv, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_adv in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namdyn_adv in configuration namelist : Momentum advection scheme
+      READ  ( numnam_cfg, namdyn_adv, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_adv in configuration namelist', lwp )
+      WRITE ( numond, namdyn_adv )
 
       IF(lwp) THEN                    ! Namelist print

branches/2013/dev_r3853_CNRS9_ConfSetting/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -122 +122 @@
       !!----------------------------------------------------------------------
       INTEGER ::   ioptio = 0      ! temporary integer
+      INTEGER ::   ios             ! Local integer output status for namelist read
       !!
       NAMELIST/namdyn_hpg/ ln_hpg_zco, ln_hpg_zps, ln_hpg_sco,     &
@@ -127 +128 @@
       !!----------------------------------------------------------------------
       !
-      REWIND( numnam )               ! Read Namelist namdyn_hpg
-      READ  ( numnam, namdyn_hpg )
+      REWIND( numnam_ref )              ! Namelist namdyn_hpg in reference namelist : Hydrostatic pressure gradient
+      READ  ( numnam_ref, namdyn_hpg, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_hpg in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namdyn_hpg in configuration namelist : Hydrostatic pressure gradient
+      READ  ( numnam_cfg, namdyn_hpg, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_hpg in configuration namelist', lwp )
+      WRITE ( numond, namdyn_hpg )
       !
       IF(lwp) THEN                   ! Control print

branches/2013/dev_r3853_CNRS9_ConfSetting/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90

@@ -114 +114 @@
       NAMELIST/namdyn_nept/ ln_neptsimp, ln_smooth_neptvel, rn_tslse, rn_tslsp,      &
                             ln_neptramp, rn_htrmin, rn_htrmax
+      INTEGER  ::   ios
       !!----------------------------------------------------------------------
       ! Define the (simplified) Neptune parameters
       ! ==========================================
 
-      REWIND( numnam )                  ! Read Namelist namdyn_nept:  Simplified Neptune
-      READ  ( numnam, namdyn_nept )
+      REWIND( numnam_ref )              ! Namelist namdyn_nept in reference namelist : Simplified Neptune
+      READ  ( numnam_ref, namdyn_nept, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_nept in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namdyn_nept in reference namelist : Simplified Neptune
+      READ  ( numnam_cfg, namdyn_nept, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_nept in configuration namelist', lwp )
+      WRITE ( numond, namdyn_nept )
 
       IF(lwp) THEN                      ! Control print

branches/2013/dev_r3853_CNRS9_ConfSetting/NEMOGCM/NEMO/OPA_SRC/DYN/dynvor.F90

@@ -710 +710 @@
       INTEGER ::   ioptio          ! local integer
       INTEGER ::   ji, jj, jk      ! dummy loop indices
+      INTEGER ::   ios             ! Local integer output status for namelist read
       !!
       NAMELIST/namdyn_vor/ ln_dynvor_ens, ln_dynvor_ene, ln_dynvor_mix, ln_dynvor_een
       !!----------------------------------------------------------------------
 
-      REWIND ( numnam )               ! Read Namelist namdyn_vor : Vorticity scheme options
-      READ   ( numnam, namdyn_vor )
+      REWIND( numnam_ref )              ! Namelist namdyn_vor in reference namelist : Vorticity scheme options
+      READ  ( numnam_ref, namdyn_vor, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_vor in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namdyn_vor in configuration namelist : Vorticity scheme options
+      READ  ( numnam_cfg, namdyn_vor, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namdyn_vor in configuration namelist', lwp )
+      WRITE ( numond, namdyn_vor )
 
       IF(lwp) THEN                    ! Namelist print
@@ -721 +728 @@
          WRITE(numout,*) 'dyn_vor_init : vorticity term : read namelist and control the consistency'
          WRITE(numout,*) '~~~~~~~~~~~~'
-         WRITE(numout,*) '        Namelist namdyn_vor : oice of the vorticity term scheme'
+         WRITE(numout,*) '        Namelist namdyn_vor : choice of the vorticity term scheme'
          WRITE(numout,*) '           energy    conserving scheme                ln_dynvor_ene = ', ln_dynvor_ene
          WRITE(numout,*) '           enstrophy conserving scheme                ln_dynvor_ens = ', ln_dynvor_ens