Changeset 8422

Timestamp:

2017-08-08T15:58:05+02:00 (7 years ago)

Author:

clem

Message:

continue naming

Location:

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO

Files:

• LIM_SRC_3/ice.F90 (modified) (6 diffs)
• LIM_SRC_3/iceerr1.F90 (modified) (2 diffs)
• LIM_SRC_3/iceerr2.F90 (modified) (2 diffs)
• LIM_SRC_3/iceistate.F90 (modified) (1 diff)
• LIM_SRC_3/iceitd.F90 (added)
• LIM_SRC_3/icestp.F90 (modified) (4 diffs)
• LIM_SRC_3/icethd.F90 (added)
• LIM_SRC_3/icethd_da.F90 (added)
• LIM_SRC_3/icethd_dh.F90 (added)
• LIM_SRC_3/icethd_dif.F90 (added)
• LIM_SRC_3/icethd_ent.F90 (added)
• LIM_SRC_3/icethd_lac.F90 (added)
• LIM_SRC_3/icethd_sal.F90 (added)
• LIM_SRC_3/limitd_th.F90 (deleted)
• LIM_SRC_3/limthd.F90 (deleted)
• LIM_SRC_3/limthd_da.F90 (deleted)
• LIM_SRC_3/limthd_dh.F90 (deleted)
• LIM_SRC_3/limthd_dif.F90 (deleted)
• LIM_SRC_3/limthd_ent.F90 (deleted)
• LIM_SRC_3/limthd_lac.F90 (deleted)
• LIM_SRC_3/limthd_sal.F90 (deleted)
• LIM_SRC_3/limvar.F90 (modified) (2 diffs)
• OPA_SRC/BDY/bdyice.F90 (modified) (1 diff)
• OPA_SRC/LBC/lib_mpp.F90 (modified) (1 diff)
• OPA_SRC/SBC/sbcblk.F90 (modified) (2 diffs)
• OPA_SRC/SBC/sbccpl.F90 (modified) (2 diffs)

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

@@ -77 +77 @@
    !! - ice_adv : ice advection                                           |
    !! - ice_rdgrft : ice ridging and rafting                              |
-   !! - lim_thd : ice halo-thermodynamics                                 |
-   !! - lim_itd_th : thermodynamic changes in ice thickness distribution  |
-   !!                and creation of new ice                              |
+   !! - ice_thd : ice halo-thermodynamics and creation of new ice         |
+   !! - ice_itd : thermodynamic changes in ice thickness distribution     |
    !!                                                                     |
    !! See the associated routines for more information                    |
@@ -150 +149 @@
    !! bv_i        !      -      !    relative brine volume        | ???   | 
    !!=====================================================================
-
-   LOGICAL, PUBLIC ::   con_i = .false.   ! switch for conservation test
 
    !!--------------------------------------------------------------------------
@@ -221 +218 @@
 
    !                                     !!** ice-thermodynamics namelist (namicethd) **
-                                          ! -- limthd_dif -- !
+                                          ! -- icethd_dif -- !
    REAL(wp), PUBLIC ::   rn_kappa_i       !: coef. for the extinction of radiation Grenfell et al. (2006) [1/m]
    INTEGER , PUBLIC ::   nn_ice_thcon     !: thermal conductivity: =0 Untersteiner (1964) ; =1 Pringle et al (2007)
@@ -227 +224 @@
    INTEGER , PUBLIC ::   nn_monocat       !: virtual ITD mono-category parameterizations (1-4) or not (0)
    REAL(wp), PUBLIC ::   rn_cdsn          !: thermal conductivity of the snow [W/m/K]
-                                          ! -- limthd_dh -- !
+                                          ! -- icethd_dh -- !
    LOGICAL , PUBLIC ::   ln_limdH         !: activate ice thickness change from growing/melting (T) or not (F)
    REAL(wp), PUBLIC ::   rn_betas         !: coef. for partitioning of snowfall between leads and sea ice
-                                          ! -- limthd_da -- !
+                                          ! -- icethd_da -- !
    LOGICAL , PUBLIC ::   ln_limdA         !: activate lateral melting param. (T) or not (F)
    REAL(wp), PUBLIC ::   rn_beta          !: coef. beta for lateral melting param.
    REAL(wp), PUBLIC ::   rn_dmin          !: minimum floe diameter for lateral melting param.
