Merge branch 'next' into next-scratch

Author: pzehner

Outils/ICoCo/ICoCo_src/share/swig/CMakeLists.txt

@@ -10,7 +10,7 @@ project(ICoCo_SWIG CXX)
 enable_testing()
 
 set(TRUST_ROOT $ENV{TRUST_ROOT})
-set(MEDCOUPLING_DIR "$ENV{TRUST_MEDCOUPLING_ROOT}/$ENV{TRUST_ARCH}_opt")
+set(MEDCOUPLING_DIR "$ENV{TRUST_MEDCOUPLING_ROOT}/$ENV{TRUST_ARCH}${OPT}")
 
 if(NOT $ENV{TRUST_ARCH_CC} STREQUAL "linux_nvc++")
 add_definitions(-Wno-error)
@@ -40,6 +40,12 @@ find_library(libTrio NAMES ${libtrio_name}.a PATHS ${TRUST_ROOT}/lib NO_DEFAULT_
 #    message(FATAL_ERROR "Could not find BALTIK library: ${libbaltik_name}.so - did you run: make module_optim in your baltik (potentially in debug)??")
 #endif()
 
+if (APPLE)
+  # Necessary for MAC, otherwise system python detected when finding package Python3
+  find_package(PythonInterp 3 REQUIRED)  # Make sure to find TRUST Python first (even if not technically needed) ...
+  find_package(PythonLibs 3 REQUIRED)    # ... so that TRUST Python libs are found too.
+endif()
+
 find_package(Python3 COMPONENTS Interpreter Development.Module  REQUIRED)  # Make sure to find TRUST Python first (even if not technically needed) ...
 find_package(SWIG REQUIRED)
 include(${SWIG_USE_FILE})
@@ -54,6 +60,9 @@ include_directories(
   ${MEDCOUPLING_DIR}/include
   ${Python3_INCLUDE_DIRS})
 
+message("@@@@ Python3_INCLUDE_DIRS : ${Python3_INCLUDE_DIRS} ")
+message("@@@@ Python3_EXECUTABLE : ${Python3_EXECUTABLE} ")
+
 # Configuring .i file to put TRUST version into it
 set(TRUST_VERSION $ENV{TRUST_VERSION})
 set(swig_file ${CMAKE_CURRENT_BINARY_DIR}/trusticoco.i)

Outils/TRIOXDATA/XTriou/TRAD_2.org

@@ -13,6 +13,11 @@ troismots objet_lecture nul 0 Three words.
   attr mot_1 chaine mot_1 0 First word.
   attr mot_2 chaine mot_2 0 Snd word.
   attr mot_3 chaine mot_3 0 Third word.
+quatremots objet_lecture nul 0 Three words.
+  attr mot_1 chaine mot_1 0 First word.
+  attr mot_2 chaine mot_2 0 Snd word.
+  attr mot_3 chaine mot_3 0 Third word.
+  attr mot_4 chaine mot_4 0 Fourth word.
 format_file objet_lecture nul 0 File formatted.
   attr format chaine(into=["binaire","formatte","xyz","single_hdf"]) format 1 Type of file (the file format).
   attr name_file chaine name_file 0 Name of file.

Outils/TRIOXDATA/XTriou/syno.py

@@ -1 +1 @@
-synonyme={ 'fin':'end',"vefprep1b":"vef","champ_uniforme":"uniform_field","typer_lire":"type_read","travail_pression_elem_polymac_p0p1nc":"travail_pression_elem_polymac_p0","transport_turbulent_sgdh":"transport_turbulent_isotrope","transport_turbulent_ggdh":"transport_turbulent_anisotrope","terme_puissance_thermique_echange_impose_elem_polymac":"terme_puissance_thermique_echange_impose_elem_polymac_p0p1nc","terme_puissance_thermique_echange_impose_elem_polymac":"terme_puissance_thermique_echange_impose_elem_polymac_p0","force_tchen_face_vdf":"tchen_force_face_vdf","force_tchen_face_polymac_p0":"tchen_force_face_polymac_p0","sous_domaine":"sous_zone","source_qdm_face_polymac_p0p1nc":"source_qdm_face_polymac_p0","source_generique_face_polymac_p0p1nc":"source_generique_face_polymac_p0","source_generique_vdf_p0_vdf":"source_generique_elem_polymac_p0p1nc","source_generique_vdf_p0_vdf":"source_generique_elem_polymac_p0","source_constituant_elem_polymac":"source_constituant_elem_polymac_p0p1nc","source_constituant_elem_polymac":"source_constituant_elem_polymac_p0","resoudre":"solve","schema_euler_implicite":"scheme_euler_implicit","schema_euler_explicite":"scheme_euler_explicit","runge_kutta_ordre_4":"runge_kutta_ordre_4_d3p","champ_generique_refchamp_special":"refchamp_special","lire_med_64":"read_med_64","lire_med":"read_med","lire_fichier_bin":"read_file_binary","lire_fichier":"read_file","lire":"read","raffiner_simplexes":"raffiner_isotrope","decroissance_radioactive_vef_p1nc":"radioactive_decay_vef_p1nc","decroissance_radioactive_elem_polymac":"radioactive_decay_elem_polymac_p0p1nc","decroissance_radioactive_elem_polymac":"radioactive_decay_elem_polymac_p0","decroissance_radioactive_elem_polymac":"radioactive_decay_elem_polymac","puissance_thermique_elem_polymac":"puissance_thermique_elem_polymac_p0p1nc","puissance_thermique_elem_polymac":"puissance_thermique_elem_polymac_p0","sondes":"probes","postraitements":"post_processings","postraitement":"post_processing","perte_charge_singuliere_face_polymac_p0p1nc":"perte_charge_singuliere_face_polymac_p0","perte_charge_isotrope_face_polymac_p0p1nc":"perte_charge_isotrope_face_polymac_p0","perte_charge_directionnelle_face_polymac_p0p1nc":"perte_charge_directionnelle_face_polymac_p0","perte_charge_circulaire_face_polymac_p0p1nc":"perte_charge_circulaire_face_polymac_p0","perte_charge_anisotrope_face_polymac_p0p1nc":"perte_charge_anisotrope_face_polymac_p0","pb_hem":"pb_multiphase_hem","pb_multiphase_enthalpie":"pb_multiphase_h","decouper_multi":"partition_multi","decouper_64":"partition_64","partitionneur_sous_domaines":"partitionneur_sous_zones","decouper":"partition","echange_externe_radiatif":"paroi_echange_externe_radiatif","paroi_echange_contact_polymac_p0p1nc":"paroi_echange_contact_polymac_p0p1nc_p1","rectify_mesh":"orienter_simplexes","op_grad_vefprep1b_p1nc":"op_grad_vef_p1nc","op_evanescence_homogene_polymac_p0p1nc_elem":"op_evanescence_homogene_polymac_p0_elem","op_div_vefprep1b_p1nc":"op_div_vef_p1nc","op_dift_polymac_p0_polymac_nonlinear":"op_dift_polymac_var_p0_polymac_nonlinear","op_dift_polymac_p0_polymac":"op_dift_polymac_var_p0_polymac","op_diff_polymac_face":"op_dift_polymac_var_face_polymac","op_diff_polymac_p0_face":"op_dift_polymac_p0_var_face_polymac_p0","op_dift_polymac_p0_elem_polymac_p0":"op_dift_polymac_p0_var_elem_polymac_p0","op_diff_polymac_p0_face":"op_dift_polymac_p0_face_polymac_p0","op_diff_polymac_p0p1nc_face":"op_dift_polymac_p0p1nc_var_face_polymac_p0p1nc","op_diff_polymac_p0p1nc_face":"op_dift_polymac_p0p1nc_face_polymac_p0p1nc","op_diff_polymac_face":"op_dift_polymac_face_polymac","op_diff_vdfturbulente_p0_vdf":"op_diff_vdfturbulent_p0_vdf","op_diff_vdfturbulente_face":"op_diff_vdfturbulent_face","op_diff_vdfanisotrope_p0_vdf":"op_diff_vdfaniso_p0_vdf","op_diff_turbulent_polymac_p0_face":"op_diff_turbulente_polymac_p0_face","op_diff_turbulent_polymac_p0_elem":"op_diff_turbulente_polymac_p0_elem","op_diff_polymac_face":"op_diff_polymac_var_face","op_diff_polymac_elem":"op_diff_polymac_var_elem","op_diff_polymac_p0_face":"op_diff_polymac_p0_var_face","op_diff_polymac_p0_elem":"op_diff_polymac_p0_var_elem","op_diff_polymac_p0p1nc_face":"op_diff_polymac_p0p1nc_var_face","op_diff_polymac_p0p1nc_elem":"op_diff_polymac_p0p1nc_var_elem","op_diff_nonlinear_polymac_elem":"op_diff_nonlinear_polymac_var_elem","op_conv_ef_stab_polymac_p0p1nc_elem":"op_conv_ef_stab_polymac_p0_elem","op_conv_centre_polymac_p0p1nc_elem":"op_conv_centre_polymac_p0_elem","op_conv_amont_polymac_p0p1nc_elem":"op_conv_amont_polymac_p0_elem","champ_post_statistiques_moyenne":"moyenne","masse_polymac_p0p1nc_elem":"masse_polymac_p0_elem","lml_to_lata":"lml_2_lata","lata_to_other":"lata_2_other","lata_to_med":"lata_2_med","lata_to_cgns":"lata_2_cgns","champ_post_interpolation":"interpolation","aire_interfaciale":"interfacial_area","interpolation_ibm_power_law_tbl_u_star":"ibm_power_law_tbl_u_star","interpolation_ibm_power_law_tbl":"ibm_power_law_tbl","interpolation_ibm_hybride":"ibm_hybride","interpolation_ibm_gradient_moyen":"ibm_gradient_moyen","interpolation_ibm_element_fluide":"ibm_element_fluide","interpolation_ibm_aucune":"ibm_aucune","frottement_interfacial_bulles_composant":"frottement_interfacial_bulles","frontiere_ouverte_temperature_imposee":"frontiere_ouverte_enthalpie_imposee","flux_interfacial_elem_polymac_p0p1nc":"flux_interfacial_elem_polymac_p0","equations_scalaires_passifs":"equations_especes","temperature_imposee_paroi":"enthalpie_imposee_paroi","energie_multiphase_enthalpie":"energie_multiphase_h","write_med":"ecrire_med","ecrire_fichier":"ecrire_fichier_bin","champ_post_statistiques_ecart_type":"ecart_type","dp_impose_face_polymac":"dp_impose_face_polymac_p0p1nc","dp_impose_face_polymac":"dp_impose_face_polymac_p0","discretiser":"discretize","decroissance_radioactive_elem_polymac":"decroissance_radioactive_elem_polymac_p0p1nc","decroissance_radioactive_elem_polymac":"decroissance_radioactive_elem_polymac_p0","decoupebord":"decoupebord_pour_rayonnement","create_domain_from_sub_domain":"create_domain_from_sub_domains","create_domain_from_sub_domain":"create_domain_from_sous_zone","champ_post_statistiques_correlation":"correlation","modifydomaineaxi1d":"convert_1d_to_1daxi","champ_fonc_tabule_morceaux":"champ_tabule_morceaux","transformation":"champ_post_transformation","tparoi_vef":"champ_post_tparoi_vef","refchamp":"champ_post_refchamp","reduction_0d":"champ_post_reduction_0d","gradient":"champ_post_operateur_gradient","operateur_eqn":"champ_post_operateur_eqn","divergence":"champ_post_operateur_divergence","morceau_equation":"champ_post_morceau_equation","extraction":"champ_post_extraction","champ_fonc_face":"champ_fonc_face_vdf","champ_face":"champ_face_vdf","boussinesq_vef_p1nc":"boussinesq_temperature_vef_face","boussinesq_vefprep1b_p1nc":"boussinesq_temperature_vefprep1b_p1nc","boussinesq_vdf_face":"boussinesq_temperature_vdf_face","boussinesq_polymac_face":"boussinesq_temperature_face_polymac_p0p1nc","boussinesq_polymac_face":"boussinesq_temperature_face_polymac_p0","boussinesq_polymac_face":"boussinesq_temperature_face_polymac","boussinesq_polymac_face":"boussinesq_polymac_p0_face","boussinesq_polymac_face":"boussinesq_polymac_p0p1nc_face","boussinesq_vef_p1nc":"boussinesq_concentration_vef_face","boussinesq_vefprep1b_p1nc":"boussinesq_concentration_vefprep1b_p1nc","boussinesq_vdf_face":"boussinesq_concentration_vdf_face","boussinesq_polymac_face":"boussinesq_concentration_polymac_p0_face","boussinesq_polymac_face":"boussinesq_concentration_polymac_p0p1nc_face","boussinesq_polymac_face":"boussinesq_concentration_polymac_face","associer":"associate",}
+synonyme={ 'fin':'end',"vefprep1b":"vef","champ_uniforme":"uniform_field","typer_lire":"type_read","travail_pression_elem_polymac_p0p1nc":"travail_pression_elem_polymac_p0","transport_turbulent_sgdh":"transport_turbulent_isotrope","transport_turbulent_ggdh":"transport_turbulent_anisotrope","terme_puissance_thermique_echange_impose_elem_polymac":"terme_puissance_thermique_echange_impose_elem_polymac_p0p1nc","terme_puissance_thermique_echange_impose_elem_polymac":"terme_puissance_thermique_echange_impose_elem_polymac_p0","force_tchen_face_vdf":"tchen_force_face_vdf","force_tchen_face_polymac_p0":"tchen_force_face_polymac_p0","sous_domaine":"sous_zone","source_qdm_face_polymac_p0p1nc":"source_qdm_face_polymac_p0","source_generique_face_polymac_p0p1nc":"source_generique_face_polymac_p0","source_generique_vdf_p0_vdf":"source_generique_elem_polymac_p0p1nc","source_generique_vdf_p0_vdf":"source_generique_elem_polymac_p0","source_constituant_elem_polymac":"source_constituant_elem_polymac_p0p1nc","source_constituant_elem_polymac":"source_constituant_elem_polymac_p0","resoudre":"solve","schema_euler_implicite":"scheme_euler_implicit","schema_euler_explicite":"scheme_euler_explicit","runge_kutta_ordre_4":"runge_kutta_ordre_4_d3p","champ_generique_refchamp_special":"refchamp_special","lire_med_64":"read_med_64","lire_med":"read_med","lire_fichier_bin":"read_file_binary","lire_fichier":"read_file","lire":"read","raffiner_simplexes":"raffiner_isotrope","decroissance_radioactive_vef_p1nc":"radioactive_decay_vef_p1nc","decroissance_radioactive_elem_polymac":"radioactive_decay_elem_polymac_p0p1nc","decroissance_radioactive_elem_polymac":"radioactive_decay_elem_polymac_p0","decroissance_radioactive_elem_polymac":"radioactive_decay_elem_polymac","puissance_thermique_elem_polymac":"puissance_thermique_elem_polymac_p0p1nc","puissance_thermique_elem_polymac":"puissance_thermique_elem_polymac_p0","sondes":"probes","postraitements":"post_processings","postraitement":"post_processing","perte_charge_singuliere_face_polymac_p0p1nc":"perte_charge_singuliere_face_polymac_p0","perte_charge_isotrope_face_polymac_p0p1nc":"perte_charge_isotrope_face_polymac_p0","perte_charge_directionnelle_face_polymac_p0p1nc":"perte_charge_directionnelle_face_polymac_p0","perte_charge_circulaire_face_polymac_p0p1nc":"perte_charge_circulaire_face_polymac_p0","perte_charge_anisotrope_face_polymac_p0p1nc":"perte_charge_anisotrope_face_polymac_p0","pb_hem":"pb_multiphase_hem","pb_multiphase_enthalpie":"pb_multiphase_h","decouper_multi":"partition_multi","decouper_64":"partition_64","partitionneur_sous_domaines":"partitionneur_sous_zones","decouper":"partition","echange_externe_radiatif":"paroi_echange_externe_radiatif","paroi_echange_contact_polymac_p0p1nc":"paroi_echange_contact_polymac_p0p1nc_p1","rectify_mesh":"orienter_simplexes","op_grad_vefprep1b_p1nc":"op_grad_vef_p1nc","op_evanescence_homogene_polymac_p0p1nc_elem":"op_evanescence_homogene_polymac_p0_elem","op_div_vefprep1b_p1nc":"op_div_vef_p1nc","op_dift_polymac_p0_polymac_nonlinear":"op_dift_polymac_var_p0_polymac_nonlinear","op_dift_polymac_p0_polymac":"op_dift_polymac_var_p0_polymac","op_diff_polymac_face":"op_dift_polymac_var_face_polymac","op_diff_polymac_p0_face":"op_dift_polymac_p0_var_face_polymac_p0","op_dift_polymac_p0_elem_polymac_p0":"op_dift_polymac_p0_var_elem_polymac_p0","op_diff_polymac_p0_face":"op_dift_polymac_p0_face_polymac_p0","op_diff_polymac_p0p1nc_face":"op_dift_polymac_p0p1nc_var_face_polymac_p0p1nc","op_diff_polymac_p0p1nc_face":"op_dift_polymac_p0p1nc_face_polymac_p0p1nc","op_diff_polymac_face":"op_dift_polymac_face_polymac","op_diff_vdfturbulente_p0_vdf":"op_diff_vdfturbulent_p0_vdf","op_diff_vdfturbulente_face":"op_diff_vdfturbulent_face","op_diff_vdfanisotrope_p0_vdf":"op_diff_vdfaniso_p0_vdf","op_diff_turbulent_polymac_p0_face":"op_diff_turbulente_polymac_p0_face","op_diff_turbulent_polymac_p0_elem":"op_diff_turbulente_polymac_p0_elem","op_diff_polymac_face":"op_diff_polymac_var_face","op_diff_polymac_elem":"op_diff_polymac_var_elem","op_diff_polymac_p0_face":"op_diff_polymac_p0_var_face","op_diff_polymac_p0_elem":"op_diff_polymac_p0_var_elem","op_diff_polymac_p0p1nc_face":"op_diff_polymac_p0p1nc_var_face","op_diff_polymac_p0p1nc_elem":"op_diff_polymac_p0p1nc_var_elem","op_diff_nonlinear_polymac_elem":"op_diff_nonlinear_polymac_var_elem","op_conv_ef_stab_polymac_p0p1nc_elem":"op_conv_ef_stab_polymac_p0_elem","op_conv_centre_polymac_p0p1nc_elem":"op_conv_centre_polymac_p0_elem","op_conv_amont_polymac_p0p1nc_elem":"op_conv_amont_polymac_p0_elem","champ_post_statistiques_moyenne":"moyenne","prepro_ibm_uzawa":"methode_ibm_uzawa","prepro_ibm_ponderation":"methode_ibm_ponderation","masse_polymac_p0p1nc_elem":"masse_polymac_p0_elem","lml_to_lata":"lml_2_lata","lata_to_other":"lata_2_other","lata_to_med":"lata_2_med","lata_to_cgns":"lata_2_cgns","champ_post_interpolation":"interpolation","aire_interfaciale":"interfacial_area","interpolation_ibm_power_law_tbl_u_star":"ibm_power_law_tbl_u_star","interpolation_ibm_power_law_tbl":"ibm_power_law_tbl","interpolation_ibm_hybride":"ibm_hybride","interpolation_ibm_gradient_moyen":"ibm_gradient_moyen","interpolation_ibm_element_fluide":"ibm_element_fluide","interpolation_ibm_aucune":"ibm_aucune","frottement_interfacial_bulles_composant":"frottement_interfacial_bulles","frontiere_ouverte_temperature_imposee":"frontiere_ouverte_enthalpie_imposee","flux_interfacial_elem_polymac_p0p1nc":"flux_interfacial_elem_polymac_p0","equations_scalaires_passifs":"equations_especes","temperature_imposee_paroi":"enthalpie_imposee_paroi","energie_multiphase_enthalpie":"energie_multiphase_h","write_med":"ecrire_med","ecrire_fichier":"ecrire_fichier_bin","champ_post_statistiques_ecart_type":"ecart_type","dp_impose_face_polymac":"dp_impose_face_polymac_p0p1nc","dp_impose_face_polymac":"dp_impose_face_polymac_p0","discretiser":"discretize","decroissance_radioactive_elem_polymac":"decroissance_radioactive_elem_polymac_p0p1nc","decroissance_radioactive_elem_polymac":"decroissance_radioactive_elem_polymac_p0","decoupebord":"decoupebord_pour_rayonnement","create_domain_from_sub_domain":"create_domain_from_sub_domains","create_domain_from_sub_domain":"create_domain_from_sous_zone","champ_post_statistiques_correlation":"correlation","modifydomaineaxi1d":"convert_1d_to_1daxi","champ_fonc_tabule_morceaux":"champ_tabule_morceaux","transformation":"champ_post_transformation","tparoi_vef":"champ_post_tparoi_vef","refchamp":"champ_post_refchamp","reduction_0d":"champ_post_reduction_0d","gradient":"champ_post_operateur_gradient","operateur_eqn":"champ_post_operateur_eqn","divergence":"champ_post_operateur_divergence","morceau_equation":"champ_post_morceau_equation","extraction":"champ_post_extraction","champ_fonc_face":"champ_fonc_face_vdf","champ_face":"champ_face_vdf","boussinesq_vef_p1nc":"boussinesq_temperature_vef_face","boussinesq_vefprep1b_p1nc":"boussinesq_temperature_vefprep1b_p1nc","boussinesq_vdf_face":"boussinesq_temperature_vdf_face","boussinesq_polymac_face":"boussinesq_temperature_face_polymac_p0p1nc","boussinesq_polymac_face":"boussinesq_temperature_face_polymac_p0","boussinesq_polymac_face":"boussinesq_temperature_face_polymac","boussinesq_polymac_face":"boussinesq_polymac_p0_face","boussinesq_polymac_face":"boussinesq_polymac_p0p1nc_face","boussinesq_vef_p1nc":"boussinesq_concentration_vef_face","boussinesq_vefprep1b_p1nc":"boussinesq_concentration_vefprep1b_p1nc","boussinesq_vdf_face":"boussinesq_concentration_vdf_face","boussinesq_polymac_face":"boussinesq_concentration_polymac_p0_face","boussinesq_polymac_face":"boussinesq_concentration_polymac_p0p1nc_face","boussinesq_polymac_face":"boussinesq_concentration_polymac_face","associer":"associate",}

RELEASE_NOTES

@@ -1,6 +1,10 @@
 --------------------------------------------------------------------------------------------------
 Release notes version 1.9.6_beta : Enhancements, modifications and corrected bugs since version 1.9.5 :
 --------------------------------------------------------------------------------------------------
+25/03/25 (TRUST) New feature  : Create new Pb_XXX_IBM problems and XXX_IBM equations to be used when using a Source_PDF model for immersed boundary methods
+24/03/25 (TRUST) New feature  : Possible to use a multiphase multiplicator with the VDF discretization
+24/03/25 (TRUST) New feature  : Isotrope, Anisotrope, Circular and Directional pressure-loss sources are available for the VDF discretization
+24/03/25 (TRUST) New feature  : Flux_parietal correlation for Pb_Multiphase can be used with the VDF discretization
 14/03/25 (TRUST) Change       : Remove restrictions for IJK-multigrid splitting.
 05/03/25 (TRUST) Minor change : Postprocessing: 'dt_post' and 'nb_dt_post' can now be used outside the 'fields' part of the postprocessing block. 
 03/03/25 (TRUST) New feature  : Add Lata_2_CGNS interpret that can be used to convert lata files into CGNS ones

ThirdPart/src/LIBMEDCOUPLING/install.sh

@@ -142,7 +142,7 @@ if [ "$TRUST_ENABLE_MC_DEBUG" != "0" ] || [ $HOST = $TRUST_HOST_ADMIN ] ; then
   rel_type="Debug"
   build_dir=$build_dir_root/${TRUST_ARCH}
   install_dir=$install_dir_root/${TRUST_ARCH}
-  use_python=OFF
+  use_python=$with_python
   build_and_test_mc
 else
   # Clean previous Debug version if TRUST_ENABLE_MC_DEBUG set to 0: