Changeset 9490 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

Timestamp:

2018-04-23T10:44:07+02:00 (6 years ago)

Author:

gm

Message:

#2075 - dev_merge_2017: scale-aware setting of lateral viscous and diffusive coefficient

File:

• branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90 (modified) (3 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC/DYN/dynhpg.F90

@@ -53 +53 @@
    PUBLIC   dyn_hpg_init   ! routine called by opa module
 
-   !                                 !!* Namelist namdyn_hpg : hydrostatic pressure gradient
-   LOGICAL , PUBLIC ::   ln_hpg_zco   !: z-coordinate - full steps
-   LOGICAL , PUBLIC ::   ln_hpg_zps   !: z-coordinate - partial steps (interpolation)
-   LOGICAL , PUBLIC ::   ln_hpg_sco   !: s-coordinate (standard jacobian formulation)
-   LOGICAL , PUBLIC ::   ln_hpg_djc   !: s-coordinate (Density Jacobian with Cubic polynomial)
-   LOGICAL , PUBLIC ::   ln_hpg_prj   !: s-coordinate (Pressure Jacobian scheme)
-   LOGICAL , PUBLIC ::   ln_hpg_isf   !: s-coordinate similar to sco modify for isf
-
-   INTEGER , PUBLIC ::   nhpg  =  0   ! = 0 to 7, type of pressure gradient scheme used ! (deduced from ln_hpg_... flags) (PUBLIC for TAM)
+   !                                !!* Namelist namdyn_hpg : hydrostatic pressure gradient
+   LOGICAL, PUBLIC ::   ln_hpg_zco   !: z-coordinate - full steps
+   LOGICAL, PUBLIC ::   ln_hpg_zps   !: z-coordinate - partial steps (interpolation)
+   LOGICAL, PUBLIC ::   ln_hpg_sco   !: s-coordinate (standard jacobian formulation)
+   LOGICAL, PUBLIC ::   ln_hpg_djc   !: s-coordinate (Density Jacobian with Cubic polynomial)
+   LOGICAL, PUBLIC ::   ln_hpg_prj   !: s-coordinate (Pressure Jacobian scheme)
+   LOGICAL, PUBLIC ::   ln_hpg_isf   !: s-coordinate similar to sco modify for isf
+
+   !                                !! Flag to control the type of hydrostatic pressure gradient
+   INTEGER, PARAMETER ::   np_ERROR  =-10   ! error in specification of lateral diffusion
+   INTEGER, PARAMETER ::   np_zco    =  0   ! z-coordinate - full steps
+   INTEGER, PARAMETER ::   np_zps    =  1   ! z-coordinate - partial steps (interpolation)
+   INTEGER, PARAMETER ::   np_sco    =  2   ! s-coordinate (standard jacobian formulation)
+   INTEGER, PARAMETER ::   np_djc    =  3   ! s-coordinate (Density Jacobian with Cubic polynomial)
+   INTEGER, PARAMETER ::   np_prj    =  4   ! s-coordinate (Pressure Jacobian scheme)
+   INTEGER, PARAMETER ::   np_isf    =  5   ! s-coordinate similar to sco modify for isf
+   !
+   INTEGER, PUBLIC ::   nhpg         !: type of pressure gradient scheme used ! (deduced from ln_hpg_... flags) (PUBLIC for TAM)
 
    !! * Substitutions
@@ -95 +104 @@
       !
       SELECT CASE ( nhpg )      ! Hydrostatic pressure gradient computation
-      CASE (  0 )   ;   CALL hpg_zco    ( kt )      ! z-coordinate
-      CASE (  1 )   ;   CALL hpg_zps    ( kt )      ! z-coordinate plus partial steps (interpolation)
-      CASE (  2 )   ;   CALL hpg_sco    ( kt )      ! s-coordinate (standard jacobian formulation)
-      CASE (  3 )   ;   CALL hpg_djc    ( kt )      ! s-coordinate (Density Jacobian with Cubic polynomial)
-      CASE (  4 )   ;   CALL hpg_prj    ( kt )      ! s-coordinate (Pressure Jacobian scheme)
-      CASE (  5 )   ;   CALL hpg_isf    ( kt )      ! s-coordinate similar to sco modify for ice shelf
+      CASE ( np_zco )   ;   CALL hpg_zco    ( kt )      ! z-coordinate
+      CASE ( np_zps )   ;   CALL hpg_zps    ( kt )      ! z-coordinate plus partial steps (interpolation)
+      CASE ( np_sco )   ;   CALL hpg_sco    ( kt )      ! s-coordinate (standard jacobian formulation)
+      CASE ( np_djc )   ;   CALL hpg_djc    ( kt )      ! s-coordinate (Density Jacobian with Cubic polynomial)
+      CASE ( np_prj )   ;   CALL hpg_prj    ( kt )      ! s-coordinate (Pressure Jacobian scheme)
+      CASE ( np_isf )   ;   CALL hpg_isf    ( kt )      ! s-coordinate similar to sco modify for ice shelf
       END SELECT
       !
@@ -179 +188 @@
       ENDIF
       !
-      !                               ! Set nhpg from ln_hpg_... flags
-      IF( ln_hpg_zco )   nhpg = 0
-      IF( ln_hpg_zps )   nhpg = 1
-      IF( ln_hpg_sco )   nhpg = 2
-      IF( ln_hpg_djc )   nhpg = 3
-      IF( ln_hpg_prj )   nhpg = 4
-      IF( ln_hpg_isf )   nhpg = 5
-      !
-      !                               ! Consistency check
+      !                               ! Set nhpg from ln_hpg_... flags & consistency check
+      nhpg   = np_ERROR
       ioptio = 0
-      IF( ln_hpg_zco )   ioptio = ioptio + 1
-      IF( ln_hpg_zps )   ioptio = ioptio + 1
-      IF( ln_hpg_sco )   ioptio = ioptio + 1
-      IF( ln_hpg_djc )   ioptio = ioptio + 1
-      IF( ln_hpg_prj )   ioptio = ioptio + 1
-      IF( ln_hpg_isf )   ioptio = ioptio + 1
+      IF( ln_hpg_zco ) THEN   ;   nhpg = np_zco   ;   ioptio = ioptio +1   ;   ENDIF
+      IF( ln_hpg_zps ) THEN   ;   nhpg = np_zps   ;   ioptio = ioptio +1   ;   ENDIF
+      IF( ln_hpg_sco ) THEN   ;   nhpg = np_sco   ;   ioptio = ioptio +1   ;   ENDIF
+      IF( ln_hpg_djc ) THEN   ;   nhpg = np_djc   ;   ioptio = ioptio +1   ;   ENDIF
+      IF( ln_hpg_prj ) THEN   ;   nhpg = np_prj   ;   ioptio = ioptio +1   ;   ENDIF
+      IF( ln_hpg_isf ) THEN   ;   nhpg = np_isf   ;   ioptio = ioptio +1   ;   ENDIF
+      !
       IF( ioptio /= 1 )   CALL ctl_stop( 'NO or several hydrostatic pressure gradient options used' )
       ! 
+      IF(lwp) THEN
+         WRITE(numout,*)
+         SELECT CASE( nhpg )
+         CASE( np_zco )   ;   WRITE(numout,*) '   ==>>>   z-coord. - full steps '
+         CASE( np_zps )   ;   WRITE(numout,*) '   ==>>>   z-coord. - partial steps (interpolation)'
+         CASE( np_sco )   ;   WRITE(numout,*) '   ==>>>   s-coord. (standard jacobian formulation)'
+         CASE( np_djc )   ;   WRITE(numout,*) '   ==>>>   s-coord. (Density Jacobian: Cubic polynomial)'
+         CASE( np_prj )   ;   WRITE(numout,*) '   ==>>>   s-coord. (Pressure Jacobian: Cubic polynomial)'
+         CASE( np_isf )   ;   WRITE(numout,*) '   ==>>>   s-coord. (standard jacobian formulation) for isf'
+         END SELECT
+         WRITE(numout,*)
+      ENDIF
       !                          
       IF ( .NOT. ln_isfcav ) THEN     !--- no ice shelf load