Changeset 13967 for NEMO/branches

Timestamp:

2020-12-02T10:38:21+01:00 (3 years ago)

Author:

clem

Message:

more debugs. Trying sette now but we should never go into vp routine, so it should be fine

Location:

NEMO/branches/2020/SI3_vp_rheology

Files:

• cfgs/SHARED/namelist_ice_ref (modified) (1 diff)
• src/ICE/icedyn_rhg_vp.F90 (modified) (9 diffs)

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

@@ -104 +104 @@
                                       !          this option 2 asks a lot of communications between cpu
    ln_rhg_VP        = .false.         !  VP rheology
-   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_nout    = 10              !     number of outer iterations
+      nn_vp_ninn    = 1500            !     number of inner iterations
+      nn_vp_cvgchk  = 5               !     iteration step for convergence check
 /
 !------------------------------------------------------------------------------

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

@@ -145 +145 @@
       INTEGER ::   nn_nvp              ! total number of VP iterations (n_out_vp*n_inn_vp)      
       !
-      REAL(wp) ::   zrhoco                                              ! rau0 * rn_cio
+      REAL(wp) ::   zrhoco                                              ! rho0 * rn_cio
       REAL(wp) ::   ecc2, z1_ecc2                                       ! square of yield ellipse eccenticity
       REAL(wp) ::   zglob_area                                          ! global ice area for diagnostics
@@ -255 +255 @@
       IF( lwp )   WRITE(numout,*) ' nn_nvp      : ', nn_nvp
       
-      zrhoco = rau0 * rn_cio 
+      zrhoco = rho0 * rn_cio 
 
       ! ecc2: square of yield ellipse eccentricity
@@ -262 +262 @@
                
       ! Initialise convergence checks
-      IF( ln_rhg_chkcvg ) THEN
+      IF( nn_rhg_chkcvg /= 0 ) THEN
       
          ! ice area for global mean kinetic energy
@@ -362 +362 @@
                           
             ! Mass per unit area divided by time step
-            zmassU_t(ji,jj) = zmassU * r1_rdtice
-            zmassV_t(ji,jj) = zmassV * r1_rdtice
+            zmassU_t(ji,jj) = zmassU * r1_Dt_ice
+            zmassV_t(ji,jj) = zmassV * r1_Dt_ice
 
             ! Acceleration term contribution to RHS (depends on velocity at previous time step)            
@@ -1033 +1033 @@
                zuerr_max = 0._wp
                                
-               IF ( ll_u_iterate .AND. MOD ( i_inn, nn_cvgchk_vp ) == 0 ) THEN
+               IF ( ll_u_iterate .AND. MOD ( i_inn, nn_vp_cvgchk ) == 0 ) THEN
 
                   ! - Maximum U-velocity difference               
@@ -1064 +1064 @@
                zverr_max = 0._wp
                
-               IF ( ll_v_iterate .AND. MOD ( i_inn, nn_cvgchk_vp ) == 0 ) THEN
+               IF ( ll_v_iterate .AND. MOD ( i_inn, nn_vp_cvgchk ) == 0 ) THEN
                
                   ! - Maximum V-velocity difference
@@ -1099 +1099 @@
             !---------------------------------------------------------------------------------------
 
-            IF( ln_rhg_chkcvg .AND. MOD ( i_inn - 1, nn_cvgchk_vp ) == 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_cvgchk ) == 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 )
 
@@ -1137 +1137 @@
       !------------------------------------------------------------------------------!
 
-      IF( ln_rhg_chkcvg ) THEN
+      IF( nn_rhg_chkcvg /= 0 ) THEN
           
          IF( iom_use('uice_cvg')  ) THEN
@@ -1144 +1144 @@
          ENDIF   
         
-      ENDIF ! ln_rhg_chkcvg
+      ENDIF
 
       ! MV DEBUG test - replace ice velocity by ocean current to give the model the means to go ahead