Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

V2.0 #198

Merged
merged 424 commits into from
Oct 23, 2023
Merged

V2.0 #198

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
424 commits
Select commit Hold shift + click to select a range
e44838f
functionnal version 2
glesur Feb 28, 2023
20e15f9
-dumps now contains planets
glesur Feb 28, 2023
529ed83
remove comment
glesur Feb 28, 2023
c21f0fd
fix MHD implementation
glesur Feb 28, 2023
8526af5
fix MHD solvers
glesur Feb 28, 2023
9fa3705
some improvement to idefix test suite
glesur Mar 1, 2023
eaf6d59
change of tolerance for AmbipolarCshock3D
glesur Mar 1, 2023
ac22269
clean up idfx test
glesur Mar 1, 2023
40ebba5
fix fago-planet test
glesur Mar 1, 2023
fafddbb
ensure that viscosityStatus is in sync with viscosity object.
glesur Mar 1, 2023
187e269
fix linter
glesur Mar 1, 2023
de583bf
Merge branch 'fixViscosityFlag' into v2.0
glesur Mar 1, 2023
db6fc6f
linter happiness
glesur Mar 1, 2023
9172fe0
ensure that viscosityStatus is in sync with viscosity object.
glesur Mar 1, 2023
9dc49fe
Merge branch 'fixViscosityFlag' into 'master'
glesur Mar 1, 2023
f2e7841
fix test pointers
glesur Mar 1, 2023
f156204
refactor of the MPI class
glesur Jan 6, 2023
b15118d
fix the implicit lambda capture of this
Jan 6, 2023
2fccfbe
fix integer type conversion
Jan 6, 2023
2c56237
cleanup
Jan 6, 2023
e1c965e
fix unused variables
Jan 6, 2023
9b6f61d
do not reconsctruct B normal when periodic or internal
glesur Jan 8, 2023
c12f288
full implementation of periodic and MPI domain decomposition with normal
glesur Jan 11, 2023
6435c5c
fix a final bug in the MPI exchange routines (now fully validated)
glesur Jan 11, 2023
a9e3b17
restore specific emf boundary, and add a flag for consistency checks
glesur Jan 29, 2023
337c23c
increase tolerance of dedicated tests
glesur Mar 1, 2023
fe14445
new reference files for Ambipolar C-shock due to the new treatment of
glesur Mar 1, 2023
d633530
RFC: deduplicate ouptut.CheckForWrites for initial conditions
neutrinoceros Mar 1, 2023
66ba156
Merge branch 'dedup_init_write' into 'v2.0'
glesur Mar 1, 2023
5bbe411
RFC: split Vtk class into a base and a concrete class
neutrinoceros Mar 8, 2023
64b9af5
RFC: avoid messing with name mangling in idfx_test.py
neutrinoceros Mar 8, 2023
4dbcb61
RFC: simplify argument parsing in idfx_test.py
neutrinoceros Mar 8, 2023
b8ecdcc
RFC: use os.path.join for portability in idfx_test.py
neutrinoceros Mar 8, 2023
0635750
RFC: avoid messing with PYTHONPATH in idfx_test.py
neutrinoceros Mar 8, 2023
f635f92
Add documentation for git LFS
glesur Mar 8, 2023
b0e87ac
Merge branch 'docGitLFS' into 'master'
glesur Mar 8, 2023
5c2aba5
Merge branch 'base_vtk' into 'v2.0'
glesur Mar 10, 2023
ccfd6ca
Merge branch 'master' into v2.0
glesur Mar 10, 2023
8e9a173
Remove #ifdef MHD, #if ENERGY and explicit reference to PRS, ENG and …
glesur Mar 13, 2023
fcca710
Merge branch 'cleanPreprocessorIf' into 'v2.0'
glesur Mar 13, 2023
ac1499e
use PPM reconstruction in 2D RMHD solvers when Parabolic reconstruction
glesur Mar 20, 2023
ee83c5a
update reference files with new reconstruction
glesur Mar 20, 2023
1119be0
fix HLL
glesur Mar 21, 2023
44fb8d9
ENH: throw a warning in case a field that was registered was not retr…
neutrinoceros Mar 27, 2023
7bc4e20
Merge branch 'check_all_fields_at_restart' into 'v2.0'
glesur Apr 5, 2023
0cfbfad
add comments
glesur Apr 5, 2023
9c09fcd
RFC: move vtkScalarMap definition to Vtk class
neutrinoceros Apr 12, 2023
86b5d90
cleanup unnecessary host->device synchronization in Vtk
neutrinoceros Apr 13, 2023
d1b4d89
User-defined shock flag
Apr 13, 2023
98aa1e2
Merge branch 'UserShockFlag' into 'master'
glesur Apr 13, 2023
77bfe1d
Merge branch 'upstream_vtk' into 'v2.0'
glesur Apr 17, 2023
f444b92
Merge branch 'PPM_HLLD' into 'master'
glesur Apr 17, 2023
5da5b33
Merge branch 'python_testing' into 'v2.0'
glesur Apr 24, 2023
1a81078
RFC: drop unnecessary WRITE_TIME pre-processor definition
neutrinoceros Apr 25, 2023
cf99d6b
Merge branch 'drop_WRITE_TIME' into 'v2.0'
glesur Apr 25, 2023
ee9a6e2
MNT: cleanup 2 unused variables in shearing box boundary condition
neutrinoceros Apr 30, 2023
adac4cc
DOC: add a comment to explain size of shearing box buffer array
neutrinoceros May 1, 2023
a2ed151
Merge branch 'cleanup_sb' into 'v2.0'
glesur May 2, 2023
ac36b64
RFC: make DataBlock::gravity a std::unique_ptr
neutrinoceros May 1, 2023
4b3e38d
RFC: use a forward decl instead of include
neutrinoceros May 4, 2023
b7bd48b
fix missing includes
neutrinoceros May 4, 2023
98bdd8f
Merge branch 'unique_ptr_gravity' into 'v2.0'
glesur May 4, 2023
031d5e6
RFC: make DataBlock::planetarySystem a std::unique_ptr
neutrinoceros May 2, 2023
c9d5946
Clean up unused #include files
glesur May 4, 2023
8bae4bc
cleanup out-of-sync comments
neutrinoceros May 4, 2023
f38b8ac
fix compilation
neutrinoceros May 4, 2023
fe957d3
CLN: drop a comment and a redundancy
neutrinoceros May 2, 2023
f040c69
Merge branch 'shared_ptr_planets' into 'v2.0'
neutrinoceros May 4, 2023
83099e9
Merge branch 'cln_haveGravity' into 'v2.0'
glesur May 5, 2023
b7410d9
bug if feelPlanets + planet isActive + RK5 integrator (+ test) + warn…
volodia99 May 10, 2023
a635ca4
pre-commit corrections
volodia99 May 10, 2023
0998333
modified tests Planet3Body and PlanetPlanetRK42D correcting the bug i…
volodia99 May 10, 2023
0283b5f
add planet.ref.dat files for test PlanetsisActiveRK52D
volodia99 May 10, 2023
6a4a43e
clean up debugging comments
glesur May 12, 2023
e572ad0
clean up deprecated enrollbodyforce functions
glesur May 12, 2023
03abc56
Merge branch 'v2.0' of gricad-gitlab.univ-grenoble-alpes.fr:discs/ide…
glesur May 12, 2023
1feb06c
Merge branch 'planet-RK5-isactive' into 'master'
glesur May 12, 2023
5cb5211
- allow one to have negative pressure fix in hydro
glesur May 15, 2023
5691090
fix heating computation when fargo is enabled
glesur May 17, 2023
aa12fb3
enable fargo corrections only when energy is enabled
glesur May 17, 2023
a0e6ad0
more cleaning
glesur May 17, 2023
8a07dff
unused variables
glesur May 17, 2023
6f5bd5e
fix typo
glesur May 17, 2023
08c05c8
Merge branch 'refactorMPI' into 'v2.0'
glesur May 23, 2023
857f9a3
push modified Planet reference files to git lfs
glesur May 23, 2023
4783b6d
Merge branch 'userStep' into 'v2.0'
glesur May 23, 2023
5d8b3eb
add dust physics
glesur Mar 13, 2023
aa07ddd
here comes the dust
glesur Mar 13, 2023
d49a079
cleaning up old hydro refs
glesur Mar 13, 2023
0292ab9
compiling version of dust
glesur Mar 13, 2023
3d4ff80
working dust solver!
glesur Mar 13, 2023
6023703
fix boundary conditions for dust
glesur Mar 13, 2023
af00129
streaming instability setup
glesur Mar 13, 2023
f4ea28a
more noise in streaming
glesur Mar 13, 2023
6be58f0
proper case for directories
glesur Mar 13, 2023
93a4cc5
make streaming gpu compatible
glesur Mar 13, 2023
178b446
add timestep computation from dust dynamics
glesur Mar 16, 2023
a8e83b7
check nans on dust grains as well
glesur Mar 16, 2023
9d40b6f
fix popRegions
glesur Mar 16, 2023
1c97687
add issing file
glesur Mar 16, 2023
de06bab
fix checknan bound
glesur Mar 16, 2023
8de05d2
clean up MHD defined flag
glesur Mar 16, 2023
cade0df
ensure that dust specie is not repeated in I/Os
glesur Mar 16, 2023
27d52b9
fix checkNan when MHD is disabled
glesur Mar 21, 2023
0de5a6a
ensure fargo runs smoothly with dust
glesur Mar 21, 2023
017bba0
working fargo with dust
glesur Mar 21, 2023
a57a62a
implement new userdefboundarycondition signature
glesur Apr 5, 2023
a179eff
new version of the internal boundary conditions
glesur Apr 5, 2023
666f892
new signature for source terms
glesur Apr 5, 2023
412221d
show config only for the first dust specie.
glesur Apr 6, 2023
f415f6a
change variable name in VTK outputs to avoid "-"
glesur Apr 7, 2023
35dbe44
Merge branch 'fixPlanetLFS' into 'master'
glesur May 23, 2023
3c06162
implements a proper drag force
glesur May 24, 2023
faf314a
better implementation where drag properties are centralized in the
glesur May 24, 2023
fd29663
cleaning riemann solver
glesur May 24, 2023
f873768
add doc for dust grains
glesur May 25, 2023
ca9ec22
update documentation
glesur May 25, 2023
1010afc
ensure that the cfl is computed correctly without feedback
glesur May 25, 2023
d6a0233
energy validation for dust grains
glesur May 25, 2023
363d2e8
clean up test
glesur May 25, 2023
f413551
add reference file for dusty fluid
glesur May 25, 2023
de90893
copy hydro properties to dust fluids so that one does not have to repeat
glesur May 25, 2023
b64a4cf
fix documentation
glesur May 25, 2023
17d2599
cleaning up streaming instability setup
glesur May 25, 2023
3e343d9
fix expression of stopping time in doc
glesur May 25, 2023
b158570
add dust module test to CI
glesur May 25, 2023
05f6ff8
Clean up mach reflection test
glesur May 25, 2023
f737be7
fix mach reflection test
glesur May 26, 2023
8f0fb24
add missing dusty wave test file
glesur May 26, 2023
50f1a66
delete testme from former fargoplanet
glesur May 26, 2023
2080d8d
fix tolerance
glesur May 26, 2023
8bb52ab
fix shearing box setup
glesur May 26, 2023
44001a7
Merge branch 'dustyFluid' into 'v2.0'
glesur May 26, 2023
bf01526
bump up to kokkos V4.01
glesur May 27, 2023
bce14d5
Merge branch 'master' into bringMaster
glesur Jun 1, 2023
0de5b20
fix new template parameters for slope limiter
glesur Jun 1, 2023
f56c1be
bring back enrolling function
glesur Jun 1, 2023
7b95ebd
update reference file so that they include the time (this was included
glesur Jun 2, 2023
4a8aba2
fix planetisactiveRK52D to be v2.0 compliant
glesur Jun 2, 2023
999131e
fix the RK5 setup
Jun 2, 2023
3a17371
Merge branch 'bringMaster' into 'v2.0'
glesur Jun 5, 2023
0eda83b
write/read in dedicated directories
glesur Jun 6, 2023
6aca307
put output files in dedicated directories using C++17 functionnalities
glesur Jun 7, 2023
892ad0e
use MPI_SAFE_CALL macro
glesur Jun 7, 2023
1067b69
clean up input
glesur Jun 7, 2023
5fe359c
fix the tests
glesur Jun 7, 2023
e9d5490
fix size version of the drag force
glesur Jun 7, 2023
ad3f5ba
compiling implementation of passive tracers
glesur Jun 9, 2023
c5ef1ad
working tracer
glesur Jun 9, 2023
e219bc0
missing cmakelist for tracers
glesur Jun 9, 2023
6149490
fix uninitialized variable in boundary.cpp
Jun 9, 2023
fc41bcd
validate tracers
glesur Jun 11, 2023
b6414f0
Merge branch 'scalar' of gricad-gitlab.univ-grenoble-alpes.fr:discs/i…
glesur Jun 11, 2023
edcad15
fix drag implementation
glesur Jun 11, 2023
b5d5052
probably clearer setup?
glesur Jun 12, 2023
22d777d
fix useless variable
glesur Jun 12, 2023
e2edda4
Merge branch 'fixDrag' into 'v2.0'
glesur Jun 13, 2023
384d5c1
Merge branch 'scalar' into 'v2.0'
glesur Jun 13, 2023
1277e5b
fix missing viscous stress source term in spherical geometry
glesur Jun 13, 2023
7a528d3
refresh reference files
glesur Jun 13, 2023
6675368
Merge branch 'fixViscosity' into 'v2.0'
glesur Jun 14, 2023
5087d6f
revert to old behaviour: files are written in current directory
glesur Jun 14, 2023
fc41361
use MPI_SAFE_CALL
glesur Jun 14, 2023
bc2b651
see if the RC 4.1 of Kokkos clears up the warnings
glesur Jun 14, 2023
7b5cf2d
better error handling.
glesur Jun 15, 2023
db65676
TST: fix a regression in testing framework (AttributeError: noplot)
neutrinoceros Jun 15, 2023
3bb3ccc
TST: call same Python interpreter in subprocesses (avoid python3 alias)
neutrinoceros Jun 15, 2023
504b6ef
Merge branch 'hotfix_idfx_test' into 'v2.0'
neutrinoceros Jun 16, 2023
1a4c88e
Merge branch 'outputDirectories' into 'v2.0'
glesur Jun 16, 2023
ed8d799
TST: simplify post-processing code in planet tests
neutrinoceros Jun 16, 2023
f05d093
TST: avoid writing time twice in planet outputs
neutrinoceros Jun 16, 2023
0f43224
fix a typo
neutrinoceros Jun 17, 2023
1cbee65
Merge branch 'simplify_planet_tests' into 'v2.0'
glesur Jun 20, 2023
9d106b0
BUG: fix a bug where vtk files could be overwritten on restart
neutrinoceros Jun 20, 2023
90818af
Merge branch 'hotfix_overwrite_vtk' into 'v2.0'
glesur Jun 20, 2023
b912140
TST: treat self runtime warnings as errors
neutrinoceros Jun 20, 2023
49ef50d
TST: avoid using deprecated API in tests (UserdefBoundary(DataBlock&,…
neutrinoceros Jun 17, 2023
0af17d3
TST: avoid using deprecated API in tests (UserSourceTerm(DataBlock&, …
neutrinoceros Jun 17, 2023
dd58048
TST: avoid using deprecated API in tests (UserInternalBoundary(DataBl…
neutrinoceros Jun 18, 2023
f2700a5
fix linter warning
glesur Jun 21, 2023
8b84403
make sure everything is initialized
glesur Jun 21, 2023
f2f6988
Merge branch 'treat_runtime_warnings_as_errors_in_CI_2' into 'v2.0'
glesur Jun 21, 2023
c45393a
add comment for the hack function
glesur Jun 21, 2023
01f2780
Merge branch 'fixRestartDumpDate' into 'v2.0'
neutrinoceros Jun 21, 2023
1d84e4b
ensure that the restart works even when only one dump is in current
glesur Jun 21, 2023
a6ee156
Merge branch 'fixRestartDumpDate' into 'v2.0'
neutrinoceros Jun 21, 2023
3a53364
BUG: fix a bug where dumps could be duplicated on restart (with dmp=0)
neutrinoceros Jun 22, 2023
494f14d
Merge branch 'no_redumps3' into 'v2.0'
glesur Jun 22, 2023
13532ec
show kokkos version
glesur Jun 22, 2023
a43219a
add more verbose options
neutrinoceros Jun 23, 2023
1b3ccf6
versions are now only handled by the parent CMakeLists.txt
glesur Jun 23, 2023
668a1a3
Merge branch 'improveCommandLine' of gricad-gitlab.univ-grenoble-alpe…
glesur Jun 23, 2023
a7a2a9c
make Clement happy
glesur Jun 23, 2023
84328e3
cosmetics
glesur Jun 23, 2023
7fd1902
more cosmetics
glesur Jun 23, 2023
fc4397f
Merge branch 'improveCommandLine' into 'v2.0'
glesur Jun 23, 2023
5baa61f
Merge branch 'public' into githubMerge
glesur Jun 27, 2023
80fd199
undo header change
glesur Jun 27, 2023
79408b4
clear up things that were ommited by merge
glesur Jun 27, 2023
9f03823
clear up old reference file for vtk
glesur Jun 27, 2023
f30857c
use new testing suite in github actions
glesur Jun 28, 2023
c8b5677
fix github actions
glesur Jun 28, 2023
267ea5b
full test suite for github
glesur Jun 28, 2023
b7c417a
fix examples
glesur Jun 29, 2023
041b4d4
Merge branch master from github into githubMerge
glesur Jun 29, 2023
60133a9
use kokkos 4.1 release
glesur Jun 29, 2023
4e5c65f
Merge branch 'githubMerge' into 'v2.0'
glesur Jun 29, 2023
107b6c3
fix naming convention
glesur Jun 29, 2023
7b13b2a
fix hydroboundary
glesur Jun 29, 2023
f4927e3
more cleanup
glesur Jun 29, 2023
d7d534c
Merge branch 'kokkos4' into 'v2.0'
glesur Jun 29, 2023
a2d7d1d
Merge branch 'fixPushRegions' into 'v2.0'
glesur Jun 29, 2023
cc5e09e
update doc and changelog
glesur Jun 30, 2023
e20e9dc
update doc
glesur Jun 30, 2023
b9d1367
add tracer doc
glesur Jun 30, 2023
f03e5d2
add push/pop in boundary
glesur Jun 23, 2023
3be853c
fix some warning
glesur Jun 23, 2023
422704d
add missing header file
glesur Jul 3, 2023
bc806e8
Merge branch 'cleanDebugFeatures' into 'v2.0'
glesur Jul 3, 2023
7148fad
fix typo in doc for userdef boundary conditions
glesur Jul 5, 2023
696ceff
Merge branch 'fixDocHydroPointer' into 'v2.0'
glesur Jul 5, 2023
6f9904c
Update idefix-ci.yml to test v2.0
glesur Jul 10, 2023
f02fb50
fix missing cell-centered field in dump outputs when DIMENSIONS<3 (#174)
glesur Jul 11, 2023
54621f4
use UGA's gitlab as LFS server to avoid github bandwidth limitations …
glesur Aug 8, 2023
8a28b23
Reference as submodule (#183)
glesur Aug 10, 2023
24733ce
ENH: use most appropriate memory size units in memory footprint repor…
neutrinoceros Aug 18, 2023
c5a899f
Custom equation of state (#185)
glesur Aug 22, 2023
32c3af8
Xdmf to v2.0 (#187)
glesur Aug 25, 2023
2f6805b
Improved debug and profiling (#188)
glesur Sep 1, 2023
35a2bad
Doc: updates (#190)
glesur Sep 7, 2023
3d3ba6d
remove reference to old gitlab-lfs server
glesur Sep 8, 2023
dce1dba
revert to original reference to avoid merge conflict
glesur Sep 12, 2023
1ec1193
update link in programming guide
glesur Sep 14, 2023
10e5ad0
Braginskii diffusion modules (#184)
jeankpf Sep 17, 2023
46288ee
ENH: add CLI flag to force calling Setup::InitFlow ahead of dump read…
neutrinoceros Sep 17, 2023
6f79142
ENH: define reusable macros for runtime checks (#189)
neutrinoceros Sep 21, 2023
391d9ae
Improved self gravity (#194)
glesur Oct 12, 2023
8cc32ea
VTK slices (#195)
glesur Oct 13, 2023
f0c3dfa
DOC: document #ifdef RUNTIME_CHECKS (#197)
neutrinoceros Oct 17, 2023
6aaec33
Properly handle variable reconstruction to cell faces in non-cartesia…
glesur Oct 18, 2023
a4713f1
Merge branch 'master' into v2.0
glesur Oct 18, 2023
82b59ef
[pre-commit.ci lite] apply automatic fixes
pre-commit-ci-lite[bot] Oct 18, 2023
13c251b
fix merge with master
glesur Oct 18, 2023
a05c11f
Update CHANGELOG.md
glesur Oct 18, 2023
465fd61
add some documentation required by users
glesur Oct 18, 2023
52ceb5d
Merge branch 'v2.0' of github.com:idefix-code/idefix into v2.0
glesur Oct 18, 2023
d08acbf
BUG: fix a segmentation fault occuring with self-gravity in reduced d…
neutrinoceros Oct 19, 2023
bae8f94
MNT: cleanup unused forward declarations (#199)
neutrinoceros Oct 19, 2023
7075ff8
get Changelog ready for v2.0
glesur Oct 23, 2023
85c49a5
update main version
glesur Oct 23, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- fixed a bug that led to race condition when using GPU offloading, axis boundary condition and domain decomposition along X3 (!309)
- fixed a bug that led to inconsistent results with MPI and UCT_HLLx EMF reconstruction schemes (!310)
- fixed a bug that could result in .dmp file duplication on restart (!354)
- Moving developement onto github.com. Some references to merge requests will likely be lost.
glesur marked this conversation as resolved.
Show resolved Hide resolved
- fixed a bug in v2.0 developement branch that resulted in broekn dump files when MHD was enabled with DIMENSIONS<3 (#174)
- IDEFIX_Debug now automatically introduce Kokkos::fence at the end of each idefix_for, enforcing synchronisation between host and device when debugging (#188)
- Moving developement onto github.com. Some references to merge requests will likely be lost.
- Do not use git lfs anymore due to bandwidth restrictions imposed by github (#183)
- use proper cell centroid PLM reconstruction when using non-cartesian coordinates (#196)
- fixed a bug that could lead to low (O(1e-10)) leakage of conserved quantities along the axis (#196)
- changed radial pressure curvature term so that machine precision balance is achieved for constant pressure flows in every geometry (#196)

### Added
- Self-gravity (!186)
Expand Down
2 changes: 1 addition & 1 deletion pytools/idfx_test.py
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ def __init__ (self):
idefix_dir_env = os.getenv("IDEFIX_DIR")

parser.add_argument("-noplot",
dest="plot",
dest="noplot",
help="disable plotting in standard tests",
action="store_false")

Expand Down
5 changes: 4 additions & 1 deletion src/fluid/fluid.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,15 @@
#include "idefix.hpp"
#include "grid.hpp"
#include "fluid_defs.hpp"
#include "eos.hpp"
#include "thermalDiffusion.hpp"
#include "bragThermalDiffusion.hpp"
#include "selfGravity.hpp"
#include "vtk.hpp"
#include "dump.hpp"
#include "eos.hpp"
#ifdef WITH_HDF5
#include "xdmf.hpp"
#endif

// forward class declaration
class DataBlock;
Expand Down
45 changes: 3 additions & 42 deletions src/output/output.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
#include "fluid.hpp"
#include "slice.hpp"


Output::Output(Input &input, DataBlock &data) {
idfx::pushRegion("Output::Output");
// initialise the output objects for each format
Expand Down Expand Up @@ -66,24 +65,6 @@ Output::Output(Input &input, DataBlock &data) {
}
}


// Initialise xdmf outputs
if(input.CheckEntry("Output","xdmf")>0) {
xdmfPeriod = input.Get<real>("Output","xdmf",0);
if(xdmfPeriod>=0.0) { // backward compatibility (negative value means no file)
xdmfLast = data.t - xdmfPeriod; // write something in the next CheckForWrite()
#ifdef WITH_HDF5
xdmfEnabled = true;
#else
xdmfEnabled = false;
IDEFIX_ERROR("Attention: HDF5 library not linked when building Idefix!");
#endif
}
}
#ifdef WITH_HDF5
xdmf.Init(input,data); // Always initialised in case of emergency xdmf output
#endif

// intialise dump outputs
if(input.CheckEntry("Output","dmp")>0) {
dumpPeriod = input.Get<real>("Output","dmp",0);
Expand Down Expand Up @@ -120,6 +101,9 @@ Output::Output(Input &input, DataBlock &data) {
data.dump->RegisterVariable(&dumpLast, "dumpLast");
data.dump->RegisterVariable(&analysisLast, "analysisLast");
data.dump->RegisterVariable(&vtkLast, "vtkLast");
#ifdef WITH_HDF5
data.dump->RegisterVariable(&xdmfLast, "xdmfLast");
#endif

idfx::popRegion();
}
Expand Down Expand Up @@ -312,29 +296,6 @@ void Output::ForceWriteXdmf(DataBlock &data) {
}
#endif

#ifdef WITH_HDF5
void Output::ForceWriteXdmf(DataBlock &data) {
idfx::pushRegion("Output::ForceWriteXdmf");

if(!forceNoWrite) {
if(userDefVariablesEnabled) {
if(haveUserDefVariablesFunc) {
// Call user-def function to fill the userdefined variable arrays
idfx::pushRegion("UserDef::User-defined variables function");
userDefVariablesFunc(data, userDefVariables);
idfx::popRegion();
} else {
IDEFIX_ERROR("Cannot output user-defined variables without "
"enrollment of your user-defined variables function");
}
}
xdmfLast += xdmfPeriod;
xdmf.Write(data, *this);
}
idfx::popRegion();
}
#endif

void Output::EnrollAnalysis(AnalysisFunc myFunc) {
idfx::pushRegion("Output::EnrollAnalysis");
if(!analysisEnabled) {
Expand Down
2 changes: 0 additions & 2 deletions src/output/xdmf.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,6 @@ Xdmf::Xdmf(Input &input, DataBlock *datain) {
D_EXPAND( x1_cell = grid.x[IDIR](i + data->gbeg[IDIR]); ,
x2_cell = grid.x[JDIR](j + data->gbeg[JDIR]); ,
x3_cell = grid.x[KDIR](k + data->gbeg[KDIR]); )

}
#if (GEOMETRY == CARTESIAN) || (GEOMETRY == CYLINDRICAL)
node_coord(0,k,j,i) = x1;
Expand Down Expand Up @@ -251,7 +250,6 @@ Xdmf::Xdmf(Input &input, DataBlock *datain) {
this->mpi_data_start[dir] = data->gbeg[2-dir]-grid.nghost[2-dir];
this->mpi_data_size[dir] = grid.np_int[2-dir];
this->mpi_data_subsize[dir] = data->np_int[2-dir];

}
#elif (DIMENSIONS == 2)
for(int dir = 0; dir < DIMENSIONS ; dir++) {
Expand Down
3 changes: 0 additions & 3 deletions src/output/xdmf.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#ifndef OUTPUT_XDMF_HPP_
#define OUTPUT_XDMF_HPP_
#include <string>

#include <filesystem>
#include <map>
#include "idefix.hpp"
Expand All @@ -30,7 +29,6 @@
class Output;
class DataBlock;


class Xdmf {
friend class Dump;

Expand Down Expand Up @@ -123,5 +121,4 @@ void Xdmf::RegisterVariable(T& in, std::string name, int var) {
xdmfScalarMap.emplace(name, ScalarField(in, var));
}
}

#endif // OUTPUT_XDMF_HPP_