Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90

Timestamp:

2013-11-04T12:51:55+01:00 (10 years ago)

Author:

cetlod

Message:

merge in dev_LOCEAN_2013, the 1st development branch dev_r3853_CNRS9_Confsetting, from its starting point ( r3853 ) on the trunk: see ticket #1169

File:

• branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/DYN/dynnept.F90 (modified) (2 diffs)

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

@@ -49 +49 @@
 
    !! * Namelist namdyn_nept variables
-   LOGICAL, PUBLIC  ::  ln_neptsimp        = .FALSE.  ! yes/no simplified neptune
-
-   LOGICAL          ::  ln_smooth_neptvel  = .FALSE.  ! yes/no smooth zunep, zvnep
-   REAL(wp)         ::  rn_tslse           =  1.2e4   ! value of lengthscale L at the equator
-   REAL(wp)         ::  rn_tslsp           =  3.0e3   ! value of lengthscale L at the pole
+   LOGICAL, PUBLIC  ::  ln_neptsimp          ! yes/no simplified neptune
+
+   LOGICAL          ::  ln_smooth_neptvel    ! yes/no smooth zunep, zvnep
+   REAL(wp)         ::  rn_tslse             ! value of lengthscale L at the equator
+   REAL(wp)         ::  rn_tslsp             ! value of lengthscale L at the pole
 !! Specify whether to ramp down the Neptune velocity in shallow
 !! water, and the depth range controlling such ramping down
-   LOGICAL          ::  ln_neptramp        = .FALSE.  ! ramp down Neptune velocity in shallow water
-   REAL(wp)         ::  rn_htrmin          =  100.0   ! min. depth of transition range
-   REAL(wp)         ::  rn_htrmax          =  200.0   ! max. depth of transition range
+   LOGICAL          ::  ln_neptramp          ! ramp down Neptune velocity in shallow water
+   REAL(wp)         ::  rn_htrmin            ! min. depth of transition range
+   REAL(wp)         ::  rn_htrmax            ! max. depth of transition range
 
    !! * Module variables
@@ -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