code sources updates v2.0

AUTHORS

@@ -1,6 +1,6 @@
 ECOGEN is under GPLv3 or later license. Here is the name and contact information of contributors of the project.
 
-Contributors : S. Le Martelot, F. Petitpas, K. Schmidmayer, E. Daniel
+Contributors : S. Le Martelot, F. Petitpas, K. Schmidmayer, E. Daniel, B. Dorschner, J. Caze
 
 F. Petitpas
 -----------
@@ -13,10 +13,19 @@ Expert enginneer turbopumps at CNES.
 
 K. Schmidmayer
 --------------
-PhD, postdoctoral scholar at California Institute of Technology, Pasadena, USA.
+Postdoctoral scholar at California Institute of Technology, Pasadena, USA.
 e-mail adress: [email protected] ; [email protected]
-Personal web page: http://kevinschmidmayer.wixsite.com/webpage
+Personal web page: https://kevinschmidmayer.github.io/
 
 E. Daniel
 ---------
-Professor at Aix-Marseille Universite, France. Teaching at the Polytech Marseille engineering school.
+Professor at Aix-Marseille Universite, France. Teaching at the Polytech Marseille engineering school.
+e-mail adress: [email protected]
+
+B. Dorschner
+------------
+Postdoctoral scholar at California Institute of Technology, Pasadena, USA.
+
+J. Caze
+-------
+Phd student at CNES / Aix Marseille Universite.

COPYRIGHT

@@ -3,4 +3,5 @@ ECOGEN
 Copyright © 2014 	  Sebastien Le Martelot, Fabien Petitpas
 Copyright © 2016-2017 Fabien Petitpas, Kevin Schmidmayer
 Copyright © 2018 	  Fabien Petitpas, Kevin Schmidmayer, Eric Daniel
-Copyright © 2019 	  Fabien Petitpas, Kevin Schmidmayer, Eric Daniel
+Copyright © 2019 	  Fabien Petitpas, Kevin Schmidmayer, Eric Daniel, Benedikt Dorschner
+Copyright © 2020 	  Fabien Petitpas, Kevin Schmidmayer, Eric Daniel, Benedikt Dorschner, Joris Caze

ECOGEN.xml

@@ -1,6 +1,5 @@
-<?xml version = "1.0" encoding = "UTF-8" standalone = "yes"?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <ecogen>
-
   <!-- Euler reference test cases -->
   <!-- -------------------------- -->
   <testCase>./libTests/referenceTestCases/euler/1D/transport/positiveVelocity/</testCase>
@@ -12,17 +11,22 @@
   <!-- <testCase>./libTests/referenceTestCases/euler/2D/HPUnstructured/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/euler/2D/nozzles/tankWithShock/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/euler/3D/LPCenter/</testCase> -->
+  <!-- <testCase>./libTests/referenceTestCases/euler/2D/shockTubes/cylindrical/</testCase> -->
+  <!-- <testCase>./libTests/referenceTestCases/euler/2D/nozzles/supersonicInjection/</testCase> -->
 
   <!-- Kapila reference test cases -->
   <!-- --------------------------- -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/1D/transports/interfaceWaterAir/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/1D/shockTubes/interfaceWaterAir/</testCase> -->
+  <!-- <testCase>./libTests/referenceTestCases/kapila/1D/shockTubes/interfaceWaterAirNASG/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/1D/shockTubes/epoxySpinel/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/1D/cavitation/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/2D/transportWaterSquareInAir/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/2D/squareWaterExplosion/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/2D/shockBubble/heliumAir/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/2D/richtmyerMeshkov/</testCase> -->
+  <!-- <testCase>./libTests/referenceTestCases/kapila/2D/nozzles/tank/</testCase> -->
+  <!-- <testCase>./libTests/referenceTestCases/kapila/2D/nozzles/injection/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/2D/testUnstructured/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/Kapila/AddPhysicalEffects/evap/evapShockTube/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/AddPhysicalEffects/surfaceTension/squareToCircle/</testCase> -->
@@ -31,9 +35,10 @@
   <!-- <testCase>./libTests/referenceTestCases/kapila/AddPhysicalEffects/surfaceTension/waterDropletInAir/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/AddPhysicalEffects/surfaceTension/dropletImpact/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/AddPhysicalEffects/gravity/</testCase> -->
