Skip to content

Commit f9aa073

Browse files
markarenmarkaren
committed
cleanup
1 parent 1c244fb commit f9aa073

2 files changed

Lines changed: 26 additions & 47 deletions

File tree

‎export/src/fmu4cpp/fmi2.cpp‎

Lines changed: 24 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,6 @@
1313

1414
namespace {
1515

16-
fmiStatus toCommonStatusFromFmi2(fmi2Status status) {
17-
switch (status) {
18-
case fmi2OK:
19-
return fmiOK;
20-
case fmi2Warning:
21-
return fmiWarning;
22-
case fmi2Discard:
23-
return fmiDiscard;
24-
case fmi2Error:
25-
return fmiError;
26-
case fmi2Fatal:
27-
return fmiFatal;
28-
case fmi2Pending:
29-
return fmiPending;
30-
default:
31-
return fmiStatusUnknown;
32-
}
33-
}
34-
3516
fmi2Status toFmi2StatusFromCommon(fmiStatus status) {
3617
switch (status) {
3718
case fmiOK:
@@ -178,10 +159,10 @@ fmi2Status fmi2EnterInitializationMode(fmi2Component c) {
178159
component->slave->enter_initialisation_mode(component->start, component->stop, component->tolerance);
179160
return fmi2OK;
180161
} catch (const fmu4cpp::fatal_error &ex) {
181-
component->logger->log(toCommonStatusFromFmi2(fmi2Fatal), ex.what());
162+
component->logger->log(fmiFatal, ex.what());
182163
return fmi2Fatal;
183164
} catch (const std::exception &ex) {
184-
component->logger->log(toCommonStatusFromFmi2(fmi2Error), ex.what());
165+
component->logger->log(fmiError, ex.what());
185166
return fmi2Error;
186167
}
187168
}
@@ -192,10 +173,10 @@ fmi2Status fmi2ExitInitializationMode(fmi2Component c) {
192173
component->slave->exit_initialisation_mode();
193174
return fmi2OK;
194175
} catch (const fmu4cpp::fatal_error &ex) {
195-
component->logger->log(toCommonStatusFromFmi2(fmi2Fatal), ex.what());
176+
component->logger->log(fmiFatal, ex.what());
196177
return fmi2Fatal;
197178
} catch (const std::exception &ex) {
198-
component->logger->log(toCommonStatusFromFmi2(fmi2Error), ex.what());
179+
component->logger->log(fmiError, ex.what());
199180
return fmi2Error;
200181
}
201182
}
@@ -206,10 +187,10 @@ fmi2Status fmi2Terminate(fmi2Component c) {
206187
component->slave->terminate();
207188
return fmi2OK;
208189
} catch (const fmu4cpp::fatal_error &ex) {
209-
component->logger->log(toCommonStatusFromFmi2(fmi2Fatal), ex.what());
190+
component->logger->log(fmiFatal, ex.what());
210191
return fmi2Fatal;
211192
} catch (const std::exception &ex) {
212-
component->logger->log(toCommonStatusFromFmi2(fmi2Error), ex.what());
193+
component->logger->log(fmiError, ex.what());
213194
return fmi2Error;
214195
}
215196
}
@@ -229,10 +210,10 @@ fmi2Status fmi2DoStep(
229210

230211
return fmi2Discard;
231212
} catch (const fmu4cpp::fatal_error &ex) {
232-
component->logger->log(toCommonStatusFromFmi2(fmi2Fatal), ex.what());
213+
component->logger->log(fmiFatal, ex.what());
233214
return fmi2Fatal;
234215
} catch (const std::exception &ex) {
235-
component->logger->log(toCommonStatusFromFmi2(fmi2Error), ex.what());
216+
component->logger->log(fmiError, ex.what());
236217
return fmi2Error;
237218
}
238219
}
@@ -258,10 +239,10 @@ fmi2Status fmi2GetInteger(
258239
component->slave->get_integer(vr, nvr, value);
259240
return fmi2OK;
260241
} catch (const fmu4cpp::fatal_error &ex) {
261-
component->logger->log(toCommonStatusFromFmi2(fmi2Fatal), ex.what());
242+
component->logger->log(fmiFatal, ex.what());
262243
return fmi2Fatal;
263244
} catch (const std::exception &ex) {
264-
component->logger->log(toCommonStatusFromFmi2(fmi2Error), ex.what());
245+
component->logger->log(fmiError, ex.what());
265246
return fmi2Error;
266247
}
267248
}
@@ -277,10 +258,10 @@ fmi2Status fmi2GetReal(
277258
component->slave->get_real(vr, nvr, value);
278259
return fmi2OK;
279260
} catch (const fmu4cpp::fatal_error &ex) {
280-
component->logger->log(toCommonStatusFromFmi2(fmi2Fatal), ex.what());
261+
component->logger->log(fmiFatal, ex.what());
281262
return fmi2Fatal;
282263
} catch (const std::exception &ex) {
283-
component->logger->log(toCommonStatusFromFmi2(fmi2Error), ex.what());
264+
component->logger->log(fmiError, ex.what());
284265
return fmi2Error;
285266
}
286267
}
@@ -296,10 +277,10 @@ fmi2Status fmi2GetBoolean(
296277
component->slave->get_boolean(vr, nvr, value);
297278
return fmi2OK;
298279
} catch (const fmu4cpp::fatal_error &ex) {
299-
component->logger->log(toCommonStatusFromFmi2(fmi2Fatal), ex.what());
280+
component->logger->log(fmiFatal, ex.what());
300281
return fmi2Fatal;
301282
} catch (const std::exception &ex) {
302-
component->logger->log(toCommonStatusFromFmi2(fmi2Error), ex.what());
283+
component->logger->log(fmiError, ex.what());
303284
return fmi2Error;
304285
}
305286
}
@@ -315,10 +296,10 @@ fmi2Status fmi2GetString(
315296
component->slave->get_string(vr, nvr, value);
316297
return fmi2OK;
317298
} catch (const fmu4cpp::fatal_error &ex) {
318-
component->logger->log(toCommonStatusFromFmi2(fmi2Fatal), ex.what());
299+
component->logger->log(fmiFatal, ex.what());
319300
return fmi2Fatal;
320301
} catch (const std::exception &ex) {
321-
component->logger->log(toCommonStatusFromFmi2(fmi2Error), ex.what());
302+
component->logger->log(fmiError, ex.what());
322303
return fmi2Error;
323304
}
324305
}
@@ -334,10 +315,10 @@ fmi2Status fmi2SetInteger(
334315
component->slave->set_integer(vr, nvr, value);
335316
return fmi2OK;
336317
} catch (const fmu4cpp::fatal_error &ex) {
337-
component->logger->log(toCommonStatusFromFmi2(fmi2Fatal), ex.what());
318+
component->logger->log(fmiFatal, ex.what());
338319
return fmi2Fatal;
339320
} catch (const std::exception &ex) {
340-
component->logger->log(toCommonStatusFromFmi2(fmi2Error), ex.what());
321+
component->logger->log(fmiError, ex.what());
341322
return fmi2Error;
342323
}
343324
}
@@ -353,10 +334,10 @@ fmi2Status fmi2SetReal(
353334
component->slave->set_real(vr, nvr, value);
354335
return fmi2OK;
355336
} catch (const fmu4cpp::fatal_error &ex) {
356-
component->logger->log(toCommonStatusFromFmi2(fmi2Fatal), ex.what());
337+
component->logger->log(fmiFatal, ex.what());
357338
return fmi2Fatal;
358339
} catch (const std::exception &ex) {
359-
component->logger->log(toCommonStatusFromFmi2(fmi2Error), ex.what());
340+
component->logger->log(fmiError, ex.what());
360341
return fmi2Error;
361342
}
362343
}
@@ -372,10 +353,10 @@ fmi2Status fmi2SetBoolean(
372353
component->slave->set_boolean(vr, nvr, value);
373354
return fmi2OK;
374355
} catch (const fmu4cpp::fatal_error &ex) {
375-
component->logger->log(toCommonStatusFromFmi2(fmi2Fatal), ex.what());
356+
component->logger->log(fmiFatal, ex.what());
376357
return fmi2Fatal;
377358
} catch (const std::exception &ex) {
378-
component->logger->log(toCommonStatusFromFmi2(fmi2Error), ex.what());
359+
component->logger->log(fmiError, ex.what());
379360
return fmi2Error;
380361
}
381362
}
@@ -391,10 +372,10 @@ fmi2Status fmi2SetString(
391372
component->slave->set_string(vr, nvr, value);
392373
return fmi2OK;
393374
} catch (const fmu4cpp::fatal_error &ex) {
394-
component->logger->log(toCommonStatusFromFmi2(fmi2Fatal), ex.what());
375+
component->logger->log(fmiFatal, ex.what());
395376
return fmi2Fatal;
396377
} catch (const std::exception &ex) {
397-
component->logger->log(toCommonStatusFromFmi2(fmi2Error), ex.what());
378+
component->logger->log(fmiError, ex.what());
398379
return fmi2Error;
399380
}
400381
}

‎export/tests/identity_test.cpp‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -85,10 +85,8 @@ fmu4cpp::model_info fmu4cpp::get_model_info() {
8585
return info;
8686
}
8787

88-
std::unique_ptr<fmu4cpp::fmu_base> fmu4cpp::createInstance(const std::string &instanceName,
89-
const std::filesystem::path &fmuResourceLocation) {
90-
return std::make_unique<Model>(instanceName, fmuResourceLocation);
91-
}
88+
FMU4CPP_INSTANTIATE(Model);
89+
9290

9391
int readInt(fmi2Component c, fmi2ValueReference ref) {
9492
fmi2Integer value;

0 commit comments

Comments
 (0)