Skip to content

Commit 4e25b67

Browse files
kevinschmidmayerkevinschmidmayer
committed
Version 3.0
1 parent cfa4501 commit 4e25b67

File tree

771 files changed

+15711
-12198
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

771 files changed

+15711
-12198
lines changed

‎AUTHORS‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ e-mail adress: [email protected]
99

1010
S. LeMartelot
1111
-------------
12-
Expert enginneer turbopumps at CNES.
12+
Expert enginneer turbopumps at CNES, France.
1313

1414
K. Schmidmayer
1515
--------------
16-
Postdoctoral scholar at California Institute of Technology, Pasadena, USA.
17-
e-mail adress: [email protected] ; [email protected]
16+
Postdoctoral scholar at Aix-Marseille Universite, France.
17+
e-mail adress: [email protected]
1818
Personal web page: https://kevinschmidmayer.github.io/
1919

2020
E. Daniel
@@ -24,8 +24,9 @@ e-mail adress: [email protected]
2424

2525
B. Dorschner
2626
------------
27-
Postdoctoral scholar at California Institute of Technology, Pasadena, USA.
27+
Postdoctoral scholar at ETH Zurich, Switzerland.
2828

2929
J. Caze
3030
-------
31-
Phd student at CNES / Aix Marseille Universite.
31+
Phd student at CNES / Aix Marseille Universite, France.
32+
Personal web page: https://joriscaze.github.io/website/

‎COPYRIGHT‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ Copyright © 2014 Sebastien Le Martelot, Fabien Petitpas
44
Copyright © 2016-2017 Fabien Petitpas, Kevin Schmidmayer
55
Copyright © 2018 Fabien Petitpas, Kevin Schmidmayer, Eric Daniel
66
Copyright © 2019 Fabien Petitpas, Kevin Schmidmayer, Eric Daniel, Benedikt Dorschner
7-
Copyright © 2020 Fabien Petitpas, Kevin Schmidmayer, Eric Daniel, Benedikt Dorschner, Joris Caze
7+
Copyright © 2020 Fabien Petitpas, Kevin Schmidmayer, Eric Daniel, Benedikt Dorschner, Joris Caze
8+
Copyright © 2021 Fabien Petitpas, Kevin Schmidmayer, Eric Daniel, Joris Caze

‎ECOGEN.xml‎

