Merge pull request #391 from JX278/master

add options for thermo DNN
deepmodeling · Dec 21, 2023 · ab128cc · ab128cc
2 parents 15ae774 + 082a87a
commit ab128cc
Show file tree

Hide file tree

Showing 28 changed files with 234 additions and 86 deletions.
diff --git a/.github/workflows/CPU_inferencce_validation.yml b/.github/workflows/CPU_inferencce_validation.yml
@@ -33,6 +33,7 @@ jobs:
         conda activate libcantera
         conda install -c cantera libcantera-devel=2.6
         conda install pytorch pybind11
+        conda install pkg-config
         conda install --channel https://conda.anaconda.org/zhaofeng-shu33 easydict
         git clone https://github.com/deepmodeling/deepflame-dev.git
         cd deepflame-dev
@@ -52,7 +53,7 @@ jobs:
         && cp -r flareFGM_Table_Download/SandiaD/flare.tbl examples/dfLowMachFoam/2DSandiaD_flareFGM/
         && git clone https://github.com/intelligent-algorithm-team/intelligent-combustion.git 
         && cp -r intelligent-combustion/DeePCK/Model/HE04_Hydrogen_ESH2_GMS_sub_20221101/ mechanisms/ && source ~/miniconda3/etc/profile.d/conda.sh && conda activate libcantera && source /opt/openfoam7/etc/bashrc 
-        && . configure.sh && source ./bashrc && . install.sh 
+        && . configure.sh --use_pytorch&& source ./bashrc && . install.sh 
         && cd test && ./Allrun && conda deactivate "
 
      - name: test 

diff --git a/applications/solvers/df0DFoam/CMakeLists.txt b/applications/solvers/df0DFoam/CMakeLists.txt
@@ -29,7 +29,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=bfd -Xlinker --add-needed -Xlinker --no-as-
 
 SET(CMAKE_C_COMPILER g++)
 SET(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
-SET(EXE_COMPILE_OPTION "-std=c++17 -m64 -Dlinux64 -DWM_ARCH_OPTION=64
+SET(EXE_COMPILE_OPTION "-std=c++14 -m64 -Dlinux64 -DWM_ARCH_OPTION=64
 -DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor
 -Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3
 -DNoRepository -ftemplate-depth-100

diff --git a/applications/solvers/df0DFoam/Make/options b/applications/solvers/df0DFoam/Make/options
@@ -1,6 +1,6 @@
 -include $(GENERAL_RULES)/mplibType
 
-EXE_INC = -std=c++17 \
+EXE_INC = -std=c++14 \
     -Wno-unused-variable \
     -Wno-unused-but-set-variable \
     -Wno-old-style-cast \

diff --git a/applications/solvers/dfHighSpeedFoam/CMakeLists.txt b/applications/solvers/dfHighSpeedFoam/CMakeLists.txt
@@ -29,7 +29,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=bfd -Xlinker --add-needed -Xlinker --no-as-
 
 SET(CMAKE_C_COMPILER g++)
 SET(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
-SET(EXE_COMPILE_OPTION "-std=c++17 -m64 -Dlinux64 -DWM_ARCH_OPTION=64
+SET(EXE_COMPILE_OPTION "-std=c++14 -m64 -Dlinux64 -DWM_ARCH_OPTION=64
 -DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor
 -Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3
 -DNoRepository -ftemplate-depth-100

diff --git a/applications/solvers/dfHighSpeedFoam/Make/options b/applications/solvers/dfHighSpeedFoam/Make/options
@@ -1,6 +1,6 @@
 -include $(GENERAL_RULES)/mplibType
 
-EXE_INC = -std=c++17 \
+EXE_INC = -std=c++14 \
     -Wno-unused-variable \
     -Wno-unused-but-set-variable \
     -Wno-old-style-cast \

diff --git a/applications/solvers/dfLowMachFoam/CMakeLists.txt b/applications/solvers/dfLowMachFoam/CMakeLists.txt
@@ -33,7 +33,7 @@ SET (CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS} ${OpenMP_CXX_FLAGS})
 
 SET(CMAKE_C_COMPILER g++)
 SET(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
-SET(EXE_COMPILE_OPTION "-std=c++17 -m64 -Dlinux64 -DWM_ARCH_OPTION=64
+SET(EXE_COMPILE_OPTION "-std=c++14 -m64 -Dlinux64 -DWM_ARCH_OPTION=64
 -DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor
 -Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3
 -DNoRepository -ftemplate-depth-100

diff --git a/applications/solvers/dfLowMachFoam/Make/options b/applications/solvers/dfLowMachFoam/Make/options
@@ -1,6 +1,6 @@
 -include $(GENERAL_RULES)/mplibType
 
-EXE_INC = -std=c++17 \
+EXE_INC = -std=c++14 \
     -g \
     -fopenmp \
     -Wno-unused-variable \

diff --git a/applications/solvers/dfSprayFoam/CMakeLists.txt b/applications/solvers/dfSprayFoam/CMakeLists.txt
@@ -29,7 +29,7 @@ SET(CMAKE_EXE_LINKER_FLAGS "-fuse-ld=bfd -Xlinker --add-needed -Xlinker --no-as-
 
 SET(CMAKE_C_COMPILER g++)
 SET(PATH_LIB_OPENMPI "openmpi-system")  # Foundation version
-SET(EXE_COMPILE_OPTION "-std=c++17 -m64 -Dlinux64 -DWM_ARCH_OPTION=64
+SET(EXE_COMPILE_OPTION "-std=c++14 -m64 -Dlinux64 -DWM_ARCH_OPTION=64
 -DWM_DP -DWM_LABEL_SIZE=32 -Wall -Wextra -Wold-style-cast -Wnon-virtual-dtor
 -Wno-unused-parameter -Wno-invalid-offsetof -Wno-attributes -O3
 -DNoRepository -ftemplate-depth-100

diff --git a/applications/solvers/dfSprayFoam/Make/options b/applications/solvers/dfSprayFoam/Make/options
@@ -1,6 +1,6 @@
 -include $(GENERAL_RULES)/mplibType
 
-EXE_INC = -std=c++17 \
+EXE_INC = -std=c++14 \
     -Wno-unused-variable \
     -Wno-unused-but-set-variable \
     -Wno-old-style-cast \

diff --git a/applications/utilities/flameSpeed/Make/options b/applications/utilities/flameSpeed/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -std=c++17\
+EXE_INC = -std=c++14\
     -Wno-unused-variable \
     -Wno-unused-but-set-variable \
     -Wno-old-style-cast \

diff --git a/src/TurbulenceModels/compressible/Make/options b/src/TurbulenceModels/compressible/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -std=c++17\
+EXE_INC = -std=c++14\
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \

diff --git a/src/TurbulenceModels/turbulenceModels/Make/options b/src/TurbulenceModels/turbulenceModels/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -std=c++17\
+EXE_INC = -std=c++14\
     -I$(LIB_SRC)/TurbulenceModels/compressible/lnInclude \
     -I$(LIB_SRC)/TurbulenceModels/turbulenceModels/lnInclude \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \

diff --git a/src/dfCanteraMixture/Make/options b/src/dfCanteraMixture/Make/options
@@ -1,4 +1,4 @@
-EXE_INC = -std=c++17\
+EXE_INC = -std=c++14\
     -Wno-old-style-cast \
     -I$(LIB_SRC)/transportModels/compressible/lnInclude \
     -I$(LIB_SRC)/thermophysicalModels/basic/lnInclude \

diff --git a/src/dfChemistryModel/Make/options b/src/dfChemistryModel/Make/options
@@ -1,6 +1,6 @@
 -include $(GENERAL_RULES)/mplibType
 
-EXE_INC = -std=c++17 \
+EXE_INC = -std=c++14 \
     -Wno-old-style-cast \
     $(PFLAGS) $(PINC) \
     $(if $(LIBTORCH_ROOT),-DUSE_LIBTORCH,) \