Ignore:
Timestamp:
2018-05-11T12:53:25+02:00 (3 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:
11 edited
1 moved

Legend:

Unmodified
Added
Removed
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/dia25h.F90

    r9168 r9570  
    3232 
    3333   !!---------------------------------------------------------------------- 
    34    !! NEMO/OPA 3.6 , NEMO Consortium (2014) 
     34   !! NEMO/OCE 3.6 , NEMO Consortium (2014) 
    3535   !! $Id:$ 
    3636   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     
    109109         rmxln_25h(:,:,:) = hmxl_n(:,:,:) 
    110110      ENDIF 
    111 #if defined key_lim3 
     111#if defined key_si3 
    112112      CALL ctl_stop('STOP', 'dia_25h not setup yet to do tidemean ice') 
    113113#endif  
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diaar5.F90

    r9125 r9570  
    4141#  include "vectopt_loop_substitute.h90" 
    4242   !!---------------------------------------------------------------------- 
    43    !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
     43   !! NEMO/OCE 3.3 , NEMO Consortium (2010) 
    4444   !! $Id$ 
    4545   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diacfl.F90

    r9124 r9570  
    3939#  include "vectopt_loop_substitute.h90" 
    4040   !!---------------------------------------------------------------------- 
    41    !! NEMO/OPA 3.2 , LOCEAN-IPSL (2009)  
     41   !! NEMO/OCE 3.2 , LOCEAN-IPSL (2009)  
    4242   !! $Id$ 
    4343   !! Software governed by the CeCILL licence (modipsl/doc/NEMO_CeCILL.txt) 
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diadct.F90

    r9125 r9570  
    3232   USE dianam          ! build name of file 
    3333   USE lib_mpp         ! distributed memory computing library 
    34 #if defined key_lim3 
     34#if defined key_si3 
    3535   USE ice 
    3636#endif 
     
    9898 
    9999   !!---------------------------------------------------------------------- 
    100    !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
     100   !! NEMO/OCE 3.3 , NEMO Consortium (2010) 
    101101   !! $Id$ 
    102102   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     
    724724           END DO !end of loop on the level 
    725725 
    726 #if defined key_lim3 
     726#if defined key_si3 
    727727 
    728728           !ICE CASE     
     
    746746              zTnorm=zumid_ice*e2u(k%I,k%J)+zvmid_ice*e1v(k%I,k%J) 
    747747 
    748 #if defined key_lim3 
     748#if defined key_si3 
    749749              DO jl=1,jpl 
    750750                 transports_2d(1,jsec,jseg) = transports_2d(1,jsec,jseg) + (zTnorm)*       & 
     
    929929           END DO ! loop over jk  
    930930  
    931 #if defined key_lim3  
     931#if defined key_si3  
    932932  
    933933           !ICE CASE      
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diaharm.F90

    r9168 r9570  
    5555 
    5656   !!---------------------------------------------------------------------- 
    57    !! NEMO/OPA 3.5 , NEMO Consortium (2013) 
     57   !! NEMO/OCE 3.5 , NEMO Consortium (2013) 
    5858   !! $Id$ 
    5959   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diahsb.F90

    r9367 r9570  
    5252#  include "vectopt_loop_substitute.h90" 
    5353   !!---------------------------------------------------------------------- 
    54    !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
     54   !! NEMO/OCE 3.3 , NEMO Consortium (2010) 
    5555   !! $Id$ 
    5656   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diahth.F90

    r9124 r9570  
    4141 
    4242   !!---------------------------------------------------------------------- 
    43    !! NEMO/OPA 4.0 , NEMO Consortium (2011) 
     43   !! NEMO/OCE 4.0 , NEMO Consortium (2011) 
    4444   !! $Id$  
    4545   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/dianam.F90

    r6140 r9570  
    2323 
    2424   !!---------------------------------------------------------------------- 
    25    !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
     25   !! NEMO/OCE 3.3 , NEMO Consortium (2010) 
    2626   !! $Id$  
    2727   !! Software governed by the CeCILL licence (NEMOGCM/NEMO_CeCILL.txt) 
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diaptr.F90

    r9124 r9570  
    6565#  include "vectopt_loop_substitute.h90" 
    6666   !!---------------------------------------------------------------------- 
    67    !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
     67   !! NEMO/OCE 3.3 , NEMO Consortium (2010) 
    6868   !! $Id$  
    6969   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diatmb.F90

    r9490 r9570  
    2121 
    2222   !!---------------------------------------------------------------------- 
    23    !! NEMO/OPA 3.6 , NEMO Consortium (2014) 
     23   !! NEMO/OCE 3.6 , NEMO Consortium (2014) 
    2424   !! $Id:$ 
    2525   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
  • branches/2017/dev_merge_2017/NEMOGCM/NEMO/OCE_SRC/DIA/diawri.F90

    r9399 r9570  
    5151   USE ioipsl         !  
    5252 
    53 #if defined key_lim3 
     53#if defined key_si3 
    5454   USE icewri  
    5555#endif 
     
    7979#  include "vectopt_loop_substitute.h90" 
    8080   !!---------------------------------------------------------------------- 
    81    !! NEMO/OPA 3.3 , NEMO Consortium (2010) 
     81   !! NEMO/OCE 3.3 , NEMO Consortium (2010) 
    8282   !! $Id$ 
    8383   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt) 
     
    971971      ENDIF 
    972972 
    973 #if defined key_lim3 
     973#if defined key_si3 
    974974      IF( nn_ice == 2 ) THEN   ! condition needed in case agrif + ice-model but no-ice in child grid 
    975975         CALL ice_wri_state( kt, id_i, nh_i ) 
Note: See TracChangeset for help on using the changeset viewer.