Changeset 9598 for NEMO/trunk/mk

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/mk

Files:

• . (modified) (1 prop)
• Fcheck_archfile.sh (modified) (3 diffs)
• Fcheck_config.sh (modified) (1 diff)
• Fclean_config.sh (modified) (1 diff)
• Fcopy_dir.sh (modified) (1 diff)
• Fcopy_extdir.sh (modified) (1 diff)
• Fgo_to_TOOLS.sh (modified) (1 diff)
• Flist_archfile.sh (modified) (4 diffs)
• Fmake_WORK.sh (modified) (4 diffs)
• Fmake_bld.sh (modified) (1 diff)
• Fprep_agrif.sh (modified) (3 diffs)
• bld.cfg (modified) (2 diffs)
• bldxag.cfg (modified) (1 diff)
• conv.cfg (modified) (1 diff)

NEMO/trunk/mk/Fcheck_archfile.sh

@@ -117 +117 @@
     fi
 else 
-    nb=$( find ${MAIN_DIR}/ARCH -name arch-${3}.fcm -print | wc -l )
+    nb=$( find ${MAIN_DIR}/arch -name arch-${3}.fcm -print | wc -l )
     if [ $nb -eq 0 ]; then # no arch file found
    echo "Warning !!!"
@@ -128 +128 @@
    echo "Warning !!!"
    echo "more than 1 arch file for the same compiler have been found"
-   find ${MAIN_DIR}/ARCH -name arch-${3}.fcm -print
+   find ${MAIN_DIR}/arch -name arch-${3}.fcm -print
    echo "keep only 1"
    echo "EXITING..."
    exit 1       
     fi
-    myarch=$( find ${MAIN_DIR}/ARCH -name arch-${3}.fcm -print )
+    myarch=$( find ${MAIN_DIR}/arch -name arch-${3}.fcm -print )
     # we were already using this arch file ?
     if [ "$myarch" == "$( cat ${COMPIL_DIR}/arch.history )" ]; then 
@@ -150 +150 @@
        fi
        # has myarch file been updated since we copied it in ${COMPIL_DIR}?
