Changeset 9570 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcmod.F90

Timestamp:

2018-05-11T12:53:25+02:00 (6 years ago)

Author:

nicolasmartin

Message:

Global renaming for core routines (./NEMO)

• Folders
  • LIM_SRC_3 -> ICE_SRC
  • OPA_SRC -> OCE_SRC
• CPP key: key_lim3 -> key_si3
• Modules, (sub)routines and variables names
  • MPI: mpi_comm_opa -> mpi_comm_oce, MPI_COMM_OPA -> MPI_COMM_OCE, mpi_init_opa -> mpi_init_oce
  • AGRIF: agrif_opa_* -> agrif_oce_*, agrif_lim3_* -> agrif_si3_* and few more
  • TOP-PISCES: p.zlim -> p.zice, namp.zlim -> namp.zice
• Comments
  • NEMO/OPA -> NEMO/OCE
  • ESIM|LIM3 -> SI3

Location:

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC

Files:

• . (moved) (moved from branches/2017/dev_merge_2017/NEMOGCM/NEMO/OPA_SRC)
• SBC/sbcmod.F90 (modified) (5 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/SBC/sbcmod.F90

@@ -33 +33 @@
    USE sbcblk         ! surface boundary condition: bulk formulation
    USE sbcice_if      ! surface boundary condition: ice-if sea-ice model
-#if defined key_lim3
+#if defined key_si3
    USE icestp         ! surface boundary condition: LIM 3.0 sea-ice model
 #endif
@@ -68 +68 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 4.0 , NEMO-consortium (2016) 
+   !! NEMO/OCE 4.0 , NEMO-consortium (2016) 
    !! $Id$
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -227 +227 @@
       !                             !* allocate sbc arrays
       IF( sbc_oce_alloc() /= 0 )   CALL ctl_stop( 'sbc_init : unable to allocate sbc_oce arrays' )
-#if ! defined key_lim3 && ! defined key_cice
+#if ! defined key_si3 && ! defined key_cice
       IF( sbc_ice_alloc() /= 0 )   CALL ctl_stop( 'sbc_init : unable to allocate sbc_ice arrays' )
 #endif
@@ -327 +327 @@
       IF( ln_apr_dyn )    CALL sbc_apr_init            ! Atmo Pressure Forcing initialization
       !
-#if defined key_lim3
+#if defined key_si3
       IF( lk_agrif .AND. nn_ice == 0 ) THEN            ! allocate ice arrays in case agrif + ice-model + no-ice in child grid
                           IF( sbc_ice_alloc() /= 0 )   CALL ctl_stop('STOP', 'sbc_ice_alloc : unable to allocate arrays' )
@@ -426 +426 @@
       SELECT CASE( nn_ice )                                       ! Update heat and freshwater fluxes over sea-ice areas
       CASE(  1 )   ;         CALL sbc_ice_if   ( kt )             ! Ice-cover climatology ("Ice-if" model)
-#if defined key_lim3
+#if defined key_si3
       CASE(  2 )   ;         CALL ice_stp  ( kt, nsbc )           ! LIM-3 ice model
 #endif