Changeset 821 for branches/dev_002_LIM/NEMO/LIM_SRC/icestp.F90

Timestamp:

2008-03-06T12:22:15+01:00 (16 years ago)

Author:

rblod

Message:

Change name of modules and subroutines for LIM2 with suffix _2, add albedo_2 and flxblk_2, see ticket #71

File:

• branches/dev_002_LIM/NEMO/LIM_SRC/icestp.F90 (modified) (10 diffs)

branches/dev_002_LIM/NEMO/LIM_SRC/icestp.F90

@@ -1 @@
-MODULE icestp
+MODULE icestp_2
    !!======================================================================
-   !!                       ***  MODULE icestp   ***
+   !!                       ***  MODULE icestp_2   ***
    !!   Sea-Ice model : LIM Sea ice model time-stepping
    !!======================================================================
@@ -8 +8 @@
    !!   2.0  !  02-09  (G. Madec, C. Ethe)  F90: Free form and module
    !!----------------------------------------------------------------------
-#if defined key_ice_lim
-   !!----------------------------------------------------------------------
-   !!   'key_ice_lim' :                                   Lim sea-ice model
-   !!----------------------------------------------------------------------
-   !!----------------------------------------------------------------------
-   !!   ice_stp       : sea-ice model time-stepping
+#if defined key_lim2
+   !!----------------------------------------------------------------------
+   !!   'key_lim2' :                                  LIM 2.0 sea-ice model
+   !!----------------------------------------------------------------------
+   !!----------------------------------------------------------------------
+   !!   ice_stp_2       : sea-ice model time-stepping
    !!----------------------------------------------------------------------
    USE dom_oce
@@ -20 +20 @@
    USE ice_oce         ! ice variables
    USE flx_oce         ! forcings variables
-   USE dom_ice
+   USE dom_ice_2
    USE cpl_oce
    USE daymod
    USE phycst          ! Define parameters for the routines
    USE taumod
-   USE ice
+   USE ice_2
    USE ocesbc
    USE lbclnk
-   USE limdyn
-   USE limtrp
-   USE limthd
-   USE limflx
-   USE limdia
-   USE limwri
-   USE limrst
-   USE limdmp          ! Ice damping
+   USE limdyn_2
+   USE limtrp_2
+   USE limthd_2
+   USE limflx_2
+   USE limdia_2
+   USE limwri_2
+   USE limrst_2
+   USE limdmp_2        ! Ice damping
    USE prtctl          ! Print control
 
@@ -41 +41 @@
    PRIVATE
 
-   PUBLIC   ice_stp    ! called by step.F90
+   PUBLIC   ice_stp_2  ! called by step.F90
 
    !! * Substitutions
@@ -54 +54 @@
 CONTAINS
 
-   SUBROUTINE ice_stp ( kt )
+   SUBROUTINE ice_stp_2 ( kt )
       !!---------------------------------------------------------------------
-      !!                  ***  ROUTINE ice_stp  ***
+      !!                  ***  ROUTINE ice_stp_2  ***
       !!                   
       !! ** Purpose :   Louvain la Neuve Sea Ice Model time stepping 
@@ -196 +196 @@
 
          !                                                           !-----------------------!
-         CALL lim_rst_opn( kt )                                   ! Open Ice restart file !
+         CALL lim_rst_opn_2( kt )                                    ! Open Ice restart file !
          !                                                           !-----------------------!
 
          !                                                           !--------------!
-         CALL lim_dyn( kt )                                          ! Ice dynamics !   ( rheology/dynamics )
+         CALL lim_dyn_2( kt )                                        ! Ice dynamics !   ( rheology/dynamics )
          !                                                           !--------------!
          IF(ln_ctl) THEN
@@ -209 +209 @@
 
          !                                                           !---------------!
-         CALL lim_trp( kt )                                          ! Ice transport !  ( Advection/diffusion )
+         CALL lim_trp_2( kt )                                        ! Ice transport !  ( Advection/diffusion )
          !                                                           !---------------!
          IF(ln_ctl) THEN
@@ -220 +220 @@
          !                                                           !-------------!
 #if defined key_agrif
-            IF( Agrif_Root() )   CALL lim_dmp(kt)
+            IF( Agrif_Root() )   CALL lim_dmp_2(kt)
 #else
-            CALL lim_dmp(kt)                                         
+            CALL lim_dmp_2(kt)                                         
 #endif
          ENDIF
          !                                                           !--------------------!
-         CALL lim_thd( kt )                                          ! Ice thermodynamics !
+         CALL lim_thd_2( kt )                                        ! Ice thermodynamics !
          !                                                           !--------------------!
          IF(ln_ctl) THEN
@@ -236 +236 @@
          ! Mass and heat fluxes from ice to ocean
          !                                                           !------------------------------!
-         CALL lim_flx                                                ! Ice/Ocean Mass & Heat fluxes !
+         CALL lim_flx_2                                              ! Ice/Ocean Mass & Heat fluxes !
          !                                                           !------------------------------!
 
          IF( MOD( kt + nfice -1, ninfo ) == 0 .OR. ntmoy == 1 )  THEN        !-----------------!
-            CALL lim_dia( kt )                                    ! Ice Diagnostics !
-         ENDIF                                                       !-----------------!
-
-         !                                                           !-------------!
-         CALL lim_wri( kt )                                          ! Ice outputs !
+            CALL lim_dia_2( kt )                                             ! Ice Diagnostics !
+         ENDIF                                                               !-----------------!
+
+         !                                                           !-------------!
+         CALL lim_wri_2( kt )                                        ! Ice outputs !
          !                                                           !-------------!
 
          !                                                           !------------------------!
-         IF( lrst_ice ) CALL lim_rst_write( kt )                  ! Write Ice restart file !
+         IF( lrst_ice ) CALL lim_rst_write_2( kt )                   ! Write Ice restart file !
          !                                                           !------------------------!
 
@@ -271 +271 @@
       ENDIF
       !
-   END SUBROUTINE ice_stp
+   END SUBROUTINE ice_stp_2
 
 #else
    !!----------------------------------------------------------------------
-   !!   Default option           Dummy module          NO LIM sea-ice model
+   !!   Default option           Dummy module      NO LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE ice_stp ( kt )     ! Dummy routine
-      WRITE(*,*) 'ice_stp: You should not have seen this print! error?', kt
-   END SUBROUTINE ice_stp
+   SUBROUTINE ice_stp_2 ( kt )     ! Dummy routine
+      WRITE(*,*) 'ice_stp_2: You should not have seen this print! error?', kt
+   END SUBROUTINE ice_stp_2
 #endif
 
    !!======================================================================
-END MODULE icestp
+END MODULE icestp_2