Skip to content

Commit 42141b7

Browse files
Default to NONE adsorption model if not provided
Selects the NONE adsorption model by default if no model is provided by the user. Closes #60.
1 parent 0aae317 commit 42141b7

File tree

4 files changed

+14
-4
lines changed

4 files changed

+14
-4
lines changed

src/libcadet/model/GeneralRateModel.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,9 @@ bool GeneralRateModel::configureModelDiscretization(IParameterProvider& paramPro
424424
clearBindingModels();
425425
_binding = std::vector<IBindingModel*>(_disc.nParType, nullptr);
426426

427-
const std::vector<std::string> bindModelNames = paramProvider.getStringArray("ADSORPTION_MODEL");
427+
std::vector<std::string> bindModelNames = { "NONE" };
428+
if (paramProvider.exists("ADSORPTION_MODEL"))
429+
bindModelNames = paramProvider.getStringArray("ADSORPTION_MODEL");
428430

429431
if (paramProvider.exists("ADSORPTION_MODEL_MULTIPLEX"))
430432
_singleBinding = (paramProvider.getInt("ADSORPTION_MODEL_MULTIPLEX") == 1);

src/libcadet/model/GeneralRateModel2D.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,9 @@ bool GeneralRateModel2D::configureModelDiscretization(IParameterProvider& paramP
608608
clearBindingModels();
609609
_binding = std::vector<IBindingModel*>(_disc.nParType, nullptr);
610610

611-
const std::vector<std::string> bindModelNames = paramProvider.getStringArray("ADSORPTION_MODEL");
611+
std::vector<std::string> bindModelNames = { "NONE" };
612+
if (paramProvider.exists("ADSORPTION_MODEL"))
613+
bindModelNames = paramProvider.getStringArray("ADSORPTION_MODEL");
612614

613615
if (paramProvider.exists("ADSORPTION_MODEL_MULTIPLEX"))
614616
_singleBinding = (paramProvider.getInt("ADSORPTION_MODEL_MULTIPLEX") == 1);

src/libcadet/model/LumpedRateModelWithPores.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,9 @@ bool LumpedRateModelWithPores::configureModelDiscretization(IParameterProvider&
260260
clearBindingModels();
261261
_binding = std::vector<IBindingModel*>(_disc.nParType, nullptr);
262262

263-
const std::vector<std::string> bindModelNames = paramProvider.getStringArray("ADSORPTION_MODEL");
263+
std::vector<std::string> bindModelNames = { "NONE" };
264+
if (paramProvider.exists("ADSORPTION_MODEL"))
265+
bindModelNames = paramProvider.getStringArray("ADSORPTION_MODEL");
264266

265267
if (paramProvider.exists("ADSORPTION_MODEL_MULTIPLEX"))
266268
_singleBinding = (paramProvider.getInt("ADSORPTION_MODEL_MULTIPLEX") == 1);

src/libcadet/model/LumpedRateModelWithoutPores.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,11 @@ bool LumpedRateModelWithoutPores::configureModelDiscretization(IParameterProvide
199199
clearBindingModels();
200200
_binding.push_back(nullptr);
201201

202-
_binding[0] = helper.createBindingModel(paramProvider.getString("ADSORPTION_MODEL"));
202+
if (paramProvider.exists("ADSORPTION_MODEL"))
203+
_binding[0] = helper.createBindingModel(paramProvider.getString("ADSORPTION_MODEL"));
204+
else
205+
_binding[0] = helper.createBindingModel("NONE");
206+
203207
if (!_binding[0])
204208
throw InvalidParameterException("Unknown binding model " + paramProvider.getString("ADSORPTION_MODEL"));
205209

0 commit comments

Comments
 (0)