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

branches/dev_002_LIM/NEMO/LIM_SRC/limrst.F90

@@ -1 @@
-MODULE limrst
+MODULE limrst_2
    !!======================================================================
-   !!                     ***  MODULE  limrst  ***
+   !!                     ***  MODULE  limrst_2  ***
    !! Ice restart :  write the ice restart file
    !!======================================================================
@@ -7 +7 @@
    !!                 !  06-07  (S. Masson)  use IOM for restart read/write
    !!----------------------------------------------------------------------
-#if defined key_ice_lim
-   !!----------------------------------------------------------------------
-   !!   'key_ice_lim' :                                   LIM sea-ice model
-   !!----------------------------------------------------------------------
-   !!----------------------------------------------------------------------
-   !!   lim_rst_opn   : open ice restart file
-   !!   lim_rst_write : write of the ice restart file 
-   !!   lim_rst_read  : read  the ice restart file 
-   !!----------------------------------------------------------------------
-   USE ice
+#if defined key_lim2
+   !!----------------------------------------------------------------------
+   !!   'key_lim2' :                                  LIM 2.0 sea-ice model
+   !!----------------------------------------------------------------------
+   !!----------------------------------------------------------------------
+   !!   lim_rst_opn_2   : open ice restart file
+   !!   lim_rst_write_2 : write of the ice restart file 
+   !!   lim_rst_read_2  : read  the ice restart file 
+   !!----------------------------------------------------------------------
+   USE ice_2
    USE dom_oce
    USE ice_oce         ! ice variables
@@ -27 +27 @@
    PRIVATE
 
-   PUBLIC   lim_rst_opn     ! routine called by ??? module
-   PUBLIC   lim_rst_write   ! routine called by ??? module
-   PUBLIC   lim_rst_read    ! routine called by ??? module
+   PUBLIC   lim_rst_opn_2     ! routine called by ??? module
+   PUBLIC   lim_rst_write_2   ! routine called by ??? module
+   PUBLIC   lim_rst_read_2    ! routine called by ??? module
 
    LOGICAL, PUBLIC ::   lrst_ice         !: logical to control the ice restart write 
@@ -42 +42 @@
 CONTAINS
 
-   SUBROUTINE lim_rst_opn( kt )
-      !!----------------------------------------------------------------------
-      !!                    ***  lim_rst_opn  ***
+   SUBROUTINE lim_rst_opn_2( kt )
+      !!----------------------------------------------------------------------
+      !!                    ***  lim_rst_opn_2  ***
       !!
       !! ** purpose  :   output of sea-ice variable in a netcdf file
@@ -82 +82 @@
       ENDIF
       !
-   END SUBROUTINE lim_rst_opn
-
-   SUBROUTINE lim_rst_write( kt )
-      !!----------------------------------------------------------------------
-      !!                    ***  lim_rst_write  ***
+   END SUBROUTINE lim_rst_opn_2
+
+   SUBROUTINE lim_rst_write_2( kt )
+      !!----------------------------------------------------------------------
+      !!                    ***  lim_rst_write_2  ***
       !!
       !! ** purpose  :   output of sea-ice variable in a netcdf file
@@ -99 +99 @@
       IF( iter == nitrst ) THEN
          IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'lim_rst_write : write ice restart file  kt =', kt
+         IF(lwp) WRITE(numout,*) 'lim_rst_write_2 : write ice restart file  kt =', kt
          IF(lwp) WRITE(numout,*) '~~~~~~~'         
       ENDIF
@@ -166 +166 @@
       ENDIF
       !
-   END SUBROUTINE lim_rst_write
-
-
-   SUBROUTINE lim_rst_read
-      !!----------------------------------------------------------------------
-      !!                    ***  lim_rst_read  ***
+   END SUBROUTINE lim_rst_write_2
+
+
+   SUBROUTINE lim_rst_read_2
+      !!----------------------------------------------------------------------
+      !!                    ***  lim_rst_read_2  ***
       !!
       !! ** purpose  :   read of sea-ice variable restart in a netcdf file
@@ -181 +181 @@
       IF(lwp) THEN
          WRITE(numout,*)
-         WRITE(numout,*) 'lim_rst_read : read ice NetCDF restart file'
+         WRITE(numout,*) 'lim_rst_read_2 : read ice NetCDF restart file'
          WRITE(numout,*) '~~~~~~~~'
       ENDIF
@@ -257 +257 @@
       CALL iom_close( numrir )
       !
-   END SUBROUTINE lim_rst_read
+   END SUBROUTINE lim_rst_read_2
 
 #else
    !!----------------------------------------------------------------------
-   !!   Default option :       Empty module            NO LIM sea-ice model
+   !!   Default option :       Empty module        NO LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
 #endif
 
    !!======================================================================
-END MODULE limrst
+END MODULE limrst_2