Upgrade to 6.1.0 + some post-release fixes.

Release notes at
<https://github.com/code-saturne/code_saturne/blob/v6.1/NEWS.md>.

6 files changed, 62 insertions, 76 deletions

diff --git a/science/code_saturne/Makefile b/science/code_saturne/Makefile
index bb530363c5c8..419b401929bc 100644
--- a/science/code_saturne/Makefile
+++ b/science/code_saturne/Makefile
@@ -2,9 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	code_saturne
-PORTVERSION=	6.0.2
+PORTVERSION=	6.1.0
 DISTVERSIONPREFIX=	v
-PORTREVISION=	2
 CATEGORIES=	science parallel
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -25,6 +24,7 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}matplotlib>0:math/py-matplotlib@${PY_FLAVOR}
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	code-saturne
+GH_TAGNAME=	89e7bbf	# Some fixes are needed for atmospheric aerosols
 
 USES=		autoreconf bison fortran gettext gnome gmake iconv libtool	\
 		pyqt:5 python:3.6+ shebangfix
@@ -46,6 +46,7 @@ OPTIONS_DEFINE=		DOCS EXAMPLES BATCH BLAS MPI
 OPTIONS_DEFAULT=	BATCH BLAS MPI METIS
 OPTIONS_RADIO=		METIS
 OPTIONS_RADIO_METIS=	METIS PARMETIS
+BLAS_DESC=		Support of OpenBLAS
 BLAS_USES=		blaslapack
 BLAS_CONFIGURE_ON=	--with-blas=yes --with-blas-lib=${LOCALBASE}/lib --with-blas-libs=-lopenblas
 BLAS_LIB_DEPENDS=	libopenblas.so:math/openblas
@@ -53,8 +54,10 @@ BATCH_DESC=		Use Torque to submit batches
 BATCH_RUN_DEPENDS=	pbs-config:sysutils/torque
 MPI_LIB_DEPENDS=	libmpi.so:net/mpich
 MPI_CONFIGURE_WITH=	mpi
+METIS_DESC=		Support of METIS
 METIS_LIB_DEPENDS=	libmetis.so:math/metis
 METIS_CONFIGURE_ON=	--with-metis-include="${LOCALBASE}/include"
+PARMETIS_DESC=		Support of ParMETIS
 PARMETIS_LIB_DEPENDS=	libparmetis.so:math/parmetis
 PARMETIS_CONFIGURE_ON=	--with-metis-include="${LOCALBASE}/include/parmetis"	\
 			--with-metis-lib="${LOCALBASE}/lib/parmetis"
@@ -89,8 +92,6 @@ DOCS=		AUTHORS ChangeLog README
 .endif
 
 pre-configure:
-	(cd ${WRKSRC} && ${LS} preprocessor/*/*.c src/*/*.c* |	\
-		${GREP} -v user_examples > po/POTFILES.in)
 	${FLEX} -o ${WRKSRC}/src/mei/mei_scanner.c ${WRKSRC}/src/mei/mei_scanner.l
 	${LOCALBASE}/bin/bison --defines=${WRKSRC}/src/mei/mei_parser.h	\
 		-o ${WRKSRC}/src/mei/mei_parser.c ${WRKSRC}/src/mei/mei_parser.y
