Changeset 152 for codes/icosagcm/trunk/make_icosa

Timestamp:

05/13/13 14:33:09 (11 years ago)

Author:

ymipsl

Message:

Mixte parallelism MPI/OpenMP compilation

YM

File:

• codes/icosagcm/trunk/make_icosa (modified) (2 diffs)

codes/icosagcm/trunk/make_icosa

@@ -77 +77 @@
 fi
 
+LD_FLAGS="%BASE_LD"
+
 if [[ "$compil_mode" == "prod" ]]
 then
@@ -91 +93 @@
 then
   CPP_KEY="$CPP_KEY CPP_USING_MPI"
+elif [[ "$parallel" == "omp" ]]
+then
+  CPP_KEY="$CPP_KEY CPP_USING_OMP"
+  COMPIL_FFLAGS="$COMPIL_FFLAGS %OMP_FFLAGS"
+  LD_FLAGS="$LD_FLAGS %OMP_LD"
+elif [[ "$parallel" == "mpi_omp" ]]
+then
+  CPP_KEY="$CPP_KEY CPP_USING_MPI CPP_USING_OMP"
+  LD_FLAGS="$LD_FLAGS %OMP_LD"
 elif [[ "$parallel" == "none" ]]
 then
   parallel="none"
 else 
-  echo "-parallel value $parallel is invalid, only permited <none> or <mpi>"
+  echo "-parallel value $parallel is invalid, only permited <none>, <mpi>, <omp> or <mpi_omp>"
   exit 1
 fi
 
-ICOSA_LIB="$NETCDF_LIBDIR $HDF5_LIBDIR $NETCDF_LIB $HDF5_LIB"
+ICOSA_LIB="$NETCDF_LIBDIR $NETCDF_LIB $HDF5_LIBDIR $HDF5_LIB"
 
 rm -f config.fcm
 
 echo "%COMPIL_FFLAGS $COMPIL_FFLAGS $NETCDF_INCDIR" >> config.fcm
+echo "%LD_FLAGS $LD_FLAGS" >> config.fcm
 echo "%CPP_KEY $CPP_KEY" >> config.fcm
 echo "%LIB $ICOSA_LIB">> config.fcm