Skip to content

Commit 0ac1e8e

Browse files
committed
fix: removed case sensitivity in the options list keywords
1 parent 0f2afd5 commit 0ac1e8e

File tree

1 file changed

+26
-26
lines changed

1 file changed

+26
-26
lines changed

source/MoorDyn2.cpp

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2128,19 +2128,19 @@ moordyn::MoorDyn::readOptionsLine(vector<string>& in_txt, int i)
21282128

21292129
LOGDBG << "\t" << entries[1] << " = " << entries[0] << endl;
21302130
const string value = entries[0];
2131-
const string name = entries[1];
2131+
const string name = str::lower(entries[1]);
21322132

21332133
// DT is old way, should phase out
2134-
if ((name == "dtM") || (name == "DT"))
2134+
if ((name == "dtm") || (name == "dt"))
21352135
dtM0 = atof(value.c_str());
2136-
else if ((name == "CFL") || (name == "cfl"))
2136+
else if (name == "cfl")
21372137
cfl = atof(value.c_str());
2138-
else if (name == "writeLog") {
2138+
else if (name == "writelog") {
21392139
// This was actually already did, so we do not need to do that again
21402140
// But we really want to have this if to avoid showing a warning for
21412141
// Unrecognized option writeLog
21422142
// env->writeLog = atoi(value.c_str());
2143-
} else if (name == "tScheme") {
2143+
} else if (name == "tscheme") {
21442144
moordyn::error_id err = MOORDYN_SUCCESS;
21452145
string err_msg;
21462146
try {
@@ -2153,40 +2153,40 @@ moordyn::MoorDyn::readOptionsLine(vector<string>& in_txt, int i)
21532153
}
21542154
} else if ((name == "g") || (name == "gravity"))
21552155
env->g = atof(value.c_str());
2156-
else if ((name == "Rho") || (name == "rho") || (name == "WtrDnsty"))
2156+
else if ((name == "rho") || (name == "wtrdnsty"))
21572157
env->rho_w = atof(value.c_str());
2158-
else if (name == "WtrDpth")
2158+
else if (name == "wtrdpth")
21592159
env->WtrDpth = atof(value.c_str());
2160-
else if ((name == "kBot") || (name == "kbot") || (name == "kb"))
2160+
else if ((name == "kbot") || (name == "kb"))
21612161
env->kb = atof(value.c_str());
2162-
else if ((name == "cBot") || (name == "cbot") || (name == "cb"))
2162+
else if ((name == "cbot") || (name == "cb"))
21632163
env->cb = atof(value.c_str());
2164-
else if ((name == "dtIC") || (name == "ICdt"))
2164+
else if ((name == "dtic") || (name == "icdt"))
21652165
ICdt = atof(value.c_str());
2166-
else if ((name == "TmaxIC") || (name == "ICTmax"))
2166+
else if ((name == "tmaxic") || (name == "ictmax"))
21672167
ICTmax = atof(value.c_str());
2168-
else if ((name == "CdScaleIC") || (name == "ICDfac"))
2168+
else if ((name == "cdscaleic") || (name == "icdfac"))
21692169
ICDfac = atof(value.c_str());
2170-
else if ((name == "threshIC") || (name == "ICthresh"))
2170+
else if ((name == "threshic") || (name == "icthresh"))
21712171
ICthresh = atof(value.c_str());
2172-
else if ((name == "genDynamicIC") || (name == "ICgenDynamic"))
2172+
else if ((name == "gendynamicic") || (name == "icgendynamic"))
21732173
ICgenDynamic = bool(atof(value.c_str()));
2174-
else if ((name == "fileIC") || (name == "ICfile"))
2174+
else if ((name == "fileic") || (name == "icfile"))
21752175
ICfile = value;
2176-
else if (name == "WaveKin") {
2176+
else if (name == "wavekin") {
21772177
WaveKinTemp = (waves::waves_settings)stoi(value);
21782178
if ((WaveKinTemp < waves::WAVES_NONE) ||
21792179
(WaveKinTemp > waves::WAVES_SUM_COMPONENTS_NODE))
21802180
LOGWRN << "Unknown WaveKin option value " << WaveKinTemp << endl;
2181-
} else if (name == "dtWave")
2181+
} else if (name == "dtwave")
21822182
env->waterKinOptions.dtWave = stof(value);
2183-
else if (name == "Currents") {
2183+
else if (name == "currents") {
21842184
auto current_mode = (waves::currents_settings)stoi(value);
21852185
env->waterKinOptions.currentMode = current_mode;
21862186
if ((current_mode < waves::CURRENTS_NONE) ||
21872187
(current_mode > waves::CURRENTS_4D))
21882188
LOGWRN << "Unknown Currents option value " << current_mode << endl;
2189-
} else if (name == "UnifyCurrentGrid") {
2189+
} else if (name == "unifycurrentgrid") {
21902190
if (value == "1") {
21912191
env->waterKinOptions.unifyCurrentGrid = true;
21922192
} else if (value == "0") {
@@ -2195,23 +2195,23 @@ moordyn::MoorDyn::readOptionsLine(vector<string>& in_txt, int i)
21952195
LOGWRN << "Unrecognized UnifyCurrentGrid value "
21962196
<< std::quoted(value) << ". Should be 0 or 1" << endl;
21972197
}
2198-
} else if (name == "WriteUnits")
2198+
} else if (name == "writeunits")
21992199
env->WriteUnits = atoi(value.c_str());
2200-
else if (name == "FrictionCoefficient")
2200+
else if (name == "frictioncoefficient")
22012201
env->FrictionCoefficient = atof(value.c_str());
2202-
else if (name == "FricDamp")
2202+
else if (name == "fricdamp")
22032203
env->FricDamp = atof(value.c_str());
2204-
else if (name == "StatDynFricScale")
2204+
else if (name == "statdynfricscale")
22052205
env->StatDynFricScale = atof(value.c_str());
22062206
// output writing period (0 for at every call)
2207-
else if (name == "dtOut")
2207+
else if (name == "dtout")
22082208
dtOut = atof(value.c_str());
2209-
else if (name == "SeafloorFile") {
2209+
else if (name == "seafloorfile") {
22102210
env->SeafloorMode = seafloor_settings::SEAFLOOR_3D;
22112211
this->seafloor = make_shared<moordyn::Seafloor>(_log);
22122212
std::string filepath = value;
22132213
this->seafloor->setup(env, filepath);
2214-
} else if (name == "disableOutput"){
2214+
} else if (name == "disableoutput"){
22152215
if (value == "1") {
22162216
disableOutput = true;
22172217
} else if (value == "0") {

0 commit comments

Comments
 (0)