Changeset 821 for branches/dev_002_LIM/NEMO/LIM_SRC/limistate.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/limistate.F90 (modified) (8 diffs)

branches/dev_002_LIM/NEMO/LIM_SRC/limistate.F90

@@ -1 @@
-MODULE limistate
+MODULE limistate_2
    !!======================================================================
-   !!                     ***  MODULE  limistate  ***
+   !!                     ***  MODULE  limistate_2  ***
    !!              Initialisation of diagnostics ice variables
    !!======================================================================
@@ -8 +8 @@
    !!                  !  06-07  (S. Masson)  IOM to read the restart
    !!--------------------------------------------------------------------
-#if defined key_ice_lim
-   !!----------------------------------------------------------------------
-   !!   'key_ice_lim' :                                   LIM sea-ice model
-   !!----------------------------------------------------------------------
-   !!----------------------------------------------------------------------
-   !!   lim_istate      :  Initialisation of diagnostics ice variables
-   !!   lim_istate_init :  initialization of ice state and namelist read
+#if defined key_lim2
+   !!----------------------------------------------------------------------
+   !!   'key_lim2' :                                  LIM 2.0 sea-ice model
+   !!----------------------------------------------------------------------
+   !!----------------------------------------------------------------------
+   !!   lim_istate_2      :  Initialisation of diagnostics ice variables
+   !!   lim_istate_init_2 :  initialization of ice state and namelist read
    !!----------------------------------------------------------------------
    USE phycst
@@ -20 +20 @@
    USE oce             ! dynamics and tracers variables      !!gm used???
    USE dom_oce                                                     !!gm used???
-   USE par_ice         ! ice parameters
+   USE par_ice_2       ! ice parameters
    USE ice_oce         ! ice variables
-   USE dom_ice
-   USE ice             ! ???
+   USE dom_ice_2
    USE lbclnk
-   USE ice
+   USE ice_2
    USE iom
    USE in_out_manager
@@ -32 +31 @@
    PRIVATE
 
-   PUBLIC lim_istate      ! routine called by lim_init.F90
+   PUBLIC lim_istate_2      ! routine called by lim_init_2.F90
 
    REAL(wp) ::           &  !!! ** init namelist (namiceini) **
@@ -54 +53 @@
 CONTAINS
 
-   SUBROUTINE lim_istate
-      !!-------------------------------------------------------------------
-      !!                    ***  ROUTINE lim_istate  ***
+   SUBROUTINE lim_istate_2
+      !!-------------------------------------------------------------------
+      !!                    ***  ROUTINE lim_istate_2  ***
       !!
       !! ** Purpose :   defined the sea-ice initial state
@@ -68 +67 @@
       !--------------------------------------------------------------------
 
-       CALL lim_istate_init     !  reading the initials parameters of the ice
+       CALL lim_istate_init_2   !  reading the initials parameters of the ice
 
       !-- Initialisation of sst,sss,u,v do i=1,jpi
@@ -200 +199 @@
       CALL lbc_lnk( sss_io , 'T', 1. )
       !
-   END SUBROUTINE lim_istate
+   END SUBROUTINE lim_istate_2
 
    
-   SUBROUTINE lim_istate_init
-      !!-------------------------------------------------------------------
-      !!                   ***  ROUTINE lim_istate_init  ***
+   SUBROUTINE lim_istate_init_2
+      !!-------------------------------------------------------------------
+      !!                   ***  ROUTINE lim_istate_init_2  ***
       !!        
       !! ** Purpose :   Definition of initial state of the ice 
@@ -273 +272 @@
       ENDIF
       !
-   END SUBROUTINE lim_istate_init
+   END SUBROUTINE lim_istate_init_2
 
 #else
    !!----------------------------------------------------------------------
-   !!   Default option :         Empty module          NO LIM sea-ice model
+   !!   Default option :         Empty module      NO LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE lim_istate          ! Empty routine
-   END SUBROUTINE lim_istate
+   SUBROUTINE lim_istate_2        ! Empty routine
+   END SUBROUTINE lim_istate_2
 #endif
 
    !!======================================================================
-END MODULE limistate
+END MODULE limistate_2