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

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/OBS/diaobs.F90

@@ -97 +97 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 3.3 , NEMO Consortium (2010)
+   !! NEMO/OCE 3.3 , NEMO Consortium (2010)
    !! $Id$
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
@@ -324 +324 @@
                &                  lfpindegs, llnightav )
          ENDIF
-#if defined key_lim3 || defined key_cice
+#if defined key_si3 || defined key_cice
          IF( ln_sic ) THEN
             jtype = jtype + 1
@@ -500 +500 @@
       USE oce    , ONLY : tsn, un, vn, sshn   ! Ocean dynamics and tracers variables
       USE phycst , ONLY : rday                ! Physical constants
-#if defined  key_lim3
+#if defined  key_si3
       USE ice    , ONLY : at_i                ! LIM3 Ice model variables
 #endif
@@ -611 +611 @@
                   CYCLE
                ELSE
-#if defined key_cice || defined key_lim3
+#if defined key_cice || defined key_si3
                   zsurfvar(:,:) = fr_i(:,:)
 #else