Changeset 9598 for NEMO/trunk/cfgs

Timestamp:

2018-05-16T00:47:16+02:00 (6 years ago)

Author:

nicolasmartin

Message:

Reorganisation plan for NEMO repository: changes to make compilation succeed with new structure
Juste one issue left with AGRIF_NORDIC with AGRIF preprocessing
Standardisation of routines header with version 4.0 and year 2018
Fix for some broken symlinks

Location:

NEMO/trunk/cfgs

Files:

• SPITZ12/MY_SRC/sbcblk.F90 (modified) (1 diff)
• cfg.txt (modified) (1 diff)
• makenemo (modified) (8 diffs)
• uspcfg.txt (modified) (1 diff)

NEMO/trunk/cfgs/SPITZ12/MY_SRC/sbcblk.F90

@@ -137 +137 @@
    !! NEMO/OPA 3.7 , NEMO-consortium (2014)
    !! $Id: sbcblk.F90 6416 2016-04-01 12:22:17Z clem $
-   !! Software governed by the CeCILL licence     (NEMOGCM/NEMO_CeCILL.txt)
+   !! Software governed by the CeCILL licence     (./LICENSE)
    !!----------------------------------------------------------------------
 CONTAINS

NEMO/trunk/cfgs/cfg.txt

@@ -1 @@
-AGRIF_NORDIC OCE_SRC ICE_SRC NST_SRC
-AMM12 OCE_SRC
-C1D_PAPA OCE_SRC
-GYRE_BFM OCE_SRC TOP_SRC
-GYRE_PISCES OCE_SRC TOP_SRC
-ORCA2_OFF_PISCES OCE_SRC TOP_SRC OFF_SRC
-ORCA2_OFF_TRC OCE_SRC TOP_SRC OFF_SRC
-ORCA2_SAS_SI3 OCE_SRC ICE_SRC NST_SRC SAS_SRC
-ORCA2_SI3_PISCES OCE_SRC TOP_SRC ICE_SRC NST_SRC
-SPITZ12 OCE_SRC ICE_SRC
+AGRIF_NORDIC OCE ICE NST
+AMM12 OCE
+C1D_PAPA OCE
+GYRE_BFM OCE TOP
+GYRE_PISCES OCE TOP
+ORCA2_OFF_PISCES OCE TOP OFF
+ORCA2_OFF_TRC OCE TOP OFF
+ORCA2_SAS_SI3 OCE ICE NST SAS
+ORCA2_SI3_PISCES OCE TOP ICE NST
+SPITZ12 OCE ICE
+GYRE_PISCES_ST OCE TOP
+ORCA2_SI3_PISCES_ST OCE TOP ICE NST
+ORCA2_OFF_PISCES_ST OCE TOP OFF
+AMM12_ST OCE
+ORCA2_SAS_SI3_ST OCE ICE NST SAS
+ORCA2_SI3_OBS_ST OCE ICE
+AGRIF_NORDIC_ST OCE ICE NST
+AGRIF_NORDIC_NOAGRIF_ST OCE ICE NST
+SPITZ12_ST OCE ICE

NEMO/trunk/cfgs/makenemo

@@ -96 +96 @@
 x_j=1;
 x_e="none";
-x_s=NEMO;
+x_s=src;
 x_v=1;
 
@@ -104 +104 @@
 MAIN_DIR=$(cd $(dirname "$0"); pwd)
 MAIN_DIR=${MAIN_DIR%/SETTE*}
-MAIN_DIR=${MAIN_DIR%/TOOLS*}
-MAIN_DIR=${MAIN_DIR%/CONFIG*}
+MAIN_DIR=${MAIN_DIR%/tools*}
+MAIN_DIR=${MAIN_DIR%/cfgs*}
 export MAIN_DIR
 #
-export CONFIG_DIR=${MAIN_DIR}/CONFIG
-export TOOLS_DIR=${MAIN_DIR}/TOOLS
-export COMPIL_DIR=${MAIN_DIR}/TOOLS/COMPILE
+export CONFIG_DIR=${MAIN_DIR}/cfgs
+export TOOLS_DIR=${MAIN_DIR}/tools
+export COMPIL_DIR=${MAIN_DIR}/mk
 export NEMO_DIR=${MAIN_DIR}/${x_s}
 export AGRIFUSE=10
@@ -120 +120 @@
 #-
 #- FCM and functions location ---
-export PATH=${MAIN_DIR}/EXTERNAL/fcm/bin:$PATH
+export PATH=${MAIN_DIR}/ext/FCM/bin:$PATH
 
 #-
@@ -146 +146 @@
    echo "";
    echo "Example to install a new configuration MY_CONFIG";
