Changeset 7060 for branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/LIM_SRC_3

Timestamp:

2016-10-20T16:16:29+02:00 (8 years ago)

Author:

clem

Message:

update agrif+lim3

File:

• branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90 (modified) (3 diffs)

branches/2016/dev_v3_6_STABLE_r6506_AGRIF_LIM3/NEMOGCM/NEMO/LIM_SRC_3/limistate.F90

@@ -108 +108 @@
       ! 1) Read namelist
       !--------------------------------------------------------------------
-
-      CALL lim_istate_init     !  reading the initials parameters of the ice
-
-      ! surface temperature
-      DO jl = 1, jpl ! loop over categories
+      CALL lim_istate_init
+
+      ! init surface temperature
+      DO jl = 1, jpl
          t_su  (:,:,jl) = rt0 * tmask(:,:,1)
          tn_ice(:,:,jl) = rt0 * tmask(:,:,1)
       END DO
 
-      ! basal temperature (considered at freezing point)
+      ! init basal temperature (considered at freezing point)
       CALL eos_fzp( sss_m(:,:), t_bo(:,:) )
       t_bo(:,:) = ( t_bo(:,:) + rt0 ) * tmask(:,:,1) 
 
 
+      !--------------------------------------------------------------------
+      ! 2) Initialization of sea ice state variables
+      !--------------------------------------------------------------------
       IF( ln_limini ) THEN
 
-         !--------------------------------------------------------------------
-         ! 2) Basal temperature, ice mask and hemispheric index
-         !--------------------------------------------------------------------
-
-         DO jj = 1, jpj                                       ! ice if sst <= t-freez + ttest
-            DO ji = 1, jpi
-               IF( ( sst_m(ji,jj)  - ( t_bo(ji,jj) - rt0 ) ) * tmask(ji,jj,1) >= rn_thres_sst * tmask(ji,jj,1) ) THEN
-                  zswitch(ji,jj) = 0._wp                     ! no ice
-               ELSE                                                                                   
-                  zswitch(ji,jj) = 1._wp * tmask(ji,jj,1)    !    ice
-               ENDIF
-            END DO
-         END DO
-
-         !--------------------------------------------------------------------
-         ! 3) Initialization of sea ice state variables
-         !--------------------------------------------------------------------
          IF( ln_limini_file )THEN
 
@@ -150 +135 @@
             zsm_i_ini(:,:)  = si(jp_smi)%fnow(:,:,1)
 
+            WHERE( zat_i_ini(:,:) > 0._wp ) ; zswitch(:,:) = tmask(:,:,1) 
+            ELSEWHERE                       ; zswitch(:,:) = 0._wp
+            END WHERE
+
          ELSE ! ln_limini_file = F
+
+            !--------------------------------------------------------------------
+            ! 3) Basal temperature, ice mask
+            !--------------------------------------------------------------------
+            ! no ice if sst <= t-freez + ttest
+            WHERE( ( sst_m(:,:) - (t_bo(:,:) - rt0) ) * tmask(:,:,1) >= rn_thres_sst ) ; zswitch(:,:) = 0._wp 
+            ELSEWHERE                                                                  ; zswitch(:,:) = tmask(:,:,1)
+            END WHERE
 
             !-----------------------------
@@ -457 +454 @@
 !!      ! Output the initial state and forcings
 !!      CALL dia_wri_state( 'output.init', nit000 )
-!!!
-      
+!!!      
+
       CALL wrk_dealloc( jpi, jpj, jpl, zh_i_ini,  za_i_ini )
       CALL wrk_dealloc( jpi, jpj,      zht_i_ini, zat_i_ini, zvt_i_ini, zts_u_ini, zht_s_ini, zsm_i_ini, ztm_i_ini )