Lines changed: 62 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,78 @@
11
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
22
<ecogen>
3+
4+
<!-- Logo ECOGEN -->
5+
<!-- ----------- -->
6+
<!-- <testCase>./libTests/logoECOGEN/ECOGEN/</testCase> -->
7+
<!-- <testCase>./libTests/logoECOGEN/ECOGENFluide/</testCase> -->
8+
39
<!-- Euler reference test cases -->
410
<!-- -------------------------- -->
5-
<testCase>./libTests/referenceTestCases/euler/1D/transport/positiveVelocity/</testCase>
11+
<!-- <testCase>./libTests/referenceTestCases/euler/1D/transport/positiveVelocity/</testCase> -->
612
<!-- <testCase>./libTests/referenceTestCases/euler/1D/transport/negativeVelocity/</testCase> -->
713
<!-- <testCase>./libTests/referenceTestCases/euler/1D/shockTubes/HPLeft/</testCase> -->
814
<!-- <testCase>./libTests/referenceTestCases/euler/1D/shockTubes/HPRight/</testCase> -->
15+
<!-- <testCase>./libTests/referenceTestCases/euler/1D/shockTubes/spherical/</testCase> -->
916
<!-- <testCase>./libTests/referenceTestCases/euler/2D/transports/rectangleDiagonal/</testCase> -->
1017
<!-- <testCase>./libTests/referenceTestCases/euler/2D/HPCenter/</testCase> -->
1118
<!-- <testCase>./libTests/referenceTestCases/euler/2D/HPUnstructured/</testCase> -->
1219
<!-- <testCase>./libTests/referenceTestCases/euler/2D/nozzles/tankWithShock/</testCase> -->
13-
<!-- <testCase>./libTests/referenceTestCases/euler/3D/LPCenter/</testCase> -->
20+
<!-- <testCase>./libTests/referenceTestCases/euler/2D/nozzles/supersonicInjection/</testCase> --> <!-- Something is wrong with the results of this test case (certainly coming from injection boundary condition), maybe something missing in initialConditionsV4.xml -->
21+
<!-- <testCase>./libTests/referenceTestCases/euler/2D/nozzles/subsonicInjection/</testCase> -->
1422
<!-- <testCase>./libTests/referenceTestCases/euler/2D/shockTubes/cylindrical/</testCase> -->
15-
<!-- <testCase>./libTests/referenceTestCases/euler/2D/nozzles/supersonicInjection/</testCase> -->
16-
17-
<!-- Kapila reference test cases -->
18-
<!-- --------------------------- -->
19-
<!-- <testCase>./libTests/referenceTestCases/kapila/1D/transports/interfaceWaterAir/</testCase> -->
20-
<!-- <testCase>./libTests/referenceTestCases/kapila/1D/shockTubes/interfaceWaterAir/</testCase> -->
21-
<!-- <testCase>./libTests/referenceTestCases/kapila/1D/shockTubes/interfaceWaterAirNASG/</testCase> -->
22-
<!-- <testCase>./libTests/referenceTestCases/kapila/1D/shockTubes/epoxySpinel/</testCase> -->
23-
<!-- <testCase>./libTests/referenceTestCases/kapila/1D/cavitation/</testCase> -->
24-
<!-- <testCase>./libTests/referenceTestCases/kapila/2D/transportWaterSquareInAir/</testCase> -->
25-
<!-- <testCase>./libTests/referenceTestCases/kapila/2D/squareWaterExplosion/</testCase> -->
26-
<!-- <testCase>./libTests/referenceTestCases/kapila/2D/shockBubble/heliumAir/</testCase> -->
27-
<!-- <testCase>./libTests/referenceTestCases/kapila/2D/richtmyerMeshkov/</testCase> -->
28-
<!-- <testCase>./libTests/referenceTestCases/kapila/2D/nozzles/tank/</testCase> -->
29-
<!-- <testCase>./libTests/referenceTestCases/kapila/2D/nozzles/injection/</testCase> -->
30-
<!-- <testCase>./libTests/referenceTestCases/kapila/2D/testUnstructured/</testCase> -->
31-
<!-- <testCase>./libTests/referenceTestCases/Kapila/AddPhysicalEffects/evap/evapShockTube/</testCase> -->
32-
<!-- <testCase>./libTests/referenceTestCases/kapila/AddPhysicalEffects/surfaceTension/squareToCircle/</testCase> -->
33-
<!-- <testCase>./libTests/referenceTestCases/kapila/AddPhysicalEffects/surfaceTension/squareToCircleSymmetry/</testCase> -->
34-
<!-- <testCase>./libTests/referenceTestCases/kapila/AddPhysicalEffects/surfaceTension/waterCylinderInAir/</testCase> -->
35-
<!-- <testCase>./libTests/referenceTestCases/kapila/AddPhysicalEffects/surfaceTension/waterDropletInAir/</testCase> -->
36-
<!-- <testCase>./libTests/referenceTestCases/kapila/AddPhysicalEffects/surfaceTension/dropletImpact/</testCase> -->
37-
<!-- <testCase>./libTests/referenceTestCases/kapila/AddPhysicalEffects/gravity/</testCase> -->
38-
<!-- <testCase>./libTests/referenceTestCases/kapila/AddPhysicalEffects/heatConduction/simple/</testCase> -->
39-
<!-- <testCase>./libTests/referenceTestCases/kapila/3D/unstructured/</testCase> -->
40-
<!-- <testCase>./libTests/referenceTestCases/kapila/3D/shockBubble/heliumAir/</testCase> -->
41-
42-
<!-- Thermal and Mechanical equilibrium reference test cases -->
43-
<!-- ------------------------------------------------------- -->
44-
<!-- <testCase>./libTests/referenceTestCases/thermalEq/transports/interfaceAirHelium/</testCase> -->
45-
<!-- <testCase>./libTests/referenceTestCases/thermalEq/shockTubes/interfaceWaterAir/</testCase> -->
46-
<!-- <testCase>./libTests/referenceTestCases/thermalEq/shockTubes/interfaceDodecane/</testCase> -->
47-
48-
<!-- Homogeneous Euler reference test cases -->
23+
<!-- <testCase>./libTests/referenceTestCases/euler/3D/LPCenter/</testCase> -->
24+
25+
<!-- Pressure- and velocity-equilibrium-model reference test cases -->
26+
<!-- ------------------------------------------------------------- -->
27+
<!-- <testCase>./libTests/referenceTestCases/PUEq/1D/transports/interfaceWaterAir/</testCase> -->
28+
<!-- <testCase>./libTests/referenceTestCases/PUEq/1D/shockTubes/interfaceWaterAir/</testCase> -->
29+
<!-- <testCase>./libTests/referenceTestCases/PUEq/1D/shockTubes/interfaceWaterAirNASG/</testCase> -->
30+
<!-- <testCase>./libTests/referenceTestCases/PUEq/1D/shockTubes/epoxySpinel/</testCase> -->
31+
<!-- <testCase>./libTests/referenceTestCases/PUEq/1D/cavitation/</testCase> -->
32+
<!-- <testCase>./libTests/referenceTestCases/PUEq/1D/sphericalCollapse/Pratio1427/</testCase> -->
33+
<!-- <testCase>./libTests/referenceTestCases/PUEq/2D/transportWaterSquareInAir/</testCase> -->
34+
<!-- <testCase>./libTests/referenceTestCases/PUEq/2D/squareWaterExplosion/</testCase> -->
35+
<!-- <testCase>./libTests/referenceTestCases/PUEq/2D/shockBubble/heliumAir/</testCase> -->
36+
<!-- <testCase>./libTests/referenceTestCases/PUEq/2D/richtmyerMeshkov/</testCase> -->
37+
<!-- <testCase>./libTests/referenceTestCases/PUEq/2D/sphericalCollapse/Pratio1427/</testCase> -->
38+
<!-- <testCase>./libTests/referenceTestCases/PUEq/2D/nozzles/tank/</testCase> -->
39+
<!-- <testCase>./libTests/referenceTestCases/PUEq/2D/nozzles/injection/</testCase> --> <!-- Something is wrong with the results of this test case (certainly coming from injection boundary condition), maybe something missing in initialConditionsV4.xml -->
40+
<!-- <testCase>./libTests/referenceTestCases/PUEq/2D/testUnstructured/</testCase> -->
41+
<!-- <testCase>./libTests/referenceTestCases/PUEq/2D/shockTubeFreeSurface/</testCase> --> <!-- Works but initial conditions (mesh) might not be the best ones -->
42+
<!-- <testCase>./libTests/referenceTestCases/PUEq/AddPhysicalEffects/evap/evapShockTube/</testCase> -->
43+
<!-- <testCase>./libTests/referenceTestCases/PUEq/AddPhysicalEffects/surfaceTension/squareToCircle/</testCase> -->
44+
<!-- <testCase>./libTests/referenceTestCases/PUEq/AddPhysicalEffects/surfaceTension/squareToCircleSymmetry/</testCase> -->
45+
<!-- <testCase>./libTests/referenceTestCases/PUEq/AddPhysicalEffects/surfaceTension/waterCylinderInAir/</testCase> -->
46+
<!-- <testCase>./libTests/referenceTestCases/PUEq/AddPhysicalEffects/surfaceTension/waterDropletInAir/</testCase> -->
47+
<!-- <testCase>./libTests/referenceTestCases/PUEq/AddPhysicalEffects/surfaceTension/waterDropletInAir_axisym/</testCase> -->
48+
<!-- <testCase>./libTests/referenceTestCases/PUEq/AddPhysicalEffects/surfaceTension/dropletImpact/</testCase> -->
49+
<!-- <testCase>./libTests/referenceTestCases/PUEq/AddPhysicalEffects/surfaceTension/dropletImpact_restart/</testCase> -->
50+
<!-- <testCase>./libTests/referenceTestCases/PUEq/AddPhysicalEffects/gravity/</testCase> -->
51+
<!-- <testCase>./libTests/referenceTestCases/PUEq/3D/shockBubble/heliumAir/</testCase> -->
52+
<!-- <testCase>./libTests/referenceTestCases/PUEq/3D/sphericalCollapse/Pratio1427/</testCase> -->
53+
<!-- <testCase>./libTests/referenceTestCases/PUEq/3D/unstructured/</testCase> --> <!-- Not working, once corrected, to add to nonreg -->
54+
55+
<!-- Temperature-, pressure- and velocity-equilibrium-model reference test cases -->
56+
<!-- --------------------------------------------------------------------------- -->
57+
<!-- <testCase>./libTests/referenceTestCases/PTUEq/transports/interfaceAirHelium/</testCase> -->
58+
<!-- <testCase>./libTests/referenceTestCases/PTUEq/shockTubes/interfaceWaterAir/</testCase> -->
59+
<!-- <testCase>./libTests/referenceTestCases/PTUEq/shockTubes/interfaceDodecane/</testCase> -->
60+
61+
<!-- Homogeneous-Euler reference test cases -->
4962
<!-- -------------------------------------- -->
5063
<!-- <testCase>./libTests/referenceTestCases/eulerHomogeneous/shockTubes/</testCase> -->
5164

