Changeset 4155 for branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3

Timestamp:

2013-11-05T15:24:22+01:00 (11 years ago)

Author:

clem

Message:

 

Location:

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3

Files:

• ice.F90 (modified) (1 diff)
• iceini.F90 (modified) (1 diff)
• limdyn.F90 (modified) (1 diff)
• limitd_th.F90 (modified) (1 diff)
• limrhg.F90 (modified) (3 diffs)
• limtrp.F90 (modified) (5 diffs)

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/ice.F90

@@ -188 +188 @@
    REAL(wp), PUBLIC ::   alphaevp = 1._wp      !: coeficient of the internal stresses !SB
    REAL(wp), PUBLIC ::   unit_fac = 1.e+09_wp  !: conversion factor for ice / snow enthalpy
-   REAL(wp), PUBLIC ::   hminrhg = 0.05_wp     !: clem : ice thickness (in m) below which ice velocity is set to ocean velocity
+   REAL(wp), PUBLIC ::   hminrhg = 0.001_wp    !: clem : ice volume (a*h, in m) below which ice velocity is set to ocean velocity
 
    !                                              !!** ice-salinity namelist (namicesal) **

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/iceini.F90

@@ -135 +135 @@
          ln_nicep = .FALSE.
          CALL ctl_warn( 'ice_run : specific control print for LIM3 desactivated with MPI' )
-      ENDIF       
+      ENDIF
       !
       IF(lwp) THEN                        ! control print

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limdyn.F90

@@ -224 +224 @@
       ENDIF
       !
-
       ! -------------------------------
       !- check conservation (C Rousset)

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limitd_th.F90

@@ -161 +161 @@
       ! -------------------------------
       !- check conservation (C Rousset)
-      IF (ln_limdiahsb) THEN
+      IF( ln_limdiahsb ) THEN
          zchk_fs  = glob_sum( ( sfx_bri(:,:) + sfx_thd(:,:) + sfx_res(:,:) + sfx_mec(:,:) ) * area(:,:) * tms(:,:) ) - zchk_fs_b
          zchk_fw  = glob_sum( rdm_ice(:,:) * area(:,:) * tms(:,:) ) - zchk_fw_b

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limrhg.F90

@@ -659 +659 @@
          DO ji = fs_2, fs_jpim1
             zindb  = MAX( 0.0, SIGN( 1.0, at_i(ji,jj) - 1.0e-6 ) ) 
-            zdummy = zindb * vt_i(ji,jj) / MAX(at_i(ji,jj) , 1.0e-06 )
-            !zdummy = vt_i(ji,jj)
+            !zdummy = zindb * vt_i(ji,jj) / MAX(at_i(ji,jj) , 1.0e-06 )
+            zdummy = vt_i(ji,jj)
             IF ( zdummy .LE. hminrhg ) THEN
                u_ice(ji,jj) = u_oce(ji,jj)
@@ -682 +682 @@
          DO ji = fs_2, fs_jpim1
             zindb  = MAX( 0.0, SIGN( 1.0, at_i(ji,jj) - 1.0e-6 ) ) 
