Changeset 3843 for dynamico_lmdz/aquaplanet/ICOSAGCM

Timestamp:

Jul 2, 2015, 6:09:47 PM (9 years ago)

Author:

ymipsl

Message:

Update dynamico building environment for dynamico-LMDZ

YM

Location:

dynamico_lmdz/aquaplanet/ICOSAGCM

Files:

• bld.cfg (modified) (2 diffs)
• clean (modified) (1 diff)
• compile (modified) (1 diff)
• make_icosa (modified) (4 diffs)

dynamico_lmdz/aquaplanet/ICOSAGCM/bld.cfg

@@ -13 +13 @@
 %FFLAGS           %BASE_FFLAGS %COMPIL_FFLAGS
 
-#dest   $PWD
 dir::root            $PWD
 
 src::src        src
-src::ioipsl     tools/ioipsl
+src::ioipsl     %IOIPSL_PATH
 search_src           false
-bld::lib::ioipsl ioipsl
-bld::target libioipsl.a
-bld::lib::src icosa
+#bld::lib::ioipsl ioipsl
+#bld::target libioipsl.a
+bld::lib    icosa
 bld::target libicosa.a
 bld::target icosa_gcm.exe
@@ -40 +39 @@
 bld::excl_dep        inc::mpif.h
 bld::excl_dep        use::xios
+bld::excl_dep        %USE_IOIPSL
 
 bld::tool::SHELL   /bin/bash

dynamico_lmdz/aquaplanet/ICOSAGCM/clean

@@ -1 @@
-rm -rf ./obj/*
-rm -rf ./done/*
-rm -rf ./inc/*
-rm -rf ./flags/*
-rm -rf ./ppsrc/*
+rm -rf ./obj
+rm -rf ./done
+rm -rf ./inc
+rm -rf ./flags
+rm -rf ./ppsrc
+rm -rf ./bld
+rm -rf ./lib
+rm -rf ./etc
+rm -rf ./tmp
+rm -rf ./bin
 
+

dynamico_lmdz/aquaplanet/ICOSAGCM/compile

@@ -1 @@
-./make_icosa -prod -arch x86_skd 
-#./make_icosa -prod -arch x86_skdmpi -parallel mpi
+./make_icosa -debug -parallel mpi_omp -arch X64_CURIE 

dynamico_lmdz/aquaplanet/ICOSAGCM/make_icosa

@@ -17 +17 @@
 parallel="none"
 physics="none"
+external_ioipsl="FALSE"
+external_physics="FALSE"
+
 CPP_KEY="CPP_NONE" 
 ICOSA_LIB=""
@@ -61 +64 @@
       "-with_xios")
           with_xios_defined="TRUE" ; shift ;;
+
+      "-external_ioipsl")
+          external_ioipsl="TRUE" ; shift ;;
+
+      "-external_physics")
+          external_physics="TRUE" ; shift ;;
 
       *)
@@ -140 +149 @@
 fi  
 
+if [[ "$external_ioipsl" == "TRUE" ]]
+then
+  ioipsl_path="./void_dir"
+  use_ioipsl="use::ioipsl"
+  COMPIL_FFLAGS="$COMPIL_FFLAGS $IOIPSL_INCDIR"
+  ICOSA_LIB="$ICOSA_LIB $IOIPSL_LIBDIR $IOIPSL_LIB"
+else 
+  ioipsl_path="tools/ioipsl"
+  use_ioipsl=""
+fi  
+
+if [[ "$external_physics" == "TRUE" ]]
+then
+  CPP_KEY="$CPP_KEY CPP_USING_EXTERNAL_PHYSICS"
+fi
+
 ICOSA_LIB="$ICOSA_LIB $NETCDF_LIBDIR $NETCDF_LIB $HDF5_LIBDIR $HDF5_LIB"
 
@@ -149 +174 @@
 echo "%CPP_KEY $CPP_KEY" >> config.fcm
 echo "%LIB $ICOSA_LIB">> config.fcm
+echo "%IOIPSL_PATH $ioipls_path">> config.fcm
+echo "%USE_IOIPSL $use_ioipsl">> config.fcm
 
 if [[ "$full_defined" == "TRUE" ]]