diff --git a/science/code_saturne/distinfo b/science/code_saturne/distinfo
index cc771d167f73..02b340de9625 100644
--- a/science/code_saturne/distinfo
+++ b/science/code_saturne/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1581884825
-SHA256 (code-saturne-code_saturne-v6.0.2_GH0.tar.gz) = 88a8c88e949bbcd878e2511917edd976a1306235aeab0394bee3162754c4128e
-SIZE (code-saturne-code_saturne-v6.0.2_GH0.tar.gz) = 19033062
+TIMESTAMP = 1587896974
+SHA256 (code-saturne-code_saturne-v6.1.0-89e7bbf_GH0.tar.gz) = 6308c470575e39a4656f89640a75f6b39c085b0803d921a61fbbec72fe30d636
+SIZE (code-saturne-code_saturne-v6.1.0-89e7bbf_GH0.tar.gz) = 19375559
diff --git a/science/code_saturne/files/patch-m4_cs__blas.m4 b/science/code_saturne/files/patch-m4_cs__blas.m4
deleted file mode 100644
index 7c3f6aeafd50..000000000000
--- a/science/code_saturne/files/patch-m4_cs__blas.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/cs_blas.m4.orig	2019-12-23 11:17:00 UTC
-+++ m4/cs_blas.m4
-@@ -346,7 +346,7 @@ if test "x$with_blas" != "xno" ; then
-     if test "x$with_blas_libs" != "x" ; then
-       BLAS_LIBS="$with_blas_libs"
-     else
--      BLAS_LIBS="-lblas"
-+      BLAS_LIBS="-lcblas -lblas"
-     fi
- 
-     CPPFLAGS="${saved_CPPFLAGS} ${BLAS_CPPFLAGS}"
diff --git a/science/code_saturne/files/patch-m4_cs__omniorb.m4 b/science/code_saturne/files/patch-m4_cs__omniorb.m4
deleted file mode 100644
index d71668b3df89..000000000000
--- a/science/code_saturne/files/patch-m4_cs__omniorb.m4
+++ /dev/null
@@ -1,11 +0,0 @@
---- m4/cs_omniorb.m4.orig	2019-12-23 11:17:00 UTC
-+++ m4/cs_omniorb.m4
-@@ -221,7 +221,7 @@ then
-   OMNIORB_IDLPYFLAGS_1='-bpython -nf '
-   OMNIORB_IDLPYFLAGS_2=" -I${OMNIORB_ROOT}/idl"
-   OMNIORB_IDLPYFLAGS=${OMNIORB_IDLPYFLAGS_1}${OMNIORB_IDLPYFLAGS_2}
--  for p in `cut -d: -f 1- --output-delimiter=$'\n' <<<"$PYTHONPATH"`; do
-+  for p in `echo "$PYTHONPATH" | tr ':' $'\n'`; do
-     if test -f $p/omniidl_be/python.py; then
-       OMNIORB_IDLPYFLAGS="${OMNIORB_IDLPYFLAGS} -p ${p}"
-     fi
diff --git a/science/code_saturne/files/patch-m4_cs__salome.m4 b/science/code_saturne/files/patch-m4_cs__salome.m4
deleted file mode 100644
index 66a668a0bc9b..000000000000
--- a/science/code_saturne/files/patch-m4_cs__salome.m4
+++ /dev/null
@@ -1,23 +0,0 @@
---- m4/cs_salome.m4.orig	2019-12-23 11:17:00 UTC
-+++ m4/cs_salome.m4
-@@ -167,16 +167,16 @@ AC_LANG_SAVE
- 
- omniORB_ok=no # in case following test is not called
- 
--AS_IF([test $cs_have_salome_kernel = yes -o $cs_have_salome_gui = yes],
-+AS_IF([test "x$cs_have_salome_kernel" = "xyes" -o "x$cs_have_salome_gui" = "xyes"],
-       [CS_AC_TEST_OMNIORB
-        CS_AC_TEST_CORBA])
- 
- AC_LANG_RESTORE
- 
- AM_CONDITIONAL(HAVE_SALOME,
--               test $cs_have_salome_kernel = yes \
--                 -a $cs_have_salome_gui = yes \
--                 -a $omniORB_ok = yes)
-+               test x$cs_have_salome_kernel = xyes \
-+                 -a x$cs_have_salome_gui = xyes \
-+                 -a x$omniORB_ok = xyes)
- 
- ])dnl
- 
diff --git a/science/code_saturne/pkg-plist b/science/code_saturne/pkg-plist
index b1a2ace2c572..96dd5f274890 100644
--- a/science/code_saturne/pkg-plist
+++ b/science/code_saturne/pkg-plist
@@ -23,6 +23,7 @@ include/code_saturne/cplsat.mod
 include/code_saturne/cs_1d_wall_thermal.h
 include/code_saturne/cs_1d_wall_thermal_check.h
 include/code_saturne/cs_advection_field.h
