Changeset 9570 for branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ASM/asminc.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)
• ASM/asminc.F90 (modified) (6 diffs)

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/ASM/asminc.F90

@@ -35 +35 @@
    USE sbc_oce         ! Surface boundary condition variables.
    USE diaobs   , ONLY : calc_date     ! Compute the calendar date on a given step
-#if defined key_lim3
+#if defined key_si3
    USE ice      , ONLY : hm_i, at_i, at_i_b
 #endif
@@ -96 +96 @@
 #  include "vectopt_loop_substitute.h90"
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.7 , NEMO Consortium (2015)
+   !! NEMO/OCE 3.7 , NEMO Consortium (2015)
    !! $Id$
    !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
@@ -825 +825 @@
       INTEGER  ::   it
       REAL(wp) ::   zincwgt   ! IAU weight for current time step
-#if defined key_lim3
+#if defined key_si3
       REAL(wp), DIMENSION(jpi,jpj) ::   zofrld, zohicif, zseaicendg, zhicifinc  ! LIM
       REAL(wp) ::   zhicifmin = 0.5_wp      ! ice minimum depth in metres
@@ -849 +849 @@
             ! Sea-ice : LIM-3 case
             !
-#if defined key_lim3
+#if defined key_si3
             zofrld (:,:) = 1._wp - at_i(:,:)
             zohicif(:,:) = hm_i(:,:)
@@ -898 +898 @@
             ! Sea-ice : LIM-3 case
             !
-#if defined key_lim3
+#if defined key_si3
             zofrld (:,:) = 1._wp - at_i(:,:)
             zohicif(:,:) = hm_i(:,:)
@@ -938 +938 @@
          ENDIF
 
-!#if defined defined key_lim3 || defined key_cice
+!#if defined defined key_si3 || defined key_cice
 !
 !            IF (ln_seaicebal ) THEN