Skip to content

Commit 34deb2d

Browse files
committed
[lata_tools] Build lata_tools ad MC with crayCC
1 parent 2d6c55a commit 34deb2d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

Outils/lata_tools/src/build.sh

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ if [ "x$exec" == "x$exec_debug" ]; then
2727
echo "lata_tools will be built in DEBUG mode!!"
2828
build_mode="Debug"
2929
fi
30-
if [ "$TRUST_CC_BASE_EXTP" != "" ]
30+
if [ "$TRUST_CC_BASE_EXTP" != "" ] && [ "`basename $TRUST_CC_BASE`" != crayCC ] # Sur adastra GNU ici ne marche pas... tout comme medcoupling
3131
then
3232
export OMPI_CXX=$TRUST_CC_BASE_EXTP
3333
export OMPI_CC=$TRUST_cc_BASE_EXTP
3434
export MPICH_CXX=$OMPI_CXX
3535
export MPICH_CC=$OMPI_CC
36-
fi
36+
fi
37+
[ "`basename $TRUST_CC_BASE`" != crayCC ] && export CXXFLAGS="-Wno-inconsistent-missing-override" # to suppress warnings from medcoupling
3738

3839
# CMake option + implicit use of TRUST_DEFINES and EXTRA_SRCS env var:
3940
cmake_opt="-DCMAKE_BUILD_TYPE=$build_mode -DCMAKE_INSTALL_PREFIX=$TRUST_ROOT/exec/lata_tools -DCMAKE_C_COMPILER=$TRUST_cc "

bin/BUILD64/GO

+1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ sed -i "s/long spacedim;/int spacedim;/" Outils/lata_tools/src/trust_commun/Lata
3636
sed -i "s/vector<pair< long, long > > iters= MEDCoupling::GetFieldIterations(ltypes\[t\],filename,meshname.getString(),fields\[i\].c_str());/vector<pair< int, int > > iters= MEDCoupling::GetFieldIterations(ltypes[t],filename,meshname.getString(),fields[i].c_str());/" Outils/lata_tools/src/trust_commun/LataDBmed.h
3737
sed -i "s/vector<pair<pair<long,long>,double> > vtimes=MEDCoupling::GetAllFieldIterations(filename,\/\*meshname,\*\/fields\[i\].c_str());/vector<pair<pair<int,int>,double> > vtimes=MEDCoupling::GetAllFieldIterations(filename,\/\*meshname,\*\/fields[i].c_str());/" Outils/lata_tools/src/trust_commun/LataDBmed.h
3838
sed -i "s/vector<pair<pair<long,long>,double> > vtimes=MEDCoupling::GetAllFieldIterations(fld.filename_.getString(),fieldname.getString());/vector<pair<pair<int,int>,double> > vtimes=MEDCoupling::GetAllFieldIterations(fld.filename_.getString(),fieldname.getString());/" Outils/lata_tools/src/trust_commun/LataDBmed.h
39+
sed -i "s/%d/%ld/g" Outils/lata_tools/src/tools/compare_lata.cpp
3940

4041
#
4142
# TRUST src

0 commit comments

Comments
 (0)