Changeset 4672 for branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90

Timestamp:

2014-06-17T17:06:59+02:00 (10 years ago)

Author:

clem

Message:

 

File:

• branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90 (modified) (12 diffs)

branches/2013/dev_r4028_CNRS_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limthd_lac.F90

@@ -329 +329 @@
          ! Salinity of new ice 
          !----------------------
-
          SELECT CASE ( num_sal )
          CASE ( 1 )                    ! Sice = constant 
@@ -343 +342 @@
          END SELECT
 
-
          !-------------------------
          ! Heat content of new ice
@@ -354 +352 @@
                &                       - rcp  *         ( ztmelts - rtt )  )
          END DO ! ji
+
          !----------------
          ! Age of new ice
@@ -395 +394 @@
          END DO
 
-
          !-----------------
          ! Area of new ice
@@ -407 +405 @@
          !------------------------------------------------------------------------------!
 
-         !-------------------------------------------
-         ! Compute excessive new ice area and volume
-         !-------------------------------------------
+         !------------------------
+         ! 6.1) lateral ice growth
+         !------------------------
          ! If lateral ice growth gives an ice concentration gt 1, then
          ! we keep the excessive volume in memory and attribute it later to bottom accretion
@@ -422 +420 @@
                zdv_res(ji) = 0._wp
             ENDIF
-         END DO ! ji
-
-         !------------------------------------------------
-         ! Laterally redistribute new ice volume and area
-         !------------------------------------------------
+         END DO
+
+         ! find which category to fill
          zat_i_1d(:) = 0._wp
          DO jl = 1, jpl
@@ -433 +429 @@
                   za_i_1d (ji,jl) = za_i_1d (ji,jl) + za_newice(ji)
                   zv_i_1d (ji,jl) = zv_i_1d (ji,jl) + zv_newice(ji)
-                  jcat  (ji)    = jl
+                  jcat    (ji)    = jl
                ENDIF
                zat_i_1d(ji) = zat_i_1d(ji) + za_i_1d  (ji,jl)
@@ -439 +435 @@
          END DO
 
-         !----------------------------------
-         ! Heat content - lateral accretion
-         !----------------------------------
-         DO ji = 1, nbpac
-            jl = jcat(ji)                                                  ! categroy in which new ice is put
+         ! Heat content
+         DO ji = 1, nbpac
+            jl = jcat(ji)                                                    ! categroy in which new ice is put
             zswinew  (ji) = MAX( 0._wp , SIGN( 1._wp , - za_old(ji,jl) ) )   ! 0 if old ice
          END DO
@@ -457 +451 @@
          END DO
 
-         !-----------------------------------------------
-         ! Add excessive volume of new ice at the bottom
-         !-----------------------------------------------
+         !------------------------------------------------
+         ! 6.2) bottom ice growth + ice enthalpy remapping
+         !------------------------------------------------
          DO jl = 1, jpl
+
+            ! for remapping
             h_i_old (1:nbpac,0:nlay_i+1) = 0._wp
             qh_i_old(1:nbpac,0:nlay_i+1) = 0._wp
-
             DO jk = 1, nlay_i
                DO ji = 1, nbpac
@@ -471 +466 @@
             END DO
 
+            ! new volumes including lateral/bottom accretion + residual
             DO ji = 1, nbpac
                zinda          = MAX( 0._wp, SIGN( 1._wp , zat_i_1d(ji) - epsi20 ) )
                zv_newfra      = zinda * ( zdv_res(ji) + zv_frazb(ji) ) * za_i_1d(ji,jl) / MAX( zat_i_1d(ji) , epsi20 )
                za_i_1d(ji,jl) = zinda * za_i_1d(ji,jl)               
-
+               zv_i_1d(ji,jl) = zv_i_1d(ji,jl) + zv_newfra
+
+               ! for remapping
                h_i_old (ji,nlay_i+1) = zv_newfra
                qh_i_old(ji,nlay_i+1) = ze_newice(ji) * zv_newfra
-
-               zv_i_1d(ji,jl) = zv_i_1d(ji,jl) + zv_newfra
             ENDDO
 
             ! --- Ice enthalpy remapping --- !
-            CALL lim_thd_ent( 1, nbpac, jl, ze_i_1d(1:nbpac,:,jl) ) 
+            IF( zv_newfra > 0._wp ) THEN
+               CALL lim_thd_ent( 1, nbpac, ze_i_1d(1:nbpac,:,jl) ) 
+            ENDIF
 
          ENDDO
@@ -500 +498 @@
          ! Update salinity
          !-----------------
-         !clem IF(  num_sal == 2  ) THEN
-            DO jl = 1, jpl
-               DO ji = 1, nbpac
-                  zdv   = zv_i_1d(ji,jl) - zv_old(ji,jl)
-                  zsmv_i_1d(ji,jl) = zsmv_i_1d(ji,jl) + zdv * zs_newice(ji)
-               END DO
-            END DO   
-         !clem ENDIF
+         DO jl = 1, jpl
+            DO ji = 1, nbpac
+               zdv   = zv_i_1d(ji,jl) - zv_old(ji,jl)
+               zsmv_i_1d(ji,jl) = zsmv_i_1d(ji,jl) + zdv * zs_newice(ji)
+            END DO
+         END DO
 
          !------------------------------------------------------------------------------!
-         ! 8) Change 2D vectors to 1D vectors 
+         ! 7) Change 2D vectors to 1D vectors 
          !------------------------------------------------------------------------------!
          DO jl = 1, jpl
@@ -531 +527 @@
 
       !------------------------------------------------------------------------------!
-      ! 9) Change units for e_i
+      ! 8) Change units for e_i
       !------------------------------------------------------------------------------!    
       DO jl = 1, jpl