Skip to content

Commit 5bea4c4

Browse files
committed
[Baltiks] New BALTIK_project_directory variable
1 parent 2dbc274 commit 5bea4c4

File tree

5 files changed

+241
-22
lines changed

5 files changed

+241
-22
lines changed

DEVELOPER_NOTES

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
-------------------------------------------------------------
22
Developer notes version 1.9.4_beta : Changes since version 1.9.3 :
33
-------------------------------------------------------------
4+
27/05/24 (TRUST) New feature : New BALTIK_project_directory environment variable exported in env_BALTIK.sh
45
23/05/24 (TRUST) Change : configure option '-linker=' can be used to override linker, otherwise mold will be used if found (only with gcc>12.1.0 and clang compilers). if need to use default linker, than -linker=default will force default linker (ld for gnu, ...).
56
17/05/24 (TRUST) Minor change : Methods Gpoint() and Gpoint(t1,t2) renamed derivee_en_temps() and calculer_derivee_en_temps(t1,t2)
67
14/05/24 (TRUST) Debug : configure option '-enable-kokkos-debug' can be used to compile (and link only with $exec_debug) Kokkos library in Debug mode.

bin/admin/liste.machines

+3-3
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ linux rsync_ssh cible is242981.intra.cea.fr -all -semi_opt # Fed
1313
linux rsync_ssh tache is241762-clang.intra.cea.fr -TrioCFD -C3D -clang -force_provided_openmpi -without-pdflatex # Fedora 34 Bat 451 LMSF titania
1414
linux rsync_ssh tache is234634-clang.intra.cea.fr -all -TrioCFD -FLICA5 -clang -force_provided_openmpi -without-pdflatex -without-visit # Fedora 36 Bat 451 LGLS titania bureau TMA TRUST
1515
linux rsync_ssh tache is157083-clang.intra.cea.fr -all -TrioCFD -clang -force_latest_mpich -without-pdflatex # Fedora 38 GF
16-
linux rsync_ssh tache is245205-clang.intra.cea.fr -all -TrioCFD -clang -force_latest_mpich -without-pdflatex -without-visit # Fedora 40 GA
16+
linux rsync_ssh tache is234637-clang.intra.cea.fr -all -TrioCFD -clang -force_latest_mpich -without-pdflatex -without-visit # Fedora 40 GA
1717
linux rsync_ssh tache is234634.intra.cea.fr -all -FLICA5 -without-pdflatex # Fedora 36 Bat 451 LGLS bureau TMA TRUST
1818
linux rsync_ssh tache is157083.intra.cea.fr -all -FLICA5 -TrioCFD -GENEPI3 -STT -PEMFC -C3D -SIDES -SCORPIO -without-pdflatex # Fedora 38 Bat 454 LMEC titania GF
1919
linux rsync_ssh tache is247255.intra.cea.fr -all -FLICA5 -TrioCFD -GENEPI3 -STT -PEMFC -C3D -SIDES -SCORPIO -without-pdflatex # Ubuntu 22 Bat 451 LMSF titania MF
@@ -39,7 +39,7 @@ linux rsync_ssh tache pegasi2.intra.cea.fr -TrioCFD -force_prov
3939
linux ssh_pass cible pegasi3.intra.cea.fr -all -GENEPI3 -TrioCFD -FLICA5 -force_system_mpi -without-pdflatex # Redhat 8.2 serveur rackable titania
4040
linux rsync_ssh tache pegasi6-coolprop-eos.intra.cea.fr -all -TrioCFD -FLICA5 -force_latest_openmpi -coolprop -eos # Ubuntu 20 pilote titania
4141
linux rsync_ssh tache is246145.intra.cea.fr -all -TrioCFD -GENEPI3 -FLICA5 -MPCube -platform -without-pdflatex -force_provided_mpich -gcc8 # CentOS 7.9 G+ Bat 451 bureau TMA TRUST titania
42-
linux rsync_ssh tache is246145-wopetsc.intra.cea.fr -all -TrioCFD -GENEPI3 -C3D -disable-petsc -without-pdflatex # CentOS 7.9 G+ Bat 451 bureau TMA TRUST titania
42+
linux rsync_ssh tache is246145-wopetsc.intra.cea.fr -all -TrioCFD -GENEPI3 -C3D -disable-petsc -without-pdflatex -gcc8 # CentOS 7.9 G+ Bat 451 bureau TMA TRUST titania
4343
linux rsync_ssh tache is154727.intra.cea.fr -all -check-valgrind -force_provided_mpich -without-pdflatex # CentOS 7.9 titania Bat 451 LGLS salle de formation
4444
linux rsync_ssh tache is241483.intra.cea.fr -all -MPCube -TrioCFD -SIDES -SCORPIO -GENEPI3 -TRUST_NK -FLICA5 -STT -PEMFC -force_latest_mpich -without-pdflatex -disable-mpi4py # Debian 12 titania Bat 451 LGLS bureau Gilles
4545
linux rsync_ssh non is244400-c3d.intra.cea.fr -all -GENEPI3 -C3D -for-c3d -disable-valgrind # Fedora 34 Bat 451 LMES titania
@@ -67,5 +67,5 @@ linux rsync_ssh tache is210376-tmpnoexe.intra.cea.fr -all
6767
linux rsync_ssh tache is210376-noconda.intra.cea.fr -all -C3D -without-conda # Fedora 34 tmp no exec, sans conda
6868
linux rsync_ssh tache is246513.intra.cea.fr -all -TrioCFD -prof -remote_install_TRUST_kernel_only # Ub20 mode formation titania
6969
linux ssh_pass tache is231762.intra.cea.fr -all -MPCube -TrioCFD -SIDES -SCORPIO -GENEPI3 -TRUST_NK -FLICA5 -STT -PEMFC -without-pdflatex # Rocky 9.2 GA
70-
linux rsync_ssh tache is245205.intra.cea.fr -all -TrioCFD -without-pdflatex # Fedora 40 GA titania
70+
linux rsync_ssh tache is234637.intra.cea.fr -all -TrioCFD -without-pdflatex # Fedora 40 GA titania
7171
linux rsync_ssh tache is157091.intra.cea.fr -benchmark -cuda11_6 -openmp -force_latest_mpich # Fedora ? PL titania

