Diffusion tamaas 769e213d4b4c

Merge branch 'master' into features/materials
769e213d4b4c
Actions

Authored by frerot on Apr 29 2021, 21:57.

Description

Merge branch 'master' into features/materials

Details

Committed

frerot

Apr 29 2021, 21:57

Pushed

frerot

Apr 29 2021, 22:00

Parents

rTAMAAS1cdb4a1c9578: pretty printing archive command
rTAMAASb7acda2db04c: added a base material class

Branches

Unknown

Tags

Unknown

Event Timeline

frerot committed rTAMAAS769e213d4b4c: Merge branch 'master' into features/materials (authored by frerot).Apr 29 2021, 21:57

Restricted Application completed building Restricted Buildable.Apr 29 2021, 22:00

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
1cdb4a1c9578	frerot	pretty printing archive command	Apr 29 2021
5c88b7c45e1a	frerot	pretty printing secondary scons commands (tests + install)	Apr 29 2021
b56f89b4dba1	frerot	better use of fixtures in tests	Apr 28 2021
99aeeb8af4ed	frerot	test_patch_westergaard now tests all applicable model types	Apr 27 2021
d6c631e7cf83	frerot	fixed order of inputs in Model::solveDirichlet	Apr 27 2021
d5841e5c2852	frerot	removed legacy bem grid test file	Apr 27 2021
73019bea551e	frerot	integrated autocorrelation test into test_surface	Apr 27 2021
7fc91b79d964	frerot	forgot `import os`	Apr 26 2021
287cf88791d0	frerot	better handling of file descriptors in JSONDumper	Apr 26 2021
93a4d5811ae9	frerot	marking test_epic and westergaard_multi as xfail if backend == 'tbb'	Apr 26 2021
4dbc3ee00066	frerot	cleaned up test fixtures (using parameter names)	Apr 26 2021
3438ff37dbe4	frerot	testing UVW writes	Apr 25 2021
0d37c22cb392	frerot	added JSON dumping capability and fixed dump issues ∀ model types	Apr 25 2021
a5ad130c558f	frerot	using pathlib instead of os.path in dumpers	Apr 25 2021
64e101c13b91	frerot	mpi-compatible implementation of getClusters()	Apr 20 2021
86e5cb1e1789	frerot	allowing model read from HDF5 with MPI	Apr 19 2021
97bffadf7b6a	frerot	added read method to NetCDFDumper	Apr 17 2021
0ba6912bc122	frerot	added sequential read function to H5Dumper	Apr 17 2021
0fad580005ff	frerot	added read method to FieldDumper (raises RuntimeError)	Apr 16 2021
da270d6f9606	frerot	added read() method to NumpyDumper	Apr 16 2021
d088bf7abd63	frerot	corrected description of `tamaas` command	Apr 6 2021
b4d5adb73bc8	frerot	writing surface info in text header instead of numpy file	Apr 6 2021
67d6e4dc8646	frerot	added dump option to `surface` command	Apr 6 2021
f13f8cf7202b	frerot	[doc] formatting in changelog	Apr 5 2021
9c33983aed18	frerot	silencing warning about missing uvw package	Apr 5 2021
128ac546c267	frerot	bumping version number to 2.2.2	Apr 2 2021
b19adf7440cd	frerot	[doc] changing man section number to 7	Apr 2 2021
17b6d5bd4eb1	frerot	[doc] formatting	Apr 2 2021
9578f56e3c51	frerot	[doc] describing entry point `tamaas` command	Apr 2 2021
6a713f330f44	frerot	added an entry point `tamaas` with three sub-commands	Apr 2 2021
6c56b69be4a2	frerot	[doc] silencing warnings when generating documentation	Mar 20 2021
e6092ae873a1	frerot	[doc] allowing selection of sphinx doc builders	Mar 20 2021
e28a7d62ce74	frerot	[doc] converting svg for latex sphinx	Mar 20 2021
998dbf9a8e3a	frerot	using env.subst instead of format	Mar 17 2021
b2f9e4544b61	frerot	separating TAMAAS_BACKEND to reflect the build parameters	Mar 17 2021
57a0b603d12e	frerot	[doc] using nbviewer links for tutorials	Mar 16 2021
19e35b33836d	frerot	[doc] added links to tutorials on homepage and README	Mar 15 2021
8ea64976e79c	frerot	using SCons File and Dir instead of os.path functions	Mar 15 2021
6c31459a5ce5	frerot	prettyfying doxygen and sphinx command strings	Mar 14 2021
8718664a8961	frerot	added a compile_commands.json target with scons 4+	Mar 14 2021
70977949d1a6	frerot	avoid using main_env in SConscripts	Mar 14 2021
ac4cb3de4e0d	frerot	added edit-mode indication to doc/SConscript	Mar 14 2021
4fb6e0ff9b10	frerot	[doc] removed obsolete Makefile and version.pl	Mar 14 2021
e81646b8cb6f	frerot	Merge branch 'enhancement/doc-scons'	Mar 14 2021
2f804a0f980e	frerot	[doc] generating man pages with the documentation	Mar 14 2021
1852a77c4e01	frerot	[doc] different sphinx builds based on target type	Mar 14 2021
d5937df5a153	frerot	[doc] installing sphinx doc in ${prefix}/share/doc/tamaas	Mar 13 2021
6750faf9f9ba	frerot	[doc] adding dependency of Doxygen to source files instead of lib	Mar 13 2021
648e32690df0	frerot	using a python module to define project infos	Mar 13 2021
4352ff47524d	frerot	[doc] clarified conf variables for Doxyfile	Mar 13 2021

