Merge pull request #304 from VirtualPlanetaryLaboratory/download-arti…

…fact Switched sanitizer to run on macOS-13. This means it does NOT check f…
VirtualPlanetaryLaboratory · Sep 5, 2024 · 9f1d491 · 9f1d491
2 parents af9ea6a + d0bda7b
commit 9f1d491
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/.github/workflows/sanitizer.yml b/.github/workflows/sanitizer.yml
@@ -7,8 +7,8 @@ on:
 
 jobs:
   sanitizer:
-    name: Run address-sanitizer on Ubuntu
-    runs-on: ubuntu-latest
+    name: Run address-sanitizer on macOS
+    runs-on: macos-13
     strategy:
       fail-fast: false
 

diff --git a/setup.py b/setup.py
@@ -8,7 +8,8 @@
 from setuptools.command.develop import develop
 
 # Read current code version
-VersionPath = os.path.join(os.path.abspath("."), "VERSION")
+VersionPath = os.path.join(os.path.abspath(os.path.dirname(__file__)), "VERSION")
+print(VersionPath)
 VERSION = open(VersionPath, "r").read().split("\n")[0].strip()
 
 

diff --git a/src/output.c b/src/output.c
@@ -2041,6 +2041,8 @@ void LogOutputOrder(BODY *body, CONTROL *control, FILES *files, OUTPUT *output,
   }
   fprintf(fp, "\n");
   free(cCol);
+  free(cUnit);
+  free(cTmp);
 }
 
 void LogGridOutput(BODY *body, CONTROL *control, FILES *files, OUTPUT *output,
@@ -2174,7 +2176,6 @@ void LogBody(BODY *body, CONTROL *control, FILES *files, MODULE *module,
 void WriteLog(BODY *body, CONTROL *control, FILES *files, MODULE *module,
               OPTIONS *options, OUTPUT *output, SYSTEM *system, UPDATE *update,
               fnUpdateVariable ***fnUpdate, fnWriteOutput fnWrite[], int iEnd) {
-  char *cTime=NULL;
   FILE *fp;
   double dTotTime;
 
@@ -2186,13 +2187,10 @@ void WriteLog(BODY *body, CONTROL *control, FILES *files, MODULE *module,
   double dDt = fdGetTimeStep(body, control, system, update, fnUpdate);
 
   if (iEnd == 0) {
-    fvFormattedString(&cTime, "Input");
     fp = fopen(files->cLog, "w");
   } else if (iEnd == 1) {
-    fvFormattedString(&cTime, "Final");
     fp = fopen(files->cLog, "a");
   } else if (iEnd == -1) {
-    fvFormattedString(&cTime, "Initial");
     fp = fopen(files->cLog, "w");
   } else {
     fprintf(stderr, "ERROR: Unknown cTime in output.c:WriteLog.\n");