Skip to content

Commit

Permalink
- print the error level
Browse files Browse the repository at this point in the history 
git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@23719 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
  • Loading branch information
@adeas31
adeas31 committed Dec 10, 2014
1 parent aa168dc commit 645b24a
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 54 deletions.
10 changes: 5 additions & 5 deletions SimulationRuntime/c/fmi/FMI1CoSimulation.c
View file
Expand Up @@ -68,7 +68,7 @@ void* FMI1CoSimulationConstructor_OMC(int fmi_log_level, char* working_directory
/* Load the binary (dll/so) */
jm_status_enu_t status = fmi1_import_create_dllfmu(FMI1CS->FMIImportInstance, FMI1CS->FMICallbackFunctions, 0);
if (status == jm_status_error) {
ModelicaError("Loading of FMU dynamic link library failed.\n");
ModelicaFormatError("Loading of FMU dynamic link library failed with status : %s\n", jm_log_level_to_string(status));
return 0;
}
FMI1CS->FMIInstanceName = (char*) malloc(strlen(instanceName)+1);
Expand All @@ -82,20 +82,20 @@ void* FMI1CoSimulationConstructor_OMC(int fmi_log_level, char* working_directory
FMI1CS->FMIInteractive = interactive;
jm_status_enu_t instantiateSlaveStatus = fmi1_import_instantiate_slave(FMI1CS->FMIImportInstance, FMI1CS->FMIInstanceName, FMI1CS->FMIFmuLocation, FMI1CS->FMIMimeType, FMI1CS->FMITimeOut, FMI1CS->FMIVisible, FMI1CS->FMIInteractive);
if (instantiateSlaveStatus == jm_status_error) {
ModelicaError("fmiInstantiateSlave failed.\n");
ModelicaFormatError("fmiInstantiateSlave failed with status : %s\n", jm_log_level_to_string(instantiateSlaveStatus));
return 0;
}
FMI1CS->FMIDebugLogging = debugLogging;
fmi1_status_t debugLoggingStatus = fmi1_import_set_debug_logging(FMI1CS->FMIImportInstance, FMI1CS->FMIDebugLogging);
if (debugLoggingStatus != fmi1_status_ok && debugLoggingStatus != fmi1_status_warning) {
ModelicaMessage("fmiSetDebugLogging failed.\n");
ModelicaFormatMessage("fmiSetDebugLogging failed with status : %s\n", fmi1_status_to_string(debugLoggingStatus));
}
FMI1CS->FMITStart = tStart;
FMI1CS->FMIStopTimeDefined = stopTimeDefined;
FMI1CS->FMITStop = tStop;
fmi1_status_t initializeSlaveStatus = fmi1_import_initialize_slave(FMI1CS->FMIImportInstance, FMI1CS->FMITStart, FMI1CS->FMIStopTimeDefined, FMI1CS->FMITStop);
if (initializeSlaveStatus != fmi1_status_ok && initializeSlaveStatus != fmi1_status_warning) {
ModelicaError("fmiInitializeSlave failed\n");
ModelicaFormatError("fmiInitializeSlave failed with status : %s\n", fmi1_status_to_string(initializeSlaveStatus));
}
return FMI1CS;
}
Expand Down Expand Up @@ -123,7 +123,7 @@ double fmi1DoStep_OMC(void* in_fmi1cs, double currentCommunicationPoint, double
FMI1CoSimulation* FMI1CS = (FMI1CoSimulation*)in_fmi1cs;
fmi1_status_t status = fmi1_import_do_step(FMI1CS->FMIImportInstance, currentCommunicationPoint, communicationStepSize, newStep);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiDoStep failed\n");
ModelicaFormatError("fmiDoStep failed with status : %s\n", fmi1_status_to_string(status));
}
return 0.0;
}
Expand Down
32 changes: 16 additions & 16 deletions SimulationRuntime/c/fmi/FMI1Common.c
View file
Expand Up @@ -75,15 +75,15 @@ void fmi1GetReal_OMC(void* in_fmi1, int numberOfValueReferences, double* realVal
fmi1_status_t status = fmi1_import_get_real(FMI1ME->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_real_t*)realValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiGetReal failed\n");
ModelicaFormatError("fmiGetReal failed with status : %s\n", fmi1_status_to_string(status));
}
} else if (fmiType == 2) {
FMI1CoSimulation* FMI1CS = (FMI1CoSimulation*)in_fmi1;
fmi1_value_reference_t* valuesReferences_int = real_to_fmi1_value_reference(numberOfValueReferences, realValuesReferences);
fmi1_status_t status = fmi1_import_get_real(FMI1CS->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_real_t*)realValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiGetReal failed\n");
ModelicaFormatError("fmiGetReal failed with status : %s\n", fmi1_status_to_string(status));
}
}
}
Expand All @@ -100,15 +100,15 @@ void fmi1SetReal_OMC(void* in_fmi1, int numberOfValueReferences, double* realVal
fmi1_status_t status = fmi1_import_set_real(FMI1ME->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_real_t*)realValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiSetReal failed\n");
ModelicaFormatError("fmiSetReal failed with status : %s\n", fmi1_status_to_string(status));
}
} else if (fmiType == 2) {
FMI1CoSimulation* FMI1CS = (FMI1CoSimulation*)in_fmi1;
fmi1_value_reference_t* valuesReferences_int = real_to_fmi1_value_reference(numberOfValueReferences, realValueReferences);
fmi1_status_t status = fmi1_import_set_real(FMI1CS->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_real_t*)realValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiSetReal failed\n");
ModelicaFormatError("fmiSetReal failed with status : %s\n", fmi1_status_to_string(status));
}
}
}
Expand All @@ -126,15 +126,15 @@ void fmi1GetInteger_OMC(void* in_fmi1, int numberOfValueReferences, double* inte
fmi1_status_t status = fmi1_import_get_integer(FMI1ME->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_integer_t*)integerValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiGetInteger failed\n");
ModelicaFormatError("fmiGetInteger failed with status : %s\n", fmi1_status_to_string(status));
}
} else if (fmiType == 2) {
FMI1CoSimulation* FMI1CS = (FMI1CoSimulation*)in_fmi1;
fmi1_value_reference_t* valuesReferences_int = real_to_fmi1_value_reference(numberOfValueReferences, integerValuesReferences);
fmi1_status_t status = fmi1_import_get_integer(FMI1CS->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_integer_t*)integerValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiGetInteger failed\n");
ModelicaFormatError("fmiGetInteger failed with status : %s\n", fmi1_status_to_string(status));
}
}
}
Expand All @@ -151,15 +151,15 @@ void fmi1SetInteger_OMC(void* in_fmi1, int numberOfValueReferences, double* inte
fmi1_status_t status = fmi1_import_set_integer(FMI1ME->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_integer_t*)integerValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiSetInteger failed\n");
ModelicaFormatError("fmiSetInteger failed with status : %s\n", fmi1_status_to_string(status));
}
} else if (fmiType == 2) {
FMI1CoSimulation* FMI1CS = (FMI1CoSimulation*)in_fmi1;
fmi1_value_reference_t* valuesReferences_int = real_to_fmi1_value_reference(numberOfValueReferences, integerValueReferences);
fmi1_status_t status = fmi1_import_set_integer(FMI1CS->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_integer_t*)integerValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiSetInteger failed\n");
ModelicaFormatError("fmiSetInteger failed with status : %s\n", fmi1_status_to_string(status));
}
}
}
Expand All @@ -177,15 +177,15 @@ void fmi1GetBoolean_OMC(void* in_fmi1, int numberOfValueReferences, double* bool
fmi1_status_t status = fmi1_import_get_boolean(FMI1ME->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_boolean_t*)booleanValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiGetBoolean failed\n");
ModelicaFormatError("fmiGetBoolean failed with status : %s\n", fmi1_status_to_string(status));
}
} else if (fmiType == 2) {
FMI1CoSimulation* FMI1CS = (FMI1CoSimulation*)in_fmi1;
fmi1_value_reference_t* valuesReferences_int = real_to_fmi1_value_reference(numberOfValueReferences, booleanValuesReferences);
fmi1_status_t status = fmi1_import_get_boolean(FMI1CS->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_boolean_t*)booleanValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiGetBoolean failed\n");
ModelicaFormatError("fmiGetBoolean failed with status : %s\n", fmi1_status_to_string(status));
}
}
}
Expand All @@ -202,15 +202,15 @@ void fmi1SetBoolean_OMC(void* in_fmi1, int numberOfValueReferences, double* bool
fmi1_status_t status = fmi1_import_set_boolean(FMI1ME->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_boolean_t*)booleanValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiSetBoolean failed\n");
ModelicaFormatError("fmiSetBoolean failed with status : %s\n", fmi1_status_to_string(status));
}
} else if (fmiType == 2) {
FMI1CoSimulation* FMI1CS = (FMI1CoSimulation*)in_fmi1;
fmi1_value_reference_t* valuesReferences_int = real_to_fmi1_value_reference(numberOfValueReferences, booleanValueReferences);
fmi1_status_t status = fmi1_import_set_boolean(FMI1CS->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_boolean_t*)booleanValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiSetBoolean failed\n");
ModelicaFormatError("fmiSetBoolean failed with status : %s\n", fmi1_status_to_string(status));
}
}
}
Expand All @@ -228,15 +228,15 @@ void fmi1GetString_OMC(void* in_fmi1, int numberOfValueReferences, double* strin
fmi1_status_t status = fmi1_import_get_string(FMI1ME->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_string_t*)stringValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiGetString failed\n");
ModelicaFormatError("fmiGetString failed with status : %s\n", fmi1_status_to_string(status));
}
} else if (fmiType == 2) {
FMI1CoSimulation* FMI1CS = (FMI1CoSimulation*)in_fmi1;
fmi1_value_reference_t* valuesReferences_int = real_to_fmi1_value_reference(numberOfValueReferences, stringValuesReferences);
fmi1_status_t status = fmi1_import_get_string(FMI1CS->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_string_t*)stringValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiGetString failed\n");
ModelicaFormatError("fmiGetString failed with status : %s\n", fmi1_status_to_string(status));
}
}
}
Expand All @@ -253,15 +253,15 @@ void fmi1SetString_OMC(void* in_fmi1, int numberOfValueReferences, double* strin
fmi1_status_t status = fmi1_import_set_string(FMI1ME->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_string_t*)stringValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiSetString failed\n");
ModelicaFormatError("fmiSetString failed with status : %s\n", fmi1_status_to_string(status));
}
} else if (fmiType == 2) {
FMI1CoSimulation* FMI1CS = (FMI1CoSimulation*)in_fmi1;
fmi1_value_reference_t* valuesReferences_int = real_to_fmi1_value_reference(numberOfValueReferences, stringValueReferences);
fmi1_status_t status = fmi1_import_set_string(FMI1CS->FMIImportInstance, valuesReferences_int, numberOfValueReferences, (fmi1_string_t*)stringValues);
free(valuesReferences_int);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiSetString failed\n");
ModelicaFormatError("fmiSetString failed with status : %s\n", fmi1_status_to_string(status));
}
}
}
Expand Down
22 changes: 11 additions & 11 deletions SimulationRuntime/c/fmi/FMI1ModelExchange.c
View file
Expand Up @@ -67,20 +67,20 @@ void* FMI1ModelExchangeConstructor_OMC(int fmi_log_level, char* working_director
/* Load the binary (dll/so) */
jm_status_enu_t status = fmi1_import_create_dllfmu(FMI1ME->FMIImportInstance, FMI1ME->FMICallbackFunctions, 0);
if (status == jm_status_error) {
ModelicaError("Loading of FMU dynamic link library failed.\n");
ModelicaFormatError("Loading of FMU dynamic link library failed with status : %s\n", jm_log_level_to_string(status));
return 0;
}
FMI1ME->FMIInstanceName = (char*) malloc(strlen(instanceName)+1);
strcpy(FMI1ME->FMIInstanceName, instanceName);
FMI1ME->FMIDebugLogging = debugLogging;
jm_status_enu_t instantiateModelStatus = fmi1_import_instantiate_model(FMI1ME->FMIImportInstance, FMI1ME->FMIInstanceName);
if (instantiateModelStatus == jm_status_error) {
ModelicaError("fmiInstantiateModel failed.\n");
ModelicaFormatError("fmiInstantiateModel failed with status : %s\n", jm_log_level_to_string(instantiateModelStatus));
return 0;
}
fmi1_status_t debugLoggingStatus = fmi1_import_set_debug_logging(FMI1ME->FMIImportInstance, FMI1ME->FMIDebugLogging);
if (debugLoggingStatus != fmi1_status_ok && debugLoggingStatus != fmi1_status_warning) {
ModelicaMessage("fmiSetDebugLogging failed.\n");
ModelicaFormatMessage("fmiSetDebugLogging failed with status : %s\n", fmi1_status_to_string(debugLoggingStatus));
}
FMI1ME->FMIToleranceControlled = fmi1_true;
FMI1ME->FMIRelativeTolerance = 0.001;
Expand Down Expand Up @@ -109,7 +109,7 @@ void fmi1Initialize_OMC(void* in_fmi1me)
FMI1ModelExchange* FMI1ME = (FMI1ModelExchange*)in_fmi1me;
fmi1_status_t status = fmi1_import_initialize(FMI1ME->FMIImportInstance, FMI1ME->FMIToleranceControlled, FMI1ME->FMIRelativeTolerance, FMI1ME->FMIEventInfo);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiInitialize failed\n");
ModelicaFormatError("fmiInitialize failed with status : %s\n", fmi1_status_to_string(status));
}
}

