Changeset 920 for trunk/NEMO/OPA_SRC

Timestamp:

2008-05-09T13:26:34+02:00 (16 years ago)

Author:

rblod

Message:

Correct incompatibilities with Agrif (easier part), see ticket #133

Location:

trunk/NEMO/OPA_SRC

Files:

• SBC/sbcana.F90 (modified) (2 diffs)
• SBC/sbcmod.F90 (modified) (2 diffs)
• SBC/sbcrnf.F90 (modified) (2 diffs)
• eosbn2.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/SBC/sbcana.F90

@@ -35 +35 @@
    REAL(wp) ::   rn_qsr0   = 0.e0   !     solar heat flux
    REAL(wp) ::   rn_emp0   = 0.e0   ! net freshwater flux
-   NAMELIST/namsbc_ana/ nn_tau000, rn_utau0, rn_vtau0, rn_qns0, rn_qsr0, rn_emp0
    
    !! * Substitutions
@@ -67 +66 @@
       REAL(wp)            ::   zfacto   ! local scalar
       !!---------------------------------------------------------------------
+      NAMELIST/namsbc_ana/ nn_tau000, rn_utau0, rn_vtau0, rn_qns0, rn_qsr0, rn_emp0
       !
       IF( kt == nit000 ) THEN

trunk/NEMO/OPA_SRC/SBC/sbcmod.F90

@@ -55 +55 @@
    INTEGER , PUBLIC ::   nn_ice      = 0         !: flag on ice in the surface boundary condition (=0/1/2)
    INTEGER , PUBLIC ::   nn_fwb      = 0         !: type of FreshWater Budget control (=0/1/2)
-   INTEGER          ::   nn_ico_cpl = 0    ! ice-ocean coupling indicator:         !!gm   ===>> to be put in namelist
-   !                                       !  = 0   LIM-3 old case
-   !                                       !  = 1   stresses computed using now ocean velocity
-   !                                       !  = 2   combination of 0 and 1 cases
-
-   NAMELIST/namsbc/ nn_fsbc, ln_ana, ln_flx, ln_blk_clio, ln_blk_core, ln_cpl,   &
-      &             nn_ice , ln_dm2dc, ln_rnf, ln_ssr, nn_fwb, nn_ico_cpl
+   INTEGER          ::   nn_ico_cpl  = 0         !: ice-ocean coupling indicator
+   !                                             !  = 0   LIM-3 old case
+   !                                             !  = 1   stresses computed using now ocean velocity
+   !                                             !  = 2   combination of 0 and 1 cases
 
    INTEGER ::   nsbc   ! type of surface boundary condition (deduced from namsbc informations)
@@ -89 +86 @@
       INTEGER ::   icpt      ! temporary integer
       !!----------------------------------------------------------------------
+      NAMELIST/namsbc/ nn_fsbc, ln_ana, ln_flx, ln_blk_clio, ln_blk_core, ln_cpl,   &
+         &             nn_ice , ln_dm2dc, ln_rnf, ln_ssr, nn_fwb, nn_ico_cpl
 
       IF(lwp) THEN

trunk/NEMO/OPA_SRC/SBC/sbcrnf.F90

@@ -34 +34 @@
    TYPE(FLD_N)       , PUBLIC ::   sn_rnf               !: information about the runoff file to be read
    TYPE(FLD_N)       , PUBLIC ::   sn_cnf               !: information about the runoff mouth file to be read
-   NAMELIST/namsbc_rnf/ cn_dir, nn_runoff, rn_hrnf, rn_avt_rnf, sn_rnf, sn_cnf
 
    INTEGER , PUBLIC                     ::   nkrnf = 0   !: number of levels over which Kz is increased at river mouths
@@ -67 +66 @@
       INTEGER  ::   ierror   ! temporary integer
       !!----------------------------------------------------------------------
+      NAMELIST/namsbc_rnf/ cn_dir, nn_runoff, rn_hrnf, rn_avt_rnf, sn_rnf, sn_cnf
       !                                                   !------------------!
       IF( kt == nit000 ) THEN                             !  Initialisation  !

trunk/NEMO/OPA_SRC/eosbn2.F90

@@ -54 +54 @@
    REAL(wp), PUBLIC ::   ralpha = 2.0e-4   !: thermal expension coeff. (linear equation of state)
    REAL(wp), PUBLIC ::   rbeta  = 7.7e-4   !: saline  expension coeff. (linear equation of state)
-   NAMELIST/nameos/ neos, ralpha, rbeta
    
    INTEGER ::   neos_init = 0         !: control flag for initialization
@@ -720 +719 @@
       !! ** Method  :   Read the namelist nameos and control the parameters
       !!----------------------------------------------------------------------
+      NAMELIST/nameos/ neos, ralpha, rbeta
 
       neos_init = 1               ! indicate that the initialization has been done