Changeset 8512 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90

Timestamp:

2017-09-07T20:08:11+02:00 (7 years ago)

Author:

clem

Message:

changes in style - part5 - reaching the end

File:

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

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

@@ -153 +153 @@
    !! * Share Module variables
    !!--------------------------------------------------------------------------
-   !                                     !!** ice-generic parameters namelist (namicerun) **
+   !                                     !!** ice-generic parameters namelist (namice_run) **
    INTEGER           , PUBLIC ::   jpl             !: number of ice  categories 
    INTEGER           , PUBLIC ::   nlay_i          !: number of ice  layers 
@@ -163 +163 @@
    CHARACTER(len=256), PUBLIC ::   cn_icerst_indir !: ice restart input directory
    CHARACTER(len=256), PUBLIC ::   cn_icerst_outdir!: ice restart output directory
-   LOGICAL           , PUBLIC ::   ln_limthd       !: flag for ice thermo (T) or not (F)
-   LOGICAL           , PUBLIC ::   ln_limdyn       !: flag for ice dynamics (T) or not (F)
-   INTEGER           , PUBLIC ::   nn_limdyn       !: flag for ice dynamics
-   REAL(wp)          , PUBLIC ::   rn_uice         !: prescribed u-vel (case nn_limdyn=0)
-   REAL(wp)          , PUBLIC ::   rn_vice         !: prescribed v-vel (case nn_limdyn=0)
    
-   !                                     !!** ice-diagnostics namelist (namicediag) **
+   !                                     !!** ice-diagnostics namelist (namice_dia) **
    LOGICAL , PUBLIC ::   ln_limdiachk     !: flag for ice diag (T) or not (F)
    LOGICAL , PUBLIC ::   ln_limdiahsb     !: flag for ice diag (T) or not (F)
@@ -177 +172 @@
 
    !                                     !!** ice-dynamics namelist (namicedyn) **
+   LOGICAL , PUBLIC ::   ln_icedyn        !: flag for ice dynamics (T) or not (F)
+   INTEGER , PUBLIC ::   nn_icedyn        !: flag for ice dynamics
+   REAL(wp), PUBLIC ::   rn_uice          !: prescribed u-vel (case nn_icedyn=0)
+   REAL(wp), PUBLIC ::   rn_vice          !: prescribed v-vel (case nn_icedyn=0)
                                           ! -- iceadv -- !
-   INTEGER , PUBLIC ::   nn_limadv        !: choose the advection scheme (-1=Prather ; 0=Ultimate-Macho)
-   INTEGER , PUBLIC ::   nn_limadv_ord    !: choose the order of the advection scheme (if Ultimate-Macho)   
+   LOGICAL , PUBLIC ::   ln_adv_Pra       !: Prather        advection scheme
+   LOGICAL , PUBLIC ::   ln_adv_UMx       !: Ultimate-Macho advection scheme
+   INTEGER , PUBLIC ::   nn_UMx           !: order of the UMx advection scheme   
                                           ! -- icerdgrft -- !
-   INTEGER , PUBLIC ::   nn_icestr        !: ice strength parameterization (0=Hibler79 1=Rothrock75)
-   REAL(wp), PUBLIC ::   rn_pe_rdg        !: ridging work divided by pot. energy change in ridging, nn_icestr = 1
+   LOGICAL , PUBLIC ::   ln_str_Hib       !: ice strength parameterization (Hibler79)
    REAL(wp), PUBLIC ::   rn_pstar         !: determines ice strength, Hibler JPO79
    REAL(wp), PUBLIC ::   rn_crhg          !: determines changes in ice strength
-   LOGICAL , PUBLIC ::   ln_icestr_bvf    !: use brine volume to diminish ice strength
+   LOGICAL , PUBLIC ::   ln_str_Rot       !: ice strength parameterization (Rothrock75)
+   REAL(wp), PUBLIC ::   rn_perdg         !: ridging work divided by pot. energy change in ridging
                                           ! -- icerhg -- !
    REAL(wp), PUBLIC ::   rn_ishlat        !: lateral boundary condition for sea-ice
@@ -198 +198 @@
    REAL(wp), PUBLIC ::   rn_lfrelax       !: relaxation time scale (s-1) to reach static friction (landfast ice) 
 
-   !                                     !!** ice-thermodynamics namelist (namicethd) **
+   !                                     !!** ice-thermodynamics namelist (namice_thd) **
+   LOGICAL , PUBLIC ::   ln_limthd        !: flag for ice thermo (T) or not (F)
                                           ! -- icethd_dif -- !
    REAL(wp), PUBLIC ::   rn_kappa_i       !: coef. for the extinction of radiation Grenfell et al. (2006) [1/m]
@@ -219 +220 @@
    REAL(wp), PUBLIC ::   rn_vfrazb        !: threshold drift speed for collection of bottom frazil ice
    REAL(wp), PUBLIC ::   rn_Cfrazb        !: squeezing coefficient for collection of bottom frazil ice
-                                          ! -- iceitd -- !
+                                          ! -- iceitd_th -- !
    REAL(wp), PUBLIC ::   rn_himin         !: minimum ice thickness
-
-   !                                     !!** ice-salinity namelist (namicesal) **
+                                          ! --  -- !
+   INTEGER , PUBLIC ::   nn_limflx        !: LIM3 Multi-category heat flux formulation
+   !                                      !   =-1  Use of per-category fluxes
+   !                                      !   = 0  Average per-category fluxes
+   !                                      !   = 1  Average then redistribute per-category fluxes
+   !                                      !   = 2  Redistribute a single flux over categories
+
+   !                                     !!** ice-salinity namelist (namice_sal) **
    LOGICAL , PUBLIC ::   ln_limdS         !: activate gravity drainage and flushing (T) or not (F)
    INTEGER , PUBLIC ::   nn_icesal        !: salinity configuration used in the model