Expand All @@ -122,7 +122,7 @@ void fmi1SetTime_OMC(void* in_fmi1me, double time)
FMI1ModelExchange* FMI1ME = (FMI1ModelExchange*)in_fmi1me;
fmi1_status_t status = fmi1_import_set_time(FMI1ME->FMIImportInstance, time);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiSetTime failed\n");
ModelicaFormatError("fmiSetTime failed with status : %s\n", fmi1_status_to_string(status));
}
}

Expand All @@ -136,7 +136,7 @@ void fmi1GetContinuousStates_OMC(void* in_fmi1me, int numberOfContinuousStates,
FMI1ModelExchange* FMI1ME = (FMI1ModelExchange*)in_fmi1me;
fmi1_status_t status = fmi1_import_get_continuous_states(FMI1ME->FMIImportInstance, (fmi1_real_t*)states, numberOfContinuousStates);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiGetContinuousStates failed\n");
ModelicaFormatError("fmiGetContinuousStates failed with status : %s\n", fmi1_status_to_string(status));
}
}

Expand All @@ -150,7 +150,7 @@ double fmi1SetContinuousStates_OMC(void* in_fmi1me, int numberOfContinuousStates
FMI1ModelExchange* FMI1ME = (FMI1ModelExchange*)in_fmi1me;
fmi1_status_t status = fmi1_import_set_continuous_states(FMI1ME->FMIImportInstance, (fmi1_real_t*)states, numberOfContinuousStates);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiSetContinuousStates failed\n");
ModelicaFormatError("fmiSetContinuousStates failed with status : %s\n", fmi1_status_to_string(status));
}
return flowParams;
}
Expand All @@ -165,7 +165,7 @@ void fmi1GetEventIndicators_OMC(void* in_fmi1me, int numberOfEventIndicators, do
FMI1ModelExchange* FMI1ME = (FMI1ModelExchange*)in_fmi1me;
fmi1_status_t status = fmi1_import_get_event_indicators(FMI1ME->FMIImportInstance, (fmi1_real_t*)events, numberOfEventIndicators);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiGetEventIndicators failed\n");
ModelicaFormatError("fmiGetEventIndicators failed with status : %s\n", fmi1_status_to_string(status));
}
}

