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

branches/dev_002_LIM/NEMO/LIM_SRC/limwri.F90

@@ -1 @@
-MODULE limwri
+MODULE limwri_2
    !!======================================================================
-   !!                     ***  MODULE  limwri  ***
+   !!                     ***  MODULE  limwri_2  ***
    !!         Ice diagnostics :  write ice output files
    !!======================================================================
@@ -7 +7 @@
    !!            2.0  ! 04-10  (C. Ethe )  1D configuration
    !!-------------------------------------------------------------------
-#if defined key_ice_lim
-   !!----------------------------------------------------------------------
-   !!   'key_ice_lim'                                     LIM sea-ice model
-   !!----------------------------------------------------------------------
-   !!----------------------------------------------------------------------
-   !!   lim_wri      : write of the diagnostics variables in ouput file 
-   !!   lim_wri_init : initialization and namelist read
+#if defined key_lim2
+   !!----------------------------------------------------------------------
+   !!   'key_lim2'  i                                 LIM 2.0 sea-ice model
+   !!----------------------------------------------------------------------
+   !!----------------------------------------------------------------------
+   !!   lim_wri_2      : write of the diagnostics variables in ouput file 
+   !!   lim_wri_init_2 : initialization and namelist read
    !!----------------------------------------------------------------------
    USE ioipsl
@@ -23 +23 @@
    USE ice_oce         ! ice variables
    USE flx_oce
-   USE dom_ice
-   USE ice
+   USE dom_ice_2
+   USE ice_2
    USE lbclnk
 
@@ -30 +30 @@
    PRIVATE
 
-   PUBLIC   lim_wri        ! routine called by lim_step.F90
+   PUBLIC   lim_wri_2        ! routine called by lim_step_2.F90
 
    INTEGER, PARAMETER                       ::   jpnoumax = 40   ! maximum number of variable for ice output
@@ -61 +61 @@
    !!   'key_dimgout'                                    Direct Access file
    !!----------------------------------------------------------------------
-# include "limwri_dimg.h90"
+# include "limwri_dimg_2.h90"
 #else
    !!----------------------------------------------------------------------
@@ -67 +67 @@
    !!----------------------------------------------------------------------
 
-   SUBROUTINE lim_wri( kt )
-      !!-------------------------------------------------------------------
-      !!                    ***   ROUTINE lim_wri  ***
+   SUBROUTINE lim_wri_2( kt )
+      !!-------------------------------------------------------------------
+      !!                    ***   ROUTINE lim_wri_2  ***
       !!                
       !! ** Purpose :   write the sea-ice output file in NetCDF
@@ -92 +92 @@
       IF ( kt == nit000 ) THEN                !   Initialisation   !
          !                                       !--------------------!
-         CALL lim_wri_init 
+         CALL lim_wri_init_2 
                            
          zsto     = rdt_ice
@@ -123 +123 @@
       IF(lwp) THEN
          WRITE(numout,*)
-         WRITE(numout,*) 'lim_wri : write ice outputs in NetCDF files at time : ', nyear, nmonth, nday, kt + nfice - 1
-         WRITE(numout,*) '~~~~~~~ '
+         WRITE(numout,*) 'lim_wri_2 : write ice outputs in NetCDF files at time : ', nyear, nmonth, nday, kt + nfice - 1
+         WRITE(numout,*) '~~~~~~~~~ '
       ENDIF
 
@@ -189 +189 @@
       ENDIF
       !
-   END SUBROUTINE lim_wri
+   END SUBROUTINE lim_wri_2
    
 #endif
    
-   SUBROUTINE lim_wri_init
-      !!-------------------------------------------------------------------
-      !!                    ***   ROUTINE lim_wri_init  ***
+   SUBROUTINE lim_wri_init_2
+      !!-------------------------------------------------------------------
+      !!                    ***   ROUTINE lim_wri_init_2  ***
       !!                
       !! ** Purpose :   intialisation of LIM sea-ice output
@@ -267 +267 @@
       IF(lwp) THEN
          WRITE(numout,*)
-         WRITE(numout,*) 'lim_wri_init : Ice parameters for outputs'
-         WRITE(numout,*) '~~~~~~~~~~~~'
+         WRITE(numout,*) 'lim_wri_init_2 : Ice parameters for outputs'
+         WRITE(numout,*) '~~~~~~~~~~~~~~'
          WRITE(numout,*) '    number of fields to be stored         noumef = ', noumef
          WRITE(numout,*) '           title                            name     unit      Saving (1/0) ',   &
@@ -278 +278 @@
       ENDIF
       !    
-   END SUBROUTINE lim_wri_init
+   END SUBROUTINE lim_wri_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_wri          ! Empty routine
-   END SUBROUTINE lim_wri
+   SUBROUTINE lim_wri_2          ! Empty routine
+   END SUBROUTINE lim_wri_2
 #endif
 
    !!======================================================================
-END MODULE limwri
+END MODULE limwri_2