Changeset 8414

Timestamp:

2017-08-08T12:48:02+02:00 (7 years ago)

Author:

clem

Message:

changing names

Location:

branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3

Files:

• albedoice.F90 (deleted)
• icealbedo.F90 (added)
• icediahsb.F90 (added)
• iceforcing.F90 (modified) (2 diffs)
• icestp.F90 (modified) (5 diffs)
• iceupdate.F90 (added)
• limdiahsb.F90 (deleted)
• limsbc.F90 (deleted)
• limthd.F90 (modified) (1 diff)
• limthd_dh.F90 (modified) (1 diff)

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

@@ -19 +19 @@
    USE sbcblk          ! Surface boundary condition: bulk
    USE sbccpl          ! Surface boundary condition: coupled interface
-   USE albedoice       ! ice albedo
+   USE icealbedo       ! ice albedo
    !
    USE iom             ! I/O manager library
@@ -120 +120 @@
 
       ! --- cloud-sky and overcast-sky ice albedos --- !
-      CALL albedo_ice( t_su, ht_i, ht_s, a_ip_frac, h_ip, ln_pnd_rad, zalb_cs, zalb_os )
+      CALL ice_albedo( t_su, ht_i, ht_s, a_ip_frac, h_ip, ln_pnd_rad, zalb_cs, zalb_os )
 
       ! albedo depends on cloud fraction because of non-linear spectral effects

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

@@ -11 +11 @@
    !!            3.3  ! 2010-11  (G. Madec) ice-ocean stress always computed at each ocean time-step
    !!            3.4  ! 2011-01  (A Porter)  dynamical allocation
-   !!             -   ! 2012-10  (C. Rousset)  add lim_diahsb
+   !!             -   ! 2012-10  (C. Rousset)  add ice_diahsb
    !!            3.6  ! 2014-07  (M. Vancoppenolle, G. Madec, O. Marti) revise coupled interface
    !!            4.0  ! 2016-06  (L. Brodeau) new unified bulk routine (based on AeroBulk)
@@ -36 +36 @@
    USE limthd          ! Ice thermodynamics
    USE icerdgrft       ! Ice ridging/rafting
-   USE limsbc          ! sea surface boundary condition
-   USE limdiahsb       ! Ice budget diagnostics
+   USE iceupdate       ! sea surface boundary condition
+   USE icediahsb       ! Ice budget diagnostics
    USE icewri          ! Ice outputs
    USE icerst          ! Ice restarts
@@ -209 +209 @@
 !!         IF( .NOT. Agrif_Root() )   CALL Agrif_ChildGrid_To_ParentGrid()
 !!# endif
-                                      CALL lim_sbc_flx( kt )    ! -- Update surface ocean mass, heat and salt fluxes
+                                      CALL ice_update_flx( kt )    ! -- Update surface ocean mass, heat and salt fluxes
 !!# if defined key_agrif
 !!         IF( .NOT. Agrif_Root() )   CALL Agrif_ParentGrid_To_ChildGrid()
 !!# endif
-         IF( ln_limdiahsb )           CALL lim_diahsb( kt )     ! -- Diagnostics and outputs 
+         IF( ln_limdiahsb )           CALL ice_diahsb( kt )     ! -- Diagnostics and outputs 
          !
                                       CALL ice_wri( 1 )         ! -- Ice outputs 
@@ -231 +231 @@
       ! Update surface ocean stresses (only in ice-dynamic case) otherwise the atm.-ocean stresses are used everywhere
       !    using before instantaneous surf. currents
-      IF( ln_limdyn )                 CALL lim_sbc_tau( kt, ub(:,:,1), vb(:,:,1) )
+      IF( ln_limdyn )                 CALL ice_update_tau( kt, ub(:,:,1), vb(:,:,1) )
 !!gm   remark, the ocean-ice stress is not saved in ice diag call above .....  find a solution!!!
       !
@@ -289 +289 @@
       CALL lim_var_glo2eqv
       !
-      CALL lim_sbc_init                 ! ice surface boundary condition
-      !
-      IF( ln_limdiahsb) CALL lim_diahsb_init  ! initialization for diags
+      CALL ice_update_init                 ! ice surface boundary condition
+      !
+      IF( ln_limdiahsb) CALL ice_diahsb_init  ! initialization for diags
       !
       fr_i(:,:)     = at_i(:,:)         ! initialisation of sea-ice fraction

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

@@ -191 +191 @@
       !     First  step here              :  non solar + precip - qlead - qturb
       !     Second step in limthd_dh      :  heat remaining if total melt (zq_rema) 
-      !     Third  step in limsbc         :  heat from ice-ocean mass exchange (zf_mass) + solar
+      !     Third  step in iceupdate.F90  :  heat from ice-ocean mass exchange (zf_mass) + solar
       DO jj = 1, jpj
          DO ji = 1, jpi

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

@@ -249 +249 @@
       !------------------------------
       ! qla_ice is always >=0 (upwards), heat goes to the atmosphere, therefore snow sublimates
-      ! clem comment: not counted in mass/heat exchange in limsbc since this is an exchange with atm. (not ocean)
+      ! clem comment: not counted in mass/heat exchange in iceupdate.F90 since this is an exchange with atm. (not ocean)
       zdeltah(1:nidx,:) = 0._wp
       DO ji = 1, nidx