Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found

Target

Select target project
  • PA/optics/tracy3
1 result
Show changes
Commits on Source (2)
...@@ -6,14 +6,14 @@ ...@@ -6,14 +6,14 @@
# not sh since on Ubuntu sh is not bash # not sh since on Ubuntu sh is not bash
set -x # for debugging #set -x # for debugging
if [ $# -ne 1 ] if [ $# -ne 1 ]
then # affiche l'usage then # affiche l'usage
echo "Missing parameter" echo "Missing parameter"
echo "Use: $0 debug for debug" echo "Use: $0 debug for debug"
echo "Use: $0 opt for optimization result" echo "Use: $0 opt for optimization result"
echo "Use: $0 mpi for optimization result" echo "Use: $0 mpi for optimization result"
exit 1 exit 1
fi fi
...@@ -30,6 +30,8 @@ cd "$dir/$TRACY" ...@@ -30,6 +30,8 @@ cd "$dir/$TRACY"
rm -f autom4te.cache/* rm -f autom4te.cache/*
rm -rf aclocal.m4 rm -rf aclocal.m4
### 2023jun01 sometimes distclean does not work
# try to comment distclean, run it once and then uncomment
make distclean make distclean
# Clean everything and call autoreconf # Clean everything and call autoreconf
...@@ -42,7 +44,7 @@ fi ...@@ -42,7 +44,7 @@ fi
#dirName=/home/sources/physmach/nadolski/codes #dirName=/home/sources/physmach/nadolski/codes
#dirName=/usr/local/applis_pa/codes/tracy/ #dirName=/usr/local/applis_pa/codes/tracy/
dirName=/nfs/tegile/work/sources/physmach/blanco-garcia/codes #dirName=/nfs/tegile/work/sources/physmach/blanco-garcia/codes
if [ $1 == "opt" ] if [ $1 == "opt" ]
then then
...@@ -51,12 +53,31 @@ CC=icc CXX=icpc LDFLAGS="-L$dirnName/nrecipes/recipes_c-ansi/lib/" ./configure - ...@@ -51,12 +53,31 @@ CC=icc CXX=icpc LDFLAGS="-L$dirnName/nrecipes/recipes_c-ansi/lib/" ./configure -
fi fi
if [ $1 == "mpi" ] if [ $1 == "mpi" ]
then then
#CC=icc CXX=icpc LDFLAGS="-L$dirName/nrecipes/recipes_c-ansi/lib/ -L/opt/intel/parallel_studio_xe_2017_update2/compilers_and_libraries_2017.2.174/linux/mpi/intel64/lib -lmpi" ./configure --enable-mpi-exec --prefix=$dir/$TRACY/tracy FFLAGS="-O2 -Wall -fbounds-check" CFLAGS="-O2 -Wall -fno-implicit-templates" CXXFLAGS="-O2 -Wall -fno-implicit-templates" ## 2023jun14 orblancog. I move to gcc because icc libraries are incompatible with matlab
CC=icc CXX=icpc LDFLAGS="-L$dirName/nrecipes/recipes_c-ansi/lib/ -L/opt/intel/parallel_studio_xe_2017_update2/compilers_and_libraries_2017.2.174/linux/mpi/intel64/lib -lmpi" ./configure --enable-mpi-exec --prefix=$dir/$TRACY/tracy FFLAGS="-O2 -Wall -fbounds-check" CFLAGS="-O2 -ansi -Wall -fno-implicit-templates" CXXFLAGS="-O2 -ansi -Wall -fno-implicit-templates" # https://jira.synchrotron-soleil.fr/jira/browse/CTRLDESK-21799
# CC=icc CXX=icpc LDFLAGS="-L$dirName/nrecipes/recipes_c-ansi/lib/ -L/opt/intel/parallel_studio_xe_2017_update2/compilers_and_libraries_2017.2.174/linux/mpi/intel64/lib -lmpi" ./configure --enable-mpi-exec --prefix=$dir/$TRACY/tracy FFLAGS="-O2 -Wall -fbounds-check" CFLAGS="-O2 -Wall -fno-implicit-templates" CXXFLAGS="-O2 -Wall -fno-implicit-templates"
# ok for compilation # CC=icc CXX=icpc LDFLAGS="-L$dirName/nrecipes/recipes_c-ansi/lib/ -L/opt/intel/parallel_studio_xe_2017_update2/compilers_and_libraries_2017.2.174/linux/mpi/intel64/lib -lmpi" ./configure --enable-mpi-exec --prefix=$dir/$TRACY/tracy FFLAGS="-O2 -Wall -fbounds-check" CFLAGS="-O2 -ansi -Wall -fno-implicit-templates" CXXFLAGS="-O2 -ansi -Wall -fno-implicit-templates"
# CC=icc CXX=icpc LDFLAGS="-L$NUM_REC/nrecipes/recipes_c-ansi/lib/ -L/opt/intel/parallel_studio_xe_2017_update2/compilers_and_libraries_2017.2.174/linux/mpi/intel64/lib -lmpi" ./configure --enable-mpi-exec --prefix=$dir/$TRACY/tracy FFLAGS="-O2 -Wall -fbounds-check" CFLAGS="-O2 -ansi -Wall -fno-implicit-templates" CXXFLAGS="-O2 -ansi -Wall -fno-implicit-templates"
# CC=gcc CXX=g++ LDFLAGS="-L$dirName/nrecipes/recipes_c-ansi/lib/ -I/usr/local/applications/tools/openmpi/4.1.1/include -L/usr/local/applications/tools/openmpi/4.1.1/lib -lmpi" ./configure --enable-mpi-exec FFLAGS="-O2 -Wall -fbounds-check " CFLAGS="-O2 -Wall -ansi " CXXFLAGS="-O2 -Wall -ansi -fno-implicit-templates -I/usr/local/applications/tools/openmpi/4.1.1/include -L/usr/local/applications/tools/openmpi/4.1.1/lib -lmpi_cxx"
# CC=gcc CXX=g++ LDFLAGS="-L$dirName/nrecipes/recipes_c-ansi/lib/ -I/usr/local/applications/tools/openmpi/4.1.1/include -L/usr/local/applications/tools/openmpi/4.1.1/lib -lmpi" ./configure --enable-mpi-exec FFLAGS="-O2 -Wall -fbounds-check " CFLAGS="-O2 -Wall -ansi " CXXFLAGS="-O2 -Wall -ansi -fno-implicit-templates -I/usr/local/applications/tools/openmpi/4.1.1/include -L/usr/local/applications/tools/openmpi/4.1.1/lib -lmpi_cxx" # CC=gcc CXX=g++ LDFLAGS="-L$dirName/nrecipes/recipes_c-ansi/lib/ -I/usr/local/applications/tools/openmpi/4.1.1/include -L/usr/local/applications/tools/openmpi/4.1.1/lib -lmpi" ./configure --enable-mpi-exec FFLAGS="-O2 -Wall -fbounds-check " CFLAGS="-O2 -Wall -ansi " CXXFLAGS="-O2 -Wall -ansi -fno-implicit-templates -I/usr/local/applications/tools/openmpi/4.1.1/include -L/usr/local/applications/tools/openmpi/4.1.1/lib -lmpi_cxx"
# check gcc version
currentver="$(gcc -dumpversion)"
echo "GCC is $currentver"
requiredver="9.2.0"
if [ "$(printf '%s\n' "$requiredver" "$currentver" | sort -V | head -n1)" = "$requiredver" ]; then
then
CC=gcc CXX=g++ LDFLAGS="-L$NUM_REC/lib/ -I/usr/local/applications/tools/openmpi/4.1.1/include -L/usr/local/applications/tools/openmpi/4.1.1/lib -lmpi" ./configure --enable-mpi-exec FFLAGS="-O2 -Wall -fbounds-check " CFLAGS="-O2 -Wall -ansi " CXXFLAGS="-O2 -Wall -ansi -fno-implicit-templates -I/usr/local/applications/tools/openmpi/4.1.1/include -L/usr/local/applications/tools/openmpi/4.1.1/lib -lmpi_cxx -fopenmp "
else
# newer gcc versions require extra fortran flags
echo "GCC greater than or equal to ${requiredver}"
echo "extra flags to fortran ..."
##add fallow-argument-mismatch
CC=gcc CXX=g++ LDFLAGS="-L$NUM_REC/lib/ -I/usr/local/applications/tools/openmpi/4.1.1/include -L/usr/local/applications/tools/openmpi/4.1.1/lib -lmpi" ./configure --enable-mpi-exec FFLAGS="-O2 -Wall -fbounds-check -fallow-argument-mismatch " CFLAGS="-O2 -Wall -ansi " CXXFLAGS="-O2 -Wall -ansi -fno-implicit-templates -I/usr/local/applications/tools/openmpi/4.1.1/include -L/usr/local/applications/tools/openmpi/4.1.1/lib -lmpi_cxx -fopenmp "
fi
fi fi
make make
#make install DESTDIR=/usr/local/applis_pa/codes/tracy/bin #make install DESTDIR=/usr/local/applis_pa/codes/tracy/bin
make install DESTDIR=/home/sources/physmach/blanco-garcia make install DESTDIR=~
...@@ -162,7 +162,7 @@ struct FieldMapType { ...@@ -162,7 +162,7 @@ struct FieldMapType {
/* ID Laurent */ /* ID Laurent */
#define IDXMAX 500 #define IDXMAX 500
#define IDZMAX 100 #define IDZMAX 500
struct InsertionType { struct InsertionType {
int Pmethod; /* Integration Method */ int Pmethod; /* Integration Method */
......