TRUST_Generic_Guide is now contained by TRUST_Generic_documentation

Author: trust-tma

Outils/TRIOXDATA/XTriou/objet_u.py

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

Outils/TexFiles/Makefile

@@ -1,17 +1,12 @@
-FILE1=mini_Generic_Guide
 FILE2=mini_Reference_Manual
 FILE3=mini_prm
 FILE4=mini_jupyter
 
 
-default:  $(FILE1) $(FILE2) $(FILE3)
+default:  $(FILE2) $(FILE3)
 
 jupyter: $(FILE4)
 
-$(FILE1): $(FILE1).pdf
-$(FILE1).pdf: $(FILE1).tex Makefile 
-	pdflatex -interaction=nonstopmode $(FILE1).tex > LOG
-
 $(FILE2): $(FILE2).pdf
 $(FILE2).pdf: $(FILE2).tex Makefile 
 	pdflatex -interaction=nonstopmode $(FILE2).tex > LOG

Outils/TexFiles/mini_Generic_Guide.tex

@@ -969,10 +969,9 @@ do
 	 echo PETSC_ThHyd_2D_VEF_Ostwald >> liste_cherche #&& echo Canal_perio_VDF_3D_Keps >> liste_cherche # dans TrioCFD
 	 # Autres ajouts
 	 echo cpu_3D >> liste_cherche
-	 echo VAHL_DAVIS >> liste_cherche && echo upwind >> liste_cherche && echo Cx >> liste_cherche 
+	 echo VAHL_DAVIS >> liste_cherche && echo upwind >> liste_cherche
 	 # Test outils Gmsh et VisIt
 	 echo Kernel_Gmsh2Trio_U >> liste_cherche 
-	 echo Extrait_plan >> liste_cherche # Test provisoire : en attente d une solution via SLURM
 	 # Test MED_COUPLING_PYTHON
 	 echo Lata_conversion_scripts_jdd1 >> liste_cherche
 	 echo MED_major_jdd1 >> liste_cherche

bin/admin/mise_a_jour_TRUST_arch

@@ -32,7 +32,8 @@ else
 fi
 
 echo "Suppression objets inutiles..."
-rm -r -f src
+# src n'est pas si inutile que cela : le test fftw lors du configure de TrioCFD plante si pas de src dans TRUST.
+#rm -r -f src
 rm -r -f externalpackages
 rm -r -f MonoDir_mpi* doc/html doc/Coverage
 rm -r -f exec/valgrind

bin/create_TRUST_image

@@ -214,28 +214,15 @@ do
       fi
    elif [ "$1" = "-doc" ]
    then
-      if [ "$project_directory" != "" ]
-      then
-          
-          doc=$project_directory/share/doc_auto/TRUST_Generic_Guide.pdf
-          if [ ! -f $doc ] 
-            then
-             doc=$project_directory/share/doc/TRUST_Generic_Guide.pdf
-	     [ ! -f $doc ] && doc=$TRUST_ROOT/doc/TRUST/TRUST_Generic_Guide.pdf
-            else
-		echo "Using doc generated"
-           fi
-      else
-         doc=$TRUST_ROOT/doc/TRUST/TRUST_Generic_Guide.pdf
-      fi
+      doc=$TRUST_ROOT/doc/TRUST/TRUST_Generic_documentation.pdf
       if [ -f $doc ]
       then
-	 for app in xpdf evince kpdf okular
-	 do
+         for app in xpdf evince kpdf okular
+         do
             $app $doc 1>/dev/null 2>&1 && exit 0
-	 done
-	 echo "No PDF reader found!"
-	 exit -1
+         done
+         echo "No PDF reader found!"
+         exit -1
       else
 	 echo "$doc not found!" 
 	 exit -1

bin/trust

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

doc/TRUST/TRUST_Generic_Guide.pdf

@@ -74,6 +74,7 @@ define_soumission_batch()
 
    # On se base sur la frontale pour selectionner la queue par defaut:
    queue=amdq_naples && [ "$gpu" = 1 ] && queue=gpuq_5118 && [ "`sinfo | grep $queue | grep idle`" = "" ] && queue=gpuq_5218
+   [ "`grep 'Rocky Linux 9.1' /etc/os-release 1>/dev/null 2>&1 ; echo $?`" = "0" ] && queue=amdq_milan
 
    # sacctmgr list qos
    # qos	prority		walltime	ntasks_max