Changeset 1601 for trunk/NEMO/OPA_SRC/DYN/dynhpg.F90

Timestamp:

2009-08-11T12:09:19+02:00 (15 years ago)

Author:

ctlod

Message:

Doctor naming of OPA namelist variables , see ticket: #526

File:

• trunk/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) (4 diffs)

trunk/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -41 +41 @@
    PUBLIC   dyn_hpg    ! routine called by step module
 
-   !!* Namelist nam_dynhpg : Choice of horizontal pressure gradient computation
-   LOGICAL  ::   ln_hpg_zco = .TRUE.    ! z-coordinate - full steps
-   LOGICAL  ::   ln_hpg_zps = .FALSE.   ! z-coordinate - partial steps (interpolation)
-   LOGICAL  ::   ln_hpg_sco = .FALSE.   ! s-coordinate (standard jacobian formulation)
-   LOGICAL  ::   ln_hpg_hel = .FALSE.   ! s-coordinate (helsinki modification)
-   LOGICAL  ::   ln_hpg_wdj = .FALSE.   ! s-coordinate (weighted density jacobian)
-   LOGICAL  ::   ln_hpg_djc = .FALSE.   ! s-coordinate (Density Jacobian with Cubic polynomial)
-   LOGICAL  ::   ln_hpg_rot = .FALSE.   ! s-coordinate (ROTated axes scheme)
-   REAL(wp) ::   gamm       = 0.e0      ! weighting coefficient
-
-   INTEGER  ::   nhpg  =  0             ! = 0 to 6, type of pressure gradient scheme used
-      !                                 ! (deduced from ln_hpg_... flags)
+   !                                              !!* Namelist namdyn_hpg : hydrostatic pressure gradient 
+   LOGICAL , PUBLIC ::   ln_hpg_zco    = .TRUE.    !: z-coordinate - full steps
+   LOGICAL , PUBLIC ::   ln_hpg_zps    = .FALSE.   !: z-coordinate - partial steps (interpolation)
+   LOGICAL , PUBLIC ::   ln_hpg_sco    = .FALSE.   !: s-coordinate (standard jacobian formulation)
+   LOGICAL , PUBLIC ::   ln_hpg_hel    = .FALSE.   !: s-coordinate (helsinki modification)
+   LOGICAL , PUBLIC ::   ln_hpg_wdj    = .FALSE.   !: s-coordinate (weighted density jacobian)
+   LOGICAL , PUBLIC ::   ln_hpg_djc    = .FALSE.   !: s-coordinate (Density Jacobian with Cubic polynomial)
+   LOGICAL , PUBLIC ::   ln_hpg_rot    = .FALSE.   !: s-coordinate (ROTated axes scheme)
+   REAL(wp), PUBLIC ::   rn_gamma      = 0.e0      !: weighting coefficient
+   LOGICAL , PUBLIC ::   ln_dynhpg_imp = .FALSE.   !: semi-implicite hpg flag
+   INTEGER , PUBLIC ::   nn_dynhpg_rst = 0         !: add dynhpg implicit variables in restart ot not
+
+   INTEGER  ::   nhpg  =  0   ! = 0 to 6, type of pressure gradient scheme used ! (deduced from ln_hpg_... flags)
 
    !! * Substitutions
@@ -116 +117 @@
       !!              computation and consistency control
       !!
-      !! ** Action  :   Read the namelist namdynhpg and check the consistency
+      !! ** Action  :   Read the namelist namdyn_hpg and check the consistency
       !!      with the type of vertical coordinate used (zco, zps, sco)
       !!----------------------------------------------------------------------
       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
-      !!----------------------------------------------------------------------
-
-      REWIND ( numnam )               ! Read Namelist nam_dynhpg : pressure gradient calculation options
-      READ   ( numnam, nam_dynhpg )
+      !!
+!     NAMELIST/namdyn_hpg/ ln_hpg_zco   , ln_hpg_zps   , ln_hpg_sco, ln_hpg_hel,   &
+!        &                 ln_hpg_wdj   , ln_hpg_djc   , ln_hpg_rot, rn_gamma  ,   &
+!        &                 ln_dynhpg_imp, nn_dynhpg_rst
+      !!----------------------------------------------------------------------
+
+!     REWIND ( numnam )               ! Namelist namdyn_hpg : already read in opa.F90 module
+!     READ   ( numnam, namdyn_hpg )
 
       IF(lwp) THEN                    ! Control print
          WRITE(numout,*)