-       myarch=$( find -L ${MAIN_DIR}/ARCH -cnewer ${COMPIL_DIR}/$1 -name arch-${3}.fcm -print )
+       myarch=$( find -L ${MAIN_DIR}/arch -cnewer ${COMPIL_DIR}/$1 -name arch-${3}.fcm -print )
        [ ${#myarch} -ne 0 ] && cpeval ${myarch} ${COMPIL_DIR}/$1
    else

NEMO/trunk/mk/Fcheck_config.sh

@@ -39 +39 @@
 # - Nothing set, use the previous in use 
 #
-# We use TOOLS/CONFIG_DIR/cfg.txt to check if the configuration exists.
+# We use TOOLS/cfgs_DIR/cfg.txt to check if the configuration exists.
 #
 # EXAMPLES

NEMO/trunk/mk/Fclean_config.sh

@@ -37 +37 @@
 # - remove CONFIG_NAME/WORK
 # - remove CONFIG_NAME/BLD
-# - remove CONFIG_NAME from TOOLS/TOOLS/COMPILE/cfg.txt 
+# - remove CONFIG_NAME from TOOLS/mk/cfg.txt 
 # 
 # EXAMPLES

NEMO/trunk/mk/Fcopy_dir.sh

@@ -27 +27 @@
 #
 # When a reference configuration is set, 
-# Copy NEMO sub-directories needed (OCE_SRC, TOP_SRC ...)
+# Copy NEMO sub-directories needed (OCE, TOP ...)
 #
 # EXAMPLES

NEMO/trunk/mk/Fcopy_extdir.sh

@@ -18 +18 @@
 # ===========
 # When an unsupported configuration is requested, 
-# Prepare sources for the NEMO sub-directories needed (OCE_SRC, TOP_SRC ...)
+# Prepare sources for the NEMO sub-directories needed (OCE, TOP ...)
 # EXAMPLES
 # ========

NEMO/trunk/mk/Fgo_to_TOOLS.sh

@@ -53 +53 @@
 #-
 
-cd ${MAIN_DIR}/TOOLS
+cd ${MAIN_DIR}/tools

NEMO/trunk/mk/Flist_archfile.sh

@@ -27 +27 @@
 #
 # List arch file available.
-# The first line of each file in NEMO/ARCH directory is echoed.  
+# The first line of each file in NEMO/arch directory is echoed.  
 #
 #
@@ -61 +61 @@
 
 echo "Available compilers for -m option :"
-for file in  $(ls ${MAIN_DIR}/ARCH | grep "fcm$" )
+for file in  $(ls ${MAIN_DIR}/arch | grep "fcm$" )
 do
 zvar1=${file#arch-}
-zvar2=$(head -1 ${MAIN_DIR}/ARCH/$file)
+zvar2=$(head -1 ${MAIN_DIR}/arch/$file)
 #echo "${zvar1%.fcm} : ${zvar2#\#}"
 printf "%-20s %s %-s\n" "${zvar1%.fcm}" : "${zvar2#\#}"
@@ -71 +71 @@
 
 if [ "$1" == "all" ]; then
-   for dir  in  $(ls ${MAIN_DIR}/ARCH | grep -v "fcm$" )
+   for dir  in  $(ls ${MAIN_DIR}/arch | grep -v "fcm$" )
    do 
       echo "Available compilers at ${dir} :"
-      for file in  $(ls ${MAIN_DIR}/ARCH/${dir} | grep "fcm$" )
+      for file in  $(ls ${MAIN_DIR}/arch/${dir} | grep "fcm$" )
       do
       zvar1=${file#arch-}
-      zvar2=$(head -1 ${MAIN_DIR}/ARCH/${dir}/$file)
+      zvar2=$(head -1 ${MAIN_DIR}/arch/${dir}/$file)
       #echo "${zvar1%.fcm} : ${zvar2#\#}"
       printf "%-20s %s %-s\n" "${zvar1%.fcm}" : "${zvar2#\#}"
       done
    done
-elif [ -d ${MAIN_DIR}/ARCH/${1} ]; then
+elif [ -d ${MAIN_DIR}/arch/${1} ]; then
       echo "Available compilers at $1 :"
-      for file in  $(ls ${MAIN_DIR}/ARCH/$1 | grep "fcm$" )
+      for file in  $(ls ${MAIN_DIR}/arch/$1 | grep "fcm$" )
       do
       zvar1=${file#arch-}
-      zvar2=$(head -1 ${MAIN_DIR}/ARCH/${1}/$file)
+      zvar2=$(head -1 ${MAIN_DIR}/arch/${1}/$file)
       #echo "${zvar1%.fcm} : ${zvar2#\#}"
       printf "%-20s %s %-s\n" "${zvar1%.fcm}" : "${zvar2#\#}"
@@ -93 +93 @@
 else
       echo "Available consortium member sub-directories :"
-      for dir  in  $(ls ${MAIN_DIR}/ARCH | grep -v "fcm$" )
+      for dir  in  $(ls ${MAIN_DIR}/arch | grep -v "fcm$" )
       do
          echo ${dir}

NEMO/trunk/mk/Fmake_WORK.sh

@@ -7 +7 @@
 # Fmake_WORK      : create links in the WORK
 ######################################################
-#set -x
+#set -vx
 set -o posix
 #set -u
@@ -45 +45 @@
 # ::
 #
-#  $ ./Fmake_WORK.sh ORCA2_LIM OCE_SRC ICE_SRC
+#  $ ./Fmake_WORK.sh ORCA2_LIM OCE ICE
 #
 #
@@ -89 +89 @@
 while [ $i -lt $NDIR ]
 do
-   [ "${ZTAB[i]}" = "OCE_SRC" ] && ln -sf ${NEMO_DIR}/OCE_SRC/*.[Ffh]90 ${ZCONF}/WORK
-   [ "${ZTAB[i]}" = "OCE_SRC" ] && ln -sf ${NEMO_DIR}/OCE_SRC/*/*.[Ffh]90 ${ZCONF}/WORK && break
+   [ "${ZTAB[i]}" = "OCE" ] && ln -sf ${NEMO_DIR}/OCE/*.[Ffh]90 ${ZCONF}/WORK
+   [ "${ZTAB[i]}" = "OCE" ] && ln -sf ${NEMO_DIR}/OCE/*/*.[Ffh]90 ${ZCONF}/WORK && break
    let i=$i+1
 done
@@ -97 +97 @@
 while [ $i -lt $NDIR ]
 do
-   if [ "${ZTAB[i]}" != "OCE_SRC" ]; then
+   if [ "${ZTAB[i]}" != "OCE" ]; then
       ln -sf ${NEMO_DIR}/${ZTAB[i]}/*.[Ffh]90 ${ZCONF}/WORK
       ln -sf ${NEMO_DIR}/${ZTAB[i]}/*/*.[Ffh]90 ${ZCONF}/WORK 

NEMO/trunk/mk/Fmake_bld.sh

@@ -39 +39 @@
 # ::
 #
-#  $ ./Fmake_bld.sh NEMOGCM/CONFIG GYRE  /usr/tmp
+#  $ ./Fmake_bld.sh NEMOGCM/cfgs GYRE  /usr/tmp
 #
 #

NEMO/trunk/mk/Fprep_agrif.sh

@@ -58 +58 @@
 if [ "$AGRIFUSE" == 1 ]; then
 #-MPI for AGRIF
-if [ ! -f ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h ];then
-   echo '#if defined key_mpp_mpi' > ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h
-   echo '#define AGRIF_MPI'      >> ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h
-   echo '#endif'                 >> ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h
+if [ ! -f ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h ];then
+   echo '#if defined key_mpp_mpi' > ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h
+   echo '#define AGRIF_MPI'      >> ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h
+   echo '#endif'                 >> ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h
 fi
 
@@ -67 +67 @@
 fcm build ${COMPIL_DIR}/conv.cfg || exit 1
 #C_COMPILER=${CC-cc}
-#gmake CC=${C_COMPILER} -C ${MAIN_DIR}/EXTERNAL/AGRIF/LIB
+#gmake CC=${C_COMPILER} -C ${MAIN_DIR}/ext/AGRIF/LIB
 
 #- AGRIF sources
@@ -73 +73 @@
 [ ! -d $2/$1/NEMOFILES/AGRIF_INC ] && mkdir  $2/$1/NEMOFILES/AGRIF_INC
 [ ! -d $2/$1/NEMOFILES/AGRIF_MODELFILES ] && mkdir  $2/$1/NEMOFILES/AGRIF_MODELFILES
-cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/agrif_oce.in  $2/$1/NEMOFILES/
-#cp -f -r ${MAIN_DIR}/EXTERNAL/AGRIF/conv  $2/$1/NEMOFILES/
+cp -f -r ${MAIN_DIR}/ext/AGRIF/agrif_oce.in  $2/$1/NEMOFILES/
+#cp -f -r ${MAIN_DIR}/ext/AGRIF/conv  $2/$1/NEMOFILES/
 cp -f -r $2/$1/AGRIFLIB/bin/conv  $2/$1/NEMOFILES/
 

NEMO/trunk/mk/bld.cfg

@@ -13 +13 @@
 search_src           1
 
-src::ioipsl               $MAIN_DIR/EXTERNAL/IOIPSL/src
-src::agrif                $MAIN_DIR/EXTERNAL/AGRIF/AGRIF_FILES
+src::ioipsl               $MAIN_DIR/ext/IOIPSL/src
+src::agrif                $MAIN_DIR/ext/AGRIF/AGRIF_FILES
 src::nemo                 $CONFIG_DIR/$NEW_CONF/NEMOFILES/obj
 
@@ -41 +41 @@
 bld::tool::fppflags::nemo      %FPPFLAGS -I$CONFIG_DIR/$NEW_CONF/NEMOFILES/inc
 bld::tool::fppflags::ioipsl    %FPPFLAGS
-bld::tool::fppflags::agrif     %FPPFLAGS -include ${MAIN_DIR}/EXTERNAL/AGRIF/nemo_mpi.h
+bld::tool::fppflags::agrif     %FPPFLAGS -include ${MAIN_DIR}/ext/AGRIF/nemo_mpi.h
 
 # Ignore the following dependencies

NEMO/trunk/mk/bldxag.cfg

@@ -13 +13 @@
 search_src           1
 
-src::ioipsl               $MAIN_DIR/EXTERNAL/IOIPSL/src
+src::ioipsl               $MAIN_DIR/ext/IOIPSL/src
 src::nemo                 $CONFIG_DIR/$NEW_CONF/WORK
 

NEMO/trunk/mk/conv.cfg

@@ -14 +14 @@
 bld::tool::make      %MK
 
-src::convsrc   $MAIN_DIR/EXTERNAL/AGRIF/LIB
+src::convsrc   $MAIN_DIR/ext/AGRIF/LIB
 
  #----------------------------------------------------------------------------