-            zdummy = zindb * vt_i(ji,jj) / MAX(at_i(ji,jj) , 1.0e-06 )
-            !zdummy = vt_i(ji,jj)
+            !zdummy = zindb * vt_i(ji,jj) / MAX(at_i(ji,jj) , 1.0e-06 )
+            zdummy = vt_i(ji,jj)
             IF ( zdummy .LE. hminrhg ) THEN
                v_ice1(ji,jj)  = 0.5*( (v_ice(ji,jj)+v_ice(ji,jj-1))*e1t(ji+1,jj)   &
@@ -707 +707 @@
             !- zds(:,:): shear on northeast corner of grid cells
             zindb  = MAX( 0.0, SIGN( 1.0, at_i(ji,jj) - 1.0e-6 ) ) 
-            zdummy = zindb * vt_i(ji,jj) / MAX(at_i(ji,jj) , 1.0e-06 )
-            !zdummy = vt_i(ji,jj)
+            !zdummy = zindb * vt_i(ji,jj) / MAX(at_i(ji,jj) , 1.0e-06 )
+            zdummy = vt_i(ji,jj)
             IF ( zdummy .LE. hminrhg ) THEN
 

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limtrp.F90

@@ -81 +81 @@
       REAL(wp), POINTER, DIMENSION(:,:,:,:)  ::   zs0e
       REAL(wp) :: zchk_v_i, zchk_smv, zchk_fs, zchk_fw, zchk_v_i_b, zchk_smv_b, zchk_fs_b, zchk_fw_b ! Check conservation (C Rousset)
-      REAL(wp) :: zchk_vmin, zchk_amin, zchk_amax ! Check errors (C Rousset)
+      REAL(wp) :: zchk_vmin, zchk_amin, zchk_amax, zchk_umax ! Check errors (C Rousset)
       ! mass and salt flux (clem)
       REAL(wp), POINTER, DIMENSION(:,:,:) ::   zviold   ! old ice volume...
@@ -99 +99 @@
       ! -------------------------------
       !- check conservation (C Rousset)
-      IF (ln_limdiahsb) THEN
+      IF( ln_limdiahsb ) THEN
          zchk_v_i_b = glob_sum( SUM(   v_i(:,:,:), dim=3 ) * area(:,:) * tms(:,:) )
          zchk_smv_b = glob_sum( SUM( smv_i(:,:,:), dim=3 ) * area(:,:) * tms(:,:) )
@@ -456 +456 @@
 
                   ! Ice salinity and age
-                  zsal = MAX( MIN(  (rhoic-rhosn)/rhoic*sss_m(ji,jj) ,   &
-                     &              zusvoic * zs0sm(ji,jj,jl)         ) , s_i_min ) * v_i(ji,jj,jl)
-                  IF(  num_sal == 2  )   smv_i(ji,jj,jl) = zindic * zsal
-
-                  zage = MAX(  MIN( zbigval, zs0oi(ji,jj,jl) / MAX( a_i(ji,jj,jl), epsi16 ) ), 0._wp  ) * a_i(ji,jj,jl)
+                  !clem zsal = MAX( MIN( (rhoic-rhosn)/rhoic*sss_m(ji,jj), zusvoic * zs0sm(ji,jj,jl) ), s_i_min ) * v_i(ji,jj,jl)
+                  IF(  num_sal == 2  ) THEN
+                     smv_i(ji,jj,jl) = MAX( MIN( s_i_max * v_i(ji,jj,jl), zsmv ), s_i_min * v_i(ji,jj,jl) )
+                  ENDIF
+
+                  zage = MAX( MIN( zbigval, zs0oi(ji,jj,jl) / MAX( a_i(ji,jj,jl), epsi16 ) ), 0._wp  ) * a_i(ji,jj,jl)
                   oa_i (ji,jj,jl)  = zindic * zage 
 
@@ -544 +545 @@
       ! -------------------------------
       !- check conservation (C Rousset)
-      IF (ln_limdiahsb) THEN
+      IF( ln_limdiahsb ) THEN
          zchk_fs  = glob_sum( ( sfx_bri(:,:) + sfx_thd(:,:) + sfx_res(:,:) + sfx_mec(:,:) ) * area(:,:) * tms(:,:) ) - zchk_fs_b
          zchk_fw  = glob_sum( rdm_ice(:,:) * area(:,:) * tms(:,:) ) - zchk_fw_b
@@ -554 +555 @@
          zchk_amax = glob_max(SUM(a_i,dim=3))
          zchk_amin = glob_min(a_i)
+         zchk_umax = glob_max(SQRT(u_ice**2 + v_ice**2))
 
          IF(lwp) THEN
-            IF ( ABS( zchk_v_i   ) >  1.e-5 ) WRITE(numout,*) 'violation volume [m3/day]     (limtrp) = ',(zchk_v_i * rday)
+            IF ( ABS( zchk_v_i   ) >  1.e-5 ) THEN
+               WRITE(numout,*) 'violation volume [m3/day]     (limtrp) = ',(zchk_v_i * rday)
+               WRITE(numout,*) 'u_ice max [m/s]               (limtrp) = ',zchk_umax
+               WRITE(numout,*) 'number of time steps          (limtrp) =',kt
+            ENDIF
             IF ( ABS( zchk_smv   ) >  1.e-4 ) WRITE(numout,*) 'violation saline [psu*m3/day] (limtrp) = ',(zchk_smv * rday)
             IF ( zchk_vmin <  0.            ) WRITE(numout,*) 'violation v_i<0  [mm]         (limtrp) = ',(zchk_vmin * 1.e-3)