Changeset 2166 for XIOS

Timestamp:

06/25/21 18:03:14 (3 years ago)

Author:

ymipsl

Message:

adapt makefile to new fcm version
--fcm new --> default flage
YM

File:

• XIOS/dev/dev_ym/XIOS_COUPLING/make_xios (modified) (6 diffs)

XIOS/dev/dev_ym/XIOS_COUPLING/make_xios

@@ -11 +11 @@
 use_extern_blitz="false"
 use_memtrack="false"
-use_tv="false"
 job="1"
 netcdf_lib="netcdf4_par"
@@ -19 +18 @@
 arch_defined="FALSE"
 arch_path_defined="FALSE"
+fcm_version=new
 
 # Traitement de la ligne de commande
@@ -35 +35 @@
             echo "       [--full] : to generate dependencies and recompile from scratch"
             echo "       [--use_oasis 'oasis3' 'oasis3_mct' : default oasis3_mct] : to use Oasis coupler"
-        echo "       [--build_path] : absolute path to the build directory"
-        echo "       [--build_dir ]: name of the build directory"
-        echo "       [--build_suffixed ]: generate automatically suffixed name of the build directory (e.g. config_X64_CURIE_prod)"
-        echo "       [--use_extern_boost] : to use external boost library"
-        echo "       [--use_extern_blitz] : to use external blitz library"
-        echo "       [--use_tv] : to use totalview data type display"
+        echo "       [--build_path : absolute path to the build directory"
+        echo "       [--build_dir : name of the build directory"
+        echo "       [--build_suffixed : generate automatically suffixed name of the build directory (e.g. config_X64_CURIE_prod)"
+        echo "       [--use_extern_boost : to use external boost library"
+        echo "       [--use_extern_blitz : to use external blitz library"
             echo "       [--doc] : to generate Doxygen documentation (not available yet)"
             echo "       [--job ntasks] : to use parallel compilation with ntasks"
             echo "       [--netcdf_lib 'netcdf4_par'/'netcdf4_seq'/'netcdf4_internal' : default netcdf4_par] : choice of netcdf library"
             echo "       [--memtrack] : tracking memory leak - developper only"
+            echo "       [--fcm] : fcm version compatibility : 'new'/'old'"
             echo "Example : ./make_xios --prod --arch PW6_VARGAS"
             echo "Example : ./make_xios --avail"
@@ -61 +61 @@
          "--use_extern_boost")  use_extern_boost="true" ; shift  ;;
          "--use_extern_blitz")  use_extern_blitz="true" ; shift  ;;
-         "--use_tv")  use_tv="true" ; shift  ;;
          "--doc")   doc="true"          ; shift ;;
          "--job")   job=$2              ; shift ; shift ;;
          "--netcdf_lib")   netcdf_lib=$2 ; shift ; shift ;;
          "--memtrack")  use_memtrack="true" memtrack=$2  ; shift ; shift ;;
+         "--fcm")       fcm_version=$2  ; shift ; shift ;;
          *)         code="$1"           ; shift ;;
       esac
@@ -236 +236 @@
 fi
 
-if [[ "$use_tv" == "true" ]]
-then
-   echo "src::tv_data_display $PWD/extern/tv_data_display" >> ${PWD}/bld_dir.cfg
-fi
-
 
 if [[ "$use_memtrack" == "true" ]]
@@ -284 +279 @@
 make_dir=$PWD
 
-export PATH=$PWD/tools/FCM/bin:$PATH
-
+if [[ "$fcm_version" == "new" ]]
+then
+  export PATH=$PWD/tools/FCM_NEW/bin:$PATH
+elif [[ "$fcm_version" == "old" ]]
+then
+  export PATH=$PWD/tools/FCM_OLD/bin:$PATH
+else
+  echo "=> Bad option for --fcm flag : "$fcm_version" , only 'new' or 'old' permitted"
+fi
+  
 if [[ "$compil_full" == "true" ]]
    then