+include/code_saturne/cs_air_props.h
 include/code_saturne/cs_ale.h
 include/code_saturne/cs_alge_headers.h
 include/code_saturne/cs_all_to_all.h
@@ -31,7 +32,9 @@ include/code_saturne/cs_assert.h
 include/code_saturne/cs_ast_coupling.h
 include/code_saturne/cs_at_data_assim.h
 include/code_saturne/cs_at_opt_interp.h
-include/code_saturne/cs_at_plugin.h
+include/code_saturne/cs_atmo.h
+include/code_saturne/cs_atmo_aerosol.h
+include/code_saturne/cs_atmo_aerosol_ssh.h
 include/code_saturne/cs_atmo_headers.h
 include/code_saturne/cs_bad_cells_regularisation.h
 include/code_saturne/cs_balance.h
@@ -41,6 +44,7 @@ include/code_saturne/cs_base_fortran.h
 include/code_saturne/cs_base_headers.h
 include/code_saturne/cs_basis_func.h
 include/code_saturne/cs_benchmark.h
+include/code_saturne/cs_benchmark_matrix.h
 include/code_saturne/cs_bft_headers.h
 include/code_saturne/cs_blas.h
 include/code_saturne/cs_block_dist.h
@@ -54,26 +58,30 @@ include/code_saturne/cs_cdo_advection.h
 include/code_saturne/cs_cdo_bc.h
 include/code_saturne/cs_cdo_connect.h
 include/code_saturne/cs_cdo_diffusion.h
+include/code_saturne/cs_cdo_field_interpolation.h
 include/code_saturne/cs_cdo_headers.h
 include/code_saturne/cs_cdo_local.h
 include/code_saturne/cs_cdo_main.h
 include/code_saturne/cs_cdo_quantities.h
 include/code_saturne/cs_cdo_time.h
+include/code_saturne/cs_cdoeb_vecteq.h
 include/code_saturne/cs_cdofb_ac.h
 include/code_saturne/cs_cdofb_monolithic.h
+include/code_saturne/cs_cdofb_monolithic_sles.h
 include/code_saturne/cs_cdofb_navsto.h
 include/code_saturne/cs_cdofb_predco.h
 include/code_saturne/cs_cdofb_priv.h
 include/code_saturne/cs_cdofb_scaleq.h
-include/code_saturne/cs_cdofb_uzawa.h
 include/code_saturne/cs_cdofb_vecteq.h
 include/code_saturne/cs_cdovb_priv.h
 include/code_saturne/cs_cdovb_scaleq.h
 include/code_saturne/cs_cdovb_vecteq.h
 include/code_saturne/cs_cdovcb_scaleq.h
+include/code_saturne/cs_cell_to_vertex.h
 include/code_saturne/cs_cf_bindings.mod
 include/code_saturne/cs_cf_model.h
 include/code_saturne/cs_cf_thermo.h
+include/code_saturne/cs_cfbl_headers.h
 include/code_saturne/cs_coal_incl.mod
 include/code_saturne/cs_combustion_model.h
 include/code_saturne/cs_config.h
@@ -82,7 +90,6 @@ include/code_saturne/cs_convection_diffusion.h
 include/code_saturne/cs_coupling.h
 include/code_saturne/cs_crystal_router.h
 include/code_saturne/cs_ctwr.h
-include/code_saturne/cs_ctwr_air_props.h
 include/code_saturne/cs_ctwr_headers.h
 include/code_saturne/cs_darc_headers.h
 include/code_saturne/cs_dbg.h
