Changeset 1571 for trunk/NEMO/LIM_SRC_3/limitd_me.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/limitd_me.F90 (modified) (2 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