Skip to content

Commit

Permalink
Commit before the 1.9.5 version.
Browse files Browse the repository at this point in the history
  • Loading branch information
@trust-tma
trust-tma committed Nov 28, 2024
1 parent 909bb4f commit ad9fae8
Show file tree
Hide file tree
Showing 24 changed files with 58 additions and 58 deletions.
2 changes: 1 addition & 1 deletion DEVELOPER_NOTES
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
-------------------------------------------------------------
Developer notes version 1.9.5_beta : Changes since version 1.9.4 :
Developer notes version 1.9.5 : Changes since version 1.9.4 :
-------------------------------------------------------------
29/10/24 (TRUST) Major change : No more try/catch in get_champ. Virtual methods has_champ added and can be used !
28/10/24 (TRUST) Kokkos : Add -kokkos_openmp configure option to build Kokkos with OpenMP backend instead of serial backend
Expand Down
2 changes: 1 addition & 1 deletion License.txt
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Copyright (c) 2024, CEA
Copyright (c) 2025, CEA
All rights reserved.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
Expand Down
2 changes: 1 addition & 1 deletion Outils/ICoCo/ICoCo_src/src/Version_kernel
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.9.5_beta
1.9.5
2 changes: 1 addition & 1 deletion Outils/TRIOXDATA/XTriou/objet_u.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2435,7 +2435,7 @@ def gen_doc_base(fr=1):
\begin{document}
\title{
\vspace{5cm}
\Huge \textbf{TRUST Reference Manual V1.9.5beta} \vspace{0.5cm}}
\Huge \textbf{TRUST Reference Manual V1.9.5} \vspace{0.5cm}}
\author{
\vspace{2cm}
\LARGE \textbf{Support team: \href{mailto:trust@cea.fr}{trust@cea.fr}} \\
Expand Down
8 changes: 4 additions & 4 deletions Outils/trustify/doc/extra_rst/parser.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,15 +49,15 @@ In a mathematical function, used for example in field definition, it's possible
+---------+----------------------------------------------------------------------------+
| x_GT_y | greater than (returns 1 if :math:`x>y`, else 0) |
+---------+----------------------------------------------------------------------------+
| x_GE_y | greater than or equal to (returns 1 if x$\geq$ y, else 0) |
| x_GE_y | greater than or equal to |
+---------+----------------------------------------------------------------------------+
| x_LT_y | less than (returns 1 if x{\textless}y, else 0) |
| x_LT_y | less than (returns 1 if x<y, else 0) |
+---------+----------------------------------------------------------------------------+
| x_LE_y | less than or equal to (returns 1 if x{\textless}=y, else 0) |
| x_LE_y | less than or equal to |
+---------+----------------------------------------------------------------------------+
| x_MIN_y | returns the smallest of x and y |
+---------+----------------------------------------------------------------------------+
| x_MA\_y | returns the largest of x and y |
| x_MAX_y | returns the largest of x and y |
+---------+----------------------------------------------------------------------------+
| x_MOD_y | modular division of x per y |
+---------+----------------------------------------------------------------------------+
Expand Down
2 changes: 2 additions & 0 deletions Outils/valgrind/suppressions
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@
fun:_Znwm
fun:_ZN6Kokkos4Impl14SerialInternal9singletonEv
fun:_ZN6Kokkos6Serial15impl_initializeERKNS_22InitializationSettingsE
...
fun:_ZN6Kokkos4Impl16ExecSpaceManager17initialize_spacesERKNS_22InitializationSettingsE
...
fun:_ZN6Kokkos10initializeERiPPc
fun:_ZN8mon_main13init_parallelE*PPc*
fun:_Z10main_TRUST*PPcRP8mon_main*
Expand Down
20 changes: 10 additions & 10 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,21 +6,21 @@ This software is **OpenSource ([BSD license](https://github.com/cea-trust-platfo

You can visit **[TRUST website](https://cea-trust-platform.github.io/)**

# **How to install TRUST-1.9.4 version ?**
# **How to install TRUST-1.9.5 version ?**

### **First method (git configuration)**

```bash
# Check out the sources for TRUST
git clone git@github.com:cea-trust-platform/trust-code.git TRUST-1.9.4
git clone git@github.com:cea-trust-platform/trust-code.git TRUST-1.9.5
# Move to the cloned TRUST folder
cd TRUST-1.9.4
cd TRUST-1.9.5
# Download the required external packages
wget ftp://ftp.cea.fr/pub/TRUST/externalpackages/externalpackages-1.9.4.tar
wget ftp://ftp.cea.fr/pub/TRUST/externalpackages/externalpackages-1.9.5.tar
# or:
# curl ftp://ftp.cea.fr/pub/TRUST/externalpackages/externalpackages-1.9.4.tar > externalpackages-1.9.4.tar
# curl ftp://ftp.cea.fr/pub/TRUST/externalpackages/externalpackages-1.9.5.tar > externalpackages-1.9.5.tar
# Unzip the downloaded external packages folder
tar xf externalpackages-1.9.4.tar
tar xf externalpackages-1.9.5.tar
# Have a look at the available configuration options
./configure -help
# Execute the configure script with your selected options
Expand All @@ -41,13 +41,13 @@ type mpicxx

```bash
# Download the sources for TRUST
wget ftp://ftp.cea.fr/pub/TRUST/TRUST/Version1.9.4/TRUST-1.9.4.tar.gz
wget ftp://ftp.cea.fr/pub/TRUST/TRUST/Version1.9.5/TRUST-1.9.5.tar.gz
# or:
# curl ftp://ftp.cea.fr/pub/TRUST/TRUST/Version1.9.4/TRUST-1.9.4.tar.gz > TRUST-1.9.4.tar.gz
# curl ftp://ftp.cea.fr/pub/TRUST/TRUST/Version1.9.5/TRUST-1.9.5.tar.gz > TRUST-1.9.5.tar.gz
# Unzip the downloaded folder
tar xzf TRUST-1.9.4.tar.gz
tar xzf TRUST-1.9.5.tar.gz
# Move to the unziped TRUST folder
cd TRUST-1.9.4
cd TRUST-1.9.5
# Execute the configure script with your selected options
./configure $OPTIONS
```
Expand Down
2 changes: 1 addition & 1 deletion RELEASE_NOTES
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------------------------------
Release notes version 1.9.5_beta : Enhancements, modifications and corrected bugs since version 1.9.4 :
Release notes version 1.9.5 : Enhancements, modifications and corrected bugs since version 1.9.4 :
--------------------------------------------------------------------------------------------------
20/11/24 (TRUST) Tools : 'trustpy' now becomes 'trustify'. Check the syntax of your dataset with 'trust -trustify my_case.data'. See a more complete usage example in Outils/trustify/doc/examples/hello_world.
28/10/24 (TRUST) New feature : Support for Cathare FORT21 format in lata tools and plugins.
Expand Down
3 changes: 2 additions & 1 deletion bin/admin/lance_test_nuit
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1384,7 +1384,8 @@ echo "##################"
echo "# On study cases #"
echo "##################"
echo "---> Begin at "`date '+%H:%M:%S %d/%m'`
etude_activation=1
# ND je desactive les etudes car souci sur irene
etude_activation=0
if [ `date '+%u'` -ge 5 ]
then
# le vendredi soir on lance toutes les etudes
Expand Down
16 changes: 9 additions & 7 deletions bin/admin/liste.machines
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,19 @@ linux rsync_ssh tache altair-valgrind.intra.cea.fr -limited -FLICA5
linux rsync_ssh cible is246427.intra.cea.fr -TrioCFD -semi_opt -without-pdflatex # Ubuntu 24 MF titania
linux rsync_ssh tache unitas20-mv-install.intra.cea.fr -all -force_provided_mpich -move-install -disable-valgrind # Ubuntu 20 rack triocfd
linux rsync_ssh tache is234617-intel.intra.cea.fr -all -TRUST -TrioCFD -GENEPI3 -STT -PEMFC -FLICA5 -C3D -TRUST_NK -TrioMC -intel23 -disable-plot2d -force_system_mpi -disable-mpi4py -without-visit # Ubuntu 22 TMA TRUST
linux rsync_ssh tache is245198-intel21.intra.cea.fr -all -TRUST -intel21 -disable-plot2d -force_system_mpi -disable-mpi4py -without-visit # Ubuntu 20 TMA EOS titania
linux rsync_ssh tache is245198-intel21.intra.cea.fr -all -TRUST -intel21 -disable-plot2d -force_system_mpi -disable-mpi4py -without-visit # Ubuntu 20 TMA EOS formation titania
linux rsync_ssh tache is245198-intel22.intra.cea.fr -all -TRUST -TrioCFD -GENEPI3 -STT -PEMFC -FLICA5 -C3D -TRUST_NK -TrioMC -intel22 -disable-plot2d -force_system_mpi -disable-mpi4py -without-visit # Ubuntu 20 TMA EOS
linux rsync_ssh non rockefellia9-build64.intra.cea.fr -all -TrioCFD -build_64_bit -disable-plot2d -without-pdflatex -disable-mpi4py -disable-gmsh -without-visit # Rocky 9 titania
linux rsync_ssh tache is241479.intra.cea.fr -all -TrioCFD -g -disable-valgrind -disable-plot2d -without-pdflatex -disable-vc # UB 22 salle de formation titania
linux rsync_ssh tache is242981-clang.intra.cea.fr -TrioCFD -clang -force_provided_openmpi -without-pdflatex -without-visit # Fedora 32 Bat 451 LGLS titania bureau Pierre Ledac
linux rsync_ssh cible is242981.intra.cea.fr -all -FLICA5 -semi_opt -coolprop -eos # Fedora 32 Bat 451 LGLS titania bureau Pierre Ledac
linux rsync_ssh tache is234634-clang.intra.cea.fr -all -FLICA5 -clang -force_provided_openmpi -without-pdflatex -without-visit # Fedora 36 Bat 451 LGLS titania bureau TMA TRUST
linux rsync_ssh tache is157083-clang.intra.cea.fr -all -TrioCFD -FLICA5 -clang -force_latest_mpich -without-pdflatex # Fedora 38 GF
linux rsync_ssh tache is245205-clang.intra.cea.fr -all -TrioCFD -FLICA5 -clang -force_latest_mpich -without-pdflatex # Fedora 38 GF
linux rsync_ssh tache is234637-clang.intra.cea.fr -all -TrioCFD -FLICA5 -clang -force_latest_mpich -without-pdflatex -without-visit -disable-plot2d -disable-gmsh # Fedora 40 GA
linux rsync_ssh tache is234634.intra.cea.fr -all -FLICA5 -without-pdflatex # Fedora 36 Bat 451 LGLS bureau TMA TRUST
linux rsync_ssh tache is157083-cpp14.intra.cea.fr -all -FLICA5 -TrioCFD -GENEPI3 -STT -PEMFC -C3D -SIDES -SCORPIO -TrioMC -stdcpp14 -without-pdflatex # Fedora 38 Bat 454 LMEC titania GF
linux rsync_ssh tache is245205.intra.cea.fr -all -FLICA5 -TrioCFD -GENEPI3 -STT -PEMFC -C3D -SIDES -SCORPIO -TrioMC -without-pdflatex # Fedora 38 Bat 454 LMEC titania GF
linux rsync_ssh cible is227246.intra.cea.fr -all -MPCube -TrioCFD -GENEPI3 -SIDES -SCORPIO -STT -PEMFC -FLICA5 -C3D -TrioMC -force_latest_mpich # Fedora 34 Bat 451 Erwan titania
linux rsync_ssh tache irene-ccrt.ccc.cea.fr -limited -TrioCFD -semi_opt -benchmark -disable-gnuplot -without-doc -disable-plot2d -without-conda -disable-hwloc # RedHat 7.6 CEA CCRT
linux rsync_ssh tache irene-ccrt-build64.ccc.cea.fr -limited -TrioCFD -build_64_bit -disable-gnuplot -without-doc -disable-plot2d -without-conda -disable-hwloc # RedHat 7.6 CEA CCRT
Expand All @@ -26,13 +28,13 @@ linux rsync_ssh tache jean-zay.idris.fr -limited -TrioCFD -
linux rsync_ssh tache jean-zay-gpu.idris.fr -limited -TrioCFD -benchmark -build_64_bit -cuda -openmp -without-doc -disable-plot2d -without-visit -disable-hwloc # RedHat 8.1
linux rsync_ssh tache jean-zay-build64.idris.fr -limited -TrioCFD -build_64_bit -without-doc -disable-plot2d -without-visit -disable-hwloc # RedHat 8.1
linux ssh_pass tache adastra.cines.fr -limited -TrioCFD -build_64_bit -without-doc -disable-hwloc -disable-plot2d -disable-gmsh -without-visit
linux ssh_pass tache adastra-gpu.cines.fr -limited -TrioCFD -benchmark -rocm -openmp -build_64_bit -without-doc -disable-hwloc -disable-plot2d -disable-gmsh -without-visit
linux rsync_ssh tache orcus-amd.intra.cea.fr -limited -TrioCFD -STT -PEMFC -FLICA5 -disable-plot2d -disable-hwloc -without-conda -benchmark # CentOS 7.6 CEA Saclay
linux ssh_pass tache adastra-gpu.cines.fr -limited -TrioCFD -benchmark -rocm -openmp -without-doc -disable-hwloc -disable-plot2d -disable-gmsh -without-visit
linux rsync_ssh tache orcus-amd.intra.cea.fr -limited -TrioCFD -STT -PEMFC -FLICA5 -disable-plot2d -disable-hwloc -benchmark # CentOS 7.6 CEA Saclay
linux rsync_ssh tache orcus-amd-build64.intra.cea.fr -limited -TrioCFD -build_64_bit -without-doc -disable-hwloc -disable-plot2d # CentOS 7.6 CEA Saclay
linux rsync_ssh tache orcus-amd-gpu.intra.cea.fr -TrioCFD -cuda -openmp # Rocky 9 CEA Saclay
linux rsync_ssh tache mezel.intra.cea.fr -limited -benchmark -without-doc -disable-plot2d -disable-hwloc # Redhat 8.5 CEA Cad
linux rsync_ssh tache pegasi2.intra.cea.fr -TrioCFD -without-pdflatex # Redhat 9 serveur rackable pour validation TrioCFD titania
linux ssh_pass cible rhodia8-4.intra.cea.fr -all -GENEPI3 -TrioCFD -FLICA5 -force_system_mpi -without-pdflatex # Redhat 8.4 serveur rackable titania
linux ssh_pass cible rhodia8-4.intra.cea.fr -all -GENEPI3 -TrioCFD -FLICA5 -force_provided_openmpi -without-pdflatex # Redhat 8.4 serveur rackable titania
linux rsync_ssh tache unitas20-coolprop-eos.intra.cea.fr -all -TrioCFD -FLICA5 -coolprop -eos # Ubuntu 20 pilote titania
linux rsync_ssh tache is246145.intra.cea.fr -all -TrioCFD -GENEPI3 -FLICA5 -MPCube -platform -without-pdflatex -force_provided_mpich -without-visit -gcc8 # CentOS 7.9 G+ Bat 451 bureau TMA TRUST titania
linux rsync_ssh tache is246145-wopetsc.intra.cea.fr -all -TrioCFD -GENEPI3 -C3D -TrioMC -disable-petsc -without-pdflatex -without-visit -gcc8 # CentOS 7.9 G+ Bat 451 bureau TMA TRUST titania
Expand All @@ -45,11 +47,11 @@ linux rsync_ssh non is247785.intra.cea.fr -all -C3D # Fedora 30
linux rsync_ssh non is247255.intra.cea.fr -all -TrioCFD # UB 22 Bat 451 LMSF
linux rsync_ssh non is241478.intra.cea.fr -all -TrioCFD -disable-petsc -without-pdflatex # UB 22 Bat 451 LGLS salle de formation titania
linux rsync_ssh non is241478-xdata.intra.cea.fr -xdata -without-pdflatex # UB 22 Bat 451 LGLS salle de formation
linux rsync_ssh cible is246436.intra.cea.fr -TrioCFD -g -without-pdflatex -disable-gmsh # RedHat 9.4 Bat 451 LMSF titania Michel
linux rsync_ssh cible is246436.intra.cea.fr -TrioCFD -g -without-pdflatex -disable-gmsh -without-visit # RedHat 9.4 Bat 451 LMSF titania Michel
linux rsync_ssh non is154726.intra.cea.fr -all -g -enable-petsc-debug -enable-mc-debug -without-pdflatex # UB 22 titania Bat 451 LGLS salle de formation
linux rsync_ssh tache is240933.intra.cea.fr -check-valgrind -without-pdflatex # UB 22 Salle de formation titania
linux rsync_ssh tache is241480-wompi-64.intra.cea.fr -all -disable-mpi -build_64_bit -disable-mpi4py -without-visit -without-pdflatex # UB 22 Bat 451 LMSF Salle de formation titania
linux rsync_ssh tache is244274-build64.intra.cea.fr -build_64_bit -force-provided-mpich # Fedora 32 Bat 451 LGLS bureau Gilles
linux rsync_ssh tache is244274-build64.intra.cea.fr -build_64_bit # Fedora 32 Bat 451 LGLS bureau Gilles
linux rsync_ssh tache is234617-build64-wompi.intra.cea.fr -all -FLICA5 -build_64_bit -disable-mpi -disable-valgrind # Ubuntu 22 Bat 451 titania
linux rsync_ssh cible is234617.intra.cea.fr -all -TrioCFD -GENEPI3 -C3D -MPCube -FLICA5 -TRUST_NK -SIDES -SCORPIO -TrioMC -Semi_opt_gcov # Ubuntu 22 Bat 451
linux rsync_ssh tache is244274.intra.cea.fr -TRUST_NK -Check_decoupage -force-provided-mpich # Fedora 32 titania Bat 451 LGLS bureau Gilles
Expand All @@ -61,7 +63,7 @@ linux rsync_ssh non is232973-gui.intra.cea.fr -all -TrioCFD -GENEPI3
linux rsync_ssh cible petra.intra.cea.fr -all -benchmark -CUDA_VISIBLE_DEVICES=0 -cuda=download -openmp -without-pdflatex -without-visit # Ubuntu 20.04 serveur rackable titania
linux rsync_ssh tache is210376-tmpnoexe.intra.cea.fr -all # Fedora 34 titania tmp no exec
linux rsync_ssh tache is210376-noconda.intra.cea.fr -all -C3D -without-conda # Fedora 34 tmp no exec, sans conda
linux rsync_ssh tache unitas24-noconda.intra.cea.fr -all -without-conda # ubuntu 24 sans conda titania
linux rsync_ssh tache unitas24.intra.cea.fr -all # ubuntu 24
linux rsync_ssh tache is246513.intra.cea.fr -all -TrioCFD -prof -remote_install_TRUST_kernel_only # Ub22 mode formation titania
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
linux rsync_ssh tache is234637.intra.cea.fr -all -MPCube -TrioCFD -SIDES -SCORPIO -GENEPI3 -TRUST_NK -FLICA5 -STT -PEMFC -C3D -TrioMC -disable-plot2d -disable-gmsh # Fedora 40 GA titania
Expand Down
15 changes: 5 additions & 10 deletions bin/baltik_gen_class.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,14 +74,9 @@ def build_location_in_baltik_mode( error_manager ):

# classname analysis utility function
def classname_analysis( classname, error_manager ):
import re

root = classname
root = re.sub( "^\s*", "", root )
root = re.sub( "\s*$", "", root )
root = re.sub( "\(\s*", "(", root )
root = re.sub( "\s*\)", ")", root )
#import re

root = classname.strip()
macros = []

#pattern = "^(REF|DERIV|LIST|VECT)\((.*)\)$"
Expand Down Expand Up @@ -191,7 +186,7 @@ def build_keywords_for_standard_class( arguments, error_manager ):
inclusions.append( keywords[ "header_filename" ] )
inclusions.reverse( )

keywords[ "source_inclusions" ] = "\n".join( [ "#include <{0}>".format( x ) for x in inclusions ] )
keywords[ "source_inclusions" ] = r"\n".join( [ "#include <{0}>".format( x ) for x in inclusions ] )

if ( arguments.trust_mode ):
keywords[ "location" ] = build_location_in_trust_mode( error_manager )
Expand Down Expand Up @@ -273,15 +268,15 @@ def build_keywords_for_macro_class( arguments, error_manager ):
header_inclusions = [ x for x in set( macros ) ]
header_inclusions.remove( classtype.upper( ) )
header_inclusions.insert( 0, classtype.upper( ) )
keywords[ "header_inclusions" ] = "\n".join( [ "#include <{0}.h>".format( prefixes_[ x ] ) for x in header_inclusions ] )
keywords[ "header_inclusions" ] = r"\n".join( [ "#include <{0}.h>".format( prefixes_[ x ] ) for x in header_inclusions ] )

source_inclusions = [ "{0}.h".format( root ) ]
macros.reverse( )
for m in macros:
source_inclusions.append( "_".join( ( prefixes_[ m ], source_inclusions[ -1 ] ) ) )
source_inclusions.reverse( )

keywords[ "source_inclusions" ] = "\n".join( [ "#include <{0}>".format( x ) for x in source_inclusions ] )
keywords[ "source_inclusions" ] = r"\n".join( [ "#include <{0}>".format( x ) for x in source_inclusions ] )

if ( arguments.trust_mode ):
keywords[ "location" ] = build_location_in_trust_mode( error_manager )
Expand Down
Binary file modified doc/TRUST/Baltik_tutorial.pdf
View file
Binary file not shown.
Binary file modified doc/TRUST/ICoCo_tutorial.pdf
View file
Binary file not shown.
Binary file modified doc/TRUST/TRUST_tutorial.pdf
View file
Binary file not shown.
4 changes: 2 additions & 2 deletions doc/TRUST/Tutorial/Baltik_tutorial.tex
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,7 @@
% TITLE PAGE
%----------------------------------------------------------------------------------------
%\title[Short title]{Long title}
\title[TRUST Baltik Project Tutorial V1.9.5beta]{TRUST Baltik Project Tutorial V1.9.5beta}
\title[TRUST Baltik Project Tutorial V1.9.5]{TRUST Baltik Project Tutorial V1.9.5}
% The short title appears at the bottom of every slide, the full title is only on the title page

%\author{John Smith} % Your name
Expand Down Expand Up @@ -191,7 +191,7 @@ \section{{\bf{TRUST initialization }}}
\item Load TRUST environment:
\begin{itemize}
\item On CEA Saclay PCs, TRUST versions are available with:\\
\textbf{source /home/trust\_trio-public/env\_TRUST-1.9.4.sh}
\textbf{source /home/trust\_trio-public/env\_TRUST-1.9.5.sh}
%
\item On your own computer, download and install the latest version of TRUST in your local folder \$MyPathToTRUSTversion (unless this was done), then write on the terminal:\\
%
Expand Down
Loading

0 comments on commit ad9fae8

Please sign in to comment.