diff --git a/Critere_Entrainement_Gaz/src/Version_kernel b/Critere_Entrainement_Gaz/src/Version_kernel index f8e233b27..9ab8337f3 100644 --- a/Critere_Entrainement_Gaz/src/Version_kernel +++ b/Critere_Entrainement_Gaz/src/Version_kernel @@ -1 +1 @@ -1.9.0 +1.9.1 diff --git a/Fluid_Structure_Interaction/src/Version_kernel b/Fluid_Structure_Interaction/src/Version_kernel index f8e233b27..9ab8337f3 100644 --- a/Fluid_Structure_Interaction/src/Version_kernel +++ b/Fluid_Structure_Interaction/src/Version_kernel @@ -1 +1 @@ -1.9.0 +1.9.1 diff --git a/Multiphase/CMFD/src/Version_kernel b/Multiphase/CMFD/src/Version_kernel index cfc3d7524..9ab8337f3 100644 --- a/Multiphase/CMFD/src/Version_kernel +++ b/Multiphase/CMFD/src/Version_kernel @@ -1 +1 @@ -1.9.1_beta +1.9.1 diff --git a/Multiphase/Front_tracking_IJK/share/doc_src/TRAD2_ajout0 b/Multiphase/Front_tracking_IJK/share/doc_src/TRAD2_ajout0 index 951ab638e..97238c85e 100644 --- a/Multiphase/Front_tracking_IJK/share/doc_src/TRAD2_ajout0 +++ b/Multiphase/Front_tracking_IJK/share/doc_src/TRAD2_ajout0 @@ -2,6 +2,8 @@ IJK_FT_double interprete IJK_FT_double 1 not_set attr ijk_splitting chaine(into=["grid_splitting"]) ijk_splitting 1 not_set attr ijk_splitting_ft_extension entier ijk_splitting_ft_extension 1 not_set attr timestep floattant timestep 1 not_set + attr time_scheme chaine time_scheme 1 not_set + attr cfl floattant cfl 1 not_set attr timestep_facsec floattant timestep_facsec 1 not_set attr dt_post entier dt_post 1 not_set attr dt_post_stats_bulles entier dt_post_stats_bulles 1 not_set @@ -28,6 +30,10 @@ IJK_FT_double interprete IJK_FT_double 1 not_set attr expression_vz_init chaine expression_vz_init 1 not_set attr expression_derivee_force chaine expression_derivee_force 1 not_set attr expression_p_init chaine expression_p_init 1 not_set + attr expression_p_ana chaine expression_p_ana 1 not_set + attr expression_vx_ana chaine expression_vx_ana 1 not_set + attr expression_vy_ana chaine expression_vy_ana 1 not_set + attr expression_vz_ana chaine expression_vz_ana 1 not_set attr expression_dPdx_ana chaine expression_dPdx_ana 1 not_set attr expression_dPdy_ana chaine expression_dPdy_ana 1 not_set attr expression_dPdz_ana chaine expression_dPdz_ana 1 not_set @@ -64,12 +70,15 @@ IJK_FT_double interprete IJK_FT_double 1 not_set attr expression_ddWdxdy_ana chaine expression_ddWdxdy_ana 1 not_set attr expression_ddWdxdz_ana chaine expression_ddWdxdz_ana 1 not_set attr expression_ddWdydz_ana chaine expression_ddWdydz_ana 1 not_set + attr expression_potential_phi chaine expression_potential_phi 1 not_set attr check_divergence rien check_divergence 1 not_set + attr refuse_patch_conservation_QdM_RK3_source_interf rien refuse_patch_conservation_QdM_RK3_source_interf 1 not_set attr check_stats rien check_stats 1 not_set attr disable_diphasique rien disable_diphasique 1 not_set attr disable_diffusion_qdm rien disable_diffusion_qdm 1 not_set attr disable_convection_qdm rien disable_convection_qdm 1 not_set attr disable_solveur_poisson rien disable_solveur_poisson 1 not_set + attr disable_source_interf rien disable_source_interf 1 not_set attr nom_sauvegarde chaine nom_sauvegarde 1 not_set attr nom_reprise chaine nom_reprise 1 not_set attr sondes bloc_lecture sondes 1 not_set @@ -109,6 +118,7 @@ multigrid_solver interprete nul 1 not_set attr seuil floattant seuil 1 not_set attr nb_full_mg_steps listentier nb_full_mg_steps 1 not_set attr solveur_grossier solveur_sys_base solveur_grossier 1 not_set + attr iterations_mixed_solver entier iterations_mixed_solver 1 not_set attr impr rien impr 1 not_set Coarsen_Operator_Uniform objet_lecture nul 0 not_set attr Coarsen_Operator_Uniform chaine Coarsen_Operator_Uniform 1 not_set diff --git a/Multiphase/Front_tracking_IJK/src/Version_kernel b/Multiphase/Front_tracking_IJK/src/Version_kernel index cfc3d7524..9ab8337f3 100644 --- a/Multiphase/Front_tracking_IJK/src/Version_kernel +++ b/Multiphase/Front_tracking_IJK/src/Version_kernel @@ -1 +1 @@ -1.9.1_beta +1.9.1 diff --git a/Multiphase/Front_tracking_discontinu/src/Version_kernel b/Multiphase/Front_tracking_discontinu/src/Version_kernel index cfc3d7524..9ab8337f3 100644 --- a/Multiphase/Front_tracking_discontinu/src/Version_kernel +++ b/Multiphase/Front_tracking_discontinu/src/Version_kernel @@ -1 +1 @@ -1.9.1_beta +1.9.1 diff --git a/Multiphase/Phase_field/src/Version_kernel b/Multiphase/Phase_field/src/Version_kernel index f8e233b27..9ab8337f3 100644 --- a/Multiphase/Phase_field/src/Version_kernel +++ b/Multiphase/Phase_field/src/Version_kernel @@ -1 +1 @@ -1.9.0 +1.9.1 diff --git a/Multiphase/share/doc_src/TRAD2_ajout0 b/Multiphase/share/doc_src/TRAD2_ajout0 index 781457ccf..834c773fd 100644 --- a/Multiphase/share/doc_src/TRAD2_ajout0 +++ b/Multiphase/share/doc_src/TRAD2_ajout0 @@ -2,6 +2,8 @@ IJK_FT_double interprete IJK_FT_double 1 not_set attr ijk_splitting chaine(into=["grid_splitting"]) ijk_splitting 1 not_set attr ijk_splitting_ft_extension entier ijk_splitting_ft_extension 1 not_set attr timestep floattant timestep 1 not_set + attr time_scheme chaine time_scheme 1 not_set + attr cfl floattant cfl 1 not_set attr timestep_facsec floattant timestep_facsec 1 not_set attr dt_post entier dt_post 1 not_set attr dt_post_stats_bulles entier dt_post_stats_bulles 1 not_set @@ -28,6 +30,10 @@ IJK_FT_double interprete IJK_FT_double 1 not_set attr expression_vz_init chaine expression_vz_init 1 not_set attr expression_derivee_force chaine expression_derivee_force 1 not_set attr expression_p_init chaine expression_p_init 1 not_set + attr expression_p_ana chaine expression_p_ana 1 not_set + attr expression_vx_ana chaine expression_vx_ana 1 not_set + attr expression_vy_ana chaine expression_vy_ana 1 not_set + attr expression_vz_ana chaine expression_vz_ana 1 not_set attr expression_dPdx_ana chaine expression_dPdx_ana 1 not_set attr expression_dPdy_ana chaine expression_dPdy_ana 1 not_set attr expression_dPdz_ana chaine expression_dPdz_ana 1 not_set @@ -64,12 +70,15 @@ IJK_FT_double interprete IJK_FT_double 1 not_set attr expression_ddWdxdy_ana chaine expression_ddWdxdy_ana 1 not_set attr expression_ddWdxdz_ana chaine expression_ddWdxdz_ana 1 not_set attr expression_ddWdydz_ana chaine expression_ddWdydz_ana 1 not_set + attr expression_potential_phi chaine expression_potential_phi 1 not_set attr check_divergence rien check_divergence 1 not_set + attr refuse_patch_conservation_QdM_RK3_source_interf rien refuse_patch_conservation_QdM_RK3_source_interf 1 not_set attr check_stats rien check_stats 1 not_set attr disable_diphasique rien disable_diphasique 1 not_set attr disable_diffusion_qdm rien disable_diffusion_qdm 1 not_set attr disable_convection_qdm rien disable_convection_qdm 1 not_set attr disable_solveur_poisson rien disable_solveur_poisson 1 not_set + attr disable_source_interf rien disable_source_interf 1 not_set attr nom_sauvegarde chaine nom_sauvegarde 1 not_set attr nom_reprise chaine nom_reprise 1 not_set attr sondes bloc_lecture sondes 1 not_set @@ -109,6 +118,7 @@ multigrid_solver interprete nul 1 not_set attr seuil floattant seuil 1 not_set attr nb_full_mg_steps listentier nb_full_mg_steps 1 not_set attr solveur_grossier solveur_sys_base solveur_grossier 1 not_set + attr iterations_mixed_solver entier iterations_mixed_solver 1 not_set attr impr rien impr 1 not_set Coarsen_Operator_Uniform objet_lecture nul 0 not_set attr Coarsen_Operator_Uniform chaine Coarsen_Operator_Uniform 1 not_set diff --git a/P1NCP0RT/src/Version_kernel b/P1NCP0RT/src/Version_kernel index f8e233b27..9ab8337f3 100644 --- a/P1NCP0RT/src/Version_kernel +++ b/P1NCP0RT/src/Version_kernel @@ -1 +1 @@ -1.9.0 +1.9.1 diff --git a/README.md b/README.md index d48b53eb5..ef6e6ac4f 100755 --- a/README.md +++ b/README.md @@ -8,27 +8,27 @@ This software is OpenSource (BSD license). -# **How to install TrioCFD-1.9.0 version ?** +# **How to install TrioCFD-1.9.1 version ?** -### If TRUST-1.9.0 is not already installed, [please follow TRUST install instructions](https://github.com/cea-trust-platform/trust-code#readme). +### If TRUST-1.9.1 is not already installed, [please follow TRUST install instructions](https://github.com/cea-trust-platform/trust-code#readme). -### Once TRUST installed, install TrioCFD-1.9.0 using one of these methods: +### Once TRUST installed, install TrioCFD-1.9.1 using one of these methods: ### **First method** - $> git clone https://github.com/cea-trust-platform/TrioCFD-code.git TrioCFD-1.9.0 - $> cd TrioCFD-1.9.0 - $> source PathToTRUST-1.9.0/env_TRUST.sh + $> git clone https://github.com/cea-trust-platform/TrioCFD-code.git TrioCFD-1.9.1 + $> cd TrioCFD-1.9.1 + $> source PathToTRUST-1.9.1/env_TRUST.sh $> baltik_build_configure -execute $> make optim debug ### **Second method** - $> wget ftp://ftp.cea.fr/pub/TRUST/TrioCFD/versions/v1.9.0/TrioCFD-1.9.0.tar.gz - $> tar xzf TrioCFD-1.9.0.tar.gz - $> mv TrioCFD TrioCFD-1.9.0 - $> cd TrioCFD-1.9.0 - $> source PathToTRUST-1.9.0/env_TRUST.sh + $> wget ftp://ftp.cea.fr/pub/TRUST/TrioCFD/versions/v1.9.1/TrioCFD-1.9.1.tar.gz + $> tar xzf TrioCFD-1.9.1.tar.gz + $> mv TrioCFD TrioCFD-1.9.1 + $> cd TrioCFD-1.9.1 + $> source PathToTRUST-1.9.1/env_TRUST.sh $> baltik_build_configure -execute $> make optim debug diff --git a/Rayonnement/Rayonnement_milieu_transparent/src/Version_kernel b/Rayonnement/Rayonnement_milieu_transparent/src/Version_kernel index f8e233b27..9ab8337f3 100644 --- a/Rayonnement/Rayonnement_milieu_transparent/src/Version_kernel +++ b/Rayonnement/Rayonnement_milieu_transparent/src/Version_kernel @@ -1 +1 @@ -1.9.0 +1.9.1 diff --git a/Rayonnement/Rayonnement_semi_transp/src/Version_kernel b/Rayonnement/Rayonnement_semi_transp/src/Version_kernel index f8e233b27..9ab8337f3 100644 --- a/Rayonnement/Rayonnement_semi_transp/src/Version_kernel +++ b/Rayonnement/Rayonnement_semi_transp/src/Version_kernel @@ -1 +1 @@ -1.9.0 +1.9.1 diff --git a/Schema_Euler_Implicite_Stationnaire/src/Version_kernel b/Schema_Euler_Implicite_Stationnaire/src/Version_kernel index f8e233b27..9ab8337f3 100755 --- a/Schema_Euler_Implicite_Stationnaire/src/Version_kernel +++ b/Schema_Euler_Implicite_Stationnaire/src/Version_kernel @@ -1 +1 @@ -1.9.0 +1.9.1 diff --git a/Sensitivity_analysis/src/Version_kernel b/Sensitivity_analysis/src/Version_kernel index f8e233b27..9ab8337f3 100644 --- a/Sensitivity_analysis/src/Version_kernel +++ b/Sensitivity_analysis/src/Version_kernel @@ -1 +1 @@ -1.9.0 +1.9.1 diff --git a/Turbulence/src/Version_kernel b/Turbulence/src/Version_kernel index f8e233b27..9ab8337f3 100644 --- a/Turbulence/src/Version_kernel +++ b/Turbulence/src/Version_kernel @@ -1 +1 @@ -1.9.0 +1.9.1 diff --git a/share/RELEASE_NOTES b/share/RELEASE_NOTES index 0e3593742..5dcdefbff 100644 --- a/share/RELEASE_NOTES +++ b/share/RELEASE_NOTES @@ -1,6 +1,25 @@ -------------------------------------------------------------------------------------------------- -Release notes version 1.9.1_beta : Enhancements, modifications and corrected bugs since version 1.9.0 : --------------------------------------------------------------------------------------------------- +Release notes version 1.9.1 : Enhancements, modifications and corrected bugs since version 1.9.0 : +-------------------------------------------------------------------------------------------------- +09/12/22 (TrioCFD) Enhancement : Aposteriori estimator takes now into account equation's source terms +19/11/22 (TrioCFD) Bug fixed : Fix Wilke's viscosity formula + documentation for Multi-species QC +18/11/22 (TrioCFD) New feature : New Baltik Fluid_structure_interaction: Partitioned explicit serial coupling between the ALE module and the Beam model. +18/11/22 (TrioCFD) New features: Reduced mechanical model (Beam model): Euler-bernouli model with a resolution based on a modal analysis and Newmark temporal discretization. +03/11/22 (TrioCFD) Change : IJK_Kernel (multigrid + simd) are moved to TRUST +03/11/22 (TrioCFD) New feature : Activation of TCL module (to include singular heat flux and contact angle at Triple Contact Line) +03/11/22 (TrioCFD) Enhancement : Improvement in FTD 2D_Axi calculations (contact angle, interpolation,...) +03/11/22 (TrioCFD) Enhancement : Keywords for phase-change : modification of volume_correction keywords, Option New mass source term +03/11/22 (TrioCFD) Bug fix : Fix of phase indicator calculation and remeshing +30/06/22 (TrioCFD) New feature : Front_Tracking_IJK (TrioIJK) is now activated in TrioCFD. +19/10/22 (TRUST) Tool : Syntax in datafile for medium, gravity, porosity, champ_fonc_MED* and Read_MED can be updated using command: trust -convert_data +18/10/22 (TRUST) Syntax : Champ_Fonc_MED* keywords have a new syntax using { } and key/value pairs. See reference manual. Old syntax supported until 1.9.3. +13/10/22 (TRUST) Syntax : Read_MED/Lire_MED has a new syntax using { } and key/value pairs. See reference manual. Old syntax supported until 1.9.3. +12/10/22 (TrioCFD) Change : postraitement_ft_lata syntax changed since it uses Lata_V2 instead of Lata_V1 format. Syntaxe has also evolved for this particular post-processing. +12/10/22 (TrioCFD) Change : Lata_V1 is not supported anymore. Only Lata_V2 (option 'lata') remains. Domain and Zone postprocessing in Lata_V2. +04/10/22 (TrioCFD) Major Change: Previous Phases interpret is no more available in Pb_multiphase and Pb_HEM. Milieu_composite class should now be used and should be placed as well in the problem. +04/10/22 (TrioCFD) Major Change: Medium (Fluid, solid, constituent, ...) is no more read and associated to a problem for non Front-Tracking problems. It should be read at the begining of each problem bloc. +04/10/22 (TrioCFD) Major Change: Gravity is no more read and associated to a medium for non Front-Tracking datafiles. It is read directly in the medium. +04/10/22 (TrioCFD) Syntax : For Rayonnement datafiles, the problem name should now contain _Rayo (ex: Pb_Thermohydraulique -> Pb_Rayo_Thermohydraulique) -------------------------------------------------------------------------------------------------- Release notes version 1.9.0 : Enhancements, modifications and corrected bugs since version 1.8.4 : -------------------------------------------------------------------------------------------------- diff --git a/share/doc/TRUST_Generic_Guide.pdf b/share/doc/TRUST_Generic_Guide.pdf index 9560298d1..da54a73b1 100644 Binary files a/share/doc/TRUST_Generic_Guide.pdf and b/share/doc/TRUST_Generic_Guide.pdf differ diff --git a/share/doc/TrioCFD_PGC.pdf b/share/doc/TrioCFD_PGC.pdf index e949cc46f..61606b3ff 100644 Binary files a/share/doc/TrioCFD_PGC.pdf and b/share/doc/TrioCFD_PGC.pdf differ diff --git a/share/doc/TrioCFD_Reference_Manual.pdf b/share/doc/TrioCFD_Reference_Manual.pdf index 9531d25a5..74c68788b 100644 Binary files a/share/doc/TrioCFD_Reference_Manual.pdf and b/share/doc/TrioCFD_Reference_Manual.pdf differ diff --git a/share/doc/TrioCFD_install_report.pdf b/share/doc/TrioCFD_install_report.pdf index 906ba062b..c18f22e5d 100644 Binary files a/share/doc/TrioCFD_install_report.pdf and b/share/doc/TrioCFD_install_report.pdf differ diff --git a/share/doc/TrioCFD_models_report.pdf b/share/doc/TrioCFD_models_report.pdf index 9b2cfc04f..20c41ea47 100644 Binary files a/share/doc/TrioCFD_models_report.pdf and b/share/doc/TrioCFD_models_report.pdf differ diff --git a/share/doc/TrioCFD_recap_fiches_validation.pdf b/share/doc/TrioCFD_recap_fiches_validation.pdf new file mode 100644 index 000000000..ad9e09ad6 Binary files /dev/null and b/share/doc/TrioCFD_recap_fiches_validation.pdf differ diff --git a/share/doc/TrioCFD_validation_report.pdf b/share/doc/TrioCFD_validation_report.pdf index 821a2ffab..c3e327090 100644 Binary files a/share/doc/TrioCFD_validation_report.pdf and b/share/doc/TrioCFD_validation_report.pdf differ diff --git a/share/doc_src/PGC/PGC_TrioCFD.tex b/share/doc_src/PGC/PGC_TrioCFD.tex index 12888ef76..cdb41819d 100755 --- a/share/doc_src/PGC/PGC_TrioCFD.tex +++ b/share/doc_src/PGC/PGC_TrioCFD.tex @@ -81,14 +81,14 @@ \makeatother % \fancypagestyle{part}{% -\lfoot{\textit{Plan de Gestion Logiciel TrioCFD, v1.9.0}} +\lfoot{\textit{Plan de Gestion Logiciel TrioCFD, v1.9.1}} \cfoot{} \rfoot{\thepage} \renewcommand{\headrulewidth}{0.5pt} \renewcommand{\footrulewidth}{0.3pt}} % \fancypagestyle{chapter}{% -\lfoot{\textit{Plan de Gestion Logiciel TrioCFD, v1.9.0}} +\lfoot{\textit{Plan de Gestion Logiciel TrioCFD, v1.9.1}} \cfoot{} \rfoot{\thepage} \renewcommand{\headrulewidth}{0.5pt} @@ -100,7 +100,7 @@ \renewcommand{\headrulewidth}{0.5pt} \renewcommand{\footrulewidth}{0.3pt} \chead{} -\lfoot{\textit{Plan de Gestion Logiciel TrioCFD, v1.9.0}} +\lfoot{\textit{Plan de Gestion Logiciel TrioCFD, v1.9.1}} \cfoot{} \rfoot{\thepage} % @@ -171,7 +171,7 @@ \begin{center} \vspace{1.8cm} \parbox[t]{12cm}{\hspace{1.2cm}\huge{\textbf{USER DOCUMENTATION :}} \vspace{0.4cm}\\ -\hspace{2.8cm}\LARGE{\textbf{Plan de Gestion de Configuration de TrioCFD v1.9.0}}} \end{center} +\hspace{2.8cm}\LARGE{\textbf{Plan de Gestion de Configuration de TrioCFD v1.9.1}}} \end{center} \vspace{0.3cm} \begin{center}\includegraphics[scale=0.7]{pictures/TrioCFD.png} \end{center} \vspace{0.3cm} @@ -183,7 +183,7 @@ Code Version & Date & Code manager & Authors \\ & & J. DARONA & \\ \hline & &\multirow{3}{*}{\includegraphics[scale=0.55]{pictures/sign_JD.png}} & \\ -v1.9.0 & \today && J.DARONA\\ +v1.9.1 & \today && J.DARONA\\ & && \\ \hline \multicolumn{2}{Sc|}{ } & \multicolumn{2}{Sl}{\textit{Input file : } PGC\_TrioCFD.tex } \\ \multicolumn{2}{c|}{\textbf{DES/ISAS/DM2S} } & \multicolumn{2}{l}{\textit{Software : } TrioCFD } \\ diff --git a/share/doc_src/PGC/part1-introduction.tex b/share/doc_src/PGC/part1-introduction.tex index 997c30daf..e3d017f21 100755 --- a/share/doc_src/PGC/part1-introduction.tex +++ b/share/doc_src/PGC/part1-introduction.tex @@ -291,11 +291,12 @@ \chapter{Un peu d'histoire} \draw[green,thick,dashed] (6.3,01.52) -- (8.0,01.52) ; \draw (6.2,01.52) node[left]{R\'eorganisation des fiches de validation} ; \draw (8.8,01.52) node[right]{\textcolor{blue}{v1.9.0} \textbf{Baltik} Multiphase/CMFD}; - \draw (7.8,01.10) -- (8.0,01.10) ; \draw (9.8,01.18) node[right]{\textbf{Baltik} Multiphase/Front\_tracking\_IJK}; + \draw (7.8,01.10) -- (8.0,01.10) ; + \draw[blue,thick,dashed] (8.0,00.82) -- (8.7,00.82) ; + \draw (8.8,00.82) node[right]{\textcolor{blue}{v1.9.1} \textbf{Baltik} Fluid\_Structure\_Interaction}; \draw (7.8,00.68) -- (8.2,00.68) ; - \draw (7.8,00.42) node[left]{$2023$} ; - \draw (7.8,00.42) -- (8.0,00.42) ; + \draw (7.8,00.68) node[left]{$2023$} ; % \draw (7.8,01.84) -- (8.0,01.84) ; % \draw (7.8,01.42) -- (8.0,01.42) ; % \draw (7.8,01.00) -- (8.2,01.00) ; @@ -394,9 +395,12 @@ \chapter{Pr\'esentation g\'en\'erale et cartographie} \hline\hline \rowcolor{lightgray}\textbf{Baltik} & \textbf{Description} & \textbf{D\'ependances} \tabularnewline \hline -\textbf{ALE} & M\'ethode Arbitrary Langrangian-Eulerian & Turbulence \tabularnewline - & pour les interactions fluide-structure & \tabularnewline\hline -\textbf{Critere\_Entrainement\_Gaz} & & Turbulence \tabularnewline\hline + +\textbf{Critere\_Entrainement\_Gaz} & Crit\`ere num\'erique bas\'e sur la voriticit\'e & Turbulence \tabularnewline +& pour pr\'edire l'aparition d'un vortex & Turbulence \tabularnewline\hline + & M\'ethode Arbitrary Langrangian-Eulerian & Turbulence \tabularnewline +\textbf{Fluid\_Structure\_Interaction} & pour les interactions fluide-structure & \tabularnewline + & mod\`ele vibratoire de poutre & \tabularnewline\hline \textbf{Multiphase} & & \tabularnewline $\hookrightarrow$ CMFD & Computational Multiphase Fluid Dynamics & SO \tabularnewline $\hookrightarrow$ Front\_tracking\_IJK & Int\'egration de TrioIJK dans TrioCFD & Turbulence \& FTD \tabularnewline diff --git a/share/doc_src/TRAD2_ajout0 b/share/doc_src/TRAD2_ajout0 index 5fe6636dc..3006f45b4 100644 --- a/share/doc_src/TRAD2_ajout0 +++ b/share/doc_src/TRAD2_ajout0 @@ -434,6 +434,8 @@ IJK_FT_double interprete IJK_FT_double 1 not_set attr ijk_splitting chaine(into=["grid_splitting"]) ijk_splitting 1 not_set attr ijk_splitting_ft_extension entier ijk_splitting_ft_extension 1 not_set attr timestep floattant timestep 1 not_set + attr time_scheme chaine time_scheme 1 not_set + attr cfl floattant cfl 1 not_set attr timestep_facsec floattant timestep_facsec 1 not_set attr dt_post entier dt_post 1 not_set attr dt_post_stats_bulles entier dt_post_stats_bulles 1 not_set @@ -460,6 +462,10 @@ IJK_FT_double interprete IJK_FT_double 1 not_set attr expression_vz_init chaine expression_vz_init 1 not_set attr expression_derivee_force chaine expression_derivee_force 1 not_set attr expression_p_init chaine expression_p_init 1 not_set + attr expression_p_ana chaine expression_p_ana 1 not_set + attr expression_vx_ana chaine expression_vx_ana 1 not_set + attr expression_vy_ana chaine expression_vy_ana 1 not_set + attr expression_vz_ana chaine expression_vz_ana 1 not_set attr expression_dPdx_ana chaine expression_dPdx_ana 1 not_set attr expression_dPdy_ana chaine expression_dPdy_ana 1 not_set attr expression_dPdz_ana chaine expression_dPdz_ana 1 not_set @@ -496,12 +502,15 @@ IJK_FT_double interprete IJK_FT_double 1 not_set attr expression_ddWdxdy_ana chaine expression_ddWdxdy_ana 1 not_set attr expression_ddWdxdz_ana chaine expression_ddWdxdz_ana 1 not_set attr expression_ddWdydz_ana chaine expression_ddWdydz_ana 1 not_set + attr expression_potential_phi chaine expression_potential_phi 1 not_set attr check_divergence rien check_divergence 1 not_set + attr refuse_patch_conservation_QdM_RK3_source_interf rien refuse_patch_conservation_QdM_RK3_source_interf 1 not_set attr check_stats rien check_stats 1 not_set attr disable_diphasique rien disable_diphasique 1 not_set attr disable_diffusion_qdm rien disable_diffusion_qdm 1 not_set attr disable_convection_qdm rien disable_convection_qdm 1 not_set attr disable_solveur_poisson rien disable_solveur_poisson 1 not_set + attr disable_source_interf rien disable_source_interf 1 not_set attr nom_sauvegarde chaine nom_sauvegarde 1 not_set attr nom_reprise chaine nom_reprise 1 not_set attr sondes bloc_lecture sondes 1 not_set @@ -541,6 +550,7 @@ multigrid_solver interprete nul 1 not_set attr seuil floattant seuil 1 not_set attr nb_full_mg_steps listentier nb_full_mg_steps 1 not_set attr solveur_grossier solveur_sys_base solveur_grossier 1 not_set + attr iterations_mixed_solver entier iterations_mixed_solver 1 not_set attr impr rien impr 1 not_set Coarsen_Operator_Uniform objet_lecture nul 0 not_set attr Coarsen_Operator_Uniform chaine Coarsen_Operator_Uniform 1 not_set @@ -2711,6 +2721,8 @@ IJK_FT_double interprete IJK_FT_double 1 not_set attr ijk_splitting chaine(into=["grid_splitting"]) ijk_splitting 1 not_set attr ijk_splitting_ft_extension entier ijk_splitting_ft_extension 1 not_set attr timestep floattant timestep 1 not_set + attr time_scheme chaine time_scheme 1 not_set + attr cfl floattant cfl 1 not_set attr timestep_facsec floattant timestep_facsec 1 not_set attr dt_post entier dt_post 1 not_set attr dt_post_stats_bulles entier dt_post_stats_bulles 1 not_set @@ -2737,6 +2749,10 @@ IJK_FT_double interprete IJK_FT_double 1 not_set attr expression_vz_init chaine expression_vz_init 1 not_set attr expression_derivee_force chaine expression_derivee_force 1 not_set attr expression_p_init chaine expression_p_init 1 not_set + attr expression_p_ana chaine expression_p_ana 1 not_set + attr expression_vx_ana chaine expression_vx_ana 1 not_set + attr expression_vy_ana chaine expression_vy_ana 1 not_set + attr expression_vz_ana chaine expression_vz_ana 1 not_set attr expression_dPdx_ana chaine expression_dPdx_ana 1 not_set attr expression_dPdy_ana chaine expression_dPdy_ana 1 not_set attr expression_dPdz_ana chaine expression_dPdz_ana 1 not_set @@ -2773,12 +2789,15 @@ IJK_FT_double interprete IJK_FT_double 1 not_set attr expression_ddWdxdy_ana chaine expression_ddWdxdy_ana 1 not_set attr expression_ddWdxdz_ana chaine expression_ddWdxdz_ana 1 not_set attr expression_ddWdydz_ana chaine expression_ddWdydz_ana 1 not_set + attr expression_potential_phi chaine expression_potential_phi 1 not_set attr check_divergence rien check_divergence 1 not_set + attr refuse_patch_conservation_QdM_RK3_source_interf rien refuse_patch_conservation_QdM_RK3_source_interf 1 not_set attr check_stats rien check_stats 1 not_set attr disable_diphasique rien disable_diphasique 1 not_set attr disable_diffusion_qdm rien disable_diffusion_qdm 1 not_set attr disable_convection_qdm rien disable_convection_qdm 1 not_set attr disable_solveur_poisson rien disable_solveur_poisson 1 not_set + attr disable_source_interf rien disable_source_interf 1 not_set attr nom_sauvegarde chaine nom_sauvegarde 1 not_set attr nom_reprise chaine nom_reprise 1 not_set attr sondes bloc_lecture sondes 1 not_set @@ -2818,6 +2837,7 @@ multigrid_solver interprete nul 1 not_set attr seuil floattant seuil 1 not_set attr nb_full_mg_steps listentier nb_full_mg_steps 1 not_set attr solveur_grossier solveur_sys_base solveur_grossier 1 not_set + attr iterations_mixed_solver entier iterations_mixed_solver 1 not_set attr impr rien impr 1 not_set Coarsen_Operator_Uniform objet_lecture nul 0 not_set attr Coarsen_Operator_Uniform chaine Coarsen_Operator_Uniform 1 not_set diff --git a/share/doc_src/install_report/TrioCFD_install_report.tex b/share/doc_src/install_report/TrioCFD_install_report.tex index c13332493..a9389ac7e 100755 --- a/share/doc_src/install_report/TrioCFD_install_report.tex +++ b/share/doc_src/install_report/TrioCFD_install_report.tex @@ -23,7 +23,7 @@ \end{minipage} \begin{minipage}{0.6\textwidth} \begin{center} - {\LARGE TRIOCFD v1.9.0 : \\ INSTALLATION REPORT} + {\LARGE TRIOCFD v1.9.1 : \\ INSTALLATION REPORT} \end{center} \end{minipage} \begin{minipage}{.15\textwidth} diff --git a/share/doc_src/model_report/models_report_TrioCFD.tex b/share/doc_src/model_report/models_report_TrioCFD.tex index 513f7fe3d..cb5660055 100755 --- a/share/doc_src/model_report/models_report_TrioCFD.tex +++ b/share/doc_src/model_report/models_report_TrioCFD.tex @@ -291,7 +291,7 @@ Code Version & Date & Code manager & Authors \\ & & J. DARONA & \\ \hline & &\multirow{3}{*}{\includegraphics[scale=0.6]{../validation_report/tools/sign_JD.png}} & \\ -v1.9.0 & \today && TrioCFD Team\\ +v1.9.1 & \today && TrioCFD Team\\ & && \\ \hline \multicolumn{2}{Sc|}{ } & \multicolumn{2}{Sl}{\textit{Input file : } models\_report\_TrioCFD.tex } \\ \multicolumn{2}{c|}{\textbf{DES/ISAS/DM2S} } & \multicolumn{2}{l}{\textit{Software : } TrioCFD } \\ diff --git a/share/doc_src/validation_report/generer_rapport_valid.unix b/share/doc_src/validation_report/generer_rapport_valid.unix index 0114d4eb4..d354e9d18 100755 --- a/share/doc_src/validation_report/generer_rapport_valid.unix +++ b/share/doc_src/validation_report/generer_rapport_valid.unix @@ -38,6 +38,7 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/Poiseuille_flow_2D_VDF_VEF/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex ########### Lid_driven_cavity ######################## @@ -64,6 +65,7 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/Lid_driven_cavity/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex ########### Cir_Cyl_Re100 ######################## @@ -90,6 +92,7 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/Cir_Cyl_Re100/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex ################################################## @@ -119,6 +122,7 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/Convection_Vahl_Davis/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex ########### Oscillatory convection flow ################ @@ -145,6 +149,7 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/Oscillating_Flow/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex ################################################## @@ -174,6 +179,7 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/OBI_diffuser_VEF_k_eps/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex ########### Mixing_length_VEF_WF ################ @@ -200,6 +206,7 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/Mixing_length_VEF_WF/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex ################################################## @@ -255,6 +262,7 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/Channel_T1_T2_incompressible/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex sed -i "109 s@Incompressible/Canal\_plan\_bi\_periodique\_M1/Canal\_plan\_bi\_periodique\_M1@M1@" corps.tex @@ -289,6 +297,7 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/FTD_oscillating_bubble/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex ########### FTD_hanging_drop ################ @@ -315,6 +324,7 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/FTD_hanging_drop/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex ################################################## @@ -327,9 +337,9 @@ cd DivaALE mkdir build cd build #copie de tous les fichiers -cp -R $version/ALE/share/Validation/Rapports_automatiques/DivaALE/build/* . +cp -R $version/Fluid_Structure_Interaction/share/Validation/Rapports_automatiques/DivaALE/build/* . #copie supplementaire des fichiers et repertoires caches -cp -R $version/ALE/share/Validation/Rapports_automatiques/DivaALE/build/.[!.]* . +cp -R $version/Fluid_Structure_Interaction/share/Validation/Rapports_automatiques/DivaALE/build/.[!.]* . #nettoyage des fichiers tex cd .tmp echo 'traitement ' $(pwd) @@ -344,6 +354,7 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/DivaALE/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex ########### TwoCylindersALE ################ @@ -353,9 +364,9 @@ cd TwoCylindersALE mkdir build cd build #copie de tous les fichiers -cp -R $version/ALE/share/Validation/Rapports_automatiques/TwoCylindersALE/build/* . +cp -R $version/Fluid_Structure_Interaction/share/Validation/Rapports_automatiques/TwoCylindersALE/build/* . #copie supplementaire des fichiers et repertoires caches -cp -R $version/ALE/share/Validation/Rapports_automatiques/TwoCylindersALE/build/.[!.]* . +cp -R $version/Fluid_Structure_Interaction/share/Validation/Rapports_automatiques/TwoCylindersALE/build/.[!.]* . #nettoyage des fichiers tex cd .tmp echo 'traitement ' $(pwd) @@ -370,6 +381,7 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/TwoCylindersALE/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex ########### TwoOscillatingCylindersALE ################ @@ -379,9 +391,9 @@ cd TwoOscillatingCylindersALE mkdir build cd build #copie de tous les fichiers -cp -R $version/ALE/share/Validation/Rapports_automatiques/TwoOscillatingCylindersALE/build/* . +cp -R $version/Fluid_Structure_Interaction/share/Validation/Rapports_automatiques/TwoOscillatingCylindersALE/build/* . #copie supplementaire des fichiers et repertoires caches -cp -R $version/ALE/share/Validation/Rapports_automatiques/TwoOscillatingCylindersALE/build/.[!.]* . +cp -R $version/Fluid_Structure_Interaction/share/Validation/Rapports_automatiques/TwoOscillatingCylindersALE/build/.[!.]* . #nettoyage des fichiers tex cd .tmp echo 'traitement ' $(pwd) @@ -396,8 +408,36 @@ sed -i '/makeindex/d' fic.tex sed -i '/begin{document}/d' fic.tex sed -i '/huge/d' fic.tex sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex sed -i "s@orig{..}@orig{./fiches/TwoOscillatingCylindersALE/build}@g" fic.tex sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex +########### 3dOscillatingBeamALE ################ +cd $rapport/fiches +mkdir 3dOscillatingBeamALE +cd 3dOscillatingBeamALE +mkdir build +cd build +#copie de tous les fichiers +cp -R $version/Fluid_Structure_Interaction/share/Validation/Rapports_automatiques/3dOscillatingBeamALE/build/* . +#copie supplementaire des fichiers et repertoires caches +cp -R $version/Fluid_Structure_Interaction/share/Validation/Rapports_automatiques/3dOscillatingBeamALE/build/.[!.]* . +#nettoyage des fichiers tex +cd .tmp +echo 'traitement ' $(pwd) +sed -i '45d' fic.tex +sed -i "s@rhead{}@rhead{ALE}@g" fic.tex +sed -i '/documentclass/d' fic.tex +sed -i '/usepackage/d' fic.tex +sed -i '/setlength/d' fic.tex +sed -i '/renewcommand/d' fic.tex +sed -i '/pagestyle/d' fic.tex +sed -i '/makeindex/d' fic.tex +sed -i '/begin{document}/d' fic.tex +sed -i '/huge/d' fic.tex +sed -i '/end{document}/d' fic.tex +sed -i '/\makesavenoteenv{tabular}/d' fic.tex +sed -i "s@orig{..}@orig{./fiches/3dOscillatingBeamALE/build}@g" fic.tex +sed -i "s@input{corps}@input{\\\orig/.tmp/corps}@g" fic.tex ################################################## # Generation document final ################################################## diff --git a/share/doc_src/validation_report/validation_report_TrioCFD.tex b/share/doc_src/validation_report/validation_report_TrioCFD.tex index 4f7a44854..4e173138a 100644 --- a/share/doc_src/validation_report/validation_report_TrioCFD.tex +++ b/share/doc_src/validation_report/validation_report_TrioCFD.tex @@ -81,7 +81,7 @@ \fancypagestyle{part}{% \fancyhead[L]{} \fancyhead[R]{\textit{\rightmark}} -\lfoot{\textit{TRUST/TRIOCFD Validation, v1.9.0}} +\lfoot{\textit{TRUST/TRIOCFD Validation, v1.9.1}} \cfoot{} \rfoot{\thepage} \renewcommand{\headrulewidth}{0.5pt} @@ -90,7 +90,7 @@ \fancypagestyle{chapter}{% \fancyhead[L]{\textit{\rightmark}} \fancyhead[R]{} -\lfoot{\textit{TRUST/TRIOCFD Validation, v1.9.0}} +\lfoot{\textit{TRUST/TRIOCFD Validation, v1.9.1}} \cfoot{} \rfoot{\thepage} \renewcommand{\headrulewidth}{0.5pt} @@ -104,7 +104,7 @@ \lhead{\leftmark} \chead{} \rhead{\rightmark} -\lfoot{\textit{TRUST/TRIOCFD Validation, v1.9.0}} +\lfoot{\textit{TRUST/TRIOCFD Validation, v1.9.1}} \cfoot{} \rfoot{\thepage} % @@ -175,7 +175,7 @@ \begin{center} \vspace{1.5cm} \parbox[t]{12cm}{\hspace{1.3cm}\huge{\textbf{USER DOCUMENTATION :}} \vspace{0.4cm}\newline -\hspace{5cm}\LARGE{\textbf{Validation Report TrioCFD v1.9.0}}} \end{center} +\hspace{5cm}\LARGE{\textbf{Validation Report TrioCFD v1.9.1}}} \end{center} \vspace{0.3cm} \begin{center}\includegraphics[scale=0.65]{tools/Trio-CFD.png} \end{center} \vspace{0.3cm} @@ -187,7 +187,7 @@ Code Version & Date & Code manager & Authors \\ & & J. DARONA & \\ \hline & &\multirow{3}{*}{\includegraphics[scale=0.65]{tools/sign_JD.png}} & J.DARONA \\ -v1.9.0 & \today && P.E. ANGELI\\ +v1.9.1 & \today && P.E. ANGELI\\ & && A. CARTALADE \\ \hline \multicolumn{2}{Sc|}{ } & \multicolumn{2}{Sl}{\textit{Input file : } validation\_report\_TrioCFD.tex } \\ \multicolumn{2}{c|}{\textbf{DES/ISAS/DM2S} } & \multicolumn{2}{l}{\textit{Software : } TrioCFD } \\ diff --git a/src/Version_kernel b/src/Version_kernel index cfc3d7524..9ab8337f3 100644 --- a/src/Version_kernel +++ b/src/Version_kernel @@ -1 +1 @@ -1.9.1_beta +1.9.1