Update PelePhysics: AMReX with bottom solve fix (#397)

* amrex-aa08ff0ce7 * build changes for inclusion of Manifold EoS in PelePhysics
AMReX-Combustion · Jul 11, 2024 · d2cf23b · d2cf23b
1 parent 82e7e4d
commit d2cf23b
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 2 deletions.
diff --git a/CMake/BuildPelePhysicsLib.cmake b/CMake/BuildPelePhysicsLib.cmake
@@ -50,6 +50,17 @@ function(build_pele_physics_lib pele_physics_lib_name)
     )
     target_include_directories(${pele_physics_lib_name} PUBLIC ${PELE_PHYSICS_UTILITY_DIR}/PltFileManager)
 
+    target_sources(${pele_physics_lib_name}
+      PRIVATE
+      ${PELE_PHYSICS_UTILITY_DIR}/BlackBoxFunction/BlackBoxFunction.cpp
+      ${PELE_PHYSICS_UTILITY_DIR}/BlackBoxFunction/BlackBoxFunction.H
+      ${PELE_PHYSICS_UTILITY_DIR}/BlackBoxFunction/BlackBoxFunctionFactory.H
+      ${PELE_PHYSICS_UTILITY_DIR}/BlackBoxFunction/NeuralNetHomerolled.H
+      ${PELE_PHYSICS_UTILITY_DIR}/BlackBoxFunction/NeuralNetLayerDef.H
+      ${PELE_PHYSICS_UTILITY_DIR}/BlackBoxFunction/NeuralNetModelDef.H
+      ${PELE_PHYSICS_UTILITY_DIR}/BlackBoxFunction/Table.H)
+    target_include_directories(${pele_physics_lib_name} PUBLIC ${PELE_PHYSICS_UTILITY_DIR}/BlackBoxFunction)
+
     target_sources(${pele_physics_lib_name}
       PRIVATE
         ${PELE_PHYSICS_UTILITY_DIR}/PMF/PMF.H

diff --git a/Exec/Make.PeleLMeX b/Exec/Make.PeleLMeX
@@ -105,7 +105,8 @@ endif
 
 ChemDir  = Mechanisms/$(Chemistry_Model)
 
-PPdirs := Source/Utility/PMF Source/Utility/TurbInflow Source/Utility/PltFileManager Source/Utility/Diagnostics
+PPdirs := Source/Utility/PMF Source/Utility/TurbInflow Source/Utility/PltFileManager
+PPdirs += Source/Utility/Diagnostics Source/Utility/BlackBoxFunction
 PPdirs += Source $(ChemDir) Source/Reactions Source/Eos Source/Transport
 Bpack += $(foreach dir, $(PPdirs), $(PELE_PHYSICS_HOME)/$(dir)/Make.package)
 Blocs += $(foreach dir, $(PPdirs), $(PELE_PHYSICS_HOME)/$(dir))

diff --git a/Submodules/PelePhysics b/Submodules/PelePhysics
+1 −0		.codespell-ignore-words
+18 −5		.github/workflows/ci.yml
+2 −0		.gitmodules
+6 −1		Mechanisms/Null/mechanism.H
+4 −2		Mechanisms/Null/mechanism.cpp
+6 −0		Source/Eos/EOS.H
+21 −0		Source/Eos/EOS.cpp
+174 −0		Source/Eos/EosParams.H
+32 −0		Source/Eos/Fuego.H
+110 −75		Source/Eos/GammaLaw.H
+365 −0		Source/Eos/Manifold.H
+32 −0		Source/Eos/SRK.H
+30 −0		Source/PelePhysicsConstraints.H
+126 −0		Source/Transport/Manifold.H
+3 −0		Source/Transport/Transport.H
+61 −0		Source/Transport/TransportParams.H
+3 −0		Source/Transport/TransportTypes.H
+86 −0		Source/Utility/BlackBoxFunction/BlackBoxFunction.H
+14 −0		Source/Utility/BlackBoxFunction/BlackBoxFunction.cpp
+104 −0		Source/Utility/BlackBoxFunction/BlackBoxFunctionFactory.H
+6 −0		Source/Utility/BlackBoxFunction/Make.package
+331 −0		Source/Utility/BlackBoxFunction/NeuralNetHomerolled.H
+391 −0		Source/Utility/BlackBoxFunction/NeuralNetLayerDef.H
+332 −0		Source/Utility/BlackBoxFunction/NeuralNetModelDef.H
+550 −0		Source/Utility/BlackBoxFunction/Table.H
+1 −1		Submodules/amrex
+4 −0		Support/CMLM/README
+ −		Support/CMLM/fgm_net.pnn
+19 −0		Support/CMLM/fgm_net_info.txt
+ −		Support/CMLM/peletable_2dim_10grid
+ −		Support/CMLM/peletable_trans_2dim_10grid
+8 −0		Testing/Exec/EosEval/GNUmakefile
+37 −20		Testing/Exec/EosEval/GPU_misc.H
+15 −0		Testing/Exec/EosEval/inputs.2d.network
+11 −0		Testing/Exec/EosEval/inputs.2d.table2d
+56 −27		Testing/Exec/EosEval/main.cpp
+18 −0		Testing/Exec/Make.PelePhysics
+0 −38		Testing/Exec/ProductionRateEval/GNUmakefile
+0 −0		Testing/Exec/ProductionRateEval/inputs.2d
+0 −177		Testing/Exec/ProductionRateEval/main.cpp
+9 −0		Testing/Exec/TranEval/GNUmakefile
+9 −6		Testing/Exec/TranEval/GPU_misc.H
+14 −0		Testing/Exec/TranEval/inputs.2d_Manifold
+11 −0		Testing/Exec/TranEval/inputs.2d_Network
+9 −0		Testing/Exec/TranEval/main.cpp