Changeset 8514 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_lac.F90

Timestamp:

2017-09-08T17:09:25+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part5 - almost done

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icethd_lac.F90 (modified) (5 diffs)

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

@@ -26 +26 @@
    USE icethd_ent     ! sea-ice: thermodynamics, enthalpy
    USE icevar         ! sea-ice: operations
+   USE icethd_sal     ! sea-ice: salinity profiles
    !
    USE in_out_manager ! I/O manager
@@ -112 +113 @@
       !!-----------------------------------------------------------------------!
 
-      IF( ln_limdiachk ) CALL ice_cons_hsm(0, 'icethd_lac', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)
+      IF( ln_icediachk ) CALL ice_cons_hsm(0, 'icethd_lac', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)
 
       CALL ice_var_agg(1)
@@ -133 +134 @@
 
       ! Default new ice thickness
-      WHERE( qlead(:,:) < 0._wp )   ;   hicol(:,:) = rn_hnewice
+      WHERE( qlead(:,:) < 0._wp )   ;   hicol(:,:) = rn_hinew
       ELSEWHERE                     ;   hicol(:,:) = 0._wp
       END WHERE
@@ -348 +349 @@
             DO ji = 1, nidx
                rswitch       = 1._wp - MAX( 0._wp, SIGN( 1._wp , - zat_i_1d(ji) ) )
-               zfrazb        = rswitch * ( TANH( rn_Cfrazb * ( zvrel_1d(ji) - rn_vfrazb ) ) + 1.0 ) * 0.5 * rn_maxfrazb
+               zfrazb        = rswitch * ( TANH( rn_Cfraz * ( zvrel_1d(ji) - rn_vfraz ) ) + 1.0 ) * 0.5 * rn_maxfraz
                zv_frazb(ji)  =         zfrazb   * zv_newice(ji)
                zv_newice(ji) = ( 1.0 - zfrazb ) * zv_newice(ji)
@@ -478 +479 @@
       ENDIF ! nidx > 0
       !
-      IF( ln_limdiachk ) CALL ice_cons_hsm(1, 'icethd_lac', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)
+      IF( ln_icediachk ) CALL ice_cons_hsm(1, 'icethd_lac', zvi_b, zsmv_b, zei_b, zfw_b, zfs_b, zft_b)
       !
    END SUBROUTINE ice_thd_lac