From 9222d9d02a3f89b3d7aafb3fa12f25240cc7131a Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Tue, 21 Nov 2023 14:51:01 -0800
Subject: [PATCH 1/5] Changed docker repository

This changes the repository for the docker images
---
 .travis.yml                                  | 5 +++--
 IBPSA/Resources/Scripts/travis/dymola/dymola | 2 +-
 IBPSA/Resources/Scripts/travis/omc/omc       | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a1b89ee8ab..a47103c0b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -20,6 +20,7 @@ services:
 
 env:
   global:
+    - DOCKER_REPONAME=lbnlblum
     - BUILDINGSPY_VERSION=BuildingsPy@v5.0.0
     - OMC_VERSION=ubuntu-2204-omc:1.22.0_dev-41-g8a5b18f-1
     - DYMOLA_VERSION=travis_ubuntu-2004_dymola:2023x-x86_64_rev-1
@@ -44,11 +45,11 @@ env:
 before_install:
   - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USERNAME" --password-stdin
   - if [[ "$TEST_ARG" == *test-dymola* || "$TEST_ARG" == *test-bestest* ]]; then
-       docker pull "$DOCKER_USERNAME"/${DYMOLA_VERSION};
+       docker pull "$DOCKER_REPONAME"/${DYMOLA_VERSION};
        cp IBPSA/Resources/Scripts/travis/dymola/dymola $HOME/bin/;
     fi;
   - if [[ "$TEST_ARG" == *test-openmodelica* ]]; then
-       docker pull "$DOCKER_USERNAME"/${OMC_VERSION};
+       docker pull "$DOCKER_REPONAME"/${OMC_VERSION};
        cp IBPSA/Resources/Scripts/travis/omc/omc $HOME/bin/omc;
     fi;
 
diff --git a/IBPSA/Resources/Scripts/travis/dymola/dymola b/IBPSA/Resources/Scripts/travis/dymola/dymola
index 37c4a00b9d..57d387e91e 100755
--- a/IBPSA/Resources/Scripts/travis/dymola/dymola
+++ b/IBPSA/Resources/Scripts/travis/dymola/dymola
@@ -15,6 +15,6 @@ docker run \
   --detach=false \
   --rm \
   -v ${sha_dir}:/mnt/shared \
-  ${DOCKER_USERNAME}/${DYMOLA_VERSION} /bin/bash -c \
+  ${DOCKER_REPONAME}/${DYMOLA_VERSION} /bin/bash -c \
   "cd /mnt/shared/${bas_nam} && \
    dymola ${arg_lis}"
diff --git a/IBPSA/Resources/Scripts/travis/omc/omc b/IBPSA/Resources/Scripts/travis/omc/omc
index 32a7f5f62b..15f716a9c6 100755
--- a/IBPSA/Resources/Scripts/travis/omc/omc
+++ b/IBPSA/Resources/Scripts/travis/omc/omc
@@ -10,7 +10,7 @@
 #################################################
 set -e
 IMG_NAME=${OMC_VERSION}
-DOCKER_USERNAME=michaelwetter
+DOCKER_REPONAME=lbnlblum
 
 # Function declarations
 function create_mount_command()
@@ -100,7 +100,7 @@ docker run \
   -v ${sha_dir}:/mnt/shared \
   --rm \
   --workdir="/mnt/shared/${bas_nam}" \
-  ${DOCKER_USERNAME}/${IMG_NAME} /bin/bash -c \
+  ${DOCKER_REPONAME}/${IMG_NAME} /bin/bash -c \
   "export MODELICAPATH=${DOCKER_MODELICAPATH} && \
   omc ${arg_lis} && \
   rm -rf spawn-* && \

From b4b7801a06bb95a1aaa9bd3195ca5f6469829dc6 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Wed, 22 Nov 2023 11:14:17 -0800
Subject: [PATCH 2/5] Corrected wrong use of getInstanceName()

