Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/OBC

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

Location:

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/OBC

Files:

• obc_oce.F90 (modified) (1 diff)
• obcini.F90 (modified) (2 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/OBC/obc_oce.F90

@@ -23 +23 @@
    !!----------------------------------------------------------------------
    !
-   !                                            !!* Namelist namobc: open boundary condition *
-   INTEGER           ::   nn_obcdta   = 0        !:  = 0 use the initial state as obc data
-   !                                             !   = 1 read obc data in obcxxx.dta files
-   CHARACTER(len=20) ::   cn_obcdta   = 'annual' !: set to annual  if obc datafile hold 1 year of data
-   !                                             !  set to monthly if obc datafile hold 1 month of data
-   LOGICAL           ::   ln_obc_clim = .true.   !:  obc data files are climatological
-   LOGICAL           ::   ln_obc_fla  = .false.  !:  Flather open boundary condition not used
-   LOGICAL           ::   ln_vol_cst  = .true.   !:  Conservation of the whole volume
-   REAL(wp)          ::   rn_dpein    =  1.      !: damping time scale for inflow at East open boundary
-   REAL(wp)          ::   rn_dpwin    =  1.      !:    "                      "   at West open boundary
-   REAL(wp)          ::   rn_dpsin    =  1.      !:    "                      "   at South open boundary
-   REAL(wp)          ::   rn_dpnin    =  1.      !:    "                      "   at North open boundary
-   REAL(wp)          ::   rn_dpeob    = 15.      !: damping time scale for the climatology at East open boundary
-   REAL(wp)          ::   rn_dpwob    = 15.      !:    "                           "       at West open boundary
-   REAL(wp)          ::   rn_dpsob    = 15.      !:    "                           "       at South open boundary
-   REAL(wp)          ::   rn_dpnob    = 15.      !:    "                           "       at North open boundary
-   REAL(wp)          ::   rn_volemp   =  1.      !: = 0 the total volume will have the variability of the 
-   !                                             !      surface Flux E-P else (volemp = 1) the volume will be constant
-   !                                             !  = 1 the volume will be constant during all the integration.
+   !                                 !!* Namelist namobc: open boundary condition *
+   INTEGER           ::   nn_obcdta   !:  = 0 use the initial state as obc data
+   !                                  !   = 1 read obc data in obcxxx.dta files
+   CHARACTER(len=20) ::   cn_obcdta   !: set to annual  if obc datafile hold 1 year of data
+   !                                  !  set to monthly if obc datafile hold 1 month of data
+   LOGICAL           ::   ln_obc_clim !:  obc data files are climatological
+   LOGICAL           ::   ln_obc_fla  !:  Flather open boundary condition not used
+   LOGICAL           ::   ln_vol_cst  !:  Conservation of the whole volume
+   REAL(wp)          ::   rn_dpein    !: damping time scale for inflow at East open boundary
+   REAL(wp)          ::   rn_dpwin    !:    "                      "   at West open boundary
+   REAL(wp)          ::   rn_dpsin    !:    "                      "   at South open boundary
+   REAL(wp)          ::   rn_dpnin    !:    "                      "   at North open boundary
+   REAL(wp)          ::   rn_dpeob    !: damping time scale for the climatology at East open boundary
+   REAL(wp)          ::   rn_dpwob    !:    "                           "       at West open boundary
+   REAL(wp)          ::   rn_dpsob    !:    "                           "       at South open boundary
+   REAL(wp)          ::   rn_dpnob    !:    "                           "       at North open boundary
+   REAL(wp)          ::   rn_volemp   !: = 0 the total volume will have the variability of the 
+   !                                  !      surface Flux E-P else (volemp = 1) the volume will be constant
+   !                                  !  = 1 the volume will be constant during all the integration.
 
    !                                  !!! OLD non-DOCTOR name of namelist variables

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/OBC/obcini.F90

@@ -57 +57 @@
       !!
       INTEGER  ::   ji, jj, istop , inumfbc
+      INTEGER  ::   ios                     ! Local integer output status for namelist read
       INTEGER, DIMENSION(4) ::   icorner
       REAL(wp), DIMENSION(2) ::   ztestmask
@@ -66 +67 @@
       !!----------------------------------------------------------------------
 
-      REWIND( numnam )              ! Namelist namobc : open boundaries
-      READ  ( numnam, namobc )
+      REWIND( numnam_ref )              ! Namelist namobc in reference namelist : Open boundaries
+      READ  ( numnam_ref, namobc, IOSTAT = ios, ERR = 901)
+901   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namobc in reference namelist', lwp )
+
+      REWIND( numnam_cfg )              ! Namelist namobc in configuration namelist : Open boundaries
+      READ  ( numnam_cfg, namobc, IOSTAT = ios, ERR = 902 )
+902   IF( ios /= 0 ) CALL ctl_nam ( ios , 'namobc in configuration namelist', lwp )
+      WRITE ( numond, namobc )
 
       ! convert DOCTOR namelist name into the OLD names