-   echo "with OCE_SRC and ICE_SRC ";
-   echo "makenemo -n MY_CONFIG -d \"OCE_SRC ICE_SRC\"";
+   echo "with OCE and ICE ";
+   echo "makenemo -n MY_CONFIG -d \"OCE ICE\"";
    echo "";
    echo "Available configurations :"; cat ${CONFIG_DIR}/cfg.txt;
@@ -230 +230 @@
 
 #-
-#- Go to NEMOGCM/CONFIG directory ---
+#- Go to NEMOGCM/cfgs directory ---
 cd ${CONFIG_DIR}
 
@@ -240 +240 @@
    export CONFIG_DIR=${CONFIG_DIR}/${ALT_DIR}
 #-
-#- Go to named subdirectory of the NEMOGCM/CONFIG directory ---
+#- Go to named subdirectory of the NEMOGCM/cfgs directory ---
    cd ${CONFIG_DIR}
  fi
@@ -274 +274 @@
    echo "You are installing a new default (ORCA2_LIM3_PISCES) configuration"
    ind=0
-   . ${COMPIL_DIR}/Fread_dir.sh OCE_SRC    YES
-   . ${COMPIL_DIR}/Fread_dir.sh ICE_SRC     NO
-   . ${COMPIL_DIR}/Fread_dir.sh TOP_SRC    NO
-   . ${COMPIL_DIR}/Fread_dir.sh NST_SRC    YES
-   . ${COMPIL_DIR}/Fread_dir.sh OFF_SRC    NO
-   . ${COMPIL_DIR}/Fread_dir.sh SAO_SRC    NO
-   . ${COMPIL_DIR}/Fread_dir.sh SAS_SRC    NO
+   . ${COMPIL_DIR}/Fread_dir.sh OCE  YES
+   . ${COMPIL_DIR}/Fread_dir.sh ICE  NO
+   . ${COMPIL_DIR}/Fread_dir.sh TOP  NO
+   . ${COMPIL_DIR}/Fread_dir.sh NST  YES
+   . ${COMPIL_DIR}/Fread_dir.sh OFF  NO
+   . ${COMPIL_DIR}/Fread_dir.sh SAO  NO
+   . ${COMPIL_DIR}/Fread_dir.sh SAS  NO
    REF_CONF=ORCA2_LIM3_PISCES
     elif [ ${#NEM_SUBDIR} -gt 0 ] && [ ${#REF_CONF} -eq 0 ] && [ ${#USP_CONF} -eq 0 ] ; then
-   echo "You are  installing a new configuration based on ORCA2_LIM3_PISCES"
+   echo "You are installing a new configuration based on ORCA2_LIM3_PISCES"
    TAB=( ${NEM_SUBDIR} )
    REF_CONF=ORCA2_LIM3_PISCES
     elif [ ${#NEM_SUBDIR} -eq 0 ] && [ ${#REF_CONF} -gt 0 ]; then
-   echo "You are  installing a new configuration based on ${REF_CONF}"
+   echo "You are installing a new configuration based on ${REF_CONF}"
    . ${COMPIL_DIR}/Fcopy_dir.sh ${REF_CONF}
     elif [ ${#NEM_SUBDIR} -gt 0 ] && [ ${#REF_CONF} -gt 0 ]; then
@@ -320 +320 @@
 #- Create the WORK ---
 #- Clean links and librairies ---
-#- Creating the good links, at first on OCE_SRC ---
+#- Creating the good links, at first on OCE ---
 . ${COMPIL_DIR}/Fmake_WORK.sh ${x_e} ${NEW_CONF} ${TAB[*]} || exit 3
 

NEMO/trunk/cfgs/uspcfg.txt

@@ -1 @@
-ORCA1_CICE # ORCA2_LIM # OCE_SRC TOP_SRC  # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/ORCA1_CICE/v3.6.0/ORCA1_CICE_ctl.txt
-ISOMIP     # GYRE      # OCE_SRC          # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/ISOMIP/trunk/ISOMIP_ctl.txt
-IRISHSEA   # GYRE      # OCE_SRC          # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/IRISHSEA/v3.7.0/IRISHSEA_ctl.txt
+ORCA1_CICE # ORCA2_LIM # OCE TOP  # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/ORCA1_CICE/v3.6.0/ORCA1_CICE_ctl.txt
+ISOMIP     # GYRE      # OCE          # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/ISOMIP/trunk/ISOMIP_ctl.txt
+IRISHSEA   # GYRE      # OCE          # http://gws-access.ceda.ac.uk/public/nemo/uspconfigs/IRISHSEA/v3.7.0/IRISHSEA_ctl.txt