@@ -182,6 +189,7 @@ include/code_saturne/cs_lagr_lec.h
 include/code_saturne/cs_lagr_log.h
 include/code_saturne/cs_lagr_new.h
 include/code_saturne/cs_lagr_options.h
+include/code_saturne/cs_lagr_orientation.h
 include/code_saturne/cs_lagr_particle.h
 include/code_saturne/cs_lagr_poisson.h
 include/code_saturne/cs_lagr_post.h
@@ -196,6 +204,7 @@ include/code_saturne/cs_lagr_sde.h
 include/code_saturne/cs_lagr_sde_model.h
 include/code_saturne/cs_lagr_stat.h
 include/code_saturne/cs_lagr_tracking.h
+include/code_saturne/cs_les_balance.h
 include/code_saturne/cs_les_filter.h
 include/code_saturne/cs_les_inflow.h
 include/code_saturne/cs_log.h
@@ -211,13 +220,18 @@ include/code_saturne/cs_matrix_default.h
 include/code_saturne/cs_matrix_priv.h
 include/code_saturne/cs_matrix_tuning.h
 include/code_saturne/cs_matrix_util.h
+include/code_saturne/cs_maxwell.h
 include/code_saturne/cs_measures_util.h
+include/code_saturne/cs_medcoupling_intersector.hxx
+include/code_saturne/cs_medcoupling_remapper.hxx
+include/code_saturne/cs_medcoupling_utils.hxx
 include/code_saturne/cs_mesh.h
 include/code_saturne/cs_mesh_adjacencies.h
 include/code_saturne/cs_mesh_bad_cells.h
 include/code_saturne/cs_mesh_boundary.h
 include/code_saturne/cs_mesh_boundary_layer.h
 include/code_saturne/cs_mesh_builder.h
+include/code_saturne/cs_mesh_coarsen.h
 include/code_saturne/cs_mesh_coherency.h
 include/code_saturne/cs_mesh_connect.h
 include/code_saturne/cs_mesh_deform.h
@@ -230,14 +244,17 @@ include/code_saturne/cs_mesh_location.h
 include/code_saturne/cs_mesh_quality.h
 include/code_saturne/cs_mesh_quantities.h
 include/code_saturne/cs_mesh_refine.h
+include/code_saturne/cs_mesh_remove.h
 include/code_saturne/cs_mesh_save.h
 include/code_saturne/cs_mesh_smoother.h
 include/code_saturne/cs_mesh_thinwall.h
 include/code_saturne/cs_mesh_to_builder.h
 include/code_saturne/cs_mesh_warping.h
 include/code_saturne/cs_multigrid.h
+include/code_saturne/cs_multigrid_smoother.h
 include/code_saturne/cs_navsto_coupling.h
 include/code_saturne/cs_navsto_param.h
+include/code_saturne/cs_navsto_sles.h
 include/code_saturne/cs_navsto_system.h
 include/code_saturne/cs_notebook.h
 include/code_saturne/cs_numbering.h
@@ -248,6 +265,8 @@ include/code_saturne/cs_order.h
 include/code_saturne/cs_parall.h
 include/code_saturne/cs_param.h
 include/code_saturne/cs_param_cdo.h
+include/code_saturne/cs_paramedmem_coupling.hxx
+include/code_saturne/cs_paramedmem_remapper.hxx
 include/code_saturne/cs_parameters.h
 include/code_saturne/cs_parameters_check.h
 include/code_saturne/cs_part_to_block.h
@@ -255,6 +274,7 @@ include/code_saturne/cs_partition.h
 include/code_saturne/cs_physical_constants.h
 include/code_saturne/cs_physical_model.h
 include/code_saturne/cs_physical_properties.h
+include/code_saturne/cs_porosity_from_scan.h
 include/code_saturne/cs_post.h
 include/code_saturne/cs_post_default.h
 include/code_saturne/cs_post_util.h
