Changeset 541 for trunk/NEMO/OPA_SRC/DYN

Timestamp:

2006-10-20T14:21:28+02:00 (18 years ago)

Author:

opalod

Message:

nemo_v1_bugfix_065:RB: move namelist declaration for compatibility with Agrif

Location:

trunk/NEMO/OPA_SRC/DYN

Files:

• dynhpg.F90 (modified) (2 diffs)
• dynvor.F90 (modified) (2 diffs)

trunk/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -66 +66 @@
    LOGICAL  ::   ln_hpg_rot = .FALSE.   ! s-coordinate (ROTated axes scheme)
    REAL(wp) ::   gamm       = 0.e0      ! weighting coefficient
-   NAMELIST/nam_dynhpg/ ln_hpg_zco, ln_hpg_zps, ln_hpg_sco, ln_hpg_hel,   &
-      &                 ln_hpg_wdj, ln_hpg_djc, ln_hpg_rot, gamm
 
    INTEGER  ::   nhpg  =  0             ! = 0 to 6, type of pressure gradient scheme used
@@ -141 +139 @@
       !!----------------------------------------------------------------------
       INTEGER ::   ioptio = 0      ! temporary integer
+
+      NAMELIST/nam_dynhpg/ ln_hpg_zco, ln_hpg_zps, ln_hpg_sco, ln_hpg_hel,   &
+         &                 ln_hpg_wdj, ln_hpg_djc, ln_hpg_rot, gamm
       !!----------------------------------------------------------------------
 

trunk/NEMO/OPA_SRC/DYN/dynvor.F90

@@ -40 +40 @@
    LOGICAL, PUBLIC ::   ln_dynvor_mix = .FALSE.   !: mixed scheme
    LOGICAL, PUBLIC ::   ln_dynvor_een = .FALSE.   !: energy and enstrophy conserving scheme
-   NAMELIST/nam_dynvor/ ln_dynvor_ens, ln_dynvor_ene, ln_dynvor_mix, ln_dynvor_een
 
    INTEGER ::   nvor = 0   ! type of vorticity trend used
@@ -565 +564 @@
       !!----------------------------------------------------------------------
       INTEGER ::   ioptio          ! temporary integer
+      NAMELIST/nam_dynvor/ ln_dynvor_ens, ln_dynvor_ene, ln_dynvor_mix, ln_dynvor_een
       !!----------------------------------------------------------------------