Changeset 4574

Timestamp:

2014-03-26T09:32:19+01:00 (10 years ago)

Author:

pabouttier

Message:

Cosmetic Changes in dynhpg_tam.F90

File:

• branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPATAM_SRC/DYN/dynhpg_tam.F90 (modified) (3 diffs)

branches/2012/dev_v3_4_STABLE_2012/NEMOGCM/NEMO/OPATAM_SRC/DYN/dynhpg_tam.F90

@@ -131 +131 @@
       INTEGER ::   ioptio = 0      ! temporary integer
 
-!      Namelist read in opa_flg
-!      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_djc, ln_hpg_prj, ln_dynhpg_imp
+      !!----------------------------------------------------------------------
+
+      REWIND ( numnam )               ! Read Namelist nam_dynhpg : pressure gradient calculation options
+      READ   ( numnam, namdyn_hpg )
 
       IF(lwp) THEN                    ! Control print
@@ -148 +147 @@
          WRITE(numout,*) '      s-coord. (standard jacobian formulation)          ln_hpg_sco    = ', ln_hpg_sco
          WRITE(numout,*) '      s-coord. (Density Jacobian: Cubic polynomial)     ln_hpg_djc    = ', ln_hpg_djc
+         WRITE(numout,*) '      s-coord. (Pressure Jacobian: Cubic polynomial)    ln_hpg_prj    = ', ln_hpg_prj
          WRITE(numout,*) '      time stepping: centered (F) or semi-implicit (T)  ln_dynhpg_imp = ', ln_dynhpg_imp
       ENDIF
@@ -404 +404 @@
             zcoef3 = zcoef0 * MIN( fse3w(ji,jj,ikv), fse3w(ji  ,jj+1,ikv) )
             ! on i-direction
-            IF ( iku > 2 ) THEN
-               ! subtract old value
-               ua_tl(ji,jj,iku) = ua_tl(ji,jj,iku) - zhpitl(ji,jj,iku)
-               ! compute the new one
-               zhpitl (ji,jj,iku) = zhpitl(ji,jj,iku-1)   &
-                  + zcoef2 * ( rhd_tl(ji+1,jj,iku-1) - rhd_tl(ji,jj,iku-1) + gru_tl(ji,jj) ) / e1u(ji,jj)
-               ! add the new one to the general momentum trend
-               ua_tl(ji,jj,iku) = ua_tl(ji,jj,iku) + zhpitl(ji,jj,iku)
+            IF ( iku > 1 ) THEN             ! on i-direction (level 2 or more)
+               ua_tl (ji,jj,iku) = ua_tl(ji,jj,iku) - zhpitl(ji,jj,iku)   ! subtract old value
+               zhpitl(ji,jj,iku) = zhpitl(ji,jj,iku-1)               &    ! compute the new one
+                  &              + zcoef2 * ( rhd_tl(ji+1,jj,iku-1) - rhd_tl(ji,jj,iku-1) + gru_tl(ji,jj) ) / e1u(ji,jj)
+               ua_tl (ji,jj,iku) = ua_tl(ji,jj,iku) + zhpitl(ji,jj,iku)   ! add the new one to the general momentum trend
             ENDIF
-            ! on j-direction
-            IF ( ikv > 2 ) THEN
-               ! subtract old value
-               va_tl(ji,jj,ikv) = va_tl(ji,jj,ikv) - zhpjtl(ji,jj,ikv)
-               ! compute the new one
-               zhpjtl (ji,jj,ikv) = zhpjtl(ji,jj,ikv-1)   &
-                  + zcoef3 * ( rhd_tl(ji,jj+1,ikv-1) - rhd_tl(ji,jj,ikv-1) + grv_tl(ji,jj) ) / e2v(ji,jj)
-               ! add the new one to the general momentum trend
-               va_tl(ji,jj,ikv) = va_tl(ji,jj,ikv) + zhpjtl(ji,jj,ikv)
+
+            IF ( ikv > 1 ) THEN            ! on j-direction
+               va_tl(ji,jj,ikv) = va_tl(ji,jj,ikv) - zhpjtl(ji,jj,ikv)    ! subtract old value
+               zhpjtl (ji,jj,ikv) = zhpjtl(ji,jj,ikv-1)   &               ! compute the new one
+                  &               + zcoef3 * ( rhd_tl(ji,jj+1,ikv-1) - rhd_tl(ji,jj,ikv-1) + grv_tl(ji,jj) ) / e2v(ji,jj)
+               va_tl(ji,jj,ikv) = va_tl(ji,jj,ikv) + zhpjtl(ji,jj,ikv)    ! add the new one to the general momentum trend
             ENDIF
 # if ! defined key_vectopt_loop