@@ -298,7 +318,9 @@ include/code_saturne/cs_selector.h
 include/code_saturne/cs_sles.h
 include/code_saturne/cs_sles_default.h
 include/code_saturne/cs_sles_it.h
+include/code_saturne/cs_sles_it_priv.h
 include/code_saturne/cs_sles_pc.h
+include/code_saturne/cs_solidification.h
 include/code_saturne/cs_sort.h
 include/code_saturne/cs_sort_partition.h
 include/code_saturne/cs_source_term.h
@@ -310,6 +332,7 @@ include/code_saturne/cs_system_info.h
 include/code_saturne/cs_tagmr.mod
 include/code_saturne/cs_tagms.mod
 include/code_saturne/cs_thermal_model.h
+include/code_saturne/cs_thermal_system.h
 include/code_saturne/cs_time_moment.h
 include/code_saturne/cs_time_plot.h
 include/code_saturne/cs_time_step.h
@@ -320,6 +343,7 @@ include/code_saturne/cs_tree_xml.h
 include/code_saturne/cs_turbomachinery.h
 include/code_saturne/cs_turbulence_bc.h
 include/code_saturne/cs_turbulence_model.h
+include/code_saturne/cs_version.h
 include/code_saturne/cs_vof.h
 include/code_saturne/cs_volume_zone.h
 include/code_saturne/cs_wall_functions.h
@@ -376,8 +400,8 @@ include/code_saturne/ppthch.mod
 include/code_saturne/ptrglo.mod
 include/code_saturne/radiat.mod
 include/code_saturne/rotation.mod
-include/code_saturne/siream.mod
 include/code_saturne/spefun.mod
+include/code_saturne/sshaerosol.mod
 include/code_saturne/turbomachinery.mod
 include/code_saturne/vof.mod
 include/code_saturne/vorinc.mod
@@ -385,12 +409,12 @@ include/ple_config.h
 include/ple_coupling.h
 include/ple_defs.h
 include/ple_locator.h
-lib/libcs_solver-6.0.so
+lib/libcs_solver-6.1.so
 lib/libcs_solver.so
 lib/libple.so
 lib/libple.so.2
 lib/libple.so.2.0.0
-lib/libsaturne-6.0.so
+lib/libsaturne-6.1.so
 lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/Base/BrowserForm.py
 %%PYTHON_SITELIBDIR%%/code_saturne/Base/BrowserView.py
@@ -548,6 +572,8 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/Pages/HeadLossesView.py
 %%PYTHON_SITELIBDIR%%/code_saturne/Pages/IdentityAndPathesForm.py
 %%PYTHON_SITELIBDIR%%/code_saturne/Pages/IdentityAndPathesView.py
+%%PYTHON_SITELIBDIR%%/code_saturne/Pages/ImmersedBoundariesNeptune.py
+%%PYTHON_SITELIBDIR%%/code_saturne/Pages/ImmersedBoundariesViewNeptune.py
 %%PYTHON_SITELIBDIR%%/code_saturne/Pages/InitializationForm.py
 %%PYTHON_SITELIBDIR%%/code_saturne/Pages/InitializationView.py
 %%PYTHON_SITELIBDIR%%/code_saturne/Pages/InterfacialArea.py
@@ -852,6 +878,10 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/Pages/__pycache__/IdentityAndPathesForm.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/Pages/__pycache__/IdentityAndPathesView.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/Pages/__pycache__/IdentityAndPathesView.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/Pages/__pycache__/ImmersedBoundariesNeptune.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/Pages/__pycache__/ImmersedBoundariesNeptune.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/Pages/__pycache__/ImmersedBoundariesViewNeptune.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/Pages/__pycache__/ImmersedBoundariesViewNeptune.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/Pages/__pycache__/InitializationForm.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/Pages/__pycache__/InitializationForm.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/Pages/__pycache__/InitializationView.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -1094,6 +1124,8 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_gui.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_info.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_info.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_math_parser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_math_parser.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_mei_to_c.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_mei_to_c.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_package.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -1102,8 +1134,6 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_run.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_runcase.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_runcase.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_salome.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_salome.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_script.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_script.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/__pycache__/cs_studymanager.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -1132,11 +1162,11 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/cs_exec_environment.py
 %%PYTHON_SITELIBDIR%%/code_saturne/cs_gui.py
 %%PYTHON_SITELIBDIR%%/code_saturne/cs_info.py
