From 8bdd5917be2317cf0952de7792a0cef4941dcacf Mon Sep 17 00:00:00 2001 From: whx <972521718@qq.com> Date: Fri, 30 Jun 2023 13:27:53 +0800 Subject: [PATCH 1/2] whx-DeePFGM-change --- .../data-2D/process_params/constants_T.npy | Bin .../data-2D/process_params/constants_YCO.npy | Bin .../data-2D/process_params/constants_YCO2.npy | Bin .../data-2D/process_params/constants_YH2O.npy | Bin .../data-2D/process_params/constants_all.npy | Bin .../data-2D/process_params/constants_cp.npy | Bin .../process_params/constants_omegac.npy | Bin .../data-2D/process_params/lambdas_T.npy | Bin .../data-2D/process_params/lambdas_YCO.npy | Bin .../data-2D/process_params/lambdas_YCO2.npy | Bin .../data-2D/process_params/lambdas_YH2O.npy | Bin .../data-2D/process_params/lambdas_all.npy | Bin .../data-2D/process_params/lambdas_cp.npy | Bin .../data-2D/process_params/lambdas_omegac.npy | Bin .../data-2D/process_params/phimax_T.npy | Bin .../data-2D/process_params/phimax_YCO.npy | Bin .../data-2D/process_params/phimax_YCO2.npy | Bin .../data-2D/process_params/phimax_YH2O.npy | Bin .../data-2D/process_params/phimax_all.npy | Bin .../data-2D/process_params/phimax_cp.npy | Bin .../data-2D/process_params/phimax_omegac.npy | Bin .../data-2D/process_params/phimin_T.npy | Bin .../data-2D/process_params/phimin_YCO.npy | Bin .../data-2D/process_params/phimin_YCO2.npy | Bin .../data-2D/process_params/phimin_YH2O.npy | Bin .../data-2D/process_params/phimin_all.npy | Bin .../data-2D/process_params/phimin_cp.npy | Bin .../data-2D/process_params/phimin_omegac.npy | Bin .../data-2D/process_params/xmax.npy | Bin .../data-2D/process_params/xmin.npy | Bin .../data-4D/process_params/constants.npy | Bin .../data-4D/process_params/constants_T.npy | Bin .../data-4D/process_params/constants_YCO.npy | Bin .../data-4D/process_params/constants_YCO2.npy | Bin .../data-4D/process_params/constants_YH2O.npy | Bin .../data-4D/process_params/constants_all.npy | Bin .../data-4D/process_params/constants_cp.npy | Bin .../process_params/constants_omegac.npy | Bin .../data-4D/process_params/lambdas.npy | Bin .../data-4D/process_params/lambdas_T.npy | Bin .../data-4D/process_params/lambdas_YCO.npy | Bin .../data-4D/process_params/lambdas_YCO2.npy | Bin .../data-4D/process_params/lambdas_YH2O.npy | Bin .../data-4D/process_params/lambdas_all.npy | Bin .../data-4D/process_params/lambdas_cp.npy | Bin .../data-4D/process_params/lambdas_omegac.npy | Bin .../data-4D/process_params/phimax.npy | Bin .../data-4D/process_params/phimax_T.npy | Bin .../data-4D/process_params/phimax_YCO.npy | Bin .../data-4D/process_params/phimax_YCO2.npy | Bin .../data-4D/process_params/phimax_YH2O.npy | Bin .../data-4D/process_params/phimax_all.npy | Bin .../data-4D/process_params/phimax_cp.npy | Bin .../data-4D/process_params/phimax_omegac.npy | Bin .../data-4D/process_params/phimin.npy | Bin .../data-4D/process_params/phimin_T.npy | Bin .../data-4D/process_params/phimin_YCO.npy | Bin .../data-4D/process_params/phimin_YCO2.npy | Bin .../data-4D/process_params/phimin_YH2O.npy | Bin .../data-4D/process_params/phimin_all.npy | Bin .../data-4D/process_params/phimin_cp.npy | Bin .../data-4D/process_params/phimin_omegac.npy | Bin .../data-4D/process_params/xmax.npy | Bin .../data-4D/process_params/xmin.npy | Bin .../FGMinference/inference.py | 76 ++++++--- .../networks-2D/model_gpu_all.pth | Bin .../FGMinference/networks-2D/model_res_T.pth | Bin .../networks-2D/model_res_YCO.pth | Bin .../networks-2D/model_res_YCO2.pth | Bin .../networks-2D/model_res_YH2O.pth | Bin .../FGMinference/networks-2D/model_res_cp.pth | Bin .../networks-2D/model_res_omegac.pth | Bin .../FGMinference/networks-4D/model_res_T.pth | Bin .../networks-4D/model_res_YCO.pth | Bin .../networks-4D/model_res_YCO2.pth | Bin .../networks-4D/model_res_YH2O.pth | Bin .../FGMinference/networks-4D/model_res_cp.pth | Bin .../networks-4D/model_res_omegac.pth | Bin src/dfCombustionModels/FGM/DeePFGM/DeePFGM.C | 161 +++++++++++------- src/dfCombustionModels/FGM/DeePFGM/DeePFGM.H | 17 +- src/dfCombustionModels/Make/files | 1 + 81 files changed, 158 insertions(+), 97 deletions(-) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/constants_T.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/constants_YCO.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/constants_YCO2.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/constants_YH2O.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/constants_all.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/constants_cp.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/constants_omegac.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/lambdas_T.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/lambdas_YCO.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/lambdas_YCO2.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/lambdas_YH2O.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/lambdas_all.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/lambdas_cp.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/lambdas_omegac.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimax_T.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimax_YCO.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimax_YCO2.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimax_YH2O.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimax_all.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimax_cp.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimax_omegac.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimin_T.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimin_YCO.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimin_YCO2.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimin_YH2O.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimin_all.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimin_cp.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/phimin_omegac.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/xmax.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-2D/process_params/xmin.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/constants.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/constants_T.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/constants_YCO.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/constants_YCO2.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/constants_YH2O.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/constants_all.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/constants_cp.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/constants_omegac.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/lambdas.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/lambdas_T.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/lambdas_YCO.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/lambdas_YCO2.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/lambdas_YH2O.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/lambdas_all.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/lambdas_cp.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/lambdas_omegac.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimax.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimax_T.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimax_YCO.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimax_YCO2.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimax_YH2O.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimax_all.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimax_cp.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimax_omegac.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimin.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimin_T.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimin_YCO.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimin_YCO2.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimin_YH2O.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimin_all.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimin_cp.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/phimin_omegac.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/xmax.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/data-4D/process_params/xmin.npy (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/inference.py (57%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-2D/model_gpu_all.pth (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-2D/model_res_T.pth (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-2D/model_res_YCO.pth (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-2D/model_res_YCO2.pth (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-2D/model_res_YH2O.pth (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-2D/model_res_cp.pth (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-2D/model_res_omegac.pth (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-4D/model_res_T.pth (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-4D/model_res_YCO.pth (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-4D/model_res_YCO2.pth (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-4D/model_res_YH2O.pth (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-4D/model_res_cp.pth (100%) rename {src/dfCombustionModels/FGM/DeePFGM => examples/dfLowMachFoam/2DSandiaD_DeePFGM}/FGMinference/networks-4D/model_res_omegac.pth (100%) diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_T.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_T.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_T.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_T.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_YCO.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_YCO.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_YCO.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_YCO.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_YCO2.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_YCO2.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_YCO2.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_YCO2.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_YH2O.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_YH2O.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_YH2O.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_YH2O.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_all.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_all.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_all.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_all.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_cp.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_cp.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_cp.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_cp.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_omegac.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_omegac.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/constants_omegac.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/constants_omegac.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_T.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_T.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_T.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_T.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_YCO.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_YCO.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_YCO.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_YCO.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_YCO2.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_YCO2.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_YCO2.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_YCO2.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_YH2O.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_YH2O.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_YH2O.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_YH2O.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_all.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_all.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_all.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_all.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_cp.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_cp.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_cp.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_cp.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_omegac.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_omegac.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/lambdas_omegac.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/lambdas_omegac.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_T.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_T.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_T.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_T.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_YCO.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_YCO.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_YCO.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_YCO.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_YCO2.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_YCO2.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_YCO2.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_YCO2.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_YH2O.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_YH2O.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_YH2O.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_YH2O.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_all.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_all.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_all.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_all.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_cp.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_cp.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_cp.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_cp.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_omegac.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_omegac.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimax_omegac.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimax_omegac.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_T.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_T.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_T.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_T.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_YCO.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_YCO.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_YCO.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_YCO.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_YCO2.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_YCO2.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_YCO2.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_YCO2.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_YH2O.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_YH2O.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_YH2O.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_YH2O.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_all.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_all.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_all.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_all.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_cp.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_cp.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_cp.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_cp.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_omegac.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_omegac.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/phimin_omegac.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/phimin_omegac.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/xmax.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/xmax.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/xmax.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/xmax.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/xmin.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/xmin.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-2D/process_params/xmin.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-2D/process_params/xmin.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_T.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_T.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_T.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_T.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_YCO.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_YCO.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_YCO.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_YCO.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_YCO2.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_YCO2.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_YCO2.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_YCO2.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_YH2O.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_YH2O.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_YH2O.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_YH2O.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_all.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_all.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_all.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_all.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_cp.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_cp.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_cp.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_cp.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_omegac.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_omegac.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/constants_omegac.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/constants_omegac.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_T.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_T.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_T.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_T.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_YCO.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_YCO.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_YCO.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_YCO.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_YCO2.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_YCO2.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_YCO2.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_YCO2.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_YH2O.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_YH2O.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_YH2O.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_YH2O.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_all.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_all.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_all.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_all.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_cp.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_cp.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_cp.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_cp.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_omegac.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_omegac.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/lambdas_omegac.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/lambdas_omegac.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_T.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_T.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_T.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_T.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_YCO.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_YCO.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_YCO.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_YCO.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_YCO2.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_YCO2.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_YCO2.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_YCO2.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_YH2O.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_YH2O.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_YH2O.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_YH2O.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_all.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_all.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_all.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_all.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_cp.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_cp.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_cp.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_cp.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_omegac.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_omegac.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimax_omegac.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimax_omegac.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_T.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_T.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_T.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_T.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_YCO.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_YCO.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_YCO.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_YCO.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_YCO2.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_YCO2.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_YCO2.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_YCO2.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_YH2O.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_YH2O.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_YH2O.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_YH2O.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_all.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_all.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_all.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_all.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_cp.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_cp.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_cp.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_cp.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_omegac.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_omegac.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/phimin_omegac.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/phimin_omegac.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/xmax.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/xmax.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/xmax.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/xmax.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/xmin.npy b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/xmin.npy similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/data-4D/process_params/xmin.npy rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/data-4D/process_params/xmin.npy diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/inference.py b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/inference.py similarity index 57% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/inference.py rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/inference.py index cad8ed0f..80ea0f62 100644 --- a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/inference.py +++ b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/inference.py @@ -6,6 +6,7 @@ import torch.nn as nn import torch.nn.functional as F from torch.autograd import Variable +import time class BasicBlock(nn.Module): def __init__(self, n_input,n_hidden): super(BasicBlock, self).__init__() @@ -43,7 +44,18 @@ def forward(self,input): out = F.relu(out) out = self.output_layer(out) return out -def FGM(z,c,gz,gc,gzc,phinum,dimension): +def load_model(phinum): + phis_s=[3,3,3,3,3,3,2,2,1,1,1] + networktype="networks-2D" + name_s=["omegac","omegac","omegac","cp","cp","cp","T","T","YH2O","YCO","YCO2"] + name=name_s[phinum] + model = ResNet(BasicBlock,6,200,2,phis_s[phinum]) + params = torch.load("./FGMinference/"+networktype+"/model_res_"+name+".pth") # 加载参数 + model.load_state_dict(params) # 应用到网络结构中 + print("load sucess "+name_s[phinum]) + # print(params) + return model +def FGM(z,c,gz,gc,gzc,phinum,dimension,models): try: z=np.array(z) c=np.array(c) @@ -57,41 +69,49 @@ def FGM(z,c,gz,gc,gzc,phinum,dimension): phis_s=[3,3,3,3,3,3,2,2,1,1,1] diff_s=[0,0,0,3,3,3,6,6,8,9,10] name=name_s[phinum] - layers=9 - neurons=300 + layers=6 + neurons=200 phis=phis_s[phinum] diff=diff_s[phinum] - dimension=4 - worktype="data-4D" - networktype="networks-4D" - x=np.stack((z, c , gz ,gc), axis=1) - xmax=np.load("/home/whx/deepflame-dev/src/dfCombustionModels/FGM/DeePFGM/FGMinference/"+worktype+"/process_params/xmax.npy") - xmin=np.load("/home/whx/deepflame-dev/src/dfCombustionModels/FGM/DeePFGM/FGMinference/"+worktype+"/process_params/xmin.npy") - for i in range(4): + dimension=2 + worktype="data-2D" + networktype="networks-2D" + x=np.stack((z, c), axis=1)#(z, c , gz ,gc) + xmax=np.load("./FGMinference/"+worktype+"/process_params/xmax.npy") + xmin=np.load("./FGMinference/"+worktype+"/process_params/xmin.npy") + for i in range(2): x[:,i]=(x[:,i]-xmin[i])/(xmax[i]-xmin[i]) x = torch.tensor(x,dtype=torch.float) - # print(np.shape(x)) - # print(name) - # device = torch.device("cuda") # 使用CUDA - # else: - # device = torch.device("cpu") # 使用CPU - # print("当前设备：",device) + time1=time.time() x=x.to("cuda") - model = ResNet(BasicBlock,layers,neurons,dimension,phis) - params = torch.load("/home/whx/deepflame-dev/src/dfCombustionModels/FGM/DeePFGM/FGMinference/"+networktype+"/model_res_"+name+".pth") # 加载参数 - model.load_state_dict(params) # 应用到网络结构中 - model=model.to("cuda") - # print(params) - # print("begin inference") + time2=time.time() + # print("cuda time",time2-time1) + # model = ResNet(BasicBlock,layers,neurons,dimension,phis) + # # params = torch.load("./FGMinference/"+networktype+"/model_res_"+name+".pth") # 加载参数 + # model.load_state_dict(models) # 应用到网络结构中 + # print(models) + # model = ResNet(BasicBlock,layers,neurons,dimension,phis) + # params=models[phinum] + # model.load_state_dict(params) + time3=time.time() + # print("load model time",time3-time2) + model=models.to("cuda") + time4=time.time() + # print("cuda model time",time4-time3) with torch.no_grad(): predictions=model(x) - # print("end inference") + time5=time.time() + # print("prediction time",time5-time4) predictions=predictions.to("cpu") predictions=predictions.data.numpy() - phimax=np.load("/home/whx/deepflame-dev/src/dfCombustionModels/FGM/DeePFGM/FGMinference/"+worktype+"/process_params/phimax_"+name+".npy") - phimin=np.load("/home/whx/deepflame-dev/src/dfCombustionModels/FGM/DeePFGM/FGMinference/"+worktype+"/process_params/phimin_"+name+".npy") - lambdas=np.load("/home/whx/deepflame-dev/src/dfCombustionModels/FGM/DeePFGM/FGMinference/"+worktype+"/process_params/lambdas_"+name+".npy") - constants=np.load("/home/whx/deepflame-dev/src/dfCombustionModels/FGM/DeePFGM/FGMinference/"+worktype+"/process_params/constants_"+name+".npy") + time6=time.time() + # print("prediction cpu time",time6-time5) + phimax=np.load("./FGMinference/"+worktype+"/process_params/phimax_"+name+".npy") + phimin=np.load("./FGMinference/"+worktype+"/process_params/phimin_"+name+".npy") + lambdas=np.load("./FGMinference/"+worktype+"/process_params/lambdas_"+name+".npy") + constants=np.load("./FGMinference/"+worktype+"/process_params/constants_"+name+".npy") + time7=time.time() + # print("load params time",time7-time6) ind=phinum predictions[:,ind-diff]=predictions[:,ind-diff]*(phimax[ind]-phimin[ind])+phimin[ind] # print("begin inv_coxbox") @@ -104,6 +124,8 @@ def FGM(z,c,gz,gc,gzc,phinum,dimension): predictions[nan_positions,ind-diff]=0 result=predictions[:,ind-diff] result = result.tolist() + time8=time.time() + # print("result out time",time8-time7) # if(phinum==0): # print("x",x) # print("z",z) diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_gpu_all.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_gpu_all.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_gpu_all.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_gpu_all.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_res_T.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_res_T.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_res_T.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_res_T.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_res_YCO.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_res_YCO.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_res_YCO.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_res_YCO.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_res_YCO2.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_res_YCO2.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_res_YCO2.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_res_YCO2.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_res_YH2O.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_res_YH2O.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_res_YH2O.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_res_YH2O.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_res_cp.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_res_cp.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_res_cp.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_res_cp.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_res_omegac.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_res_omegac.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-2D/model_res_omegac.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-2D/model_res_omegac.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-4D/model_res_T.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-4D/model_res_T.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-4D/model_res_T.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-4D/model_res_T.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-4D/model_res_YCO.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-4D/model_res_YCO.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-4D/model_res_YCO.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-4D/model_res_YCO.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-4D/model_res_YCO2.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-4D/model_res_YCO2.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-4D/model_res_YCO2.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-4D/model_res_YCO2.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-4D/model_res_YH2O.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-4D/model_res_YH2O.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-4D/model_res_YH2O.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-4D/model_res_YH2O.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-4D/model_res_cp.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-4D/model_res_cp.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-4D/model_res_cp.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-4D/model_res_cp.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-4D/model_res_omegac.pth b/examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-4D/model_res_omegac.pth similarity index 100% rename from src/dfCombustionModels/FGM/DeePFGM/FGMinference/networks-4D/model_res_omegac.pth rename to examples/dfLowMachFoam/2DSandiaD_DeePFGM/FGMinference/networks-4D/model_res_omegac.pth diff --git a/src/dfCombustionModels/FGM/DeePFGM/DeePFGM.C b/src/dfCombustionModels/FGM/DeePFGM/DeePFGM.C index a72a84e2..ce8d8a69 100644 --- a/src/dfCombustionModels/FGM/DeePFGM/DeePFGM.C +++ b/src/dfCombustionModels/FGM/DeePFGM/DeePFGM.C @@ -45,9 +45,59 @@ Foam::combustionModels::DeePFGM::DeePFGM ) { //- retrieval data from table - PyObject* module=initialize_module(); - PyObject* func=initialize_function(module); - retrieval(module,func); + module=initialize_module(); + func=initialize_function(module); + func_load=initialize_load(module); + // model_omegac = PyObject_CallObject(func_load, PyTuple_Pack(1, PyLong_FromLong(0))); + // model_cp = PyObject_CallObject(func_load, PyTuple_Pack(1, PyLong_FromLong(3))); + // model_T = PyObject_CallObject(func_load, PyTuple_Pack(1, PyLong_FromLong(6))); + // model_YH2O = PyObject_CallObject(func_load, PyTuple_Pack(1, PyLong_FromLong(8))); + // model_YCO = PyObject_CallObject(func_load, PyTuple_Pack(1, PyLong_FromLong(9))); + // model_YCO2 = PyObject_CallObject(func_load, PyTuple_Pack(1, PyLong_FromLong(10))); + // PyObject* models = PyList_New(11); + model_omegac=PyObject_CallObject(func_load, PyTuple_Pack(1, PyLong_FromLong(0))); + model_cp=PyObject_CallObject(func_load, PyTuple_Pack(1, PyLong_FromLong(3))); + model_T=PyObject_CallObject(func_load, PyTuple_Pack(1, PyLong_FromLong(6))); + model_YH2O=PyObject_CallObject(func_load, PyTuple_Pack(1, PyLong_FromLong(8))); + model_YCO=PyObject_CallObject(func_load, PyTuple_Pack(1, PyLong_FromLong(9))); + model_YCO2=PyObject_CallObject(func_load, PyTuple_Pack(1, PyLong_FromLong(10))); + // for(int i=0;i<11;i++) + // { + // int phinum[11]={0,0,0,3,3,3,6,6,8,9,10}; + // PyObject* args = PyTuple_Pack(1, PyLong_FromLong(phinum[i])); + // PyObject* py_result = PyObject_CallObject(func_load, args); + // PyList_SET_ITEM(models,i, py_result); + // } + // retrieval(module,func); +} +template +void Foam::combustionModels::DeePFGM::correct() +{ + //- initialize flame kernel + baseFGM::initialiseFalmeKernel(); + + //- solve transport equation + baseFGM::transport(); + + //update enthalpy using lookup data + if(!(this->solveEnthalpy_)) + { + this->He_ = this->Z_*(H_fuel-H_ox) + H_ox; + } + // PyObject* module=initialize_module(); + // PyObject* func=initialize_function(module); + // PyObject* func_load=initialize_load(module); + // PyObject* models = PyList_New(6); + // for(int i=0;i<6;i++) + // { + // int phinum[6]={0,3,6,8,9,10}; + // PyObject* args = PyTuple_Pack(1, PyLong_FromLong(phinum[i])); + // PyObject* py_result = PyObject_CallObject(func_load, args); + // PyList_SET_ITEM(models, i, py_result); + // } + //- retrieval data from table + retrieval(module,func,model_omegac,model_cp,model_T,model_YH2O,model_YCO,model_YCO2); + } @@ -67,11 +117,13 @@ PyObject* Foam::combustionModels::DeePFGM::initialize_module() } // 2、初始化python系统文件路径，保证可以访问到 .py文件 PyRun_SimpleString("import sys"); - PyRun_SimpleString("sys.path.append('/home/whx/deepflame-dev/src/dfCombustionModels/FGM/DeePFGM/FGMinference')"); + PyRun_SimpleString("import numpy"); + PyRun_SimpleString("sys.path.append(os.getcwd()+'/FGMinference')"); PyObject* module = PyImport_ImportModule("inference"); - if (module == nullptr) + if (module == nullptr) { std::cout <<"module not found: inference" << std::endl; + PyErr_Print(); } return module; } @@ -83,39 +135,37 @@ PyObject* Foam::combustionModels::DeePFGM::initialize_function(P if (!func || !PyCallable_Check(func)) { std::cout <<"function not found: FGM" << std::endl; + PyErr_Print(); } else { - cout <<"function found: FGM" << std::endl; + std::cout <<"function found: FGM" << std::endl; } return func; } template -void Foam::combustionModels::DeePFGM::correct() +PyObject* Foam::combustionModels::DeePFGM::initialize_load(PyObject* module) { - //- initialize flame kernel - baseFGM::initialiseFalmeKernel(); - - //- solve transport equation - baseFGM::transport(); - - //update enthalpy using lookup data - if(!(this->solveEnthalpy_)) + PyObject* func = PyObject_GetAttrString(module, "load_model"); + if (!func || !PyCallable_Check(func)) { - this->He_ = this->Z_*(H_fuel-H_ox) + H_ox; + std::cout <<"function not found: load_model" << std::endl; + PyErr_Print(); } - PyObject* module=initialize_module(); - PyObject* func=initialize_function(module); - //- retrieval data from table - retrieval(module,func); - + else + { + std::cout <<"function found: load_model" << std::endl; + } + return func; } + + template int Foam::combustionModels::DeePFGM::prediction ( double z_s[], double c_s[], double gz_s[], double gc_s[], - double gzc_s[], int phinum, int dimension,double* result,int size,PyObject* module,PyObject* func + double gzc_s[], int phinum, int dimension,double* result,int size,PyObject* module,PyObject* func,PyObject* model ) { PyObject* py_phinum = PyLong_FromLong(phinum); @@ -133,8 +183,10 @@ int Foam::combustionModels::DeePFGM::prediction PyList_SET_ITEM(py_gc, i, PyFloat_FromDouble(gc_s[i])); PyList_SET_ITEM(py_gzc, i, PyFloat_FromDouble(gzc_s[i])); } - PyObject* args = PyTuple_Pack(7, py_z, py_c,py_gz,py_gc,py_gzc,py_phinum,py_dimension); + + PyObject* args = PyTuple_Pack(8, py_z, py_c,py_gz,py_gc,py_gzc,py_phinum,py_dimension,model); PyObject* py_result = PyObject_CallObject(func, args); + // 5、调用函数 // PyObject_CallObject(func, nullptr); if (PyList_Check(py_result)) { @@ -164,7 +216,7 @@ int Foam::combustionModels::DeePFGM::prediction } template -void Foam::combustionModels::DeePFGM::retrieval(PyObject* module,PyObject* func) +void Foam::combustionModels::DeePFGM::retrieval(PyObject* module,PyObject* func,PyObject* model_omegac,PyObject* model_cp,PyObject* model_T,PyObject* model_YH2O,PyObject* model_YCO,PyObject* model_YCO2) { tmp tk(this->turbulence().k()); @@ -227,9 +279,6 @@ void Foam::combustionModels::DeePFGM::retrieval(PyObject* module double mu_s[Ncells]={}; double c_s[Ncells]={}; - // double gz{cal_gvar(this->ZCells_[celli],this->ZvarCells_[celli])}; - // double gcz{cal_gcor(this->ZCells_[celli],this->cCells_[celli],this->ZvarCells_[celli],this->cvarCells_[celli],this->ZcvarCells_[celli])}, - // Ycmax{-1.0},cNorm{},gc{}; forAll(this->rho_, celli) { @@ -244,29 +293,9 @@ void Foam::combustionModels::DeePFGM::retrieval(PyObject* module { c_s[celli]=this->cCells_[celli]; } - // Info<<"Sclaed PV"<cCells_[celli]; - // } - // else - // { - // Ycmax = this->lookup5d(NZ,z_Tb3,this->ZCells_[celli], - // NC,c_Tb3,0.0, - // NGZ,gz_Tb3,gz, - // NGC,gc_Tb3,0.0, - // NZC,gzc_Tb3,0.0, - // Ycmax_Tb3); - // Ycmax = max(this->smaller,Ycmax); - // cNorm = this->cCells_[celli]/Ycmax; - // } - - // gc = cal_gvar(this->cCells_[celli],this->cvarCells_[celli],Ycmax); - - prediction(z_s,c_s,gz_s,gc_s,gcz_s,4,dim,Wt_s,Ncells,module,func); - prediction(z_s,c_s,gz_s,gc_s,gcz_s,7,dim,mu_s,Ncells,module,func); + prediction(z_s,c_s,gz_s,gc_s,gcz_s,4,dim,Wt_s,Ncells,module,func,model_cp); + prediction(z_s,c_s,gz_s,gc_s,gcz_s,7,dim,mu_s,Ncells,module,func,model_T); // Info<< "pause4" << endl; forAll(this->rho_, celli) { @@ -280,9 +309,9 @@ void Foam::combustionModels::DeePFGM::retrieval(PyObject* module double YH2O_s[Ncells]={}; double YCO_s[Ncells]={}; double YCO2_s[Ncells]={}; - prediction(z_s,c_s,gz_s,gc_s,gcz_s,8,dim,YH2O_s,Ncells,module,func); - prediction(z_s,c_s,gz_s,gc_s,gcz_s,9,dim,YCO_s,Ncells,module,func); - prediction(z_s,c_s,gz_s,gc_s,gcz_s,10,dim,YCO2_s,Ncells,module,func); + prediction(z_s,c_s,gz_s,gc_s,gcz_s,8,dim,YH2O_s,Ncells,module,func,model_YH2O); + prediction(z_s,c_s,gz_s,gc_s,gcz_s,9,dim,YCO_s,Ncells,module,func,model_YCO); + prediction(z_s,c_s,gz_s,gc_s,gcz_s,10,dim,YCO2_s,Ncells,module,func,model_YCO2); forAll(this->rho_, celli) { this->YH2OCells_[celli]=YH2O_s[celli]; @@ -296,9 +325,9 @@ void Foam::combustionModels::DeePFGM::retrieval(PyObject* module double omegac_s[Ncells]={}; double comegac_s[Ncells]={}; double zomegac_s[Ncells]={}; - prediction(z_s,c_s,gz_s,gc_s,gcz_s,0,dim,omegac_s,Ncells,module,func); - prediction(z_s,c_s,gz_s,gc_s,gcz_s,1,dim,comegac_s,Ncells,module,func); - prediction(z_s,c_s,gz_s,gc_s,gcz_s,2,dim,zomegac_s,Ncells,module,func); + prediction(z_s,c_s,gz_s,gc_s,gcz_s,0,dim,omegac_s,Ncells,module,func,model_omegac); + prediction(z_s,c_s,gz_s,gc_s,gcz_s,1,dim,comegac_s,Ncells,module,func,model_omegac); + prediction(z_s,c_s,gz_s,gc_s,gcz_s,2,dim,zomegac_s,Ncells,module,func,model_omegac); forAll(this->rho_, celli) { this->omega_cCells_[celli]=(omegac_s[celli]+ ( @@ -325,7 +354,7 @@ void Foam::combustionModels::DeePFGM::retrieval(PyObject* module if(flameletT_) { double T_s[Ncells]={}; - prediction(z_s,c_s,gz_s,gc_s,gcz_s,6,dim,T_s,Ncells,module,func); + prediction(z_s,c_s,gz_s,gc_s,gcz_s,6,dim,T_s,Ncells,module,func,model_T); forAll(this->rho_, celli) { this->TCells_[celli]=T_s[celli]; @@ -335,8 +364,8 @@ void Foam::combustionModels::DeePFGM::retrieval(PyObject* module { double Cp_s[Ncells]={}; double Hf_s[Ncells]={}; - prediction(z_s,c_s,gz_s,gc_s,gcz_s,3,dim,Cp_s,Ncells,module,func); - prediction(z_s,c_s,gz_s,gc_s,gcz_s,5,dim,Hf_s,Ncells,module,func); + prediction(z_s,c_s,gz_s,gc_s,gcz_s,3,dim,Cp_s,Ncells,module,func,model_cp); + prediction(z_s,c_s,gz_s,gc_s,gcz_s,5,dim,Hf_s,Ncells,module,func,model_cp); forAll(this->rho_, celli) { this->CpCells_[celli]=Cp_s[celli]; @@ -428,8 +457,8 @@ void Foam::combustionModels::DeePFGM::retrieval(PyObject* module c_t[facei]=pc[facei]; } } - prediction(z_t,c_t,gz_t,gc_t,gcz_t,4,dim,Wt_t,Npatch,module,func); - prediction(z_t,c_t,gz_t,gc_t,gcz_t,7,dim,mu_t,Npatch,module,func); + prediction(z_t,c_t,gz_t,gc_t,gcz_t,4,dim,Wt_t,Npatch,module,func,model_cp); + prediction(z_t,c_t,gz_t,gc_t,gcz_t,7,dim,mu_t,Npatch,module,func,model_T); forAll(prho_, facei) { pWt[facei]=Wt_t[facei]; @@ -438,9 +467,9 @@ void Foam::combustionModels::DeePFGM::retrieval(PyObject* module double omegac_t[Npatch]={}; double comegac_t[Npatch]={}; double zomegac_t[Npatch]={}; - prediction(z_t,c_t,gz_t,gc_t,gcz_t,0,dim,omegac_t,Npatch,module,func); - prediction(z_t,c_t,gz_t,gc_t,gcz_t,1,dim,comegac_t,Npatch,module,func); - prediction(z_t,c_t,gz_t,gc_t,gcz_t,2,dim,zomegac_t,Npatch,module,func); + prediction(z_t,c_t,gz_t,gc_t,gcz_t,0,dim,omegac_t,Npatch,module,func,model_omegac); + prediction(z_t,c_t,gz_t,gc_t,gcz_t,1,dim,comegac_t,Npatch,module,func,model_omegac); + prediction(z_t,c_t,gz_t,gc_t,gcz_t,2,dim,zomegac_t,Npatch,module,func,model_omegac); forAll(prho_, facei) { pomega_c[facei]=(omegac_t[facei]+ ( @@ -466,7 +495,7 @@ void Foam::combustionModels::DeePFGM::retrieval(PyObject* module if(flameletT_) { double T_t[Npatch]={}; - prediction(z_t,c_t,gz_t,gc_t,gcz_t,6,dim,T_t,Npatch,module,func); + prediction(z_t,c_t,gz_t,gc_t,gcz_t,6,dim,T_t,Npatch,module,func,model_T); forAll(prho_, facei) { pT[facei]=T_t[facei]; @@ -476,8 +505,8 @@ void Foam::combustionModels::DeePFGM::retrieval(PyObject* module { double Cp_t[Npatch]={}; double Hf_t[Npatch]={}; - prediction(z_t,c_t,gz_t,gc_t,gcz_t,3,dim,Cp_t,Npatch,module,func); - prediction(z_t,c_t,gz_t,gc_t,gcz_t,5,dim,Hf_t,Npatch,module,func); + prediction(z_t,c_t,gz_t,gc_t,gcz_t,3,dim,Cp_t,Npatch,module,func,model_cp); + prediction(z_t,c_t,gz_t,gc_t,gcz_t,5,dim,Hf_t,Npatch,module,func,model_cp); forAll(prho_, facei) { pCp[facei]=Cp_t[facei]; diff --git a/src/dfCombustionModels/FGM/DeePFGM/DeePFGM.H b/src/dfCombustionModels/FGM/DeePFGM/DeePFGM.H index b7bb35c0..771525e7 100644 --- a/src/dfCombustionModels/FGM/DeePFGM/DeePFGM.H +++ b/src/dfCombustionModels/FGM/DeePFGM/DeePFGM.H @@ -82,7 +82,7 @@ public: //- Destructor - virtual ~DeePFGM(); + virtual ~DeePFGM(); // Member Operators @@ -93,16 +93,25 @@ public: //- retrieval data from table // virtual void retrieval(); - virtual void retrieval(PyObject* module,PyObject* func); + virtual void retrieval(PyObject* module,PyObject* func,PyObject* model_omegac,PyObject* model_cp,PyObject* model_T,PyObject* model_YH2O,PyObject* model_YCO,PyObject* model_YCO2); virtual int prediction( double z_s[], double c_s[], double gz_s[], double gc_s[], - double gcz_s[], int phinum, int dimension,double* result,int size,PyObject* module,PyObject* func + double gcz_s[], int phinum, int dimension,double* result,int size,PyObject* module,PyObject* func,PyObject* model ); virtual PyObject* initialize_module(); virtual PyObject* initialize_function(PyObject* module); - + virtual PyObject* initialize_load(PyObject* module); //- Disallow default bitwise assignment void operator=(const DeePFGM&) = delete; + PyObject* module; + PyObject* func; + PyObject* func_load; + PyObject* model_omegac; + PyObject* model_cp; + PyObject* model_T; + PyObject* model_YH2O; + PyObject* model_YCO; + PyObject* model_YCO2; }; diff --git a/src/dfCombustionModels/Make/files b/src/dfCombustionModels/Make/files index 7dc602c6..b4771538 100644 --- a/src/dfCombustionModels/Make/files +++ b/src/dfCombustionModels/Make/files @@ -10,6 +10,7 @@ EDC/EDCs.C FGM/flameletTableSolver/tableSolver.C FGM/baseFGM/baseFGMs.C FGM/flareFGM/flareFGMs.C +FGM/DeePFGM/DeePFGMFGMs.C laminar/laminars.C From 172d0c28c2b39916867228ba6f7518f94605ae6f Mon Sep 17 00:00:00 2001 From: JX278 <113102069+JX278@users.noreply.github.com> Date: Fri, 30 Jun 2023 14:20:13 +0800 Subject: [PATCH 2/2] Update files --- src/dfCombustionModels/Make/files | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/dfCombustionModels/Make/files b/src/dfCombustionModels/Make/files index b4771538..00e83f3f 100644 --- a/src/dfCombustionModels/Make/files +++ b/src/dfCombustionModels/Make/files @@ -10,7 +10,7 @@ EDC/EDCs.C FGM/flameletTableSolver/tableSolver.C FGM/baseFGM/baseFGMs.C FGM/flareFGM/flareFGMs.C -FGM/DeePFGM/DeePFGMFGMs.C +FGM/DeePFGM/DeePFGMs.C laminar/laminars.C