Changeset 8562 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90

Timestamp:

2017-09-25T21:11:19+02:00 (7 years ago)

Author:

clem

Message:

cosmetics only

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_dh.F90 (modified) (5 diffs)

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

@@ -116 +116 @@
       END SELECT
 
-      DO ji = 1, nidx
-         icount (ji,:) = 0
-         zdh_s_mel(ji) = 0._wp
-         e_i_1d(ji,nlay_i+1) = 0._wp ! Initialize enthalpy at nlay_i+1
-      END DO
-
       ! initialize layer thicknesses and enthalpies
       h_i_old (1:nidx,0:nlay_i+1) = 0._wp
@@ -227 +221 @@
       ! If heat still available (zq_su > 0), then melt more snow
       zdeltah(1:nidx,:) = 0._wp
+      zdh_s_mel(1:nidx) = 0._wp
       DO jk = 1, nlay_s
          DO ji = 1, nidx
@@ -443 +438 @@
 
                dh_i_bott(ji)      = rdt_ice * MAX( 0._wp , zf_tt(ji) / ( zdE * rhoic ) )
-
-               e_i_1d(ji,nlay_i+1) = -zEi * rhoic                        ! New ice energy of melting (J/m3, >0)
                
             END DO
@@ -475 +468 @@
 
             ! update heat content (J.m-2) and layer thickness
-            eh_i_old(ji,nlay_i+1) = eh_i_old(ji,nlay_i+1) + dh_i_bott(ji) * e_i_1d(ji,nlay_i+1)
+            eh_i_old(ji,nlay_i+1) = eh_i_old(ji,nlay_i+1) + dh_i_bott(ji) * (-zEi * rhoic)
             h_i_old (ji,nlay_i+1) = h_i_old (ji,nlay_i+1) + dh_i_bott(ji)
 
@@ -654 +647 @@
 
       ! --- ensure that a_i = 0 where ht_i = 0 ---
-      DO ji = 1, nidx
-         IF( ht_i_1d(ji) == 0._wp )   a_i_1d(ji) = 0._wp
-      END DO         
+      WHERE( ht_i_1d(1:nidx) == 0._wp )   a_i_1d(1:nidx) = 0._wp
       !
    END SUBROUTINE ice_thd_dh