Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
12 changes: 6 additions & 6 deletions fieldsolver/derivatives.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ void calculateDerivatives(
}
#endif

if(sysBoundaryLayer == 1 || (sysBoundaryLayer == 2 && sysBoundaryFlag == sysboundarytype::NOT_SYSBOUNDARY)) {
if(P::fieldSolverFiniteDifferencing && (sysBoundaryLayer == 1 || (sysBoundaryLayer == 2 && sysBoundaryFlag == sysboundarytype::NOT_SYSBOUNDARY))) {
if(calculateMoments) {
dMoments->at(fsgrids::dmoments::drhomdx) = (rghtMoments->at(fsgrids::moments::RHOM)-leftMoments->at(fsgrids::moments::RHOM))/2;
dMoments->at(fsgrids::dmoments::drhoqdx) = (rghtMoments->at(fsgrids::moments::RHOQ)-leftMoments->at(fsgrids::moments::RHOQ))/2;
Expand Down Expand Up @@ -174,7 +174,7 @@ void calculateDerivatives(
rghtMoments = centMoments;
}

if(sysBoundaryLayer == 1 || (sysBoundaryLayer == 2 && sysBoundaryFlag == sysboundarytype::NOT_SYSBOUNDARY)) {
if(P::fieldSolverFiniteDifferencing && (sysBoundaryLayer == 1 || (sysBoundaryLayer == 2 && sysBoundaryFlag == sysboundarytype::NOT_SYSBOUNDARY))) {
if(calculateMoments) {
dMoments->at(fsgrids::dmoments::drhomdy) = (rghtMoments->at(fsgrids::moments::RHOM)-leftMoments->at(fsgrids::moments::RHOM))/2;
dMoments->at(fsgrids::dmoments::drhoqdy) = (rghtMoments->at(fsgrids::moments::RHOQ)-leftMoments->at(fsgrids::moments::RHOQ))/2;
Expand Down Expand Up @@ -226,7 +226,7 @@ void calculateDerivatives(
rghtMoments = centMoments;
}

if(sysBoundaryLayer == 1 || (sysBoundaryLayer == 2 && sysBoundaryFlag == sysboundarytype::NOT_SYSBOUNDARY)) {
if(P::fieldSolverFiniteDifferencing && (sysBoundaryLayer == 1 || (sysBoundaryLayer == 2 && sysBoundaryFlag == sysboundarytype::NOT_SYSBOUNDARY))) {
if(calculateMoments) {
dMoments->at(fsgrids::dmoments::drhomdz) = (rghtMoments->at(fsgrids::moments::RHOM)-leftMoments->at(fsgrids::moments::RHOM))/2;
dMoments->at(fsgrids::dmoments::drhoqdz) = (rghtMoments->at(fsgrids::moments::RHOQ)-leftMoments->at(fsgrids::moments::RHOQ))/2;
Expand Down Expand Up @@ -448,7 +448,7 @@ void calculateBVOLDerivatives(
rght = array;
}

if (sysBoundaryLayer == 1 || (sysBoundaryLayer == 2 && sysBoundaryFlag == sysboundarytype::NOT_SYSBOUNDARY)) {
if(P::fieldSolverFiniteDifferencing && (sysBoundaryLayer == 1 || (sysBoundaryLayer == 2 && sysBoundaryFlag == sysboundarytype::NOT_SYSBOUNDARY))) {
array->at(fsgrids::volfields::dPERBXVOLdx) = (rght->at(fsgrids::volfields::PERBXVOL)-left->at(fsgrids::volfields::PERBXVOL))/2;
array->at(fsgrids::volfields::dPERBYVOLdx) = (rght->at(fsgrids::volfields::PERBYVOL)-left->at(fsgrids::volfields::PERBYVOL))/2;
array->at(fsgrids::volfields::dPERBZVOLdx) = (rght->at(fsgrids::volfields::PERBZVOL)-left->at(fsgrids::volfields::PERBZVOL))/2;
Expand All @@ -469,7 +469,7 @@ void calculateBVOLDerivatives(
rght = array;
}

if (sysBoundaryLayer == 1 || (sysBoundaryLayer == 2 && sysBoundaryFlag == sysboundarytype::NOT_SYSBOUNDARY)) {
if(P::fieldSolverFiniteDifferencing && (sysBoundaryLayer == 1 || (sysBoundaryLayer == 2 && sysBoundaryFlag == sysboundarytype::NOT_SYSBOUNDARY))) {
array->at(fsgrids::volfields::dPERBXVOLdy) = (rght->at(fsgrids::volfields::PERBXVOL)-left->at(fsgrids::volfields::PERBXVOL))/2;
array->at(fsgrids::volfields::dPERBYVOLdy) = (rght->at(fsgrids::volfields::PERBYVOL)-left->at(fsgrids::volfields::PERBYVOL))/2;
array->at(fsgrids::volfields::dPERBZVOLdy) = (rght->at(fsgrids::volfields::PERBZVOL)-left->at(fsgrids::volfields::PERBZVOL))/2;
Expand All @@ -490,7 +490,7 @@ void calculateBVOLDerivatives(
rght = array;
}

if (sysBoundaryLayer == 1 || (sysBoundaryLayer == 2 && sysBoundaryFlag == sysboundarytype::NOT_SYSBOUNDARY)) {
if(P::fieldSolverFiniteDifferencing && (sysBoundaryLayer == 1 || (sysBoundaryLayer == 2 && sysBoundaryFlag == sysboundarytype::NOT_SYSBOUNDARY))) {
array->at(fsgrids::volfields::dPERBXVOLdz) = (rght->at(fsgrids::volfields::PERBXVOL)-left->at(fsgrids::volfields::PERBXVOL))/2;
array->at(fsgrids::volfields::dPERBYVOLdz) = (rght->at(fsgrids::volfields::PERBYVOL)-left->at(fsgrids::volfields::PERBYVOL))/2;
array->at(fsgrids::volfields::dPERBZVOLdz) = (rght->at(fsgrids::volfields::PERBZVOL)-left->at(fsgrids::volfields::PERBZVOL))/2;
Expand Down
3 changes: 3 additions & 0 deletions parameters.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,7 @@ uint P::maxFieldSolverSubcycles = 0.0;
int P::maxSlAccelerationSubcycles = 0.0;
Real P::resistivity = NAN;
bool P::fieldSolverDiffusiveEterms = true;
bool P::fieldSolverFiniteDifferencing = true;
uint P::ohmHallTerm = 0;
uint P::ohmGradPeTerm = 0;
Real P::electronTemperature = 0.0;
Expand Down Expand Up @@ -354,6 +355,7 @@ bool P::addParameters() {
RP::add("fieldsolver.maxSubcycles", "Maximum allowed field solver subcycles", 1);
RP::add("fieldsolver.resistivity", "Resistivity for the eta*J term in Ohm's law.", 0.0);
RP::add("fieldsolver.diffusiveEterms", "Enable diffusive terms in the computation of E", true);
RP::add("fieldsolver.finiteDifferencing", "Enable finite differencing at sysboundaries", true);
RP::add(
"fieldsolver.ohmHallTerm",
"Enable/choose spatial order of the Hall term in Ohm's law. 0: off, 1: 1st spatial order, 2: 2nd spatial order",
Expand Down Expand Up @@ -1005,6 +1007,7 @@ void Parameters::getParameters() {
RP::get("fieldsolver.maxSubcycles", P::maxFieldSolverSubcycles);
RP::get("fieldsolver.resistivity", P::resistivity);
RP::get("fieldsolver.diffusiveEterms", P::fieldSolverDiffusiveEterms);
RP::get("fieldsolver.finiteDifferencing",P::fieldSolverFiniteDifferencing);
RP::get("fieldsolver.ohmHallTerm", P::ohmHallTerm);
RP::get("fieldsolver.ohmGradPeTerm", P::ohmGradPeTerm); // Which order solver to use for fieldsolver eGradPe term (supported: 0 for off, 1 for first-order)
RP::get("fieldsolver.electronTemperature", P::electronTemperature); // Electron temperature associated with anchor point, e.g. incoming solar wind
Expand Down
1 change: 1 addition & 0 deletions parameters.h
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,7 @@ struct Parameters {
isothermal, 1.667 is adiabatic electrons */

static bool fieldSolverDiffusiveEterms; /*!< Enable resistive terms in the computation of E*/
static bool fieldSolverFiniteDifferencing; /*!< Enable finite differencing at sysboundaries*/

static Real maxSlAccelerationRotation; /*!< Maximum rotation in acceleration for semilagrangian solver*/
static int maxSlAccelerationSubcycles; /*!< Maximum number of subcycles in acceleration*/
Expand Down
Loading