Skip to content

Commit 834c623

Browse files
trust-tmaNabil DJATI
trust-tma
authored and
Nabil DJATI
committed
TRUST_Generic_Guide is now contained by TRUST_Generic_documentation
1 parent c90f1f1 commit 834c623

11 files changed

+17
-57
lines changed

‎Outils/TRIOXDATA/XTriou/objet_u.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2440,7 +2440,7 @@ def gen_doc_base(fr=1):
24402440
\vspace{2cm}
24412441
\LARGE \textbf{Support team: \href{mailto:[email protected]}{[email protected]}} \\
24422442
\vspace{4cm} % espace entre ref manual et ce qui est en dessous
2443-
Link to: \LARGE \textbf{\href{run:TRUST_Generic_Guide.pdf}{ TRUST Generic Guide}}\\
2443+
%Link to: \LARGE \textbf{\href{run:TRUST_Generic_Guide.pdf}{ TRUST Generic Guide}}\\
24442444
}
24452445
\maketitle
24462446
\newpage

‎Outils/TexFiles/Makefile

+1-6
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
1-
FILE1=mini_Generic_Guide
21
FILE2=mini_Reference_Manual
32
FILE3=mini_prm
43
FILE4=mini_jupyter
54

65

7-
default: $(FILE1) $(FILE2) $(FILE3)
6+
default: $(FILE2) $(FILE3)
87

98
jupyter: $(FILE4)
109

11-
$(FILE1): $(FILE1).pdf
12-
$(FILE1).pdf: $(FILE1).tex Makefile
13-
pdflatex -interaction=nonstopmode $(FILE1).tex > LOG
14-
1510
$(FILE2): $(FILE2).pdf
1611
$(FILE2).pdf: $(FILE2).tex Makefile
1712
pdflatex -interaction=nonstopmode $(FILE2).tex > LOG

‎Outils/TexFiles/mini_Generic_Guide.tex

-21
This file was deleted.

‎bin/admin/mise_a_jour_TRUST_arch

+1-2
Original file line numberDiff line numberDiff line change
@@ -969,10 +969,9 @@ do
969969
echo PETSC_ThHyd_2D_VEF_Ostwald >> liste_cherche #&& echo Canal_perio_VDF_3D_Keps >> liste_cherche # dans TrioCFD
970970
# Autres ajouts
971971
echo cpu_3D >> liste_cherche
972-
echo VAHL_DAVIS >> liste_cherche && echo upwind >> liste_cherche && echo Cx >> liste_cherche
972+
echo VAHL_DAVIS >> liste_cherche && echo upwind >> liste_cherche
973973
# Test outils Gmsh et VisIt
974974
echo Kernel_Gmsh2Trio_U >> liste_cherche
975-
echo Extrait_plan >> liste_cherche # Test provisoire : en attente d une solution via SLURM
976975
# Test MED_COUPLING_PYTHON
977976
echo Lata_conversion_scripts_jdd1 >> liste_cherche
978977
echo MED_major_jdd1 >> liste_cherche

‎bin/create_TRUST_image

+2-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@ else
3232
fi
3333

3434
echo "Suppression objets inutiles..."
35-
rm -r -f src
35+
# src n'est pas si inutile que cela : le test fftw lors du configure de TrioCFD plante si pas de src dans TRUST.
36+
#rm -r -f src
3637
rm -r -f externalpackages
3738
rm -r -f MonoDir_mpi* doc/html doc/Coverage
3839
rm -r -f exec/valgrind

‎bin/trust

+6-19
Original file line numberDiff line numberDiff line change
@@ -214,28 +214,15 @@ do
214214
fi
215215
elif [ "$1" = "-doc" ]
216216
then
217-
if [ "$project_directory" != "" ]
218-
then
219-
220-
doc=$project_directory/share/doc_auto/TRUST_Generic_Guide.pdf
221-
if [ ! -f $doc ]
222-
then
223-
doc=$project_directory/share/doc/TRUST_Generic_Guide.pdf
224-
[ ! -f $doc ] && doc=$TRUST_ROOT/doc/TRUST/TRUST_Generic_Guide.pdf
225-
else
226-
echo "Using doc generated"
227-
fi
228-
else
229-
doc=$TRUST_ROOT/doc/TRUST/TRUST_Generic_Guide.pdf
230-
fi
217+
doc=$TRUST_ROOT/doc/TRUST/TRUST_Generic_documentation.pdf
231218
if [ -f $doc ]
232219
then
233-
for app in xpdf evince kpdf okular
234-
do
220+
for app in xpdf evince kpdf okular
221+
do
235222
$app $doc 1>/dev/null 2>&1 && exit 0
236-
done
237-
echo "No PDF reader found!"
238-
exit -1
223+
done
224+
echo "No PDF reader found!"
225+
exit -1
239226
else
240227
echo "$doc not found!"
241228
exit -1

