Changeset 28

Timestamp:

07/26/12 15:27:26 (12 years ago)

Author:

ymipsl

Message:

update of bld.cfg and make_icosa for parallelism

YM

Location:

codes/icosagcm/trunk

Files:

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

codes/icosagcm/trunk/bld.cfg

@@ -26 +26 @@
 bld::tool::fc        %COMPILER
 bld::tool::ld        %LINK
-bld::tool::ldflags   %LD_FLAGS 
+bld::tool::ldflags   %LD_FLAGS %LIB 
 bld::tool::fflags    %FFLAGS 
+bld::tool::fppkeys   %CPP_KEY %FPP_DEF
+
 # Pre-process code before analysing dependencies
-bld::pp              false
+bld::pp              true
 
 bld::excl_dep        use::netcdf
 bld::excl_dep        use::omp_lib
+bld::excl_dep        inc::mpif.h
+
 bld::tool::SHELL   /bin/bash
 

codes/icosagcm/trunk/make_icosa

@@ -7 +7 @@
 
 arch_defined="FALSE"
+parallel_defined="FALSE"
 arch=""
+parallel="none"
+CPP_KEY="CPP_NONE" 
 
 while (($# > 0))
@@ -33 +36 @@
           arch=$2 ; arch_defined="TRUE"; shift ; shift ;;
 
+      "-parallel")
+          parallel=$2 ; parallel_defined="TRUE"; shift ; shift ;;
+
       *)
           code="$1" ; shift ;;
@@ -38 +44 @@
 done
 
+rm -f .void_file
+echo > .void_file
+rm -rf .void_dir
+mkdir .void_dir
+
 if [[ "$arch_defined" == "TRUE" ]]
 then
   rm -f arch.path
   rm -f arch.fcm
+  rm -f arch.env
   ln -s arch/arch-${arch}.path ./arch.path
   ln -s arch/arch-${arch}.fcm  ./arch.fcm
+  if test -f arch/arch-${arch}.env
+    then
+      ln -s arch/arch-${arch}.env arch.env
+    else
+      ln -s .void_file arch.env
+    fi
+  source arch.env
   source arch.path
 else
@@ -61 +80 @@
 fi
 
+if [[ "$parallel" == "mpi" ]]
+then
+  CPP_KEY="$CPP_KEY CPP_USING_MPI"
+elif [[ "$parallel" == "none" ]]
+then
+  parallel="none"
+else 
+  echo "-parallel value $parallel is invalid, only permited <none> or <mpi>"
+  exit 1
+fi
+
+ICOSA_LIB="$NETCDF_LIBDIR $HDF5_LIBDIR $NETCDF_LIB $HDF5_LIB"
+
 rm -f config.fcm
 
-echo "%COMPIL_FFLAGS $COMPIL_FFLAGS" >> config.fcm
+echo "%COMPIL_FFLAGS $COMPIL_FFLAGS $NETCDF_INCDIR" >> config.fcm
+echo "%CPP_KEY $CPP_KEY" >> config.fcm
+echo "%LIB $ICOSA_LIB">> config.fcm
 
 ./build