Skip to content

update the criterion choosing networks #114

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Nov 3, 2022
Merged

update the criterion choosing networks #114

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
07e5c55
update the criterion choosing networks
maorz1998 Nov 3, 2022
3944898
update
maorz1998 Nov 3, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 34 additions & 12 deletions src/dfChemistryModel/dfChemistryModel.C
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ Foam::dfChemistryModel<ThermoType>::dfChemistryModel
"Qdot",
mesh_.time().timeName(),
mesh_,
IOobject::NO_READ,
IOobject::READ_IF_PRESENT,
IOobject::AUTO_WRITE
),
mesh_,
Expand Down Expand Up @@ -1031,7 +1031,7 @@ Foam::scalar Foam::dfChemistryModel<ThermoType>::torchCUDAoneCoreSolve(
std::cout << "vec2ndarrayTime = " << processingTime_4.count() << std::endl;
time_vec2ndarray_ += processingTime_4.count();

pybind11::module_ call_torch = pybind11::module_::import("inference_H2"); // import python file
pybind11::module_ call_torch = pybind11::module_::import("inference"); // import python file

std::chrono::steady_clock::time_point start_5 = std::chrono::steady_clock::now();

Expand Down Expand Up @@ -1092,6 +1092,17 @@ Foam::dfChemistryModel<ThermoType>::getGPUProblems
scalar pi = p_[cellI];
scalar rhoi = rho_[cellI];

// if T < 1000, set RR=0
if (T_[cellI] < Tact1_)
{
Qdot_[cellI] = 0;
for (size_t i = 0; i < CanteraGas_->nSpecies(); i++)
{
RR_[i][cellI] = 0.0;
}
continue;
}

// set problems
GpuProblem problem(CanteraGas_->nSpecies());
problem.cellid = cellI;
Expand All @@ -1101,22 +1112,28 @@ Foam::dfChemistryModel<ThermoType>::getGPUProblems
{
problem.Y[i] = Y_[i][cellI];
}
problem.rhoi = rhoi;

// choose DNN module
if ((Qdot_[cellI] < Qdotact2_) && (T_[cellI] <= Tact2_) && ( T_[cellI] >= Tact1_))//choose1
if ((Qdot_[cellI] < Qdotact2_) && (T_[cellI] < Tact2_) && ( T_[cellI] >= Tact1_))//choose1
{
problem.DNNid = 0;
problem.DNNid = 0;
problemList.append(problem);
continue;
}
if(((Qdot_[cellI] <= Qdotact3_)&&(Qdot_[cellI] >= Qdotact2_) && (Tact3_ > T_[cellI])&&(T_[cellI] > Tact2_))||(Qdot_[cellI] > Qdotact3_)) //choose2
if(((Qdot_[cellI] >= Qdotact2_) && (T_[cellI] < Tact2_)&&(T_[cellI] >= Tact1_))||((Qdot_[cellI] > Qdotact3_) && T_[cellI] > Tact2_)) //choose2
{
problem.DNNid = 1;
problem.DNNid = 1;
problemList.append(problem);
continue;
}
if ((Qdot_[cellI] <= Qdotact3_) && (T_[cellI] >= Tact3_))//if(Ti >= Tact_))//choose3
if ((Qdot_[cellI] < Qdotact3_) && (T_[cellI] >= Tact2_) && (Qdot_[cellI]!=0)) //choose3
{
problem.DNNid = 2;
problem.DNNid = 2;
problemList.append(problem);
continue;
}
problem.rhoi = rhoi;
problemList.append(problem);
Qdot_[cellI] = 0.0;

}

return problemList;
Expand Down Expand Up @@ -1218,6 +1235,10 @@ void Foam::dfChemistryModel<ThermoType>::getDNNinputs
cellIDBuffer = {cellIDList0Buffer, cellIDList1Buffer, cellIDList2Buffer};
problemCounter = {problemCounter0, problemCounter1, problemCounter2};

std::cout << "inputsDNN0 = " << inputsDNN0.size();
std::cout << "inputsDNN1 = " << inputsDNN1.size();
std::cout << "inputsDNN2 = " << inputsDNN2.size();

Info<<"get inputs successfully"<<endl;

return;
Expand Down Expand Up @@ -1370,7 +1391,7 @@ Foam::scalar Foam::dfChemistryModel<ThermoType>::torchDCUSolve(
std::cout << "vec2ndarrayTime = " << processingTime8.count() << std::endl;
time_vec2ndarray_ += processingTime8.count();

pybind11::module_ call_torch = pybind11::module_::import("inference2"); // import python file
pybind11::module_ call_torch = pybind11::module_::import("inference"); // import python file

std::chrono::steady_clock::time_point start9 = std::chrono::steady_clock::now();

Expand Down Expand Up @@ -1430,6 +1451,7 @@ Foam::scalar Foam::dfChemistryModel<ThermoType>::torchDCUSolve(
/*=============================update RR fields=============================*/
for (size_t cellI = 0; cellI < finalList.size(); cellI++)
{
Qdot_[finalList[cellI].cellid] = 0;
for (size_t speciID = 0; speciID < CanteraGas_->nSpecies(); speciID++)
{
RR_[speciID][finalList[cellI].cellid] = finalList[cellI].RRi[speciID];
Expand Down