+%%PYTHON_SITELIBDIR%%/code_saturne/cs_math_parser.py
 %%PYTHON_SITELIBDIR%%/code_saturne/cs_mei_to_c.py
 %%PYTHON_SITELIBDIR%%/code_saturne/cs_package.py
 %%PYTHON_SITELIBDIR%%/code_saturne/cs_run.py
 %%PYTHON_SITELIBDIR%%/code_saturne/cs_runcase.py
-%%PYTHON_SITELIBDIR%%/code_saturne/cs_salome.py
 %%PYTHON_SITELIBDIR%%/code_saturne/cs_script.py
 %%PYTHON_SITELIBDIR%%/code_saturne/cs_studymanager.py
 %%PYTHON_SITELIBDIR%%/code_saturne/cs_studymanager_gui.py
@@ -1171,6 +1201,7 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/model/HeadLossesModel.py
 %%PYTHON_SITELIBDIR%%/code_saturne/model/HgnModel.py
 %%PYTHON_SITELIBDIR%%/code_saturne/model/IdentityAndPathesModel.py
+%%PYTHON_SITELIBDIR%%/code_saturne/model/ImmersedBoundariesModel.py
 %%PYTHON_SITELIBDIR%%/code_saturne/model/InitializationModel.py
 %%PYTHON_SITELIBDIR%%/code_saturne/model/InterfacialAreaModel.py
 %%PYTHON_SITELIBDIR%%/code_saturne/model/InterfacialEnthalpyModel.py
@@ -1276,6 +1307,8 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/HgnModel.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/IdentityAndPathesModel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/IdentityAndPathesModel.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ImmersedBoundariesModel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/ImmersedBoundariesModel.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InitializationModel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InitializationModel.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/model/__pycache__/InterfacialAreaModel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -1393,12 +1426,15 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_study.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_texmaker.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_texmaker.cpython-%%PYTHON_SUFFIX%%.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_xml_init.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%PYTHON_SITELIBDIR%%/code_saturne/studymanager/__pycache__/cs_studymanager_xml_init.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/cs_studymanager_drawing.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/cs_studymanager_parser.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/cs_studymanager_pathes_model.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/cs_studymanager_run.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/cs_studymanager_study.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager/cs_studymanager_texmaker.py
+%%PYTHON_SITELIBDIR%%/code_saturne/studymanager/cs_studymanager_xml_init.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/BrowserView.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/MainForm.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/MainView.py
@@ -1413,7 +1449,6 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/PathesForm.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/PathesView.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/Toolbox.py
-%%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/XMLinitialize.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/__init__.py
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/__pycache__/BrowserView.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/__pycache__/BrowserView.cpython-%%PYTHON_SUFFIX%%.pyc
@@ -1443,8 +1478,6 @@ lib/libsaturne.so
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/__pycache__/PathesView.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/__pycache__/Toolbox.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/__pycache__/Toolbox.cpython-%%PYTHON_SUFFIX%%.pyc
-%%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/__pycache__/XMLinitialize.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
-%%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/__pycache__/XMLinitialize.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
 %%PYTHON_SITELIBDIR%%/code_saturne/studymanager_gui/__pycache__/resource_base_rc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
@@ -1471,14 +1504,13 @@ man/man1/ple-config.1.gz
 %%DATADIR%%/COPYING
 %%DATADIR%%/batch/batch.CCC
 %%DATADIR%%/batch/batch.LOADL
