Changeset 8426 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90

Timestamp:

2017-08-08T17:53:09+02:00 (7 years ago)

Author:

clem

Message:

last routine names to be changed

File:

• branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/iceupdate.F90 (modified) (9 diffs)

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

@@ -32 +32 @@
    USE sbc_oce , ONLY : nn_fsbc, ln_ice_embd, sfx, fr_i, qsr_tot, qns, qsr, fmmflx, emp, taum, utau, vtau
    USE sbccpl         ! Surface boundary condition: coupled interface
-   USE icealbedo      ! albedo parameters
+   USE icealb         ! albedo parameters
    USE traqsr         ! add penetration of solar flux in the calculation of heat budget
    USE domvvl         ! Variable volume
    USE icectl         !
-   USE icecons        !
    USE bdy_oce  , ONLY: ln_bdy
    !
@@ -44 +43 @@
    USE lib_mpp        ! MPP library
    USE lib_fortran    ! Fortran utilities (allows no signed zero when 'key_nosignedzero' defined)  
+   USE timing         ! Timing
 
    IMPLICIT NONE
@@ -108 +108 @@
       REAL(wp), DIMENSION(jpi,jpj,jpl) ::   zalb_cs, zalb_os     ! 3D workspace
       !!---------------------------------------------------------------------
+      IF( nn_timing == 1 )  CALL timing_start('ice_update_flx')
+
+      IF( kt == nit000 .AND. lwp ) THEN
+         WRITE(numout,*)
+         WRITE(numout,*)'ice_update_flx'
+         WRITE(numout,*)'~~~~~~~~~~~~~~'
+      ENDIF
 
       ! --- case we bypass ice thermodynamics --- !
@@ -201 +208 @@
       !    Snow/ice albedo (only if sent to coupler, useless in forced mode)   !
       !------------------------------------------------------------------------!
-      CALL ice_albedo( t_su, ht_i, ht_s, a_ip_frac, h_ip, ln_pnd_rad, zalb_cs, zalb_os ) ! cloud-sky and overcast-sky ice albedos
+      CALL ice_alb( t_su, ht_i, ht_s, a_ip_frac, h_ip, ln_pnd_rad, zalb_cs, zalb_os ) ! cloud-sky and overcast-sky ice albedos
 
       alb_ice(:,:,:) = ( 1. - cldf_ice ) * zalb_cs(:,:,:) + cldf_ice * zalb_os(:,:,:)
@@ -211 +218 @@
       IF( ln_limctl )   CALL ice_prt( kt, iiceprt, jiceprt, 3, ' - Final state ice_update - ' )
       IF( ln_ctl )      CALL ice_prt3D( 'iceupdate' )
+
+      IF( nn_timing == 1 )  CALL timing_stop('ice_update_flx')
 
    END SUBROUTINE ice_update_flx
@@ -247 +256 @@
       REAL(wp) ::   zat_v, zvtau_ice, zv_t, zrhoco  !   -      -
       !!---------------------------------------------------------------------
+
+      IF( nn_timing == 1 )  CALL timing_start('ice_update_tau')
+
+      IF( kt == nit000 .AND. lwp ) THEN
+         WRITE(numout,*)
+         WRITE(numout,*)'ice_update_tau'
+         WRITE(numout,*)'~~~~~~~~~~~~~~'
+      ENDIF
+
       zrhoco = rau0 * rn_cio
       !
@@ -285 +303 @@
       CALL lbc_lnk_multi( utau, 'U', -1., vtau, 'V', -1. )   ! lateral boundary condition
       !
+      IF( nn_timing == 1 )  CALL timing_stop('ice_update_tau')
       !  
    END SUBROUTINE ice_update_tau
@@ -304 +323 @@
       IF(lwp) WRITE(numout,*)
       IF(lwp) WRITE(numout,*) 'ice_update_init : LIM-3 sea-ice - surface boundary condition'
-      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~   '
+      IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~~~   '
 
       !                                      ! allocate ice_update array
@@ -368 +387 @@
    END SUBROUTINE ice_update_init
 
-#else
-   !!----------------------------------------------------------------------
-   !!   Default option :        Dummy module       NO LIM 3.0 sea-ice model
-   !!----------------------------------------------------------------------
-CONTAINS
-   SUBROUTINE ice_update           ! Dummy routine
-   END SUBROUTINE ice_update
 #endif