For #1814. This function cannot be called inside a function
---
 .../Validation/InternalResistancesOneUTube.mo          | 10 +++++++++-
 .../Validation/InternalResistancesOneUTubeNegative.mo  | 10 +++++++++-
 .../Validation/InternalResistancesTwoUTube.mo          | 10 +++++++++-
 .../Validation/InternalResistancesTwoUTubeNegative.mo  | 10 +++++++++-
 .../Functions/internalResistancesOneUTube.mo           |  9 ++++++++-
 .../Functions/internalResistancesTwoUTube.mo           |  9 ++++++++-
 .../Functions/partialInternalResistances.mo            |  9 +++++++++
 .../Boreholes/BaseClasses/InternalHEXOneUTube.mo       | 10 +++++++++-
 .../Boreholes/BaseClasses/InternalHEXTwoUTube.mo       | 10 +++++++++-
 9 files changed, 79 insertions(+), 8 deletions(-)

diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo
index 0fb0e0cbd8..9b8d86d942 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTube.mo
@@ -57,7 +57,8 @@ initial equation
       kMed=kMed,
       muMed=muMed,
       cpMed=cpMed,
-      m_flow_nominal=m_flow_nominal);
+      m_flow_nominal=m_flow_nominal,
+      instanceName=getInstanceName());
 
   annotation (
     __Dymola_Commands(file=
@@ -75,6 +76,13 @@ borehole.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 June 21, 2018, by Massimo Cimmino:<br/>
 First implementation.
 </li>
diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo
index 802eaa4f6e..4b3c2dde28 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesOneUTubeNegative.mo
@@ -56,7 +56,8 @@ initial equation
       kMed=kMed,
       muMed=muMed,
       cpMed=cpMed,
-      m_flow_nominal=m_flow_nominal);
+      m_flow_nominal=m_flow_nominal,
+      instanceName=getInstanceName());
 
   annotation (
     __Dymola_Commands(file=
@@ -79,6 +80,13 @@ capacity location <code>x</code> is then automatically set to zero.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 June 21, 2018, by Massimo Cimmino:<br/>
 First implementation.
 </li>
diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo
index f09d546434..f7316bba97 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTube.mo
@@ -58,7 +58,8 @@ initial equation
       kMed=kMed,
       muMed=muMed,
       cpMed=cpMed,
-      m_flow_nominal=m_flow_nominal);
+      m_flow_nominal=m_flow_nominal,
+      instanceName=getInstanceName());
 
   annotation (
     __Dymola_Commands(file=
@@ -76,6 +77,13 @@ borehole.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 June 21, 2018, by Massimo Cimmino:<br/>
 First implementation.
 </li>
diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo
index 1b1d524183..5122e57bb7 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/Validation/InternalResistancesTwoUTubeNegative.mo
@@ -58,7 +58,8 @@ initial equation
       kMed=kMed,
       muMed=muMed,
       cpMed=cpMed,
-      m_flow_nominal=m_flow_nominal);
+      m_flow_nominal=m_flow_nominal,
+      instanceName=getInstanceName());
 
   annotation (
     __Dymola_Commands(file=
@@ -81,6 +82,13 @@ capacity location <code>x</code> is then automatically set to zero.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 June 21, 2018, by Massimo Cimmino:<br/>
 First implementation.
 </li>
diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo
index 4f7f235718..3f2656f748 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesOneUTube.mo
@@ -81,7 +81,7 @@ algorithm
       i := i + 1;
     end while;
   end if;
-  assert(test, "In " + getInstanceName() + ":\n" +
+  assert(test, "In " + instanceName + ":\n" +
   "Maximum number of iterations exceeded. Check the borehole geometry.
   The tubes may be too close to the borehole wall.
   Input to the function
@@ -121,6 +121,13 @@ International Journal of Energy Research, 35:312&ndash;320, 2011.</p>
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 February 7, 2022, by Michael Wetter:<br/>
 Changed function to be <code>pure</code>.<br/>
 This is for
diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo
index dbfa736170..e5622b0d18 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/internalResistancesTwoUTube.mo
@@ -88,7 +88,7 @@ algorithm
       i := i + 1;
     end while;
   end if;
-  assert(test, "In " + getInstanceName() + ":\n" +
+  assert(test, "In " + instanceName + ":\n" +
   "Maximum number of iterations exceeded. Check the borehole geometry.
   The tubes may be too close to the borehole wall.
   Input to the function
@@ -129,6 +129,13 @@ International Journal of Energy Research, 35:312&ndash;320, 2011.</p>
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 February 7, 2022, by Michael Wetter:<br/>
 Changed function to be <code>pure</code>.<br/>
 This is for
diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo
index 6e8b1c1a6a..df2bde1e4f 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo
@@ -29,6 +29,8 @@ partial function partialInternalResistances
   input Modelica.Units.SI.SpecificHeatCapacity cpMed
     "Specific heat capacity of the fluid";
   input Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate";
+  input String instanceName "undeclared caller"
+    "Instance name of the model or block that calls this function";
 
   // Outputs
   output Real x "Capacity location";
@@ -71,6 +73,13 @@ the borehole internal resistances.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 June 4, 2023, by Michael Wetter:<br/>
 Corrected variability.<br/>
 This is for <a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1762\">IBPSA, #1762</a>.
diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo
index bee39be3b3..32eba2c17a 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXOneUTube.mo
@@ -92,7 +92,8 @@ initial equation
       kMed=kMed,
       muMed=muMed,
       cpMed=cpMed,
-      m_flow_nominal=m1_flow_nominal);
+      m_flow_nominal=m1_flow_nominal,
+      instanceName=getInstanceName());
 
 equation
     assert(borFieDat.conDat.borCon == IBPSA.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.SingleUTube,
@@ -159,6 +160,13 @@ International Journal Of Energy Research, 35:312-320, 2011.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 March 7, 2022, by Michael Wetter:<br/>
 Removed <code>massDynamics</code>.<br/>
 This is for
diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXTwoUTube.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXTwoUTube.mo
index 7227f45d60..335079ce7b 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXTwoUTube.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/InternalHEXTwoUTube.mo
@@ -153,7 +153,8 @@ initial equation
       kMed=kMed,
       muMed=muMed,
       cpMed=cpMed,
-      m_flow_nominal=m1_flow_nominal);
+      m_flow_nominal=m1_flow_nominal,
+      instanceName=getInstanceName());
 
 equation
   assert(borFieDat.conDat.borCon == IBPSA.Fluid.Geothermal.Borefields.Types.BoreholeConfiguration.DoubleUTubeParallel
@@ -253,6 +254,13 @@ International Journal Of Energy Research, 35:312-320, 2011.
 </html>", revisions="<html>
 <ul>
 <li>
+November 22, 2023, by Michael Wetter:<br/>
+Corrected use of <code>getInstanceName()</code> which was called inside a function which
+is not allowed.<br/>
+This is for
+<a href=\"https://github.com/ibpsa/modelica-ibpsa/issues/1814\">IBPSA, #1814</a>.
+</li>
+<li>
 March 7, 2022, by Michael Wetter:<br/>
 Removed <code>massDynamics</code>.<br/>
 This is for

From c06cd62e092dbd4540941b279af3c11afa0e16c7 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Wed, 22 Nov 2023 12:55:41 -0800
Subject: [PATCH 3/5] Corrected syntax

---
 .../BaseClasses/Functions/partialInternalResistances.mo         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo
index df2bde1e4f..862e85866f 100644
--- a/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo
+++ b/IBPSA/Fluid/Geothermal/Borefields/BaseClasses/Boreholes/BaseClasses/Functions/partialInternalResistances.mo
@@ -29,7 +29,7 @@ partial function partialInternalResistances
   input Modelica.Units.SI.SpecificHeatCapacity cpMed
     "Specific heat capacity of the fluid";
   input Modelica.Units.SI.MassFlowRate m_flow_nominal "Nominal mass flow rate";
-  input String instanceName "undeclared caller"
+  input String instanceName="undeclared caller"
     "Instance name of the model or block that calls this function";
 
   // Outputs

From 229122a3a8e08fc72cddaeeeb128a475079cf189 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Wed, 29 Nov 2023 05:15:28 -0800
Subject: [PATCH 4/5] Added missing header file declaration

---
 IBPSA/Resources/C-Sources/getTimeSpan.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/IBPSA/Resources/C-Sources/getTimeSpan.c b/IBPSA/Resources/C-Sources/getTimeSpan.c
index e166c14e1b..755d7aae4d 100644
--- a/IBPSA/Resources/C-Sources/getTimeSpan.c
+++ b/IBPSA/Resources/C-Sources/getTimeSpan.c
@@ -6,6 +6,9 @@
 #define GETTIMESPAN_C_
 
 #include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
 #include "ModelicaUtilities.h"
 
 #include "getTimeSpan.h"

From 48b14a8228baf34607b0cf3dab1b41bb5ae450b7 Mon Sep 17 00:00:00 2001
From: Michael Wetter <mwetter@lbl.gov>
Date: Mon, 4 Dec 2023 15:46:51 -0800
Subject: [PATCH 5/5] Added header files and ifdef statements

For #1818
---
 IBPSA/Resources/C-Sources/fileWriterFree.c      | 6 ++++++
 IBPSA/Resources/C-Sources/fileWriterStructure.c | 3 +++
 IBPSA/Resources/C-Sources/jsonWriterInit.c      | 8 ++++++++
 3 files changed, 17 insertions(+)

diff --git a/IBPSA/Resources/C-Sources/fileWriterFree.c b/IBPSA/Resources/C-Sources/fileWriterFree.c
index 4085c48ca1..0c4ac49c91 100644
--- a/IBPSA/Resources/C-Sources/fileWriterFree.c
+++ b/IBPSA/Resources/C-Sources/fileWriterFree.c
@@ -2,6 +2,10 @@
  *
  * Michael Wetter, LBNL                     2018-05-12
  */
+
+#ifndef IBPSA_FILEWRITERFree_c
+#define IBPSA_FILEWRITERFree_c
+
 #include <stdlib.h>
 #include <stdio.h>
 #include "ModelicaUtilities.h"
@@ -62,3 +66,5 @@ void fileWriterFree(void* ptrFileWriter){
 
   return;
 }
+
+#endif
diff --git a/IBPSA/Resources/C-Sources/fileWriterStructure.c b/IBPSA/Resources/C-Sources/fileWriterStructure.c
index 15fa6f8e2a..fafbbc18b8 100644
--- a/IBPSA/Resources/C-Sources/fileWriterStructure.c
+++ b/IBPSA/Resources/C-Sources/fileWriterStructure.c
@@ -1,6 +1,9 @@
 #ifndef IBPSA_FILEWRITERStructure_c
 #define IBPSA_FILEWRITERStructure_c
 
+#include <stdlib.h>
+#include <string.h>
+
 #include "ModelicaUtilities.h"
 
 #include "fileWriterStructure.h"
diff --git a/IBPSA/Resources/C-Sources/jsonWriterInit.c b/IBPSA/Resources/C-Sources/jsonWriterInit.c
index 9d8ffbe88b..5e19354b49 100644
--- a/IBPSA/Resources/C-Sources/jsonWriterInit.c
+++ b/IBPSA/Resources/C-Sources/jsonWriterInit.c
@@ -5,6 +5,12 @@
  * Filip Jorissen, KU Leuven
  */
 
+#ifndef IBPSA_JSONWRITERINIT_c
+#define IBPSA_JSONWRITERINIT_c
+
+#include <stdlib.h>
+#include <string.h>
+
 #include "fileWriterStructure.c"
 #include "ModelicaUtilities.h"
 
@@ -90,3 +96,5 @@ void writeJson(void *ptrFileWriter,  const double* varVals, const int numVals){
   if (fclose(fOut) == EOF)
     ModelicaFormatError("In writeJson.c: Returned an error when closing %s.", ID->fileWriterName);
 }
+
+#endif