Changeset 881 for branches/dev_001_SBC/NEMO/OPA_SRC/SBC/sbcice_lim.F90

Timestamp:

2008-04-08T11:45:52+02:00 (16 years ago)

Author:

ctlod

Message:

dev_001_SBC: Step I: change cpp ket name key_ice_lim into key_lim2 & change names inside modules with extension _2, see ticket: #110

File:

• branches/dev_001_SBC/NEMO/OPA_SRC/SBC/sbcice_lim.F90 (modified) (7 diffs)

branches/dev_001_SBC/NEMO/OPA_SRC/SBC/sbcice_lim.F90

@@ -1 @@
-MODULE sbcice_lim
+MODULE sbcice_lim_2
    !!======================================================================
-   !!                       ***  MODULE  sbcice  ***
+   !!                       ***  MODULE  sbcice_lim_2  ***
    !! Surface module :  update surface ocean boundary condition over ice
    !!                   covered area using LIM sea-ice model
-   !! Sea-Ice model  :  LIM Sea ice model time-stepping
+   !! Sea-Ice model  :  LIM 2.0 Sea ice model time-stepping
    !!======================================================================
-   !! History :  9.0   !  06-06  (G. Madec)  from icestp.F90
+   !! History :  9.0   !  06-06  (G. Madec)  from icestp_2.F90
    !!----------------------------------------------------------------------
-#if defined key_ice_lim
+#if defined key_lim2
    !!----------------------------------------------------------------------
-   !!   'key_ice_lim' :                                   Lim sea-ice model
+   !!   'key_lim2' :                                  LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
    !!----------------------------------------------------------------------
-   !!   sbc_ice_lim    : sea-ice model time-stepping and
+   !!   sbc_ice_lim_2  : sea-ice model time-stepping and
    !!                    update ocean sbc over ice-covered area
    !!----------------------------------------------------------------------
    USE oce             ! ocean dynamics and tracers
    USE dom_oce         ! ocean space and time domain
-   USE ice
-   USE iceini
+   USE ice_2
+   USE iceini_2
    USE ice_oce         ! ice variables
-   USE dom_ice
+   USE dom_ice_2
    USE cpl_oce
 
@@ -33 +33 @@
    USE phycst          ! Define parameters for the routines
    USE eosbn2          ! equation of state
-   USE limdyn
-   USE limtrp
-   USE limdmp
-   USE limthd
-   USE limsbc          ! sea surface boundary condition
-   USE limdia
-   USE limwri
-   USE limrst
+   USE limdyn_2
+   USE limtrp_2
+   USE limdmp_2
+   USE limthd_2
+   USE limsbc_2        ! sea surface boundary condition
+   USE limdia_2
+   USE limwri_2
+   USE limrst_2
 
    USE lbclnk
@@ -50 +50 @@
    PRIVATE
 
-   PUBLIC sbc_ice_lim ! routine called by step.F90
+   PUBLIC sbc_ice_lim_2 ! routine called by sbcmod.F90
    
    !! * Substitutions
@@ -57 +57 @@
    !!----------------------------------------------------------------------
    !!   OPA 9.0 , LOCEAN-IPSL (2006) 
-   !! $Header: /
+   !! $ Id: $
    !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt)
    !!----------------------------------------------------------------------
@@ -63 +63 @@
 CONTAINS
 
-   SUBROUTINE sbc_ice_lim( kt, kblk )
+   SUBROUTINE sbc_ice_lim_2( kt, kblk )
       !!---------------------------------------------------------------------
-      !!                  ***  ROUTINE ice_stp  ***
+      !!                  ***  ROUTINE sbc_ice_lim_2  ***
       !!                   
       !! ** Purpose :   update the ocean surface boundary condition via the 
@@ -95 +95 @@
       IF( kt == nit000 ) THEN
          IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'sbc_ice_lim : update ocean surface boudary condition' 
-         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~   via Louvain la Neuve Ice Model (LIM) time stepping'
+         IF(lwp) WRITE(numout,*) 'sbc_ice_lim_2 : update ocean surface boudary condition' 
+         IF(lwp) WRITE(numout,*) '~~~~~~~~~~~~~   via Louvain la Neuve Ice Model (LIM) time stepping'
 
-         CALL ice_init
+         CALL ice_init_2
 
       ENDIF
@@ -161 +161 @@
          !  Ice model step  !
          ! ---------------- !
-         ;                              CALL lim_rst_opn  ( kt )      ! Open Ice restart file
-         ;                              CALL lim_dyn      ( kt )      ! Ice dynamics    ( rheology/dynamics )
-         ;                              CALL lim_trp      ( kt )      ! Ice transport   ( Advection/diffusion )
-         IF( ln_limdmp )                CALL lim_dmp      ( kt )      ! Ice damping 
-         ;                              CALL lim_thd      ( kt )      ! Ice thermodynamics 
-         ;                              CALL lim_sbc      ( kt )      ! Ice/Ocean Mass & Heat fluxes 
+         ;                              CALL lim_rst_opn_2  ( kt )      ! Open Ice restart file
+         ;                              CALL lim_dyn_2      ( kt )      ! Ice dynamics    ( rheology/dynamics )
+         ;                              CALL lim_trp_2      ( kt )      ! Ice transport   ( Advection/diffusion )
+         IF( ln_limdmp )                CALL lim_dmp_2      ( kt )      ! Ice damping 
+         ;                              CALL lim_thd_2      ( kt )      ! Ice thermodynamics 
+         ;                              CALL lim_sbc_2      ( kt )      ! Ice/Ocean Mass & Heat fluxes 
          IF( MOD( kt+nn_fsbc-1, ninfo ) == 0 .OR.   &
-            &  ntmoy == 1 )             CALL lim_dia      ( kt )      ! Ice Diagnostics 
-         ;                              CALL lim_wri      ( kt )      ! Ice outputs 
-         IF( lrst_ice )                 CALL lim_rst_write( kt )      ! Ice restart file 
+            &  ntmoy == 1 )             CALL lim_dia_2      ( kt )      ! Ice Diagnostics 
+         ;                              CALL lim_wri_2      ( kt )      ! Ice outputs 
+         IF( lrst_ice )                 CALL lim_rst_write_2( kt )      ! Ice restart file 
          !
       ENDIF
       !
-   END SUBROUTINE sbc_ice_lim
+   END SUBROUTINE sbc_ice_lim_2
 
 #else
    !!----------------------------------------------------------------------
-   !!   Default option           Dummy module          NO LIM sea-ice model
+   !!   Default option           Dummy module      NO LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE sbc_ice_lim ( kt, kblk )     ! Dummy routine
-      WRITE(*,*) 'sbc_ice_lim: You should not have seen this print! error?', kt, kblk
-   END SUBROUTINE sbc_ice_lim
+   SUBROUTINE sbc_ice_lim_2 ( kt, kblk )     ! Dummy routine
+      WRITE(*,*) 'sbc_ice_lim_2: You should not have seen this print! error?', kt, kblk
+   END SUBROUTINE sbc_ice_lim_2
 #endif
 
    !!======================================================================
-END MODULE sbcice_lim
+END MODULE sbcice_lim_2