Changeset 8341 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90

Timestamp:

2017-07-15T13:00:17+02:00 (7 years ago)

Author:

clem

Message:

correct the heat conservation (all fine except limthd_da for a reason I do not understand)

File:

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

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

@@ -426 +426 @@
 
       ! Iterative procedure
-      DO iter = 1, num_iter_max
-         DO ji = kideb, kiut
-            IF(  zf_tt(ji) < 0._wp  ) THEN
+      DO ji = kideb, kiut
+         IF(  zf_tt(ji) < 0._wp  ) THEN
+            DO iter = 1, num_iter_max
 
                ! New bottom ice salinity (Cox & Weeks, JGR88 )
@@ -460 +460 @@
                e_i_1d(ji,nlay_i+1) = -zEi * rhoic                        ! New ice energy of melting (J/m3, >0)
                
-            ENDIF
-         END DO
-      END DO
-
-      ! Contribution to Energy and Salt Fluxes
-      DO ji = kideb, kiut
-         IF(  zf_tt(ji) < 0._wp  ) THEN
-            ! New ice growth
-                                    
+            END DO
+            ! Contribution to Energy and Salt Fluxes                                    
             zfmdt          = - rhoic * dh_i_bott(ji)             ! Mass flux x time step (kg/m2, < 0)
 
@@ -498 +491 @@
             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)
             h_i_old (ji,nlay_i+1) = h_i_old (ji,nlay_i+1) + dh_i_bott(ji)
+
          ENDIF
+
       END DO
 
@@ -611 +606 @@
       END DO
 
-      ! Water fluxes
-      DO ji = kideb, kiut
-         wfx_sub_1d(ji) = wfx_snw_sub_1d(ji) + wfx_ice_sub_1d(ji) ! sum ice and snow sublimation contributions
-      END DO
-
       !
       !------------------------------------------------------------------------------|
@@ -648 +638 @@
          ! Contribution to mass flux
          ! All snow is thrown in the ocean, and seawater is taken to replace the volume
-         wfx_sni_1d(ji) = wfx_sni_1d(ji) - a_i_1d(ji) * dh_snowice(ji) * rhoic * r1_rdtice
-         wfx_snw_1d(ji) = wfx_snw_1d(ji) + a_i_1d(ji) * dh_snowice(ji) * rhosn * r1_rdtice
+         wfx_sni_1d(ji)     = wfx_sni_1d(ji)     - a_i_1d(ji) * dh_snowice(ji) * rhoic * r1_rdtice
+         wfx_snw_sni_1d(ji) = wfx_snw_sni_1d(ji) + a_i_1d(ji) * dh_snowice(ji) * rhosn * r1_rdtice
 
          ! update heat content (J.m-2) and layer thickness