Changeset 8522 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90

Timestamp:

2017-09-14T17:52:02+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part6 - ice diffusion (hope the scheme still converges)

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90 (modified) (4 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icevar.F90

@@ -150 +150 @@
       !!------------------------------------------------------------------
       INTEGER  ::   ji, jj, jk, jl   ! dummy loop indices
-      REAL(wp) ::   ze_i, z1_cp, z1_2cp             ! local scalars
+      REAL(wp) ::   ze_i             ! local scalars
       REAL(wp) ::   ze_s, ztmelts, zbbb, zccc       !   -      -
       REAL(wp) ::   zhmax, z1_zhmax, zsm_i          !   -      -
@@ -193 +193 @@
 
       !-------------------
-      ! Ice temperature   [K]   (with a minimum value (rt0 - 100.) imposed everywhere)
+      ! Ice temperature   [K]   (with a minimum value (rt0 - 100.))
       !-------------------
       zlay_i   = REAL( nlay_i , wp )    ! number of layers
-      z1_2cp  = 1._wp / ( 2._wp * cpic )
       DO jl = 1, jpl
          DO jk = 1, nlay_i
@@ -208 +207 @@
                      zbbb             = ( rcp - cpic ) * ztmelts + ze_i * r1_rhoic - lfus
                      zccc             = SQRT( MAX( zbbb * zbbb - 4._wp * cpic * lfus * ztmelts , 0._wp) )
-                     t_i(ji,jj,jk,jl) = MAX( -100._wp , MIN( -( zbbb + zccc ) * z1_2cp , ztmelts ) ) + rt0   ! [K] with bounds: -100 < t_i < ztmelts
+                     t_i(ji,jj,jk,jl) = MAX( -100._wp , MIN( -( zbbb + zccc ) * 0.5_wp * r1_cpic , ztmelts ) ) + rt0   ! [K] with bounds: -100 < t_i < ztmelts
                      !
                   ELSE                                !--- no ice
-                     t_i(ji,jj,jk,jl) = rt0 - 100._wp                                   ! impose 173.15 K (i.e. -100 C)
-!!clem: I think we should impose rt0 instead
+                     t_i(ji,jj,jk,jl) = rt0
                   ENDIF
                END DO
@@ -220 +218 @@
 
       !--------------------
-      ! Snow temperature   [K]   (with a minimum value (rt0 - 100.) imposed everywhere)
+      ! Snow temperature   [K]   (with a minimum value (rt0 - 100.))
       !--------------------
       zlay_s = REAL( nlay_s , wp )
-      z1_cp  = 1._wp / cpic
       DO jk = 1, nlay_s
          WHERE( v_s(:,:,:) > epsi20 )        !--- icy area
-            t_s(:,:,jk,:) = MAX( -100._wp , MIN( z1_cp * ( -r1_rhosn * (e_s(:,:,jk,:)/v_s(:,:,:)*zlay_s) + lfus ) , 0._wp ) ) + rt0
+            t_s(:,:,jk,:) = MAX( -100._wp , MIN( r1_cpic * ( -r1_rhosn * (e_s(:,:,jk,:)/v_s(:,:,:)*zlay_s) + lfus ) , 0._wp ) ) + rt0
          ELSEWHERE                           !--- no ice
-            t_s(:,:,jk,:) =  rt0 - 100._wp         ! impose 173.15 K (i.e. -100 C)
+            t_s(:,:,jk,:) = rt0
          END WHERE
       END DO