Changeset 4147 for branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.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/SBC/sbcana.F90 (modified) (3 diffs)

branches/2013/dev_LOCEAN_2013/NEMOGCM/NEMO/OPA_SRC/SBC/sbcana.F90

@@ -27 +27 @@
    PUBLIC   sbc_gyre   ! routine called in sbcmod module
 
-   !                                !!* Namelist namsbc_ana *
-   INTEGER  ::   nn_tau000 = 1       ! nb of time-step during which the surface stress
-   !                                 ! increase from 0 to its nominal value 
-   REAL(wp) ::   rn_utau0  = 0._wp   ! constant wind stress value in i-direction
-   REAL(wp) ::   rn_vtau0  = 0._wp   ! constant wind stress value in j-direction
-   REAL(wp) ::   rn_qns0   = 0._wp   ! non solar heat flux
-   REAL(wp) ::   rn_qsr0   = 0._wp   !     solar heat flux
-   REAL(wp) ::   rn_emp0   = 0._wp   ! net freshwater flux
+   !                       !!* Namelist namsbc_ana *
+   INTEGER  ::   nn_tau000  ! nb of time-step during which the surface stress
+   !                        ! increase from 0 to its nominal value 
+   REAL(wp) ::   rn_utau0   ! constant wind stress value in i-direction
+   REAL(wp) ::   rn_vtau0   ! constant wind stress value in j-direction
+   REAL(wp) ::   rn_qns0    ! non solar heat flux
+   REAL(wp) ::   rn_qsr0    !     solar heat flux
+   REAL(wp) ::   rn_emp0    ! net freshwater flux
    
    !! * Substitutions
@@ -64 +64 @@
       INTEGER, INTENT(in) ::   kt       ! ocean time step
       !
+      INTEGER  ::   ios                   ! Local integer output status for namelist read
       REAL(wp) ::   zfacto                ! local scalar
       REAL(wp) ::   zrhoa  = 1.22_wp      ! Air density kg/m3
@@ -74 +75 @@
       IF( kt == nit000 ) THEN
          !
-         REWIND( numnam )                    ! Read Namelist namsbc : surface fluxes
-         READ  ( numnam, namsbc_ana )
+         REWIND( numnam_ref )              ! Namelist namsbc_ana in reference namelist : Analytical surface fluxes
+         READ  ( numnam_ref, namsbc_ana, IOSTAT = ios, ERR = 901)
+901      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_ana in reference namelist', lwp )
+
+         REWIND( numnam_cfg )              ! Namelist namsbc_ana in configuration namelist : Analytical surface fluxes
+         READ  ( numnam_cfg, namsbc_ana, IOSTAT = ios, ERR = 902 )
+902      IF( ios /= 0 ) CALL ctl_nam ( ios , 'namsbc_ana in configuration namelist', lwp )
+         WRITE ( numond, namsbc_ana )
          !
          IF(lwp) WRITE(numout,*)' '