bin/admin/mise_a_jour_TRUST_arch

+1-1
Original file line numberDiff line numberDiff line change
@@ -724,7 +724,7 @@ do
724724
fi
725725
echo $CC_PERF >> $PERF
726726
# On verifie si on a obtenu un executable teste
727-
if [ -f $exec ] && [ "`touch vide.data;trust vide 2>&1 | grep TRUST;rm -f vide.data`" != "" ]
727+
if [ -f $exec ] && [ "`touch vide.data;trust vide 2>&1 | grep TRUST;rm -f vide.data vide*.TU vide.log vide.stop`" != "" ]
728728
then
729729
taille=`\ls -la $exec | $TRUST_Awk '{print int($5/1024/1024)}'`
730730
type=`ldd $exec 2>/dev/null | grep lib | $TRUST_Awk 'END {type="Statique";if (NR>50) type="Dynamique";else if (NR>0) type="Semi-Statique";print type}'`

bin/baltik/share/baltik/bin/baltik_configure

+1
Original file line numberDiff line numberDiff line change
@@ -758,6 +758,7 @@ echo " . $TRUST_ROOT/env_TRUST.sh
758758
export project_directory=\$(cd \"\$( dirname \"\${BASH_SOURCE[0]:-\${(%):-%x}}\" )\" && pwd)
759759
# Initial install performed here:
760760
#export project_directory=${project_directory}
761+
export ${project_name}_project_directory=\${project_directory}
761762
export PATH=\${project_directory}/build/xdata:\$PATH
762763
export TRUST_TESTS=\${project_directory}/build/tests/all/
763764
export Rapports_auto_root=\${project_directory}/build/tests/share/all/

0 commit comments

Comments
 (0)