Skip to content

Commit

Permalink
remove volumeField for now
Browse files Browse the repository at this point in the history
  • Loading branch information
greole committed Oct 8, 2024
1 parent b5bc333 commit 9c8aa79
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 26 deletions.
28 changes: 5 additions & 23 deletions include/NeoFOAM/DSL/equation.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ class Equation

Equation(const Executor& exec, std::size_t nCells)
: exec_(exec), nCells_(nCells), temporalOperators_(), implicitOperators_(),
explicitOperators_(), volumeField_(nullptr)
explicitOperators_()
{}

/* @brief perform all explicit operation and accumulate the result */
Expand Down Expand Up @@ -116,37 +116,19 @@ class Equation

scalar getDt() const { return dt_; }

fvcc::VolumeField<scalar>* volumeField()
{
if (temporalOperators_.size() == 0 && implicitOperators_.size() == 0)
{
NF_ERROR_EXIT("No temporal or implicit terms to solve.");
}
if (temporalOperators_.size() > 0)
{
// FIXME
NF_ERROR_EXIT("Not implemented.");
// volumeField_ = temporalOperators_[0].volumeField();
}
else
{
// FIXME
NF_ERROR_EXIT("Not implemented.");
// volumeField_ = implicitOperators_[0].volumeField();
}
return volumeField_;
}

scalar dt_ = 0;

private:

const Executor exec_;

const std::size_t nCells_;

std::vector<Operator> temporalOperators_;

std::vector<Operator> implicitOperators_;

std::vector<Operator> explicitOperators_;
fvcc::VolumeField<scalar>* volumeField_;
};

Equation operator+(Equation lhs, const Equation& rhs)
Expand Down
6 changes: 3 additions & 3 deletions src/finiteVolume/cellCentred/timeIntegration/forwardEuler.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ void ForwardEuler::solve()
{
std::cout << "Solving using Forward Euler" << std::endl;
scalar dt = eqnSystem_.getDt();
fvcc::VolumeField<scalar>* refField = eqnSystem_.volumeField();
// fvcc::VolumeField<scalar>* refField = eqnSystem_.volumeField();
// Field<scalar> Phi(eqnSystem_.exec(), eqnSystem_.nCells());
// NeoFOAM::fill(Phi, 0.0);
Field<scalar> source = eqnSystem_.explicitOperation();
Expand All @@ -31,8 +31,8 @@ void ForwardEuler::solve()
// eqnTerm.temporalOperation(Phi);
// }
// Phi += source*dt;
refField->internalField() -= source * dt;
refField->correctBoundaryConditions();
// refField->internalField() -= source * dt;
// refField->correctBoundaryConditions();

// check if execturo is GPU
if (std::holds_alternative<NeoFOAM::GPUExecutor>(eqnSystem_.exec()))
Expand Down

0 comments on commit 9c8aa79

Please sign in to comment.