-                                          ! -- limthd_lac -- !
+                                          ! -- icethd_lac -- !
    LOGICAL , PUBLIC ::   ln_limdO         !: activate ice growth in open-water (T) or not (F)
    REAL(wp), PUBLIC ::   rn_hnewice       !: thickness for new ice formation (m)
@@ -241 +238 @@
    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
-                                          ! -- limitd_th -- !
+                                          ! -- iceitd -- !
    REAL(wp), PUBLIC ::   rn_himin         !: minimum ice thickness
 
@@ -366 +363 @@
 
    ! heat flux associated with ice-ocean mass exchange
-   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hfx_thd     !: ice-ocean heat flux from thermo processes (limthd_dh) [W.m-2]
+   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hfx_thd     !: ice-ocean heat flux from thermo processes (icethd_dh) [W.m-2]
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hfx_dyn     !: ice-ocean heat flux from ridging                      [W.m-2]
    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hfx_res     !: residual heat flux due to correction of ice thickness [W.m-2]

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

@@ -17 +17 @@
    USE ice
    USE ice1D           ! LIM thermodynamic sea-ice variables
-   USE limitd_th
+   USE iceitd
    USE limvar
    USE icecons         ! conservation tests
@@ -104 +104 @@
       ! Rebin categories with thickness out of bounds
       !----------------------------------------------------
-      IF ( jpl > 1 ) CALL lim_itd_th_reb
+      IF ( jpl > 1 ) CALL ice_itd_reb
 
       !-----------------

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

@@ -16 +16 @@
    USE phycst          ! physical constants
    USE ice
-   USE ice1D         ! LIM thermodynamic sea-ice variables
-   USE limitd_th
+   USE ice1D           ! LIM thermodynamic sea-ice variables
+   USE iceitd
    USE limvar
    USE icecons         ! conservation tests
@@ -118 +118 @@
       ! Rebin categories with thickness out of bounds
       !----------------------------------------------------
-      IF ( jpl > 1 ) CALL lim_itd_th_reb
+      IF ( jpl > 1 ) CALL ice_itd_reb
 
       !-----------------

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

@@ -307 +307 @@
                   ! This case below should not be used if (ht_s/ht_i) is ok in namelist
                   ! In case snow load is in excess that would lead to transformation from snow to ice
-                  ! Then, transfer the snow excess into the ice (different from limthd_dh)
+                  ! Then, transfer the snow excess into the ice (different from icethd_dh)
                   zdh = MAX( 0._wp, ( rhosn * ht_s(ji,jj,jl) + ( rhoic - rau0 ) * ht_i(ji,jj,jl) ) * r1_rau0 ) 
                   ! recompute ht_i, ht_s avoiding out of bounds values

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

@@ -34 +34 @@
    USE icerhg          ! Ice rheology
    USE iceadv          ! Ice advection
-   USE limthd          ! Ice thermodynamics
+   USE icethd          ! Ice thermodynamics
    USE icerdgrft       ! Ice ridging/rafting
    USE iceupdate       ! sea surface boundary condition
@@ -48 +48 @@
    ! END MV MP 2016
    USE iceistate       ! LIM initial state
-   USE limthd_sal      ! LIM ice thermodynamics: salinity
+   USE icethd_sal      ! LIM ice thermodynamics: salinity
    !
    USE c1d             ! 1D vertical configuration
@@ -190 +190 @@
          !----------------------------!
          ! --- zap this if no ice thermo --- !
-         IF( ln_limthd )              CALL lim_thd( kt )        ! -- Ice thermodynamics      
+         IF( ln_limthd )              CALL ice_thd( kt )        ! -- Ice thermodynamics      
 
          ! MV MP 2016
@@ -271 +271 @@
       CALL ice_itd_init                ! ice thickness distribution initialization
       !
-      CALL lim_thd_init                ! set ice thermodynics parameters
-      !
-      CALL lim_thd_sal_init            ! set ice salinity parameters
+      CALL ice_thd_init                ! set ice thermodynics parameters
+      !
+      CALL ice_thd_sal_init            ! set ice salinity parameters
        
       ! MV MP 2016

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

