Skip to content

Commit

Permalink
Fix generationDateAndTime in ModelDescription.c (#527)
Browse files Browse the repository at this point in the history
  • Loading branch information
t-sommer authored Jun 27, 2024
1 parent d124bec commit afd1d31
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
10 changes: 5 additions & 5 deletions fmusim/FMIModelDescription.c
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ static FMIModelDescription* readModelDescriptionFMI1(xmlNodePtr root) {
modelDescription->instantiationToken = (char*)xmlGetProp(root, (xmlChar*)"guid");
modelDescription->description = (char*)xmlGetProp(root, (xmlChar*)"description");
modelDescription->generationTool = (char*)xmlGetProp(root, (xmlChar*)"generationTool");
modelDescription->generationDate = (char*)xmlGetProp(root, (xmlChar*)"generationDateAndTime");
modelDescription->generationDateAndTime = (char*)xmlGetProp(root, (xmlChar*)"generationDateAndTime");
modelDescription->variableNamingConvention = getVariableNamingConvention(root);

const char* numberOfContinuousStates = (char*)xmlGetProp(root, (xmlChar*)"numberOfContinuousStates");
Expand Down Expand Up @@ -318,7 +318,7 @@ static FMIModelDescription* readModelDescriptionFMI2(xmlNodePtr root) {
modelDescription->instantiationToken = (char*)xmlGetProp(root, (xmlChar*)"guid");
modelDescription->description = (char*)xmlGetProp(root, (xmlChar*)"description");
modelDescription->generationTool = (char*)xmlGetProp(root, (xmlChar*)"generationTool");
modelDescription->generationDate = (char*)xmlGetProp(root, (xmlChar*)"generationDate");
modelDescription->generationDateAndTime = (char*)xmlGetProp(root, (xmlChar*)"generationDateAndTime");
modelDescription->variableNamingConvention = getVariableNamingConvention(root);

const char* numberOfEventIndicators = (char*)xmlGetProp(root, (xmlChar*)"numberOfEventIndicators");
Expand Down Expand Up @@ -616,7 +616,7 @@ static FMIModelDescription* readModelDescriptionFMI3(xmlNodePtr root) {
modelDescription->instantiationToken = (char*)xmlGetProp(root, (xmlChar*)"instantiationToken");
modelDescription->description = (char*)xmlGetProp(root, (xmlChar*)"description");
modelDescription->generationTool = (char*)xmlGetProp(root, (xmlChar*)"generationTool");
modelDescription->generationDate = (char*)xmlGetProp(root, (xmlChar*)"generationDate");
modelDescription->generationDateAndTime = (char*)xmlGetProp(root, (xmlChar*)"generationDateAndTime");
modelDescription->variableNamingConvention = getVariableNamingConvention(root);

xmlXPathContextPtr xpathCtx = xmlXPathNewContext(root->doc);
Expand Down Expand Up @@ -1145,7 +1145,7 @@ void FMIFreeModelDescription(FMIModelDescription* modelDescription) {
xmlFree((void*)modelDescription->instantiationToken);
xmlFree((void*)modelDescription->description);
xmlFree((void*)modelDescription->generationTool);
xmlFree((void*)modelDescription->generationDate);
xmlFree((void*)modelDescription->generationDateAndTime);

if (modelDescription->modelExchange) {
xmlFree((void*)modelDescription->modelExchange->modelIdentifier);
Expand Down Expand Up @@ -1502,7 +1502,7 @@ void FMIDumpModelDescription(FMIModelDescription* modelDescription, FILE* file)
fprintf(file, "Continuous States %zu\n", modelDescription->nContinuousStates);
fprintf(file, "Event Indicators %zu\n", modelDescription->nEventIndicators);
fprintf(file, "Generation Tool %s\n", modelDescription->generationTool ? modelDescription->generationTool : "n/a");
fprintf(file, "Generation Date %s\n", modelDescription->generationDate ? modelDescription->generationDate : "n/a");
fprintf(file, "Generation Date %s\n", modelDescription->generationDateAndTime ? modelDescription->generationDateAndTime : "n/a");
fprintf(file, "\n");
fprintf(file, "Model Variables\n");
fprintf(file, "\n");
Expand Down
2 changes: 1 addition & 1 deletion fmusim/FMIModelDescription.h
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ typedef struct {
const char* instantiationToken;
const char* description;
const char* generationTool;
const char* generationDate;
const char* generationDateAndTime;
FMIVariableNamingConvention variableNamingConvention;

FMIModelExchangeInterface* modelExchange;
Expand Down

0 comments on commit afd1d31

Please sign in to comment.