Changeset 1571

Timestamp:

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

Author:

ctlod

Message:

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

Location:

trunk/NEMO/LIM_SRC_3

Files:

• limitd_me.F90 (modified) (2 diffs)
• limthd.F90 (modified) (4 diffs)
• limthd_dh.F90 (modified) (5 diffs)

trunk/NEMO/LIM_SRC_3/limitd_me.F90

@@ -1169 +1169 @@
          zdummy     , &    ! dummy argument
          zdummy0    , &    ! dummy argument
-         ztmelts    , &    ! ice melting point
-         sm_newridge       ! new ridged ice salinity
+         ztmelts           ! ice melting point
+
+      REAL(wp) ::   zsrdg2
 
       CHARACTER (len=80) :: &
@@ -1364 +1365 @@
             ! Salinity
             !-------------
-            smsw(ji,jj)       = sss_m(ji,jj) * vsw(ji,jj) * ridge_por 
-
-            ! salinity of new ridge
-            sm_newridge       = ( srdg1(ji,jj) + smsw(ji,jj) ) / vrdg2(ji,jj)
-            zdummy            = sm_newridge * vrdg2(ji,jj)
-            ! has to be smaller than s_i_max
-            sm_newridge       = MIN( s_i_max, sm_newridge )
-
-            ! salt flux due to ridge creation
-            fsalt_rpo(ji,jj)  = fsalt_rpo(ji,jj) + & 
-               MAX ( zdummy - srdg2(ji,jj) , 0.0 )    &
-               * rhoic / rdt_ice
-
-            ! sal times volume for new ridges
-            srdg2(ji,jj)      = sm_newridge * vrdg2(ji,jj) 
-
+            smsw(ji,jj)  = sss_m(ji,jj) * vsw(ji,jj) * rhoic / rau0       ! salt content of water frozen in voids
+  
+            zsrdg2       = srdg1(ji,jj) + smsw(ji,jj)                     ! salt content of new ridge
+  
+            srdg2(ji,jj) = MIN( s_i_max * vrdg2(ji,jj) , zsrdg2 )         ! impose a maximum salinity
+                    
+            !                                                             ! excess of salt is flushed into the ocean
+            fsalt_rpo(ji,jj) = fsalt_rpo(ji,jj) + ( zsrdg2 - srdg2(ji,jj) ) * rhoic / rdt_ice 
+  
             !------------------------------------            
             ! 3.6 Increment ridging diagnostics

trunk/NEMO/LIM_SRC_3/limthd.F90

@@ -105 +105 @@
          zareamin
 
-      REAL(wp), DIMENSION(jpi,jpj) :: &
-         zhicifp            ,  &   ! ice thickness for outputs
-         zqlbsbq                   ! link with lead energy budget qldif
+      REAL(wp), DIMENSION(jpi,jpj) ::   zqlbsbq   ! link with lead energy budget qldif
 
       !!-------------------------------------------------------------------
@@ -247 +245 @@
             !  calculate oceanic heat flux (limthd_dh)
             fbif   (ji,jj) = zindb * (  fsbbq(ji,jj) / MAX( at_i(ji,jj) , epsi20 ) + fdtcn(ji,jj) )
-
-            ! computation of the daily thermodynamic ice production (only needed for output)
-            zhicifp(ji,jj) = ht_i(ji,jj,1) * at_i(ji,jj) 
-            zhicifp(ji,jj) = ht_i(ji,jj,1) * at_i(ji,jj)
+            !
          END DO
       END DO
@@ -326 +321 @@
             CALL tab_2d_1d( nbpb, qldif_1d   (1:nbpb)     , qldif      , jpi, jpj, npb(1:nbpb) )
             CALL tab_2d_1d( nbpb, rdmicif_1d (1:nbpb)     , rdmicif    , jpi, jpj, npb(1:nbpb) )
+            CALL tab_2d_1d( nbpb, rdmsnif_1d (1:nbpb)     , rdmsnif    , jpi, jpj, npb(1:nbpb) )
             CALL tab_2d_1d( nbpb, dmgwi_1d   (1:nbpb)     , dmgwi      , jpi, jpj, npb(1:nbpb) )
             CALL tab_2d_1d( nbpb, qlbbq_1d   (1:nbpb)     , zqlbsbq    , jpi, jpj, npb(1:nbpb) )
@@ -397 +393 @@
             CALL tab_1d_2d( nbpb, qfvbq      , npb, qfvbq_1d  (1:nbpb)     , jpi, jpj )
             CALL tab_1d_2d( nbpb, rdmicif    , npb, rdmicif_1d(1:nbpb)     , jpi, jpj )
+            CALL tab_1d_2d( nbpb, rdmsnif    , npb, rdmsnif_1d(1:nbpb)     , jpi, jpj )
             CALL tab_1d_2d( nbpb, dmgwi      , npb, dmgwi_1d  (1:nbpb)     , jpi, jpj )
-            CALL tab_1d_2d( nbpb, rdmsnif    , npb, rdmsnif_1d(1:nbpb)     , jpi, jpj )
             CALL tab_1d_2d( nbpb, rdvosif    , npb, dvsbq_1d  (1:nbpb)     , jpi, jpj )
             CALL tab_1d_2d( nbpb, rdvobif    , npb, dvbbq_1d  (1:nbpb)     , jpi, jpj )

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