Changeset 881 for branches/dev_001_SBC/NEMO/LIM_SRC/limdyn.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/LIM_SRC/limdyn.F90 (modified) (12 diffs)

branches/dev_001_SBC/NEMO/LIM_SRC/limdyn.F90

@@ -1 @@
-MODULE limdyn
+MODULE limdyn_2
    !!======================================================================
-   !!                     ***  MODULE  limdyn  ***
+   !!                     ***  MODULE  limdyn_2  ***
    !!   Sea-Ice dynamics :  
    !!======================================================================
@@ -9 +9 @@
    !!             2.0  !  06-07  (G. Madec)  Surface module
    !!---------------------------------------------------------------------
-#if defined key_ice_lim
-   !!----------------------------------------------------------------------
-   !!   'key_ice_lim' :                                   LIM sea-ice model
-   !!----------------------------------------------------------------------
-   !!    lim_dyn      : computes ice velocities
-   !!    lim_dyn_init : initialization and namelist read
+#if defined key_lim2
+   !!----------------------------------------------------------------------
+   !!   'key_lim2' :                                  LIM 2.0 sea-ice model
+   !!----------------------------------------------------------------------
+   !!    lim_dyn_2      : computes ice velocities
+   !!    lim_dyn_init_2 : initialization and namelist read
    !!----------------------------------------------------------------------
    USE dom_oce        ! ocean space and time domain
    USE sbc_oce        !
    USE phycst         !
-   USE ice            !
+   USE ice_2          !
    USE ice_oce        !
-   USE dom_ice        !
-   USE iceini         !
-   USE limistate      !
-   USE limrhg         ! ice rheology
+   USE dom_ice_2      !
+   USE iceini_2       !
+   USE limistate_2    !
+   USE limrhg_2       ! ice rheology
 
    USE lbclnk         !
@@ -34 +34 @@
    PRIVATE
 
-   PUBLIC   lim_dyn   ! routine called by ice_step
+   PUBLIC   lim_dyn_2 ! routine called by sbc_ice_lim
 
    REAL(wp)  ::  rone    = 1.e0   ! constant value
@@ -47 +47 @@
 CONTAINS
 
-   SUBROUTINE lim_dyn( kt )
-      !!-------------------------------------------------------------------
-      !!               ***  ROUTINE lim_dyn  ***
+   SUBROUTINE lim_dyn_2( kt )
+      !!-------------------------------------------------------------------
+      !!               ***  ROUTINE lim_dyn_2  ***
       !!               
       !! ** Purpose :   compute ice velocity and ocean-ice friction velocity
@@ -70 +70 @@
       !!---------------------------------------------------------------------
 
-      IF( kt == nit000 )   CALL lim_dyn_init   ! Initialization (first time-step only)
+      IF( kt == nit000 )   CALL lim_dyn_init_2   ! Initialization (first time-step only)
       
       IF( ln_limdyn ) THEN
@@ -88 +88 @@
             i_jpj = jpj
             IF(ln_ctl)   CALL prt_ctl_info( 'lim_dyn  :    i_j1 = ', ivar1=i_j1, clinfo2=' ij_jpj = ', ivar2=i_jpj )
-            CALL lim_rhg( i_j1, i_jpj )
+            CALL lim_rhg_2( i_j1, i_jpj )
             !
          ELSE                                 ! optimization of the computational area
@@ -109 +109 @@
                IF(ln_ctl)   WRITE(numout,*) 'lim_dyn : NH i_j1 = ', i_j1, ' ij_jpj = ', i_jpj
                ! 
-               CALL lim_rhg( i_j1, i_jpj )
+               CALL lim_rhg_2( i_j1, i_jpj )
                ! 
                ! Southern hemisphere
@@ -120 +120 @@
                IF(ln_ctl)   WRITE(numout,*) 'lim_dyn : SH i_j1 = ', i_j1, ' ij_jpj = ', i_jpj
                ! 
-               CALL lim_rhg( i_j1, i_jpj )
+               CALL lim_rhg_2( i_j1, i_jpj )
                ! 
             ELSE                                 ! local domain extends over one hemisphere only
@@ -139 +139 @@
                IF(ln_ctl)   WRITE(numout,*) 'lim_dyn : one hemisphere: i_j1 = ', i_j1, ' ij_jpj = ', i_jpj
                ! 
-               CALL lim_rhg( i_j1, i_jpj )
+               CALL lim_rhg_2( i_j1, i_jpj )
                !
             ENDIF
@@ -182 +182 @@
       IF(ln_ctl)   CALL prt_ctl(tab2d_1=ust2s , clinfo1=' lim_dyn  : ust2s :')
 
-   END SUBROUTINE lim_dyn
-
-
-   SUBROUTINE lim_dyn_init
-      !!-------------------------------------------------------------------
-      !!                  ***  ROUTINE lim_dyn_init  ***
+   END SUBROUTINE lim_dyn_2
+
+
+   SUBROUTINE lim_dyn_init_2
+      !!-------------------------------------------------------------------
+      !!                  ***  ROUTINE lim_dyn_init_2  ***
       !!
       !! ** Purpose :   Physical constants and parameters linked to the ice
@@ -207 +207 @@
       IF(lwp) THEN                                ! Control print
          WRITE(numout,*)
-         WRITE(numout,*) 'lim_dyn_init : ice parameters for ice dynamics '
-         WRITE(numout,*) '~~~~~~~~~~~~'
+         WRITE(numout,*) 'lim_dyn_init_2: ice parameters for ice dynamics '
+         WRITE(numout,*) '~~~~~~~~~~~~~~'
          WRITE(numout,*) '       tolerance parameter                              epsd   = ', epsd
          WRITE(numout,*) '       coefficient for semi-implicit coriolis           alpha  = ', alpha
@@ -236 +236 @@
       ahiv(:,:) = ahi0 * vmask(:,:,1)
       !
-   END SUBROUTINE lim_dyn_init
+   END SUBROUTINE lim_dyn_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_dyn         ! Empty routine
-   END SUBROUTINE lim_dyn
+   SUBROUTINE lim_dyn_2         ! Empty routine
+   END SUBROUTINE lim_dyn_2
 #endif 
 
    !!======================================================================
-END MODULE limdyn
+END MODULE limdyn_2