Changes (203)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path
	M			.gitlab-ci.yml
	M			CHANGELOG.md
	A			INFOS.py
	M			Jenkinsfile
	M			README.md
	M			SConstruct
	D			doc/Makefile
	A			doc/SConscript
	V			doc/doxygen/{Doxyfile → Doxyfile.in}
	V			doc/doxygen/{Doxyfile.in ← Doxyfile}
	M			doc/sphinx/source/conf.py
	M			doc/sphinx/source/examples.rst
	P			doc/sphinx/source/index.rst Copied to doc/sphinx/source/overview.rst
	P			doc/sphinx/source/overview.rst Copied from doc/sphinx/source/index.rst
	M			doc/sphinx/source/quickstart.rst
	M			doc/sphinx/source/rough_surfaces.rst
	D			doc/version.pl
	M			examples/adhesion.py
	M			examples/plasticity.py
	M			examples/rough_contact.py
	M			examples/saturated.py
	M			examples/statistics.py
	M			examples/stresses.py
	M			python/SConscript
	M			python/cast.hh
	M			python/numpy.hh
	M			python/setup.py.in
	M			python/tamaas/__init__.py.in
	A			python/tamaas/__main__.py
	M			python/tamaas/compute.py
	M			python/tamaas/dumpers/__init__.py
	M			python/tamaas/dumpers/_helper.py
	M			python/tamaas/nonlinear_solvers/__init__.py
	M			python/tamaas_module.cpp
	M			python/wrap.hh
	M			python/wrap/compute.cpp
	M			python/wrap/core.cpp
	M			python/wrap/model.cpp
	M			python/wrap/model_extensions.hh
	M			python/wrap/mpi.cpp
	M			python/wrap/percolation.cpp
	M			python/wrap/solvers.cpp
	M			python/wrap/surface.cpp
	M			python/wrap/test_features.cpp
	M			site_scons/detect.py
	M			site_scons/site_init.py
	P			site_scons/site_tools/doxygen.py Copied from tests/test_voigt.py
	M			site_scons/site_tools/nvcc.py
	A			site_scons/site_tools/sphinx.py
	M			site_scons/site_tools/tamaas.py
	M			site_scons/version.py
	M			src/SConscript
	M			src/core/array.hh
	M			src/core/computes.cpp
	M			src/core/computes.hh
	M			src/core/fft_engine.cpp
	M			src/core/fft_engine.hh
	M			src/core/fftw_allocator.hh
	M			src/core/fftw_engine.cpp
	M			src/core/fftw_engine.hh
	M			src/core/fftw_interface.hh
	M			src/core/grid.cpp
	M			src/core/grid.hh
	M			src/core/grid_base.hh
	M			src/core/grid_hermitian.cpp
	M			src/core/grid_hermitian.hh
	M			src/core/grid_tmpl.hh
	M			src/core/grid_view.hh
	M			src/core/iterator.hh
	M			src/core/logger.cpp
	M			src/core/logger.hh
	M			src/core/loop.cpp
	M			src/core/loop.hh
	M			src/core/loops/apply.hh
	M			src/core/loops/loop_utils.hh
	M			src/core/ranges.hh
	M			src/core/static_types.hh
	M			src/core/statistics.cpp
	M			src/core/statistics.hh
	M			src/core/surface_complex.hh
	M			src/core/tamaas.cpp
	M			src/core/tamaas.hh
	M			src/gpu/fftransform_cufft.cpp
	M			src/gpu/fftransform_cufft.hh
	M			src/gpu/unified_allocator.hh
	M			src/model/adhesion_functional.cpp
	M			src/model/adhesion_functional.hh
	M			src/model/be_engine.cpp
	M			src/model/be_engine.hh
	M			src/model/boussinesq.cpp
	M			src/model/boussinesq.hh
	M			src/model/boussinesq_helper.hh
	M			src/model/elastic_functional.cpp
	M			src/model/elastic_functional.hh
	M			src/model/functional.hh
	M			src/model/hooke.cpp
	M			src/model/hooke.hh
	M			src/model/influence.hh
	M			src/model/integral_operator.cpp
	M			src/model/integral_operator.hh
	M			src/model/integration/accumulator.hh
	M			src/model/integration/element.cpp
	M			src/model/integration/element.hh
	M			src/model/integration/integrator.hh
	M			src/model/kelvin.cpp
	M			src/model/kelvin.hh
	M			src/model/kelvin_helper.hh
	M			src/model/materials/isotropic_hardening.cpp
	M			src/model/meta_functional.cpp
	M			src/model/meta_functional.hh
	M			src/model/mindlin.cpp
	M			src/model/mindlin.hh
	M			src/model/model.cpp
	M			src/model/model.hh
	M			src/model/model_dumper.hh
	M			src/model/model_factory.cpp
	M			src/model/model_factory.hh
	M			src/model/model_template.cpp
	M			src/model/model_template.hh
	M			src/model/model_type.cpp
	M			src/model/model_type.hh
	M			src/model/residual.cpp
	M			src/model/residual.hh
	M			src/model/volume_potential.cpp
	M			src/model/volume_potential.hh
	M			src/model/westergaard.cpp
	M			src/model/westergaard.hh
	M			src/mpi/fftw_mpi_engine.cpp
	M			src/mpi/fftw_mpi_engine.hh
	M			src/mpi/fftw_mpi_interface.hh
	M			src/mpi/mpi_interface.cpp
	M			src/mpi/mpi_interface.hh
	M			src/mpi/partitioner.hh
	M			src/percolation/flood_fill.cpp
	M			src/percolation/flood_fill.hh
	M			src/solvers/beck_teboulle.cpp
	M			src/solvers/beck_teboulle.hh
	M			src/solvers/condat.cpp
	M			src/solvers/condat.hh
	M			src/solvers/contact_solver.cpp
	M			src/solvers/contact_solver.hh
	M			src/solvers/dfsane_solver.cpp
	M			src/solvers/dfsane_solver.hh
	M			src/solvers/ep_solver.cpp
	M			src/solvers/ep_solver.hh
	M			src/solvers/epic.cpp
	M			src/solvers/epic.hh
	M			src/solvers/kato.cpp
	M			src/solvers/kato.hh
	M			src/solvers/kato_saturated.cpp
	M			src/solvers/kato_saturated.hh
	M			src/solvers/polonsky_keer_rey.cpp
	M			src/solvers/polonsky_keer_rey.hh
	M			src/solvers/polonsky_keer_tan.cpp
	M			src/solvers/polonsky_keer_tan.hh
	M			src/surface/filter.hh
	M			src/surface/isopowerlaw.cpp
	M			src/surface/isopowerlaw.hh
	M			src/surface/regularized_powerlaw.cpp
	M			src/surface/regularized_powerlaw.hh
	M			src/surface/surface_generator.cpp
	M			src/surface/surface_generator.hh
	M			src/surface/surface_generator_filter.cpp
	M			src/surface/surface_generator_filter.hh
	M			src/surface/surface_generator_random_phase.cpp
	M			src/surface/surface_generator_random_phase.hh
	M			src/tamaas_info.cpp.in
	M			src/tamaas_info.hh
	M			tests/SConscript
	M			tests/conftest.py
	M			tests/fftfreq.py
	M			tests/mpi_routines.py
	M			tests/tamaas_gtest_main.cc
	M			tests/test.hh
	D			tests/test_autocorrelation.py
	D			tests/test_bem_grid.py
	M			tests/test_boussinesq_surface.py
	M			tests/test_dumper.py
	M			tests/test_epic.py
	M			tests/test_fft.cpp
	M			tests/test_fftfreq.cpp
	M			tests/test_flood_fill.py
	M			tests/test_grid.cpp
	M			tests/test_gtest.py
	M			tests/test_hertz.py
	M			tests/test_hertz_disp.py
	M			tests/test_hertz_kato.py
	M			tests/test_integral_operators.py
	M			tests/test_integration.cpp
	M			tests/test_loop.cpp
	M			tests/test_memory.py
	M			tests/test_model.cpp
	M			tests/test_mpi.cpp
	M			tests/test_mpi_routines.py
	M			tests/test_patch_plasticity.py
	M			tests/test_patch_westergaard.py
	M			tests/test_rough_surface.cpp
	M			tests/test_saturated_pressure.py
	M			tests/test_static_types.cpp
	M			tests/test_surface.py
	M			tests/test_tangential.py
	P			tests/test_voigt.py Copied to site_scons/site_tools/doxygen.py
	M			tests/test_westergaard.py