From 0882545ae31121f3019099782bb05d915ec58c2f Mon Sep 17 00:00:00 2001 From: Torsten Sommer Date: Thu, 27 Jun 2024 11:53:14 +0200 Subject: [PATCH] Fix generationDateAndTime in ModelDescription.c --- fmusim/FMIModelDescription.c | 10 +++++----- fmusim/FMIModelDescription.h | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/fmusim/FMIModelDescription.c b/fmusim/FMIModelDescription.c index 71e044eb..cbb7cf31 100644 --- a/fmusim/FMIModelDescription.c +++ b/fmusim/FMIModelDescription.c @@ -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"); @@ -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"); @@ -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); @@ -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); @@ -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"); diff --git a/fmusim/FMIModelDescription.h b/fmusim/FMIModelDescription.h index a47d120a..0645a9fd 100644 --- a/fmusim/FMIModelDescription.h +++ b/fmusim/FMIModelDescription.h @@ -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;