Changeset 410

Timestamp:

01/19/13 19:24:21 (12 years ago)

Author:

ymipsl

Message:

management of internal netcdf library

YM

Location:

XIOS/trunk

Files:

• bld.cfg (modified) (3 diffs)
• make_xios (modified) (2 diffs)

XIOS/trunk/bld.cfg

@@ -27 +27 @@
 src::date $PWD/extern/boost/src/date_time
 src::blitz $PWD/extern/blitz/src
+src::netcdf $PWD/extern/netcdf4
 bld::lib xios
 bld::target libxios.a
 #bld::target test.exe
-#bld::target generate_fortran_interface.exe 
+bld::target generate_fortran_interface.exe 
 bld::target xios_server.exe test_cs.exe test_client.exe
 bld::exe_dep
@@ -38 +39 @@
 bld::tool::fpp       %FPP
 bld::tool::cpp       %CPP
-bld::tool::cppflags  %BASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include 
+bld::tool::cppflags  %CBASE_INC -I${PWD}/extern/src_netcdf -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include 
 bld::tool::fppflags  %BASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include 
 bld::tool::ld        %LINKER
 bld::tool::ldflags   %LD_FLAGS 
-bld::tool::cflags    %CFLAGS %CBASE_INC -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include 
+bld::tool::cflags    %CFLAGS %CBASE_INC -I${PWD}/extern/src_netcdf -I${PWD}/extern/boost/include -I${PWD}/extern/rapidxml/include -I${PWD}/extern/blitz/include 
 bld::tool::fflags    %FFLAGS %FBASE_INC 
 bld::tool::cppkeys   %CPP_KEY
@@ -49 +50 @@
 
 # Pre-process code before analysing dependencies
+#bld::pp    false          
 bld::pp    false          
-bld::pp::interface/fortran              true
-bld::pp::interface/fortran_attr         true
+#bld::pp::interface/fortran              true
+#bld::pp::interface/fortran_attr         true
 bld::excl_dep        use::mod_prism_get_comm
 bld::excl_dep        use::mod_prism_get_localcomm_proto

XIOS/trunk/make_xios

@@ -26 +26 @@
             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' : default netcdf4_par] : choice of netcdf library"
+            echo "       [--netcdf_lib 'netcdf4_par'/'netcdf4_seq'/'netcdf4_internal' : default netcdf4_par] : choice of netcdf library"
             echo "       [--memtrack] : tracking memory leak - developper only"
             echo "Example : ./make_xios --prod --arch PW6_VARGAS"
@@ -107 +107 @@
 fi
 
+rm -r $PWD/extern/netcdf4
+
 if [[ "$netcdf_lib" == "netcdf4_par" ]]
    then
-      XMLIO_CPPKEY="$XMLIO_CPPKEY USING_NETCDF_PAR"
+     ln -s $PWD/.void_dir $PWD/extern/netcdf4
+     XMLIO_CPPKEY="$XMLIO_CPPKEY USING_NETCDF_PAR"
 elif [[ "$netcdf_lib" == "netcdf4_seq" ]]
   then 
-    set nothing  
+    ln -s $PWD/.void_dir $PWD/extern/netcdf4
+elif [[ "$netcdf_lib" == "netcdf4_internal" ]]
+  then 
+    ln -s $PWD/extern/src_netcdf4 $PWD/extern/netcdf4
+    XMLIO_CPPKEY="$XMLIO_CPPKEY USING_NETCDF_PAR USING_NETCDF_INTERNAL"
+    export NETCDF_INCDIR="-I${PWD}/extern/netcdf4"
+    export NETCDF_LIBDIR=""
+    export NETCDF_LIB=""
 else
-   echo "Bad choice for --netcdf_lib argument : choose between 'netcdf4_par' or 'netcdf4_seq'"
+   echo "Bad choice for --netcdf_lib argument : choose between 'netcdf4_par','netcdf4_seq' or 'netcdf4_internal'"
    exit
 fi