Changeset 8564 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90

Timestamp:

2017-09-27T11:11:01+02:00 (7 years ago)

Author:

clem

Message:

change variable names

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90 (modified) (7 diffs)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90

@@ -88 +88 @@
       !!                6) store before fields
       !!
-      !! ** Notes   : o_i, t_su, t_s, t_i, s_i must be filled everywhere, even
+      !! ** Notes   : o_i, t_su, t_s, t_i, sz_i must be filled everywhere, even
       !!              where there is no ice (clem: I do not know why, is it mandatory?) 
       !!--------------------------------------------------------------------
@@ -284 +284 @@
             DO jj = 1, jpj
                DO ji = 1, jpi
-                  a_i(ji,jj,jl)   = zswitch(ji,jj) * za_i_ini(ji,jj,jl)                       ! concentration
+                  a_i(ji,jj,jl)  = zswitch(ji,jj) * za_i_ini(ji,jj,jl)                       ! concentration
                   h_i(ji,jj,jl)  = zswitch(ji,jj) * zh_i_ini(ji,jj,jl)                       ! ice thickness
-                  sm_i(ji,jj,jl)  = zswitch(ji,jj) * zsm_i_ini(ji,jj)                         ! salinity
-                  o_i(ji,jj,jl)   = 0._wp                                                     ! age (0 day)
-                  t_su(ji,jj,jl)  = zswitch(ji,jj) * zts_u_ini(ji,jj) + ( 1._wp - zswitch(ji,jj) ) * rt0 ! surf temp
+                  s_i(ji,jj,jl)  = zswitch(ji,jj) * zsm_i_ini(ji,jj)                         ! salinity
+                  o_i(ji,jj,jl)  = 0._wp                                                     ! age (0 day)
+                  t_su(ji,jj,jl) = zswitch(ji,jj) * zts_u_ini(ji,jj) + ( 1._wp - zswitch(ji,jj) ) * rt0 ! surf temp
 
                   IF( zht_i_ini(ji,jj) > 0._wp )THEN
@@ -305 +305 @@
 
                   ! ice volume, salt content, age content
-                  v_i(ji,jj,jl)   = h_i(ji,jj,jl) * a_i(ji,jj,jl)              ! ice volume
-                  v_s(ji,jj,jl)   = h_s(ji,jj,jl) * a_i(ji,jj,jl)              ! snow volume
-                  smv_i(ji,jj,jl) = MIN( sm_i(ji,jj,jl) , sss_m(ji,jj) ) * v_i(ji,jj,jl) ! salt content
-                  oa_i(ji,jj,jl)  = o_i(ji,jj,jl) * a_i(ji,jj,jl)               ! age content
+                  v_i (ji,jj,jl) = h_i(ji,jj,jl) * a_i(ji,jj,jl)              ! ice volume
+                  v_s (ji,jj,jl) = h_s(ji,jj,jl) * a_i(ji,jj,jl)              ! snow volume
+                  sv_i(ji,jj,jl) = MIN( s_i(ji,jj,jl) , sss_m(ji,jj) ) * v_i(ji,jj,jl) ! salt content
+                  oa_i(ji,jj,jl) = o_i(ji,jj,jl) * a_i(ji,jj,jl)               ! age content
                END DO
             END DO
@@ -316 +316 @@
          IF( nn_icesal == 1 .OR. nn_icesal == 3 )  THEN
             CALL ice_var_salprof
-            smv_i = sm_i * v_i
+            sv_i = s_i * v_i
          ENDIF
             
@@ -340 +340 @@
                DO jj = 1, jpj
                   DO ji = 1, jpi
-                     t_i(ji,jj,jk,jl) = zswitch(ji,jj) * ztm_i_ini(ji,jj) + ( 1._wp - zswitch(ji,jj) ) * rt0 
-                     s_i(ji,jj,jk,jl) = zswitch(ji,jj) * zsm_i_ini(ji,jj) + ( 1._wp - zswitch(ji,jj) ) * rn_simin
-                     ztmelts          = - tmut * s_i(ji,jj,jk,jl) + rt0 !Melting temperature in K
+                     t_i (ji,jj,jk,jl) = zswitch(ji,jj) * ztm_i_ini(ji,jj) + ( 1._wp - zswitch(ji,jj) ) * rt0 
+                     sz_i(ji,jj,jk,jl) = zswitch(ji,jj) * zsm_i_ini(ji,jj) + ( 1._wp - zswitch(ji,jj) ) * rn_simin
+                     ztmelts          = - tmut * sz_i(ji,jj,jk,jl) + rt0 !Melting temperature in K
 
                      ! heat content per unit volume
@@ -379 +379 @@
          v_i  (:,:,:) = 0._wp
          v_s  (:,:,:) = 0._wp
-         smv_i(:,:,:) = 0._wp
+         sv_i (:,:,:) = 0._wp
          oa_i (:,:,:) = 0._wp
          h_i  (:,:,:) = 0._wp
          h_s  (:,:,:) = 0._wp
-         sm_i (:,:,:) = 0._wp
+         s_i  (:,:,:) = 0._wp
          o_i  (:,:,:) = 0._wp
 
@@ -475 +475 @@
       v_s_b  (:,:,:)   = v_s  (:,:,:)
       e_s_b  (:,:,:,:) = e_s  (:,:,:,:)
-      smv_i_b(:,:,:)   = smv_i(:,:,:)
+      sv_i_b (:,:,:)   = sv_i (:,:,:)
       oa_i_b (:,:,:)   = oa_i (:,:,:)
       u_ice_b(:,:)     = u_ice(:,:)