Changeset 13969

Timestamp:

2020-12-02T10:53:57+01:00 (4 years ago)

Author:

clem

Message:

change the name of one namelist parameter to make it more compliant with the rest

Location:

NEMO/branches/2020/SI3_vp_rheology

Files:

• cfgs/SHARED/namelist_ice_ref (modified) (1 diff)
• src/ICE/ice.F90 (modified) (1 diff)
• src/ICE/icedyn_rhg.F90 (modified) (2 diffs)
• src/ICE/icedyn_rhg_vp.F90 (modified) (3 diffs)

NEMO/branches/2020/SI3_vp_rheology/cfgs/SHARED/namelist_ice_ref

@@ -106 +106 @@
       nn_vp_nout    = 10              !     number of outer iterations
       nn_vp_ninn    = 1500            !     number of inner iterations
-      nn_vp_cvgchk  = 5               !     iteration step for convergence check
+      nn_vp_chkcvg  = 5               !     iteration step for convergence check
 /
 !------------------------------------------------------------------------------

NEMO/branches/2020/SI3_vp_rheology/src/ICE/ice.F90

@@ -160 +160 @@
    INTEGER , PUBLIC ::   nn_vp_nout       !: Number of outer iterations
    INTEGER , PUBLIC ::   nn_vp_ninn       !: Number of inner iterations (linear system solver)
-   INTEGER , PUBLIC ::   nn_vp_cvgchk     !: Number of iterations every each convergence is checked
+   INTEGER , PUBLIC ::   nn_vp_chkcvg     !: Number of iterations every each convergence is checked
    !
    !                                     !!** ice-advection namelist (namdyn_adv) **

NEMO/branches/2020/SI3_vp_rheology/src/ICE/icedyn_rhg.F90

@@ -118 +118 @@
       !!
       NAMELIST/namdyn_rhg/  ln_rhg_EVP, ln_aEVP, rn_creepl, rn_ecc , nn_nevp, rn_relast, nn_rhg_chkcvg,   &    !-- evp
-    &                       ln_rhg_VP, nn_vp_nout, nn_vp_ninn, nn_vp_cvgchk                                    !-- vp 
+    &                       ln_rhg_VP, nn_vp_nout, nn_vp_ninn, nn_vp_chkcvg                                    !-- vp 
       !!-------------------------------------------------------------------
       !
@@ -142 +142 @@
          WRITE(numout,*) '         number of outer iterations                        nn_vp_nout    = ', nn_vp_nout
          WRITE(numout,*) '         number of inner iterations                        nn_vp_ninn    = ', nn_vp_ninn
-         WRITE(numout,*) '         iteration step for convergence check              nn_vp_cvgchk  = ', nn_vp_cvgchk
+         WRITE(numout,*) '         iteration step for convergence check              nn_vp_chkcvg  = ', nn_vp_chkcvg
          IF( ln_rhg_EVP ) THEN
             IF    ( nn_rhg_chkcvg == 0 ) THEN   ;   WRITE(numout,*) '         no check cvg'

NEMO/branches/2020/SI3_vp_rheology/src/ICE/icedyn_rhg_vp.F90

@@ -1033 +1033 @@
                zuerr_max = 0._wp
                                
-               IF ( ll_u_iterate .AND. MOD ( i_inn, nn_vp_cvgchk ) == 0 ) THEN
+               IF ( ll_u_iterate .AND. MOD ( i_inn, nn_vp_chkcvg ) == 0 ) THEN
 
                   ! - Maximum U-velocity difference               
@@ -1064 +1064 @@
                zverr_max = 0._wp
                
-               IF ( ll_v_iterate .AND. MOD ( i_inn, nn_vp_cvgchk ) == 0 ) THEN
+               IF ( ll_v_iterate .AND. MOD ( i_inn, nn_vp_chkcvg ) == 0 ) THEN
                
                   ! - Maximum V-velocity difference
@@ -1099 +1099 @@
             !---------------------------------------------------------------------------------------
 
-            IF( nn_rhg_chkcvg/=0 .AND. MOD ( i_inn - 1, nn_vp_cvgchk ) == 0 ) CALL rhg_cvg_vp( kt, jter, nn_nvp, u_ice, v_ice, zmt, zuerr_max, zverr_max, zglob_area, &
+            IF( nn_rhg_chkcvg/=0 .AND. MOD ( i_inn - 1, nn_vp_chkcvg ) == 0 ) CALL rhg_cvg_vp( kt, jter, nn_nvp, u_ice, v_ice, zmt, zuerr_max, zverr_max, zglob_area, &
                       &                         zrhsu, zAU, zBU, zCU, zDU, zEU, zrhsv, zAV, zBV, zCV, zDV, zEV )