fixes and revision history for #1891

ibpsa · Jun 15, 2024 · f24c66a · f24c66a
1 parent feb1c64
commit f24c66a
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 21 deletions.
diff --git a/IBPSA/Resources/C-Sources/WeeklySchedule.c b/IBPSA/Resources/C-Sources/WeeklySchedule.c
@@ -3,6 +3,8 @@
   This code implements a weekly schedule.
 
   Changelog:
+    June 15, 2024 by Filip Jorissen, Builtwins
+          Revisions for #1891: compliance with Modelica include annotation rules.
     April 9, 2024 by Filip Jorissen, Builtwins
           Revisions for #1869 to remove a header requirement that contains the number of rows/columns.
     March 30, 2024 by Filip Jorissen, Builtwins
@@ -416,4 +418,22 @@ void* weeklyScheduleInit(const int tableOnFile, const char* name, const double t
   return (void*) scheduleID;
 }
 
+
+void weeklyScheduleFreeInit(void * ID) {
+  WeeklySchedule* scheduleID = (WeeklySchedule*)ID;
+
+  if (scheduleID->lastData != NULL)
+    free(scheduleID->lastData);
+
+  if (scheduleID->token != NULL)
+    free(scheduleID->token);
+
+  if (scheduleID->fp != NULL)
+    fclose(scheduleID->fp);
+
+  if (scheduleID->buff2 != NULL)
+    free(scheduleID->buff2);
+
+}
+
 #endif
diff --git a/IBPSA/Resources/C-Sources/WeeklyScheduleFree.c b/IBPSA/Resources/C-Sources/WeeklyScheduleFree.c
@@ -3,16 +3,8 @@
   This code implements a weekly schedule.
 
   Changelog:
-    April 9, 2024 by Filip Jorissen, Builtwins
-          Revisions for #1869 to remove a header requirement that contains the number of rows/columns.
-    March 30, 2024 by Filip Jorissen, Builtwins
-          Revisions for #1860 to avoid memory leaks when calling ModelicaFormatError.
-    May 25, 2022 by Michael Wetter, LBNL
-          Refactored to comply with C89.
-    March 9, 2022 by Filip Jorissen, KU Leuven
-         Initial version.
-    April 10, 2022 by Filip Jorissen, KU Leuven
-        Added tableOnFile option.
+    June 15, 2024 by Filip Jorissen, Builtwins
+          Initial version for #1891: compliance with Modelica include annotation rules.
 
 */
 

diff --git a/IBPSA/Resources/C-Sources/WeeklyScheduleGetValue.c b/IBPSA/Resources/C-Sources/WeeklyScheduleGetValue.c
@@ -3,19 +3,12 @@
   This code implements a weekly schedule.
 
   Changelog:
-    April 9, 2024 by Filip Jorissen, Builtwins
-          Revisions for #1869 to remove a header requirement that contains the number of rows/columns.
-    March 30, 2024 by Filip Jorissen, Builtwins
-          Revisions for #1860 to avoid memory leaks when calling ModelicaFormatError.
-    May 25, 2022 by Michael Wetter, LBNL
-          Refactored to comply with C89.
-    March 9, 2022 by Filip Jorissen, KU Leuven
-         Initial version.
-    April 10, 2022 by Filip Jorissen, KU Leuven
-        Added tableOnFile option.
+    June 15, 2024 by Filip Jorissen, Builtwins
+          Initial version for #1891: compliance with Modelica include annotation rules.
 
 */
 
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/IBPSA/Utilities/IO/Files/WeeklySchedule.mo b/IBPSA/Utilities/IO/Files/WeeklySchedule.mo
@@ -40,7 +40,7 @@ protected
     input Real timeIn "Time for look-up";
     output Real y "Schedule value";
     external "C" y=getScheduleValue(ID, iCol, timeIn)
-    annotation(Include="#include <WeeklyScheduleGet.c>",
+    annotation(Include="#include <WeeklyScheduleGetValue.c>",
     IncludeDirectory="modelica://IBPSA/Resources/C-Sources");
   end getCalendarValue;