+  <!-- <testCase>./libTests/referenceTestCases/kapila/AddPhysicalEffects/heatConduction/simple/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/3D/unstructured/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/kapila/3D/shockBubble/heliumAir/</testCase> -->
-    
+
   <!-- Thermal and Mechanical equilibrium reference test cases -->
   <!-- ------------------------------------------------------- -->
   <!-- <testCase>./libTests/referenceTestCases/thermalEq/transports/interfaceAirHelium/</testCase> -->
@@ -50,5 +55,4 @@
   <!-- <testCase>./libTests/referenceTestCases/multiP/1D/shockTubes/interfaceWaterAir/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/multiP/1D/shockTubes/epoxySpinel/</testCase> -->
   <!-- <testCase>./libTests/referenceTestCases/multiP/1D/cavitation/</testCase> -->
-
 </ecogen>

Makefile

@@ -4,7 +4,8 @@
 #Definitions
 EXECUTABLE = ECOGEN
 CXX = mpicxx
-CXXFLAGS = -O3
+CXXFLAGS = -O3 -std=c++11
+#CXXFLAGS = -g -std=c++11
 # LDFLAGS =
 
 dirs = $(shell find . -type d)

README.md

@@ -22,4 +22,30 @@ Start with ECOGEN
 -----------------
 The better way to start with **ECOGEN** is to follow installation instructions on the official documentation webSite: https://code-mphi.github.io/ECOGEN/docs/sphinx_docs/Chap2_installation_Chapter.html
 
