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

branches/dev_002_LIM/NEMO/LIM_SRC/iceini.F90

@@ -1 @@
-MODULE iceini
+MODULE iceini_2
    !!======================================================================
    !!                       ***  MODULE iceini   ***
-   !!   Sea-ice model : LIM Sea ice model Initialization
+   !!   Sea-ice model : LIM 2.0 Sea ice model Initialization
    !!======================================================================
    !! History :   1.0  !  02-08  (G. Madec)  F90: Free form and modules
    !!             2.0  !  03-08  (C. Ethe)  add ice_run
    !!----------------------------------------------------------------------
-#if defined key_ice_lim
+#if defined key_lim2
    !!----------------------------------------------------------------------
-   !!   'key_ice_lim' :                                   LIM sea-ice model
+   !!   'key_lim2' :                                  LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
    !!----------------------------------------------------------------------
-   !!   ice_init       : sea-ice model initialization
-   !!   ice_run        : Definition some run parameter for ice model
+   !!   ice_init_2       : sea-ice model initialization
+   !!   ice_run_2        : Definition some run parameter for ice model
    !!----------------------------------------------------------------------
    USE dom_oce
-   USE dom_ice
+   USE dom_ice_2
    USE in_out_manager
    USE ice_oce         ! ice variables
@@ -22 +22 @@
    USE phycst          ! Define parameters for the routines
    USE ocfzpt
-   USE ice
-   USE limmsh
-   USE limistate
-   USE limrst   
+   USE ice_2
+   USE limmsh_2
+   USE limistate_2
+   USE limrst_2   
    USE ini1d           ! initialization of the 1D configuration
       
@@ -31 +31 @@
    PRIVATE
 
-   PUBLIC   ice_init                 ! called by opa.F90
+   PUBLIC   ice_init_2               ! called by opa.F90
 
    LOGICAL , PUBLIC               ::   ln_limdyn = .TRUE.   !: flag for ice dynamics (T) or not (F)
@@ -46 +46 @@
 CONTAINS
 
-   SUBROUTINE ice_init
+   SUBROUTINE ice_init_2
       !!----------------------------------------------------------------------
-      !!                  ***  ROUTINE ice_init  ***
+      !!                  ***  ROUTINE ice_init_2  ***
       !!
       !! ** purpose :   
@@ -59 +59 @@
       CALL ctlopn(numnam_ice,namelist_icename,'OLD', 'FORMATTED', 'SEQUENTIAL',   &
                      1,numout,.FALSE.,1)      
-      CALL ice_run                    !  read in namelist some run parameters
+      CALL ice_run_2                    !  read in namelist some run parameters
                  
       ! Louvain la Neuve Ice model
@@ -70 +70 @@
       ENDIF
 
-      CALL lim_msh                    ! ice mesh initialization
+      CALL lim_msh_2                  ! ice mesh initialization
      
       ! Initial sea-ice state
       IF( .NOT.ln_rstart ) THEN
-         CALL lim_istate              ! start from rest: sea-ice deduced from sst
+         CALL lim_istate_2            ! start from rest: sea-ice deduced from sst
       ELSE
-         CALL lim_rst_read            ! start from a restart file
+         CALL lim_rst_read_2          ! start from a restart file
       ENDIF
       
@@ -85 +85 @@
 # endif
       !
-   END SUBROUTINE ice_init
+   END SUBROUTINE ice_init_2
 
 
-   SUBROUTINE ice_run
+   SUBROUTINE ice_run_2
       !!-------------------------------------------------------------------
-      !!                  ***  ROUTINE ice_run ***
+      !!                  ***  ROUTINE ice_run_2 ***
       !!                 
       !! ** Purpose :   Definition some run parameter for ice model
@@ -118 +118 @@
       ENDIF
       !
-   END SUBROUTINE ice_run
+   END SUBROUTINE ice_run_2
 
 #else
    !!----------------------------------------------------------------------
-   !!   Default option :        Empty module           NO LIM sea-ice model
+   !!   Default option :        Empty module       NO LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE ice_init        ! Empty routine
-   END SUBROUTINE ice_init
+   SUBROUTINE ice_init_2      ! Empty routine
+   END SUBROUTINE ice_init_2
 #endif
 
    !!======================================================================
-END MODULE iceini
+END MODULE iceini_2