52-
<!-- Pressure disequilibrium model reference test cases -->
53-
<!-- -------------------------------------------------- -->
54-
<!-- <testCase>./libTests/referenceTestCases/multiP/1D/transports/interfaceWaterAir/</testCase> -->
55-
<!-- <testCase>./libTests/referenceTestCases/multiP/1D/shockTubes/interfaceWaterAir/</testCase> -->
56-
<!-- <testCase>./libTests/referenceTestCases/multiP/1D/shockTubes/epoxySpinel/</testCase> -->
57-
<!-- <testCase>./libTests/referenceTestCases/multiP/1D/cavitation/</testCase> -->
65+
<!-- Velocity-equilibrium-model reference test cases -->
66+
<!-- ----------------------------------------------- -->
67+
<!-- <testCase>./libTests/referenceTestCases/UEq/1D/transports/interfaceWaterAir/</testCase> -->
68+
<!-- <testCase>./libTests/referenceTestCases/UEq/1D/shockTubes/interfaceAirHelium/</testCase> -->
69+
<!-- <testCase>./libTests/referenceTestCases/UEq/1D/shockTubes/interfaceWaterAir/</testCase> -->
70+
<!-- <testCase>./libTests/referenceTestCases/UEq/1D/shockTubes/epoxySpinel/</testCase> -->
71+
<!-- <testCase>./libTests/referenceTestCases/UEq/1D/cavitation/</testCase> -->
72+
73+
<!-- Error test cases -->
74+
<!-- ---------------- -->
75+
<!-- <testCase>./libTests/referenceTestCases/errors/errorXMLElement/</testCase> -->
76+
<!-- <testCase>./libTests/referenceTestCases/errors/errorXMLAttribute/</testCase> -->
77+
5878
</ecogen>