-%%DATADIR%%/batch/batch.LOADL_BG
 %%DATADIR%%/batch/batch.LSF
 %%DATADIR%%/batch/batch.OAR
 %%DATADIR%%/batch/batch.PBS
 %%DATADIR%%/batch/batch.SGE
 %%DATADIR%%/batch/batch.SLURM
-%%DATADIR%%/batch/batch.SLURM_BGQ
 %%DATADIR%%/cs_user_scripts.py
+%%DATADIR%%/data/setup.xml
 %%DATADIR%%/data/thch/JANAF
 %%DATADIR%%/data/thch/dp_C3P
 %%DATADIR%%/data/thch/dp_C3PSJ
@@ -1495,8 +1527,6 @@ man/man1/ple-config.1.gz
 %%DATADIR%%/data/thch/meteo
 %%DATADIR%%/images/splashscreen.png
 %%DATADIR%%/runcase_mpi_rank
-%%DATADIR%%/salome/fsi.export
-%%DATADIR%%/salome/fsi_yacs_scheme.xml
 %%DATADIR%%/user/cs_user_1d_wall_thermal.c
 %%DATADIR%%/user/cs_user_atmospheric_model.f90
 %%DATADIR%%/user/cs_user_boundary_conditions.c
@@ -1543,15 +1573,14 @@ man/man1/ple-config.1.gz
 %%DATADIR%%/user/usvosy.f90
 %%DATADIR%%/user_examples/cs_user_1d_wall_thermal.c
 %%DATADIR%%/user_examples/cs_user_atmospheric_model.f90
-%%DATADIR%%/user_examples/cs_user_boundary_conditions_ale-base.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-advanced.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-atmospheric.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-auto_inlet_profile.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-base.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-compressible.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-cooling_towers.f90
-%%DATADIR%%/user_examples/cs_user_boundary_conditions-electric_arcs_ieljou_3_or_4.c
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-electric_arcs.f90
+%%DATADIR%%/user_examples/cs_user_boundary_conditions-electric_arcs_ieljou_3_or_4.c
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-fuel.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-gas_3ptchem.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-gas_ebu.f90
@@ -1559,19 +1588,20 @@ man/man1/ple-config.1.gz
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-mapped_inlet.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-medcoupling_remapper_2d.c
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-notebook.c
-%%DATADIR%%/user_examples/cs_user_boundary_conditions-pulverized_coal_lagrangian.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-pulverized_coal.f90
+%%DATADIR%%/user_examples/cs_user_boundary_conditions-pulverized_coal_lagrangian.f90
 %%DATADIR%%/user_examples/cs_user_boundary_conditions-richards.f90
+%%DATADIR%%/user_examples/cs_user_boundary_conditions_ale-base.f90
 %%DATADIR%%/user_examples/cs_user_boundary_mass_source_terms-condensation.f90
 %%DATADIR%%/user_examples/cs_user_boundary_mass_source_terms-nzones_condensation.f90
 %%DATADIR%%/user_examples/cs_user_coupling-saturne.c
 %%DATADIR%%/user_examples/cs_user_coupling-syrthes.c
-%%DATADIR%%/user_examples/cs_user_coupling.c
 %%DATADIR%%/user_examples/cs_user_electric_scaling.c
 %%DATADIR%%/user_examples/cs_user_extra_operations-balance_by_zone.c
 %%DATADIR%%/user_examples/cs_user_extra_operations-boundary_forces.c
 %%DATADIR%%/user_examples/cs_user_extra_operations-energy_balance.f90
 %%DATADIR%%/user_examples/cs_user_extra_operations-force_temperature.f90
