Skip to content

Commit 2bf8e90

Browse files
committed
fixup! 2D rename axial dispersion
1 parent 50cf59d commit 2bf8e90

File tree

3 files changed

+4
-2
lines changed

3 files changed

+4
-2
lines changed

test/ColumnTests.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1215,7 +1215,7 @@ namespace column
12151215
unit->prepareADvectors(adParams);
12161216

12171217
// Add dispersion parameter sensitivity
1218-
REQUIRE(unit->setSensitiveParameter(makeParamId(hashString("COL_DISPERSION"), 0, CompIndep, ParTypeIndep, BoundStateIndep, ReactionIndep, SectionIndep), 0, 1.0));
1218+
REQUIRE(unit->setSensitiveParameter(makeParamId(hashString("COL_DISPERSION"), 0, CompIndep, ParTypeIndep, BoundStateIndep, ReactionIndep, SectionIndep), 0, 1.0) || unit->setSensitiveParameter(makeParamId(hashString("COL_DISPERSION_AXIAL"), 0, CompIndep, ParTypeIndep, BoundStateIndep, ReactionIndep, SectionIndep), 0, 1.0));
12191219

12201220
// Obtain memory for state, Jacobian multiply direction, Jacobian column
12211221
const unsigned int nDof = unit->numDofs();

test/GeneralRateModel2D.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,6 +291,8 @@ TEST_CASE("GRM2D with 1 radial zone matches GRM", "[GRM],[GRM2D],[FV],[UnitOp],[
291291
jpp.set("UNIT_TYPE", "GENERAL_RATE_MODEL");
292292
cadet::IModel* const iUnitGrm = mb->createUnitOperation(jpp, 0);
293293
jpp.set("UNIT_TYPE", "GENERAL_RATE_MODEL_2D");
294+
const double colDispAx = jpp.getDouble("COL_DISPERSION");
295+
jpp.set("COL_DISPERSION_AXIAL", colDispAx);
294296
cadet::IModel* const iUnitGrm2d = mb->createUnitOperation(jpp, 0);
295297
REQUIRE(nullptr != iUnitGrm);
296298
REQUIRE(nullptr != iUnitGrm2d);

test/data/model_2DGRMsd3Zone_dynLin_1Comp_benchmark1.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@
186186
},
187187
"unit_000": {
188188
"UNIT_TYPE": "GENERAL_RATE_MODEL_2D",
189-
"COL_DISPERSION": 5.75e-08,
189+
"COL_DISPERSION_AXIAL": 5.75e-08,
190190
"COL_DISPERSION_RADIAL": 5e-08,
191191
"COL_LENGTH": 0.014,
192192
"COL_POROSITY": 0.37,

0 commit comments

Comments
 (0)