Changeset 8426 for branches/2017/dev_r8183_ICEMODEL/NEMOGCM/NEMO/LIM_SRC_3/icestp.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/icestp.F90 (modified) (9 diffs)

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 ice_diahsb
+   !!             -   ! 2012-10  (C. Rousset)  add ice_dia
    !!            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)
@@ -37 +37 @@
    USE icerdgrft       ! Ice ridging/rafting
    USE iceupdate       ! sea surface boundary condition
-   USE icediahsb       ! Ice budget diagnostics
+   USE icedia          ! Ice budget diagnostics
    USE icewri          ! Ice outputs
    USE icerst          ! Ice restarts
-   USE iceerr1         ! Ice corrections after dynamics
-   USE iceerr2         ! Ice corrections after thermo
+   USE icecor          ! Ice corrections
    USE icevar          ! Ice variables switch
    USE icectl          !
@@ -47 +46 @@
    USE limmp
    ! END MV MP 2016
-   USE iceistate       ! LIM initial state
+   USE iceist          ! LIM initial state
    USE icethd_sal      ! LIM ice thermodynamics: salinity
    !
@@ -130 +129 @@
          CALL eos_fzp( sss_m(:,:) , t_bo(:,:) )
          t_bo(:,:) = ( t_bo(:,:) + rt0 ) * tmask(:,:,1) + rt0 * ( 1._wp - tmask(:,:,1) )
-
-         ! Mask sea ice surface temperature (set to rt0 over land)
-         DO jl = 1, jpl
-            t_su(:,:,jl) = t_su(:,:,jl) * tmask(:,:,1) + rt0 * ( 1._wp - tmask(:,:,1) )
-         END DO
          !
                                       CALL ice_bef         ! Store previous ice values
@@ -156 +150 @@
                                       CALL ice_adv( kt )       ! -- advection
             IF( nn_limdyn == 2 .AND. nn_monocat /= 2 )  &      ! -- ridging/rafting
-               &                      CALL ice_rdgrft         
-            IF( nn_limdyn == 2 )      CALL ice_err1( kt )      ! -- Corrections
+               &                      CALL ice_rdgrft( kt )         
+            IF( nn_limdyn == 2 )      CALL ice_cor( kt , 1 )   ! -- Corrections
             !
          ENDIF
-
          ! ---
+         
 #if defined key_agrif
          IF( .NOT. Agrif_Root() )     CALL agrif_interp_lim3('T')
@@ -196 +190 @@
          ! END MV MP 2016
 
-         IF( ln_limthd )              CALL ice_err2( kt )       ! -- Corrections
+         IF( ln_limthd )              CALL ice_cor( kt , 2 )    ! -- Corrections
          ! ---
 # if defined key_agrif
@@ -213 +207 @@
 !!         IF( .NOT. Agrif_Root() )   CALL Agrif_ParentGrid_To_ChildGrid()
 !!# endif
-         IF( ln_limdiahsb )           CALL ice_diahsb( kt )     ! -- Diagnostics and outputs 
+         IF( ln_limdiahsb )           CALL ice_dia( kt )     ! -- Diagnostics and outputs 
          !
                                       CALL ice_wri( 1 )         ! -- Ice outputs 
@@ -282 +276 @@
       !                                ! Initial sea-ice state
       IF( .NOT. ln_rstart ) THEN              ! start from rest: sea-ice deduced from sst
-         CALL ice_istate
+         CALL ice_ist
       ELSE                                    ! start from a restart file
          CALL ice_rst_read
@@ -291 +285 @@
       CALL ice_update_init                 ! ice surface boundary condition
       !
-      IF( ln_limdiahsb) CALL ice_diahsb_init  ! initialization for diags
+      IF( ln_limdiahsb) CALL ice_dia_init  ! initialization for diags
       !
       fr_i(:,:)     = at_i(:,:)         ! initialisation of sea-ice fraction