‎doc/TRUST/TRUST_Generic_Guide.pdf

-891 KB
Binary file not shown.

‎doc/TRUST/TRUST_Generic_documentation.pdf

1.62 MB
Binary file not shown.

‎doc/TRUST/makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
dirs = Tutorial exercices/Tutorial_solutions Generic_Guide
1+
dirs = Tutorial exercices/Tutorial_solutions
22
all: Keywords.Vim
33
ifeq ($(TRUST_WITHOUT_PDFLATEX),1)
44
@echo "TRUST_WITHOUT_PDFLATEX=1 ... so we will not build the PDF documentation."

‎env_src/HOST_orcus-amd.sh

+1
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ define_soumission_batch()
7474

7575
# On se base sur la frontale pour selectionner la queue par defaut:
7676
queue=amdq_naples && [ "$gpu" = 1 ] && queue=gpuq_5118 && [ "`sinfo | grep $queue | grep idle`" = "" ] && queue=gpuq_5218
77+
[ "`grep 'Rocky Linux 9.1' /etc/os-release 1>/dev/null 2>&1 ; echo $?`" = "0" ] && queue=amdq_milan
7778

7879
# sacctmgr list qos
7980
# qos prority walltime ntasks_max

‎index.html

+4-6
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<UL><BR>
1010
<B>TRUST documentation</B><BR>
1111
<a HREF=RELEASE_NOTES>Release notes</a><BR>
12-
<a HREF=doc/TRUST/TRUST_Generic_Guide.pdf>Generic guide</a><BR>
13-
<a HREF=doc/TRUST/TRUST_Reference_Manual.pdf>Reference manual</a><BR>
12+
Generic guide <a HREF=doc/TRUST/TRUST_Generic_documentation.pdf#TRUST%20Generic%20Guide>[pdf] </a><a HREF=https://cea-trust-platform.readthedocs.io/en/latest/srcs/generic/index.html#trust-generic-guide> [online]</a><BR>
13+
Reference manual <a HREF=doc/TRUST/TRUST_Generic_documentation.pdf#TRUST%20Keyword%20Reference%20Manual>[pdf] </a><a HREF=https://cea-trust-platform.readthedocs.io/en/latest/srcs/reference/index.html#trust-keyword-reference-manual> [online]</a><BR>
1414
<a HREF=doc/TRUST/Models_Equations_TRUST.pdf>Description note (NT CEA)</a><BR>
1515
<a HREF=doc/TRUST/Best_Practice_TRUST.pdf>Best practices note (NT CEA)</a><BR>
1616
<a> If a file is missing, ask the note to <A HREF=mailto:[email protected]>[email protected]</A> <BR><BR>
@@ -23,12 +23,10 @@
2323
<a HREF=doc/TRUST/Baltik_tutorial.pdf>Developer tutorial</a><BR>
2424
<a HREF=doc/TRUST/ICoCo_tutorial.pdf>ICoCo tutorial</a><BR>
2525
<a HREF=doc/TRUST/exercices/equation_convection_diffusion/rapport.pdf>Other baltik tutorial</a><BR>
26-
<a HREF=https://cea-trust-platform.github.io/TRUST_Doxygen.github.io/html/index.html>C++ classes (online)</a><BR>
27-
<a HREF=doc/html/index.html>C++ classes (offline).</a><a> If not available generate it by: make doxygen</a><BR>
26+
C++ classes <a HREF=https://cea-trust-platform.readthedocs.io/en/latest/doxy/index.html>[online] </a><a HREF=doc/html/index.html> [offline]</a><a> (If offline documentation is not available generate it by: make doxygen)</a><BR>
2827
<a href=doc/Coverage/html/index.html>Test coverage</a><BR>
2928
<a href=Validation/Rapports_automatiques/README_Jupyter.md>Jupyter notebook's validation forms</a><BR>
30-
<a href=https://cea-trust-platform.readthedocs.io/en/latest/srcs/trustutils/index.html#trust-tools-documentation>trustutils (jupyter & stats packages) html documentation (online)</a><BR>
31-
<a href=Validation/Outils/Genere_courbe/doc/manuel.xhtml>.prm syntax</a><BR><BR>
29+
<a href=https://cea-trust-platform.readthedocs.io/en/latest/srcs/trustutils/index.html#trust-tools-documentation>trustutils (jupyter & stats packages) html documentation (online)</a><BR><BR>
3230
<B>TRUST download & support</B><BR>
3331
<a HREF=https://github.com/cea-trust-platform/trust-code#readme>TRUST on GitHub</a><BR>
3432
<a HREF=https://cea-trust-platform.github.io/>TRUST website</a><BR>

0 commit comments

Comments
 (0)