Changeset 8414


Ignore:
Timestamp:
2017-08-08T12:48:02+02:00 (3 years ago)
Author:
clem
Message:

changing names

Location:
branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3
Files:
3 added
3 deleted
4 edited

Legend:

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

    r8404 r8414  
    1919   USE sbcblk          ! Surface boundary condition: bulk 
    2020   USE sbccpl          ! Surface boundary condition: coupled interface 
    21    USE albedoice       ! ice albedo 
     21   USE icealbedo       ! ice albedo 
    2222   ! 
    2323   USE iom             ! I/O manager library 
     
    120120 
    121121      ! --- cloud-sky and overcast-sky ice albedos --- ! 
    122       CALL albedo_ice( t_su, ht_i, ht_s, a_ip_frac, h_ip, ln_pnd_rad, zalb_cs, zalb_os ) 
     122      CALL ice_albedo( t_su, ht_i, ht_s, a_ip_frac, h_ip, ln_pnd_rad, zalb_cs, zalb_os ) 
    123123 
    124124      ! albedo depends on cloud fraction because of non-linear spectral effects 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.F90

    r8413 r8414  
    1111   !!            3.3  ! 2010-11  (G. Madec) ice-ocean stress always computed at each ocean time-step 
    1212   !!            3.4  ! 2011-01  (A Porter)  dynamical allocation 
    13    !!             -   ! 2012-10  (C. Rousset)  add lim_diahsb 
     13   !!             -   ! 2012-10  (C. Rousset)  add ice_diahsb 
    1414   !!            3.6  ! 2014-07  (M. Vancoppenolle, G. Madec, O. Marti) revise coupled interface 
    1515   !!            4.0  ! 2016-06  (L. Brodeau) new unified bulk routine (based on AeroBulk) 
     
    3636   USE limthd          ! Ice thermodynamics 
    3737   USE icerdgrft       ! Ice ridging/rafting 
    38    USE limsbc          ! sea surface boundary condition 
    39    USE limdiahsb       ! Ice budget diagnostics 
     38   USE iceupdate       ! sea surface boundary condition 
     39   USE icediahsb       ! Ice budget diagnostics 
    4040   USE icewri          ! Ice outputs 
    4141   USE icerst          ! Ice restarts 
     
    209209!!         IF( .NOT. Agrif_Root() )   CALL Agrif_ChildGrid_To_ParentGrid() 
    210210!!# endif 
    211                                       CALL lim_sbc_flx( kt )    ! -- Update surface ocean mass, heat and salt fluxes 
     211                                      CALL ice_update_flx( kt )    ! -- Update surface ocean mass, heat and salt fluxes 
    212212!!# if defined key_agrif 
    213213!!         IF( .NOT. Agrif_Root() )   CALL Agrif_ParentGrid_To_ChildGrid() 
    214214!!# endif 
    215          IF( ln_limdiahsb )           CALL lim_diahsb( kt )     ! -- Diagnostics and outputs  
     215         IF( ln_limdiahsb )           CALL ice_diahsb( kt )     ! -- Diagnostics and outputs  
    216216         ! 
    217217                                      CALL ice_wri( 1 )         ! -- Ice outputs  
     
    231231      ! Update surface ocean stresses (only in ice-dynamic case) otherwise the atm.-ocean stresses are used everywhere 
    232232      !    using before instantaneous surf. currents 
    233       IF( ln_limdyn )                 CALL lim_sbc_tau( kt, ub(:,:,1), vb(:,:,1) ) 
     233      IF( ln_limdyn )                 CALL ice_update_tau( kt, ub(:,:,1), vb(:,:,1) ) 
    234234!!gm   remark, the ocean-ice stress is not saved in ice diag call above .....  find a solution!!! 
    235235      ! 
     
    289289      CALL lim_var_glo2eqv 
    290290      ! 
    291       CALL lim_sbc_init                 ! ice surface boundary condition 
    292       ! 
    293       IF( ln_limdiahsb) CALL lim_diahsb_init  ! initialization for diags 
     291      CALL ice_update_init                 ! ice surface boundary condition 
     292      ! 
     293      IF( ln_limdiahsb) CALL ice_diahsb_init  ! initialization for diags 
    294294      ! 
    295295      fr_i(:,:)     = at_i(:,:)         ! initialisation of sea-ice fraction 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd.F90

    r8411 r8414  
    191191      !     First  step here              :  non solar + precip - qlead - qturb 
    192192      !     Second step in limthd_dh      :  heat remaining if total melt (zq_rema)  
    193       !     Third  step in limsbc         :  heat from ice-ocean mass exchange (zf_mass) + solar 
     193      !     Third  step in iceupdate.F90  :  heat from ice-ocean mass exchange (zf_mass) + solar 
    194194      DO jj = 1, jpj 
    195195         DO ji = 1, jpi 
  • branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/limthd_dh.F90

    r8378 r8414  
    249249      !------------------------------ 
    250250      ! qla_ice is always >=0 (upwards), heat goes to the atmosphere, therefore snow sublimates 
    251       ! clem comment: not counted in mass/heat exchange in limsbc since this is an exchange with atm. (not ocean) 
     251      ! clem comment: not counted in mass/heat exchange in iceupdate.F90 since this is an exchange with atm. (not ocean) 
    252252      zdeltah(1:nidx,:) = 0._wp 
    253253      DO ji = 1, nidx 
Note: See TracChangeset for help on using the changeset viewer.