Changeset 8422


Ignore:
Timestamp:
2017-08-08T15:58:05+02:00 (3 years ago)
Author:
clem
Message:

continue naming

Location:
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO
Files:
8 added
8 deleted
10 edited

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/ice.F90

    r8413 r8422  
    7777   !! - ice_adv : ice advection                                           | 
    7878   !! - ice_rdgrft : ice ridging and rafting                              | 
    79    !! - lim_thd : ice halo-thermodynamics                                 | 
    80    !! - lim_itd_th : thermodynamic changes in ice thickness distribution  | 
    81    !!                and creation of new ice                              | 
     79   !! - ice_thd : ice halo-thermodynamics and creation of new ice         | 
     80   !! - ice_itd : thermodynamic changes in ice thickness distribution     | 
    8281   !!                                                                     | 
    8382   !! See the associated routines for more information                    | 
     
    150149   !! bv_i        !      -      !    relative brine volume        | ???   |  
    151150   !!===================================================================== 
    152  
    153    LOGICAL, PUBLIC ::   con_i = .false.   ! switch for conservation test 
    154151 
    155152   !!-------------------------------------------------------------------------- 
     
    221218 
    222219   !                                     !!** ice-thermodynamics namelist (namicethd) ** 
    223                                           ! -- limthd_dif -- ! 
     220                                          ! -- icethd_dif -- ! 
    224221   REAL(wp), PUBLIC ::   rn_kappa_i       !: coef. for the extinction of radiation Grenfell et al. (2006) [1/m] 
    225222   INTEGER , PUBLIC ::   nn_ice_thcon     !: thermal conductivity: =0 Untersteiner (1964) ; =1 Pringle et al (2007) 
     
    227224   INTEGER , PUBLIC ::   nn_monocat       !: virtual ITD mono-category parameterizations (1-4) or not (0) 
    228225   REAL(wp), PUBLIC ::   rn_cdsn          !: thermal conductivity of the snow [W/m/K] 
    229                                           ! -- limthd_dh -- ! 
     226                                          ! -- icethd_dh -- ! 
    230227   LOGICAL , PUBLIC ::   ln_limdH         !: activate ice thickness change from growing/melting (T) or not (F) 
    231228   REAL(wp), PUBLIC ::   rn_betas         !: coef. for partitioning of snowfall between leads and sea ice 
    232                                           ! -- limthd_da -- ! 
     229                                          ! -- icethd_da -- ! 
    233230   LOGICAL , PUBLIC ::   ln_limdA         !: activate lateral melting param. (T) or not (F) 
    234231   REAL(wp), PUBLIC ::   rn_beta          !: coef. beta for lateral melting param. 
    235232   REAL(wp), PUBLIC ::   rn_dmin          !: minimum floe diameter for lateral melting param. 
    236                                           ! -- limthd_lac -- ! 
     233                                          ! -- icethd_lac -- ! 
    237234   LOGICAL , PUBLIC ::   ln_limdO         !: activate ice growth in open-water (T) or not (F) 
    238235   REAL(wp), PUBLIC ::   rn_hnewice       !: thickness for new ice formation (m) 
     
    241238   REAL(wp), PUBLIC ::   rn_vfrazb        !: threshold drift speed for collection of bottom frazil ice 
    242239   REAL(wp), PUBLIC ::   rn_Cfrazb        !: squeezing coefficient for collection of bottom frazil ice 
    243                                           ! -- limitd_th -- ! 
     240                                          ! -- iceitd -- ! 
    244241   REAL(wp), PUBLIC ::   rn_himin         !: minimum ice thickness 
    245242 
     
    366363 
    367364   ! heat flux associated with ice-ocean mass exchange 
    368    REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hfx_thd     !: ice-ocean heat flux from thermo processes (limthd_dh) [W.m-2] 
     365   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hfx_thd     !: ice-ocean heat flux from thermo processes (icethd_dh) [W.m-2] 
    369366   REAL(wp), PUBLIC, ALLOCATABLE, SAVE, DIMENSION(:,:) ::   hfx_dyn     !: ice-ocean heat flux from ridging                      [W.m-2] 
    370367   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

    r8420 r8422  
    1717   USE ice 
    1818   USE ice1D           ! LIM thermodynamic sea-ice variables 
    19    USE limitd_th 
     19   USE iceitd 
    2020   USE limvar 
    2121   USE icecons         ! conservation tests 
     
    104104      ! Rebin categories with thickness out of bounds 
    105105      !---------------------------------------------------- 
    106       IF ( jpl > 1 ) CALL lim_itd_th_reb 
     106      IF ( jpl > 1 ) CALL ice_itd_reb 
    107107 
    108108      !----------------- 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceerr2.F90

    r8420 r8422  
    1616   USE phycst          ! physical constants 
    1717   USE ice 
    18    USE ice1D         ! LIM thermodynamic sea-ice variables 
    19    USE limitd_th 
     18   USE ice1D           ! LIM thermodynamic sea-ice variables 
     19   USE iceitd 
    2020   USE limvar 
    2121   USE icecons         ! conservation tests 
     
    118118      ! Rebin categories with thickness out of bounds 
    119119      !---------------------------------------------------- 
    120       IF ( jpl > 1 ) CALL lim_itd_th_reb 
     120      IF ( jpl > 1 ) CALL ice_itd_reb 
    121121 
    122122      !----------------- 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceistate.F90

    r8413 r8422  
    307307                  ! This case below should not be used if (ht_s/ht_i) is ok in namelist 
    308308                  ! In case snow load is in excess that would lead to transformation from snow to ice 
    309                   ! Then, transfer the snow excess into the ice (different from limthd_dh) 
     309                  ! Then, transfer the snow excess into the ice (different from icethd_dh) 
    310310                  zdh = MAX( 0._wp, ( rhosn * ht_s(ji,jj,jl) + ( rhoic - rau0 ) * ht_i(ji,jj,jl) ) * r1_rau0 )  
    311311                  ! recompute ht_i, ht_s avoiding out of bounds values 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90

    r8420 r8422  
    3434   USE icerhg          ! Ice rheology 
    3535   USE iceadv          ! Ice advection 
    36    USE limthd          ! Ice thermodynamics 
     36   USE icethd          ! Ice thermodynamics 
    3737   USE icerdgrft       ! Ice ridging/rafting 
    3838   USE iceupdate       ! sea surface boundary condition 
     
    4848   ! END MV MP 2016 
    4949   USE iceistate       ! LIM initial state 
    50    USE limthd_sal      ! LIM ice thermodynamics: salinity 
     50   USE icethd_sal      ! LIM ice thermodynamics: salinity 
    5151   ! 
    5252   USE c1d             ! 1D vertical configuration 
     
    190190         !----------------------------! 
    191191         ! --- zap this if no ice thermo --- ! 
    192          IF( ln_limthd )              CALL lim_thd( kt )        ! -- Ice thermodynamics       
     192         IF( ln_limthd )              CALL ice_thd( kt )        ! -- Ice thermodynamics       
    193193 
    194194         ! MV MP 2016 
     
    271271      CALL ice_itd_init                ! ice thickness distribution initialization 
    272272      ! 
    273       CALL lim_thd_init                ! set ice thermodynics parameters 
    274       ! 
    275       CALL lim_thd_sal_init            ! set ice salinity parameters 
     273      CALL ice_thd_init                ! set ice thermodynics parameters 
     274      ! 
     275      CALL ice_thd_sal_init            ! set ice salinity parameters 
    276276        
    277277      ! MV MP 2016 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limvar.F90

    r8420 r8422  
    431431   SUBROUTINE lim_var_salprof1d 
    432432      !!------------------------------------------------------------------- 
    433       !!                  ***  ROUTINE lim_thd_salprof1d  *** 
     433      !!                  ***  ROUTINE lim_var_salprof1d  *** 
    434434      !! 
    435435      !! ** Purpose :   1d computation of the sea ice salinity profile 
     
    760760               zht_s(ji,jl) = zht_i(ji,jl) * ( zhts(ji) / zhti(ji) ) 
    761761               ! In case snow load is in excess that would lead to transformation from snow to ice 
    762                ! Then, transfer the snow excess into the ice (different from limthd_dh) 
     762               ! Then, transfer the snow excess into the ice (different from icethd_dh) 
    763763               zdh = MAX( 0._wp, ( rhosn * zht_s(ji,jl) + ( rhoic - rau0 ) * zht_i(ji,jl) ) * r1_rau0 )  
    764764               ! recompute ht_i, ht_s avoiding out of bounds values 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/BDY/bdyice.F90

    r8411 r8422  
    119119            ! ----------------- 
    120120            ! In case a) snow load would be in excess or b) ice is coming into a warmer environment that would lead to  
    121             ! very large transformation from snow to ice (see limthd_dh.F90) 
    122  
    123             ! Then, a) transfer the snow excess into the ice (different from limthd_dh) 
     121            ! very large transformation from snow to ice (see icethd_dh.F90) 
     122 
     123            ! Then, a) transfer the snow excess into the ice (different from icethd_dh) 
    124124            zdh = MAX( 0._wp, ( rhosn * ht_s(ji,jj,jl) + ( rhoic - rau0 ) * ht_i(ji,jj,jl) ) * r1_rau0 ) 
    125125            ! 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

    r8226 r8422  
    145145 
    146146   ! variables used in case of sea-ice 
    147    INTEGER, PUBLIC ::   ncomm_ice       !: communicator made by the processors with sea-ice (public so that it can be freed in limthd) 
     147   INTEGER, PUBLIC ::   ncomm_ice       !: communicator made by the processors with sea-ice (public so that it can be freed in icethd) 
    148148   INTEGER         ::   ngrp_iworld     !  group ID for the world processors (for rheology) 
    149149   INTEGER         ::   ngrp_ice        !  group ID for the ice processors (for rheology) 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbcblk.F90

    r8321 r8422  
    4141#if defined key_lim3 
    4242   USE ice     , ONLY :   u_ice, v_ice, jpl, a_i_b, at_i_b 
    43    USE limthd_dh      ! for CALL lim_thd_snwblow 
     43   USE icethd_dh      ! for CALL ice_thd_snwblow 
    4444#endif 
    4545   USE sbcblk_algo_ncar     ! => turb_ncar     : NCAR - CORE (Large & Yeager, 2009)  
     
    789789      ! --- evaporation minus precipitation --- ! 
    790790      zsnw(:,:) = 0._wp 
    791       CALL lim_thd_snwblow( (1.-at_i_b(:,:)), zsnw )  ! snow distribution over ice after wind blowing 
     791      CALL ice_thd_snwblow( (1.-at_i_b(:,:)), zsnw )  ! snow distribution over ice after wind blowing 
    792792      emp_oce(:,:) = ( 1._wp - at_i_b(:,:) ) * zevap(:,:) - ( tprecip(:,:) - sprecip(:,:) ) - sprecip(:,:) * (1._wp - zsnw ) 
    793793      emp_ice(:,:) = SUM( a_i_b(:,:,:) * evap_ice(:,:,:), dim=3 ) - sprecip(:,:) * zsnw 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/OPA_SRC/SBC/sbccpl.F90

    r8321 r8422  
    4040#endif 
    4141#if defined key_lim3 
    42    USE limthd_dh      ! for CALL lim_thd_snwblow 
     42   USE icethd_dh      ! for CALL ice_thd_snwblow 
    4343#endif 
    4444   ! 
     
    16211621#if defined key_lim3 
    16221622      ! zsnw = snow fraction over ice after wind blowing (=picefr if no blowing) 
    1623       zsnw(:,:) = 0._wp  ;  CALL lim_thd_snwblow( ziceld, zsnw ) 
     1623      zsnw(:,:) = 0._wp  ;  CALL ice_thd_snwblow( ziceld, zsnw ) 
    16241624       
    16251625      ! --- evaporation minus precipitation corrected (because of wind blowing on snow) --- ! 
Note: See TracChangeset for help on using the changeset viewer.