+%%DATADIR%%/user_examples/cs_user_extra_operations-nusselt_and_friction_calculation.c
 %%DATADIR%%/user_examples/cs_user_extra_operations-nusselt_calculation.f90
 %%DATADIR%%/user_examples/cs_user_extra_operations-parallel_operations.f90
 %%DATADIR%%/user_examples/cs_user_extra_operations-richards_flux.f90
@@ -1592,6 +1622,7 @@ man/man1/ple-config.1.gz
 %%DATADIR%%/user_examples/cs_user_initialization-gas_3ptchem.f90
 %%DATADIR%%/user_examples/cs_user_initialization-gas_ebu.f90
 %%DATADIR%%/user_examples/cs_user_initialization-gas_libby_williams.f90
+%%DATADIR%%/user_examples/cs_user_initialization-medcoupling_remapper_3d.c
 %%DATADIR%%/user_examples/cs_user_initialization-pulverized_coal.f90
 %%DATADIR%%/user_examples/cs_user_initialization-richards.f90
 %%DATADIR%%/user_examples/cs_user_initialization-time_step.f90
@@ -1615,6 +1646,7 @@ man/man1/ple-config.1.gz
 %%DATADIR%%/user_examples/cs_user_parameters-base.c
 %%DATADIR%%/user_examples/cs_user_parameters-cdo-condif.c
 %%DATADIR%%/user_examples/cs_user_parameters-cdo-gwf.c
+%%DATADIR%%/user_examples/cs_user_parameters-coupling.c
 %%DATADIR%%/user_examples/cs_user_parameters-ctwr.c
 %%DATADIR%%/user_examples/cs_user_parameters-fans.c
 %%DATADIR%%/user_examples/cs_user_parameters-linear_solvers.c
@@ -1631,13 +1663,14 @@ man/man1/ple-config.1.gz
 %%DATADIR%%/user_examples/cs_user_physical_properties-richards_sat.f90
 %%DATADIR%%/user_examples/cs_user_physical_properties-richards_unsat.f90
 %%DATADIR%%/user_examples/cs_user_physical_properties-scalar_drift.f90
+%%DATADIR%%/user_examples/cs_user_physical_properties.c
 %%DATADIR%%/user_examples/cs_user_porosity.c
 %%DATADIR%%/user_examples/cs_user_postprocess-probes-interpolate.c
 %%DATADIR%%/user_examples/cs_user_postprocess-profiles.c
 %%DATADIR%%/user_examples/cs_user_postprocess-sfc.c
 %%DATADIR%%/user_examples/cs_user_postprocess.c
-%%DATADIR%%/user_examples/cs_user_radiative_transfer_bcs.c
 %%DATADIR%%/user_examples/cs_user_radiative_transfer.c
+%%DATADIR%%/user_examples/cs_user_radiative_transfer_bcs.c
 %%DATADIR%%/user_examples/cs_user_solver-heat-equation.c
 %%DATADIR%%/user_examples/cs_user_source_terms-base.c
 %%DATADIR%%/user_examples/cs_user_source_terms-richards.c
@@ -1645,7 +1678,6 @@ man/man1/ple-config.1.gz
 %%DATADIR%%/user_examples/cs_user_source_terms-turbulence.c
 %%DATADIR%%/user_examples/cs_user_turbomachinery.c
 %%DATADIR%%/user_examples/cs_user_zones.c
-%%DATADIR%%/user_examples/usatch_4spe5reac.f90
 %%DATADIR%%/user_examples/usthht.f90
 %%DATADIR%%/user_examples/usvort.f90
 %%DATADIR%%/user_examples/usvosy.f90
@@ -1685,5 +1717,3 @@ man/man1/ple-config.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/4-2Ddisks/mesh/fluid/3rond2d_fluide.des
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/4-2Ddisks/mesh/solid/3rond2d.des
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/4-2Ddisks/mesh/solid/3rond2d_syr40.dat
-share/locale/fr/LC_MESSAGES/code_saturne.mo
-share/locale/fr/LC_MESSAGES/ple.mo