@@ -431 +431 @@
    SUBROUTINE lim_var_salprof1d
       !!-------------------------------------------------------------------
-      !!                  ***  ROUTINE lim_thd_salprof1d  ***
+      !!                  ***  ROUTINE lim_var_salprof1d  ***
       !!
       !! ** Purpose :   1d computation of the sea ice salinity profile
@@ -760 +760 @@
                zht_s(ji,jl) = zht_i(ji,jl) * ( zhts(ji) / zhti(ji) )
                ! In case snow load is in excess that would lead to transformation from snow to ice
-               ! Then, transfer the snow excess into the ice (different from limthd_dh)
+               ! Then, transfer the snow excess into the ice (different from icethd_dh)
                zdh = MAX( 0._wp, ( rhosn * zht_s(ji,jl) + ( rhoic - rau0 ) * zht_i(ji,jl) ) * r1_rau0 ) 
                ! recompute ht_i, ht_s avoiding out of bounds values

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90

@@ -119 +119 @@
             ! -----------------
             ! In case a) snow load would be in excess or b) ice is coming into a warmer environment that would lead to 
-            ! very large transformation from snow to ice (see limthd_dh.F90)
-
-            ! Then, a) transfer the snow excess into the ice (different from limthd_dh)
+            ! very large transformation from snow to ice (see icethd_dh.F90)
+
+            ! Then, a) transfer the snow excess into the ice (different from icethd_dh)
             zdh = MAX( 0._wp, ( rhosn * ht_s(ji,jj,jl) + ( rhoic - rau0 ) * ht_i(ji,jj,jl) ) * r1_rau0 )
             ! Or, b) transfer all the snow into ice (if incoming ice is likely to melt as it comes into a warmer environment)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/LBC/lib_mpp.F90

@@ -145 +145 @@
 
    ! variables used in case of sea-ice
-   INTEGER, PUBLIC ::   ncomm_ice       !: communicator made by the processors with sea-ice (public so that it can be freed in limthd)
+   INTEGER, PUBLIC ::   ncomm_ice       !: communicator made by the processors with sea-ice (public so that it can be freed in icethd)
    INTEGER         ::   ngrp_iworld     !  group ID for the world processors (for rheology)
    INTEGER         ::   ngrp_ice        !  group ID for the ice processors (for rheology)

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90

@@ -41 +41 @@
 #if defined key_lim3
    USE ice     , ONLY :   u_ice, v_ice, jpl, a_i_b, at_i_b
-   USE limthd_dh      ! for CALL lim_thd_snwblow
+   USE icethd_dh      ! for CALL ice_thd_snwblow
 #endif
    USE sbcblk_algo_ncar     ! => turb_ncar     : NCAR - CORE (Large & Yeager, 2009) 
@@ -789 +789 @@
       ! --- evaporation minus precipitation --- !
       zsnw(:,:) = 0._wp
-      CALL lim_thd_snwblow( (1.-at_i_b(:,:)), zsnw )  ! snow distribution over ice after wind blowing
+      CALL ice_thd_snwblow( (1.-at_i_b(:,:)), zsnw )  ! snow distribution over ice after wind blowing
       emp_oce(:,:) = ( 1._wp - at_i_b(:,:) ) * zevap(:,:) - ( tprecip(:,:) - sprecip(:,:) ) - sprecip(:,:) * (1._wp - zsnw )
       emp_ice(:,:) = SUM( a_i_b(:,:,:) * evap_ice(:,:,:), dim=3 ) - sprecip(:,:) * zsnw

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

@@ -40 +40 @@
 #endif
 #if defined key_lim3
-   USE limthd_dh      ! for CALL lim_thd_snwblow
+   USE icethd_dh      ! for CALL ice_thd_snwblow
 #endif
    !
@@ -1621 +1621 @@
 #if defined key_lim3
       ! zsnw = snow fraction over ice after wind blowing (=picefr if no blowing)
-      zsnw(:,:) = 0._wp  ;  CALL lim_thd_snwblow( ziceld, zsnw )
+      zsnw(:,:) = 0._wp  ;  CALL ice_thd_snwblow( ziceld, zsnw )
       
       ! --- evaporation minus precipitation corrected (because of wind blowing on snow) --- !