Expand All @@ -179,7 +179,7 @@ void fmi1GetDerivatives_OMC(void* in_fmi1me, int numberOfContinuousStates, doubl
FMI1ModelExchange* FMI1ME = (FMI1ModelExchange*)in_fmi1me;
fmi1_status_t status = fmi1_import_get_derivatives(FMI1ME->FMIImportInstance, (fmi1_real_t*)states, numberOfContinuousStates);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiGetDerivatives failed\n");
ModelicaFormatError("fmiGetDerivatives failed with status : %s\n", fmi1_status_to_string(status));
}
}

Expand All @@ -192,7 +192,7 @@ int fmi1EventUpdate_OMC(void* in_fmi1me, int intermediateResults)
FMI1ModelExchange* FMI1ME = (FMI1ModelExchange*)in_fmi1me;
fmi1_status_t status = fmi1_import_eventUpdate(FMI1ME->FMIImportInstance, intermediateResults, FMI1ME->FMIEventInfo);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiEventUpdate failed\n");
ModelicaFormatError("fmiEventUpdate failed with status : %s\n", fmi1_status_to_string(status));
}
return FMI1ME->FMIEventInfo->stateValuesChanged;
}
Expand All @@ -216,7 +216,7 @@ int fmi1CompletedIntegratorStep_OMC(void* in_fmi1me, double flowStates)
fmi1_boolean_t callEventUpdate = fmi1_false;
fmi1_status_t status = fmi1_import_completed_integrator_step(FMI1ME->FMIImportInstance, &callEventUpdate);
if (status != fmi1_status_ok && status != fmi1_status_warning) {
ModelicaError("fmiCompletedIntegratorStep failed\n");
ModelicaFormatError("fmiCompletedIntegratorStep failed with status : %s\n", fmi1_status_to_string(status));
}
return callEventUpdate;
}
Expand Down

0 comments on commit 645b24a

Please sign in to comment.