Skip to content

Commit

Permalink
Fix 1D models analytic reference tests
Browse files Browse the repository at this point in the history
  • Loading branch information
jbreue16 committed Mar 1, 2024
1 parent b661db2 commit f54b1d6
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions test/ColumnTests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -360,7 +360,7 @@ namespace column

// Get data from simulation
cadet::InternalStorageUnitOpRecorder const* const simData = drv.solution()->unitOperation(0);
double const* outlet = (forwardFlow ? simData->outlet() : simData->inlet());
double const* outlet = simData->outlet();

// Compare
for (unsigned int i = 0; i < simData->numDataPoints() * simData->numComponents() * simData->numInletPorts(); ++i, ++outlet)
Expand Down Expand Up @@ -398,7 +398,7 @@ namespace column

// Get data from simulation
cadet::InternalStorageUnitOpRecorder const* const simData = drv.solution()->unitOperation(0);
double const* outlet = (forwardFlow ? simData->outlet() : simData->inlet());
double const* outlet = simData->outlet();

// Compare
for (unsigned int i = 0; i < simData->numDataPoints() * simData->numComponents() * simData->numInletPorts(); ++i, ++outlet)
Expand Down Expand Up @@ -994,20 +994,20 @@ namespace column
const unsigned int nDataPoints = fwdData->numDataPoints() * nComp * nPorts;
double const* const time = drvFwd.solution()->time();
double const* fwdOutlet = fwdData->sensOutlet(0);
double const* bwdInlet = bwdData->sensInlet(0);
double const* bwdOutlet = bwdData->sensOutlet(0);

// Compare
unsigned int numPassed = 0;
for (unsigned int i = 0; i < nDataPoints; ++i, ++fwdOutlet, ++bwdInlet)
for (unsigned int i = 0; i < nDataPoints; ++i, ++fwdOutlet, ++bwdOutlet)
{
const unsigned int comp = (i % (nComp * nPorts)) % nComp;
const unsigned int port = (i % (nComp * nPorts)) / nComp;
const unsigned int timeIdx = i / (nComp * nPorts);

INFO("Time " << time[timeIdx] << " Port " << port << " Component " << comp << " time point idx " << timeIdx);
CHECK(*bwdInlet == makeApprox(*fwdOutlet, relTol, absTol));
CHECK(*bwdOutlet == makeApprox(*fwdOutlet, relTol, absTol));

const bool relativeOK = std::abs(*bwdInlet - *fwdOutlet) <= relTol * std::abs(*fwdOutlet);
const bool relativeOK = std::abs(*bwdOutlet - *fwdOutlet) <= relTol * std::abs(*fwdOutlet);
if (relativeOK)
++numPassed;
}
Expand Down

0 comments on commit f54b1d6

Please sign in to comment.