-Then you can follow the dedicated tutorial to run your first test: https://code-mphi.github.io/ECOGEN/docs/sphinx_docs/Chap4_1startWithECOGEN.html
+Then you can follow the dedicated tutorial to run your first test: https://code-mphi.github.io/ECOGEN/docs/sphinx_docs/Chap4_1startWithECOGEN.html
+
+License
+=======
+
+[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
+
+ECOGEN is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
+ECOGEN is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details http://www.gnu.org/licenses.
+
+Citation
+--------
+To cite ECOGEN, please use :
+
+Schmidmayer, K., Petitpas, F., Le Martelot, S. & Daniel, E. (2020). ECOGEN, an open-source tool dedicated to multiphase compressible multiphysics flows. *Computer Physics Communications*. [![DOI](https://img.shields.io/badge/DOI-10.1016/j.cpc.2019.107093-green.svg)](https://doi.org/10.1016/j.cpc.2019.107093)
+
+```
+@article{schmidmayer2020ecogen,
+  doi = {10.1016/j.cpc.2019.107093},
+  url = {https://doi.org/10.1016/j.cpc.2019.107093},
+  title={ECOGEN: An open-source tool for multiphase, compressible, multiphysics flows},
+  author={Schmidmayer, Kevin and Petitpas, Fabien and Le Martelot, S{\'e}bastien and Daniel, E},
+  journal={Computer Physics Communications},
+  volume={251},
+  year={2020}
+}
+```

libEOS/IG_air.xml

@@ -9,9 +9,6 @@
 	</parameters>
 	<physicalParameters
 		mu="1.85e-5"     
-		lambda="2.62">
+		lambda="0.0262">
 	</physicalParameters>	
-</parametersEOS>
-
-
-<!-- lambda="0.0262" -->
+</parametersEOS>

libEOS/IG_air2.xml

@@ -9,9 +9,6 @@
 	</parameters>
 	<physicalParameters
 		mu="1.85e-5"     
-		lambda="200.62">
+		lambda="0.0262">
 	</physicalParameters>	
-</parametersEOS>
-
-
-<!-- lambda="0.0262" -->
+</parametersEOS>

libEOS/IG_dodVap.xml

@@ -1,22 +1,12 @@
-<?xml version = "1.0" encoding = "UTF-8" standalone = "yes"?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <parametersEOS>
-	<EOS fichier="IG_dodVap.xml" type="IG"/>
-	<parameters
-		gamma="1.025"
-		cv="1077."
-		energyRef="-237.e3"
-		entropyRef="-3.56e4">
-	</parameters>
-	<physicalParameters
-		mu="1.e-3"
-		lambda="0.6">
-	</physicalParameters>		
+  <EOS type="IG" fichier="IG_dodVap.xml"/>
+  <parameters cv="1077." gamma="1.025" energyRef="-237.e3" entropyRef="0"/>
+  <physicalParameters lambda="0.6" mu="1.e-3"/>
 </parametersEOS>
-
-
-	<!-- <parameters
+<!-- <parameters
 		gamma="1.43"
 		cv="1040.14"
 		energyRef="3.197e6"
 		entropyRef="-23.408e3">
-	</parameters> -->
+	</parameters> -->

libEOS/IG_waterVap.xml

@@ -1,6 +1,6 @@
 <?xml version = "1.0" encoding = "UTF-8" standalone = "yes"?>
 <parametersEOS>
-	<EOS fichier="IG_eauVap.xml" type="IG"/>
+	<EOS fichier="IG_waterVap.xml" type="IG"/>
 	<parameters
 		gamma="1.358"
 		cv="1247."
@@ -11,12 +11,4 @@
 		mu="1.e-3"
 		lambda="0.6">
 	</physicalParameters>
-</parametersEOS>
-
-
-	<!-- <parameters
-		gamma="1.43"
-		cv="1040.14"
-		energyRef="3.197e6"
-		entropyRef="-23.408e3">
-	</parameters> -->
+</parametersEOS>

libEOS/NASG_dodLiq.xml

@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<parametersEOS>
+  <EOS type="NASG" fichier="NASG_dodLiq.xml"/>
+  <parameters cv="2393." b="7.51e-4" gamma="1.09" energyRef="-794.696e3" pInf="1.159e8" entropyRef="35600"/>
+  <physicalParameters lambda="0.6" mu="1.e-3"/>
+</parametersEOS>

libEOS/NASG_waterLiq.xml

@@ -0,0 +1,16 @@
+<?xml version = "1.0" encoding = "UTF-8" standalone = "yes"?>
+<parametersEOS>
+	<EOS fichier="NASG_waterLiq.xml" type="NASG"/>
+	<parameters
+		gamma="1.19"
+		pInf="7028.e5"
+		b="6.61e-4"
+		cv="3610.0"
+		energyRef="-1177788."
+		entropyRef="0.">
+	</parameters>
+	<physicalParameters
+		mu="1.e-3"
+		lambda="0.6">
+	</physicalParameters>		
+</parametersEOS>

libEOS/SG_dodLiq.xml

@@ -1,15 +1,6 @@
-<?xml version = "1.0" encoding = "UTF-8" standalone = "yes"?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <parametersEOS>
-	<EOS fichier="SG_dodLiq.xml" type="SG"/>
-	<parameters
-		gamma="2.35"
-		pInf="4.e8"
-		cv="1956.0"
-		energyRef="-755.e3"
-		entropyRef="0.">
-	</parameters>
-	<physicalParameters
-		mu="1.e-3"
-		lambda="0.6">
-	</physicalParameters>		
+  <EOS type="SG" fichier="SG_dodLiq.xml"/>
+  <parameters cv="1956.0" gamma="2.35" energyRef="-755.e3" pInf="4.e8" entropyRef="35600"/>
+  <physicalParameters lambda="0.6" mu="1.e-3"/>
 </parametersEOS>

libMeshes/shockTube/shockTubeFreeSurface.geo

@@ -10,20 +10,26 @@ Point(5) = {1.5, 0, 0, dxMarche};
 Point(6) = {1.52, 0, 0, dxMarche};
 Point(7) = {1.5, 0.05, 0, dxMarche};
 Point(8) = {1.52, 0.05, 0, dxMarche};
-
+Point(9) = {0,0.05,0, dx};
 
 Line(1) = {4, 3};
 Line(2) = {3, 2};
 Line(3) = {2, 6};
-Line(4) = {1, 4};
+Line(4) = {1, 9};
 Line(5) = {5, 7};
 Line(6) = {7, 8};
 Line(7) = {8, 6};
 Line(8) = {1, 5};
-Line Loop(9) = {4, 1, 2, 3, -7, -6, -5, -8};
-Plane Surface(10) = {9};
-Physical Surface(11) = {10};
-Physical Line(1) = {8, 4, 1, 3, 7, 6, 5};
+Line(9) = {9, 4};
+Line(10) = {9,7};
+
+//Line Loop(9) = {9, 4, 1, 2, 3, -7, -6, -5, -8};
+Line Loop(11) = {9,1,2,3,-7,-6,-10};
+Plane Surface(11) = {11};
+Line Loop(12) = {4,10,-5,-8};
+Plane Surface(12) = {12};
+Physical Surface(11) = {11,12};
+Physical Line(1) = {8, 4, 1, 3, 7, 6, 5, 9};
 Physical Line(2) = {2};
 
-Recombine Surface {10};
+Recombine Surface {11,12};