‎Makefile‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
#desactivation of the implicite rules
22
.SUFFIXES:
3+
.PHONY: nonreg
34

45
#Definitions
56
EXECUTABLE = ECOGEN
67
CXX = mpicxx
7-
CXXFLAGS = -O3 -std=c++11
8-
#CXXFLAGS = -g -std=c++11
9-
# LDFLAGS =
8+
CXXFLAGS = -O3 -std=c++11 -Wall -Wextra -Wpedantic #release
9+
#CXXFLAGS = -g -std=c++11 -Wall -Wextra -Wpedantic #debug
10+
#CXXFLAGS = -O3 -std=c++11 -Wall -Wextra -Wpedantic -fprofile-arcs -ftest-coverage #code coverage
1011

1112
dirs = $(shell find . -type d)
1213
SOURCES = $(foreach dir,$(dirs),$(wildcard $(dir)/*.cpp))
@@ -30,9 +31,9 @@ clean:
3031
cleanres:
3132
rm -rf ./results/*
3233

33-
#Creation of the executable
34-
35-
36-
# DO NOT DELETE
37-
34+
#Use command: time make nonreg
35+
nonreg:
36+
@./nonreg/nonreg.sh || true
3837

38+
cleannonreg:
39+
rm -rf ./nonreg/reports/*

‎README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,11 @@ Schmidmayer, K., Petitpas, F., Le Martelot, S. & Daniel, E. (2020). ECOGEN, an o
4242
@article{schmidmayer2020ecogen,
4343
doi = {10.1016/j.cpc.2019.107093},
4444
url = {https://doi.org/10.1016/j.cpc.2019.107093},
45-
title={ECOGEN: An open-source tool for multiphase, compressible, multiphysics flows},
46-
author={Schmidmayer, Kevin and Petitpas, Fabien and Le Martelot, S{\'e}bastien and Daniel, E},
45+
title={{ECOGEN}: {A}n open-source tool for multiphase, compressible, multiphysics flows},
46+
author={Schmidmayer, Kevin and Petitpas, Fabien and Le Martelot, S{\'e}bastien and Daniel, {\'E}ric},
4747
journal={Computer Physics Communications},
4848
volume={251},
49+
pages={107093},
4950
year={2020}
5051
}
5152
```

‎README_Developer‎ renamed to ‎README_Developer.md‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
*********************************
2-
Developers information - ECOGEN
2+
Developpers information - ECOGEN
33
*********************************
44

55
Variable and Classe names:
@@ -44,18 +44,19 @@ type m_variable; //!< member description
4444

4545

4646

47-
Developer personnal comments - flags
47+
Developper personnal comments - flags
4848
-------------------------------------
4949

50-
//Developer//KeyWord// comments, ex: "//FP//DEV// comment, description"
51-
52-
Key word list : //DEV// in developement
53-
//Q// question to dig
54-
//TODO// should be done in the future
55-
//ERR// error : to correct ASAP
56-
//ID// idea
57-
//ICI// Stop developement position
58-
//VERIF// to verify : is it needed ?
59-
//TEST// test : To delete ASAP
50+
//Developper//KeyWord// comments, ex: "//FP//DEV// comment, description"
51+
52+
Key word list : //DEV// in developpement
53+
//Q// question to dig
54+
//TODO// should be done in the future
55+
//VS2015// problem on Visual Studio 2015
56+
//ERR// error : to correct ASAP
57+
//ID// idea
58+
//ICI// Stop developement position
59+
//VERIF// to verify : is it needed ?
60+
//TEST// test : To delete ASAP
6061

6162
-----For each modification, a comment should be prepared to be included to the commit message for Git.

‎coverage/README.md‎

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
Here is described how to compute a code coverage for ECOGEN.
2+
3+
1. Open a terminal in ECOGEN/ECOGEN directory.
4+
5+
2. Execute a 'make clean' command.
6+
7+
2. Compile the code with the '-fprofile-arcs -ftest-coverage' options (see code-coverage CXXFLAGS in ECOGEN Makefile).
8+
This will generate .gcno files in the sources.
9+
10+
3. Execute the code either in sequential or in parallel (recommended) taking care of enabling all the test cases you want to compute the coverage. Note that you can execute the code several times and it will stack up the coverage analysis. For example, enable all the sequential and parallel nonreg test cases and run:
11+
./ECOGEN nonreg/ECOGEN_nonreg_sequential.xml && mpirun -n 7 --oversubscribe ./ECOGEN nonreg/ECOGEN_nonreg_parallel.xml
12+
This will generate .gcda files in the sources.
13+
14+
4. Install lcov if not already done and execute the following command to interprete the gcda files. Note that the "--capture" option may be "--coverage" on some systems.
15+
lcov --capture --directory . --output-file coverage/coverage.info
16+
17+
5. Execute the following command to generate html files from the previous coverage files.
18+
genhtml coverage/coverage.info --output-directory coverage/html
19+
20+
6. Open coverage/html/index.html with your browser to have a look at the report.
21+
22+
Note that the .gcno and .gcda files are voluntarily not added in the .gitignore to remind you to delete them after the analysis (and obviously if you do not want to keep them).

‎docs/sphinx_docs/source/Biblio.bib‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ @Article{schmidmayer2019adaptive
2323
journal = {Journal of Computational Physics},
2424
volume={388},
2525
pages={252--278},
26-
year = {2019},
27-
publisher = {Elsevier},
26+
year = {2019}
2827
}
2928

3029
@article{schmidmayer2020ecogen,
@@ -34,13 +33,14 @@ @article{schmidmayer2020ecogen
3433
author={Schmidmayer, K. and Petitpas, F. and Le Martelot, S. and Daniel, E.},
3534
journal={Computer Physics Communications},
3635
volume={251},
36+
pages={107093},
3737
year={2020}
3838
}
3939

4040
@article{schmidmayer2019comparativeStudy,
4141
title={An assessment of multicomponent flow models and interface capturing schemes for spherical bubble dynamics},
4242
author={Schmidmayer, K. and Bryngelson, S. H. and Colonius, T.},
43-
journal={J. Comp. Phys.},
43+
journal={Journal of Computational Physics},
4444
volume={402},
4545
pages={109080},
4646
year={2020}

0 commit comments

Comments
 (0)