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

branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/BDY/bdydta.F90

@@ -25 +25 @@
    USE bdy_oce        ! ocean open boundary conditions  
    USE bdytides       ! tidal forcing at boundaries
-#if defined key_lim3
+#if defined key_si3
    USE ice            ! sea-ice variables
    USE icevar         ! redistribute ice input into categories
@@ -50 +50 @@
    TYPE(MAP_POINTER), ALLOCATABLE, DIMENSION(:) :: nbmap_ptr   ! array of pointers to nbmap
 
-#if defined key_lim3
+#if defined key_si3
    INTEGER ::   nice_cat                      ! number of categories in the input file
    INTEGER ::   jfld_hti, jfld_hts, jfld_ai   ! indices of ice thickness, snow thickness and concentration in bf structure
@@ -56 +56 @@
 
    !!----------------------------------------------------------------------
-   !! NEMO/OPA 4.0 , NEMO Consortium (2017)
+   !! NEMO/OCE 4.0 , NEMO Consortium (2017)
    !! $Id$ 
    !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt)
@@ -178 +178 @@
             ENDIF
 
-#if defined key_lim3
+#if defined key_si3
             IF( nn_ice_lim_dta(jbdy) == 0 ) THEN    ! set ice to initial values
                ilen1(:) = nblen(:)
@@ -348 +348 @@
 
                ENDIF
-#if defined key_lim3
+#if defined key_si3
                IF( cn_ice_lim(jbdy) /= 'none' .AND. nn_ice_lim_dta(jbdy) == 1 ) THEN
                   IF( nice_cat == 1 ) THEN ! case input cat = 1
@@ -423 +423 @@
       INTEGER, POINTER, DIMENSION(:)         ::   nblen, nblenrim  ! short cuts
       TYPE(OBC_DATA), POINTER                ::   dta           ! short cut
-#if defined key_lim3
+#if defined key_si3
       INTEGER               ::   kndims   ! number of dimensions in an array (i.e. 3 = wo ice cat; 4 = w ice cat)
       INTEGER, DIMENSION(4) ::   kdimsz   ! size   of dimensions
@@ -431 +431 @@
       TYPE(FLD_N) ::   bn_tem, bn_sal, bn_u3d, bn_v3d   ! 
       TYPE(FLD_N) ::   bn_ssh, bn_u2d, bn_v2d           ! informations about the fields to be read
-#if defined key_lim3
+#if defined key_si3
       TYPE(FLD_N) ::   bn_a_i, bn_h_i, bn_h_s      
 #endif
       NAMELIST/nambdy_dta/ cn_dir, bn_tem, bn_sal, bn_u3d, bn_v3d, bn_ssh, bn_u2d, bn_v2d 
-#if defined key_lim3
+#if defined key_si3
       NAMELIST/nambdy_dta/ bn_a_i, bn_h_i, bn_h_s
 #endif
@@ -451 +451 @@
             &                , nn_dyn3d_dta  (jbdy)    &
             &                , nn_tra_dta    (jbdy)    &
-#if defined key_lim3
+#if defined key_si3
             &                , nn_ice_lim_dta(jbdy)    &
 #endif
@@ -472 +472 @@
             nb_bdy_fld(jbdy) = nb_bdy_fld(jbdy) + 2
          ENDIF
-#if defined key_lim3
+#if defined key_si3
          IF( cn_ice_lim(jbdy) /= 'none' .AND. nn_ice_lim_dta(jbdy) == 1  ) THEN
             nb_bdy_fld(jbdy) = nb_bdy_fld(jbdy) + 3
@@ -612 +612 @@
             ENDIF
 
-#if defined key_lim3
+#if defined key_si3
             ! sea ice
             IF( nn_ice_lim_dta(jbdy) == 1 ) THEN
@@ -791 +791 @@
          ENDIF
 
-#if defined key_lim3
+#if defined key_si3
          IF (cn_ice_lim(jbdy) /= 'none') THEN
             IF( nn_ice_lim_dta(jbdy) == 0 ) THEN