-         WRITE(numout,*) 'dyn:hpg_ctl : hydrostatic pressure gradient control'
-         WRITE(numout,*) '~~~~~~~~~~~'
-         WRITE(numout,*) '       Namelist nam_dynhpg : choice of hpg scheme'
-         WRITE(numout,*) '          z-coord. - full steps                          ln_hpg_zco = ', ln_hpg_zco
-         WRITE(numout,*) '          z-coord. - partial steps (interpolation)       ln_hpg_zps = ', ln_hpg_zps
-         WRITE(numout,*) '          s-coord. (standard jacobian formulation)       ln_hpg_sco = ', ln_hpg_sco
-         WRITE(numout,*) '          s-coord. (helsinki modification)               ln_hpg_hel = ', ln_hpg_hel
-         WRITE(numout,*) '          s-coord. (weighted density jacobian)           ln_hpg_wdj = ', ln_hpg_wdj
-         WRITE(numout,*) '          s-coord. (Density Jacobian: Cubic polynomial)  ln_hpg_djc = ', ln_hpg_djc
-         WRITE(numout,*) '          s-coord. (ROTated axes scheme)                 ln_hpg_rot = ', ln_hpg_rot
-         WRITE(numout,*) '          weighting coeff. (wdj scheme)                     gamm       = ', gamm
+         WRITE(numout,*) 'dyn_hpg : hydrostatic pressure gradient'
+         WRITE(numout,*) '~~~~~~~'
+         WRITE(numout,*) '   Namelist namdyn_hpg : choice of hpg scheme'
+         WRITE(numout,*) '      z-coord. - full steps                             ln_hpg_zco    = ', ln_hpg_zco
+         WRITE(numout,*) '      z-coord. - partial steps (interpolation)          ln_hpg_zps    = ', ln_hpg_zps
+         WRITE(numout,*) '      s-coord. (standard jacobian formulation)          ln_hpg_sco    = ', ln_hpg_sco
+         WRITE(numout,*) '      s-coord. (helsinki modification)                  ln_hpg_hel    = ', ln_hpg_hel
+         WRITE(numout,*) '      s-coord. (weighted density jacobian)              ln_hpg_wdj    = ', ln_hpg_wdj
+         WRITE(numout,*) '      s-coord. (Density Jacobian: Cubic polynomial)     ln_hpg_djc    = ', ln_hpg_djc
+         WRITE(numout,*) '      s-coord. (ROTated axes scheme)                    ln_hpg_rot    = ', ln_hpg_rot
+         WRITE(numout,*) '      weighting coeff. (wdj scheme)                     rn_gamma      = ', rn_gamma
+         WRITE(numout,*) '      time stepping: centered (F) or semi-implicit (T)  ln_dynhpg_imp = ', ln_dynhpg_imp
+         WRITE(numout,*) '      add in restart dynhpg semi-implicit variable      nn_dynhpg_rst = ', nn_dynhpg_rst
       ENDIF
+
+      IF( .NOT. ln_dynhpg_imp )   nn_dynhpg_rst = 0      ! force no adding dynhpg implicit variables in restart
 
       IF( lk_vvl .AND. .NOT. ln_hpg_sco )   THEN
@@ -517 +523 @@
       !!
       !! ** Method  :   Weighted Density Jacobian (wdj) scheme (song 1998)
-      !!      The weighting coefficients from the namelist parameter gamm
-      !!      (alpha=0.5-gamm ; beta=1-alpha=0.5+gamm)
+      !!      The weighting coefficients from the namelist parameter rn_gamma
+      !!      (alpha=0.5-rn_gamma ; beta=1-alpha=0.5+rn_gamma
       !!
       !! Reference : Song, Mon. Wea. Rev., 126, 3213-3230, 1998.
@@ -540 +546 @@
       ! Local constant initialization
       zcoef0 = - grav * 0.5
-      zalph  = 0.5 - gamm        ! weighting coefficients (alpha=0.5-gamm)
-      zbeta  = 0.5 + gamm        !                        (beta =1-alpha=0.5+gamm)
+      zalph  = 0.5 - rn_gamma    ! weighting coefficients (alpha=0.5-rn_gamma
+      zbeta  = 0.5 + rn_gamma    !                        (beta =1-alpha=0.5+rn_gamma
 
       ! Surface value (no ponderation)