Changeset 1571 for trunk/NEMO/LIM_SRC_3/limthd_dh.F90

Timestamp:

2009-08-03T16:24:31+02:00 (15 years ago)

Author:

ctlod

Message:

Correct 3 bugs in LIM-3, see ticket: #505

File:

• trunk/NEMO/LIM_SRC_3/limthd_dh.F90 (modified) (5 diffs)

trunk/NEMO/LIM_SRC_3/limthd_dh.F90

@@ -104 +104 @@
 
       REAL(wp) ::            &
+         zzfmass_i ,         &
+         zzfmass_s ,         &
          zhsnew    ,         &  !: new snow thickness
          zihgnew   ,         &  !: switch for total ablation
@@ -141 +143 @@
       REAL(wp) , DIMENSION(jpij) :: &
          z_f_surf,           &  ! surface heat for ablation
-         zhgnew                 ! new ice thickness
+         zhgnew  ,           &  ! new ice thickness
+         zfmass_i
 
       REAL(wp), DIMENSION(jpij) :: &
@@ -302 +305 @@
             - zdh_s_mel(ji) )
          dvsbq_1d(ji)   =  MIN( zzero, dvsbq_1d(ji) )
-         rdmsnif_1d(ji) =  rhosn*dvsbq_1d(ji)
+         rdmsnif_1d(ji) =  rdmsnif_1d(ji) + rhosn * dvsbq_1d(ji)
       END DO ! ji
 
@@ -669 +672 @@
          ! Mass variations of ice and snow
          !---------------------------------
-         rdmicif_1d(ji) =  rdmicif_1d(ji) + a_i_b(ji) *                        &
-            (zhgnew(ji)-ht_i_b(ji))*rhoic ! good
-
-         rdmsnif_1d(ji) =  rdmsnif_1d(ji) + a_i_b(ji) * &
-            (ht_s_b(ji)-zhni)*rhosn ! good too
+         !
+         zzfmass_s = - a_i_b(ji) * ( zhni       - ht_s_b(ji) ) * rhosn   ! snow
+         zzfmass_i =   a_i_b(ji) * ( zhgnew(ji) - ht_i_b(ji) ) * rhoic   ! ice  
+         !
+         zfmass_i(ji) = zzfmass_i                       ! ice variation saved to compute salt flux (see below)
+         !
+         !                                              ! mass variation cumulated over category
+         rdmsnif_1d(ji) = rdmsnif_1d(ji) + zzfmass_s                     ! snow 
+         rdmicif_1d(ji) = rdmicif_1d(ji) + zzfmass_i                     ! ice 
 
          ! Remaining heat to the ocean 
@@ -695 +702 @@
          IF ( num_sal .NE. 4 ) &
             fseqv_1d(ji)  = fseqv_1d(ji) + zihgnew * zfsalt_melt(ji) +           &
-            (1.0 - zihgnew) * rdmicif_1d(ji) *                  &
+            (1.0 - zihgnew) * zfmass_i(ji) *                  &
             ( sss_m(zji,zjj) - sm_i_b(ji) ) / rdt_ice
          ! new lines
          IF ( num_sal .EQ. 4 ) &
             fseqv_1d(ji)  = fseqv_1d(ji) + zihgnew * zfsalt_melt(ji) +           &
-            (1.0 - zihgnew) * rdmicif_1d(ji) *                  &
+            (1.0 - zihgnew) * zfmass_i(ji) *                  &
             ( sss_m(zji,zjj) - bulk_sal ) / rdt_ice
          ! Heat flux