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

branches/dev_002_LIM/NEMO/LIM_SRC/limdia.F90

@@ -1 @@
-MODULE limdia
+MODULE limdia_2
    !!======================================================================
-   !!                       ***  MODULE limdia   ***
+   !!                       ***  MODULE limdia_2   ***
    !!                      diagnostics of ice model 
    !!======================================================================
@@ -8 +8 @@
    !!             9.0  !  06-08  (S. Masson)  change frequency output control
    !!-------------------------------------------------------------------
-#if defined key_ice_lim
-   !!----------------------------------------------------------------------
-   !!   'key_ice_lim' :                                   LIM sea-ice model
-   !!----------------------------------------------------------------------
-   !!----------------------------------------------------------------------
-   !!   lim_dia      : computation of the time evolution of keys var.
-   !!   lim_dia_init : initialization and namelist read
+#if defined key_lim2
+   !!----------------------------------------------------------------------
+   !!   'key_lim2' :                                  LIM 2.0 sea-ice model
+   !!----------------------------------------------------------------------
+   !!----------------------------------------------------------------------
+   !!   lim_dia_2      : computation of the time evolution of keys var.
+   !!   lim_dia_init_2 : initialization and namelist read
    !!----------------------------------------------------------------------
    USE phycst          ! 
-   USE par_ice         ! ice parameters
+   USE par_ice_2       ! ice parameters
    USE ice_oce         ! ice variables
    USE daymod          !
-   USE dom_ice         !
-   USE ice             !
-   USE limistate       !
+   USE dom_ice_2       !
+   USE ice_2           !
+   USE limistate_2     !
    USE in_out_manager  ! I/O manager
 
@@ -28 +28 @@
    PRIVATE
 
-   PUBLIC               lim_dia            ! called by ice_step
+   PUBLIC               lim_dia_2          ! called by ice_step
    INTEGER, PUBLIC ::   ntmoy   = 1 ,   &  !: instantaneous values of ice evolution or averaging ntmoy
       &                 ninfo   = 1        !: frequency of ouputs on file ice_evolu in case of averaging
@@ -64 +64 @@
 CONTAINS
 
-   SUBROUTINE lim_dia( kt )
+   SUBROUTINE lim_dia_2( kt )
       !!--------------------------------------------------------------------
-      !!                  ***  ROUTINE lim_dia  ***
+      !!                  ***  ROUTINE lim_dia_2  ***
       !!   
       !! ** Purpose : Computation and outputs on file ice.evolu 
@@ -82 +82 @@
       !!-------------------------------------------------------------------
 
-      IF( kt == nit000 )   CALL lim_dia_init   ! initialisation of ice_evolu file      
+      IF( kt == nit000 )   CALL lim_dia_init_2  ! initialisation of ice_evolu file      
 
       ! computation of key variables at each time step   
@@ -162 +162 @@
        ENDIF
        !
-    END SUBROUTINE lim_dia
+    END SUBROUTINE lim_dia_2
  
 
-    SUBROUTINE lim_dia_init
+    SUBROUTINE lim_dia_init_2
        !!-------------------------------------------------------------------
-       !!                  ***  ROUTINE lim_dia_init  ***
+       !!                  ***  ROUTINE lim_dia_init_2  ***
        !!             
        !! ** Purpose : Preparation of the file ice_evolu for the output of
@@ -190 +190 @@
        IF(lwp) THEN
           WRITE(numout,*)
-          WRITE(numout,*) 'lim_dia_init : ice parameters for ice diagnostics '
-          WRITE(numout,*) '~~~~~~~~~~~~'
+          WRITE(numout,*) 'lim_dia_init_2 : ice parameters for ice diagnostics '
+          WRITE(numout,*) '~~~~~~~~~~~~~~'
           WRITE(numout,*) '   format of the output values                                 fmtinf = ', fmtinf
           WRITE(numout,*) '   number of variables written in one line                     nfrinf = ', nfrinf 
@@ -274 +274 @@
 1111   FORMAT( 3(F7.1,1X,F7.3,1X),I3,A )  
       !
-    END SUBROUTINE lim_dia_init
+    END SUBROUTINE lim_dia_init_2
 
 #else
    !!----------------------------------------------------------------------
-   !!   Default option :                               NO LIM sea-ice model
+   !!   Default option :                           NO LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE lim_dia         ! Empty routine
-   END SUBROUTINE lim_dia
+   SUBROUTINE lim_dia_2         ! Empty routine
+   END SUBROUTINE lim_dia_2
 #endif
 
    !!======================================================================
-END MODULE limdia
+END MODULE limdia_2