Changeset 5051 for branches/2015/dev_r5044_CNRS_LIM3CLEAN/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90

Timestamp:

2015-02-02T18:31:34+01:00 (9 years ago)

Author:

clem

Message:

LIM3 initialization is now called at the same time as other sbc fields

File:

• branches/2015/dev_r5044_CNRS_LIM3CLEAN/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90 (modified) (4 diffs)

branches/2015/dev_r5044_CNRS_LIM3CLEAN/NEMOGCM/NEMO/LIM_SRC_3/limupdate2.F90

@@ -78 +78 @@
       ! zap small values
       !-----------------
-      CALL lim_itd_me_zapsmall
-
+      CALL lim_var_agg( 1 )
+      CALL lim_var_zapsmall
       CALL lim_var_glo2eqv
 
@@ -133 +133 @@
       ! zap small values
       !-----------------
-      CALL lim_itd_me_zapsmall
+      CALL lim_var_zapsmall
 
       !---------------------
@@ -176 +176 @@
       v_ice(:,:) = v_ice(:,:) * tmv(:,:)
  
+      ! for outputs
+      CALL lim_var_glo2eqv            ! equivalent variables (outputs)
+      CALL lim_var_agg(2)             ! aggregate ice thickness categories
+
       ! -------------------------------------------------
       ! Diagnostics
       ! -------------------------------------------------
+      DO jl  = 1, jpl
+         afx_thd(:,:) = afx_thd(:,:) + ( a_i(:,:,jl) - a_i_b(:,:,jl) ) * r1_rdtice
+      END DO
+      afx_tot = afx_thd + afx_dyn
+
       d_a_i_thd(:,:,:)   = a_i(:,:,:)   - a_i_b(:,:,:) 
       d_v_s_thd(:,:,:)   = v_s(:,:,:)   - v_s_b(:,:,:)
@@ -187 +196 @@
       d_smv_i_thd(:,:,:) = 0._wp
       IF( num_sal == 2 )   d_smv_i_thd(:,:,:) = smv_i(:,:,:) - smv_i_b(:,:,:)
-      ! diag only (clem)
-      dv_dt_thd(:,:,:) = d_v_i_thd(:,:,:) * r1_rdtice * rday
 
       ! heat content variation (W.m-2)