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

branches/dev_001_SBC/NEMO/LIM_SRC/limadv.F90

@@ -1 @@
-MODULE limadv 
+MODULE limadv_2 
    !!======================================================================
-   !!                       ***  MODULE limadv   ***
-   !! LIM sea-ice model : sea-ice advection
+   !!                       ***  MODULE limadv_2   ***
+   !! LIM 2.0 sea-ice model : sea-ice advection
    !!======================================================================
-#if defined key_ice_lim
-   !!----------------------------------------------------------------------
-   !!   'key_ice_lim'                                     LIM sea-ice model
-   !!----------------------------------------------------------------------
-   !!   lim_adv_x  : advection of sea ice on x axis
-   !!   lim_adv_y  : advection of sea ice on y axis
+#if defined key_lim2
+   !!----------------------------------------------------------------------
+   !!   'key_lim2'                                    LIM 2.0 sea-ice model
+   !!----------------------------------------------------------------------
+   !!   lim_adv_x_2  : advection of sea ice on x axis
+   !!   lim_adv_y_2  : advection of sea ice on y axis
    !!----------------------------------------------------------------------
    !! * Modules used
    USE dom_oce
-   USE dom_ice
+   USE dom_ice_2
    USE ice_oce         ! ice variables
    USE in_out_manager  ! I/O manager
@@ -23 +23 @@
 
    !! * Routine accessibility
-   PUBLIC lim_adv_x    ! called by lim_trp
-   PUBLIC lim_adv_y    ! called by lim_trp
+   PUBLIC lim_adv_x_2    ! called by lim_trp
+   PUBLIC lim_adv_y_2    ! called by lim_trp
 
    !! * Module variables
@@ -39 +39 @@
 CONTAINS
 
-   SUBROUTINE lim_adv_x( pdf, put , pcrh, psm , ps0 ,   &
-      &                  psx, psxx, psy , psyy, psxy )
+   SUBROUTINE lim_adv_x_2( pdf, put , pcrh, psm , ps0 ,   &
+      &                    psx, psxx, psy , psyy, psxy )
       !!---------------------------------------------------------------------
-      !!                **  routine lim_adv_x  **
+      !!                **  routine lim_adv_x_2  **
       !!  
       !! ** purpose :   Computes and adds the advection trend to sea-ice
@@ -232 +232 @@
       ENDIF
 
-   END SUBROUTINE lim_adv_x
-
-
-   SUBROUTINE lim_adv_y( pdf, pvt , pcrh, psm , ps0 ,   &
-      &                  psx, psxx, psy , psyy, psxy )
+   END SUBROUTINE lim_adv_x_2
+
+
+   SUBROUTINE lim_adv_y_2( pdf, pvt , pcrh, psm , ps0 ,   &
+      &                    psx, psxx, psy , psyy, psxy )
       !!---------------------------------------------------------------------
-      !!                **  routine lim_adv_y  **
+      !!                **  routine lim_adv_y_2  **
       !!            
       !! ** purpose :   Computes and adds the advection trend to sea-ice 
@@ -432 +432 @@
       ENDIF
 
-   END SUBROUTINE lim_adv_y
+   END SUBROUTINE lim_adv_y_2
 
 #else
    !!----------------------------------------------------------------------
-   !!   Default option            Dummy module         NO LIM sea-ice model
+   !!   Default option            Dummy module     NO LIM 2.0 sea-ice model
    !!----------------------------------------------------------------------
 CONTAINS
-   SUBROUTINE lim_adv_x         ! Empty routine
-   END SUBROUTINE lim_adv_x
-   SUBROUTINE lim_adv_y           ! Empty routine
-   END SUBROUTINE lim_adv_y
+   SUBROUTINE lim_adv_x_2         ! Empty routine
+   END SUBROUTINE lim_adv_x_2
+   SUBROUTINE lim_adv_y_2         ! Empty routine
+   END SUBROUTINE lim_adv_y_2
 
 #endif
 
-END MODULE limadv
+END MODULE limadv_2