Merge pull request #300 from VirtualPlanetaryLaboratory/Strings

Strings
VirtualPlanetaryLaboratory · Aug 16, 2024 · 39ccbac · 39ccbac
2 parents 5fc4592 + f342f37
commit 39ccbac
Show file tree

Hide file tree

Showing 67 changed files with 4,854 additions and 4,768 deletions.
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
@@ -24,6 +24,7 @@ jobs:
         if: steps.setup_python.outcome == 'success'
         shell: bash -l {0}
         run: |
+          sudo apt-get update
           sudo apt-get install -y doxygen
           sudo apt-get install -y doxygen-doc
           python -m pip install -U pip

diff --git a/.github/workflows/examples.yml b/.github/workflows/examples.yml
@@ -26,7 +26,6 @@ jobs:
           sudo apt-get install cm-super
           sudo apt-get install texlive-fonts-recommended texlive-fonts-extra
           sudo apt-get install dvipng
-          sudo apt-get update
 
       - name: Set up Python
         id: setup_python

diff --git a/.github/workflows/memcheck.yml b/.github/workflows/memcheck.yml
@@ -29,6 +29,7 @@ jobs:
         if: steps.setup_python.outcome == 'success'
         shell: bash -l {0}
         run: |
+          sudo apt-get update
           sudo apt-get install valgrind
 
       - name: Run valgrind test

diff --git a/.github/workflows/tests-linux.yml b/.github/workflows/tests-linux.yml
@@ -34,15 +34,19 @@ jobs:
         if: steps.setup_python.outcome == 'success'
         shell: bash -l {0}
         run: |
+          sudo apt-get update
           python -m pip install -U pip
           python -m pip install -e .
           pip install pytest pytest-cov
           sudo apt install lcov
 
-      - name: Run tests and generate coverage
+      - name: Run tests 
+        id: test
         if: steps.install.outcome == 'success'
         shell: bash -l {0}
-        run: make coverage
+        run: |
+          make opt
+          pytest --tb=short
 
       - name: Check test ouptut created
         id: check_test_file
@@ -51,6 +55,11 @@ jobs:
           files: "/home/runner/work/vplanet/vplanet/junit/test-results.xml"
           fail: true
 
+      - name: Generate coverage
+        id: coverage
+        if: steps.test.outcome == 'success' && steps.check_test_file.outcome == 'success'
+        run: make coverage
+
       - name: Get unique id
         uses: Tiryoh/gha-jobid-action@v1
         id: jobs

diff --git a/.github/workflows/tests-macos-intel.yml b/.github/workflows/tests-macos-intel.yml
@@ -33,7 +33,9 @@ jobs:
 
       - name: Run tests
         if: steps.setup_python.outcome == 'success'
-        run: make test
+        run: |
+          make opt
+          pytest --tb=short
 
       - name: Get unique id
         uses: Tiryoh/gha-jobid-action@v1

diff --git a/.github/workflows/tests-macos-silicon.yml b/.github/workflows/tests-macos-silicon.yml
@@ -35,7 +35,7 @@ jobs:
         if: steps.setup_python.outcome == 'success'
         run: |
           make opt
-          pytest
+          pytest --tb=short
 
       - name: Get unique id
         uses: Tiryoh/gha-jobid-action@v1

diff --git a/examples/MagmOc_Earth/Earth.in b/examples/MagmOc_Earth/Earth.in
@@ -1,6 +1,6 @@
 # Planet a parameters
 sName         Earth                     # Body's name
-saModules     magmoc, atmesc                      # Modules to apply, exact spelling required
+saModules     magmoc atmesc                      # Modules to apply, exact spelling required
 sColor        13aed5
 
 # Physical Properties

diff --git a/examples/MagmOc_GJ1132b/GJ1132b.in b/examples/MagmOc_GJ1132b/GJ1132b.in
@@ -1,6 +1,6 @@
 # Planet a parameters
 sName         GJ1132b                     # Body's name
-saModules     magmoc, atmesc                      # Modules to apply, exact spelling required
+saModules     magmoc atmesc                      # Modules to apply, exact spelling required
 sColor        13aed5
 
 # Physical Properties

diff --git a/examples/MagmOc_Trappist1g/g.in b/examples/MagmOc_Trappist1g/g.in
@@ -1,6 +1,6 @@
 # Planet g parameters
 sName         g			                     # Body's name
-saModules     magmoc, atmesc, radheat, eqtide        # Modules to apply, exact spelling required
+saModules     magmoc atmesc radheat eqtide        # Modules to apply, exact spelling required
 sColor        13aed5
 
 # Physical Properties

diff --git a/src/atmesc.c b/src/atmesc.c
diff --git a/src/atmesc.h b/src/atmesc.h
@@ -177,29 +177,29 @@ void InitializeOutputFunctionAtmEsc(OUTPUT *, int, int);
 void FinalizeOutputFunctionAtmEsc(OUTPUT *, int, int);
 
 void WriteSurfaceWaterMass(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
-                           UPDATE *, int, double *, char[]);
+                           UPDATE *, int, double *, char**);
 void WriteOxygenMass(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
-                     int, double *, char[]);
+                     int, double *, char**);
 void WriteOxygenMantleMass(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
-                           UPDATE *, int, double *, char[]);
+                           UPDATE *, int, double *, char**);
 void WriteEnvelopeMass(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
-                       int, double *, char[]);
+                       int, double *, char**);
 void WriteRGLimit(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *, int,
-                  double *, char[]);
+                  double *, char**);
 void WriteBondiRadius(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
-                      int, double *, char[]);
+                      int, double *, char**);
 void WriteRocheRadius(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
-                      int, double *, char[]);
+                      int, double *, char**);
 void WriteOxygenMixingRatio(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
-                            UPDATE *, int, double *, char[]);
+                            UPDATE *, int, double *, char**);
 void WriteOxygenEta(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *, UPDATE *,
-                    int, double *, char[]);
+                    int, double *, char**);
 void WriteAtmXAbsEffH2O(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
-                        UPDATE *, int, double *, char[]);
+                        UPDATE *, int, double *, char**);
 void WriteRRCriticalFlux(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
-                         UPDATE *, int, double *, char[]);
+                         UPDATE *, int, double *, char**);
 void WriteHEscapeRegime(BODY *, CONTROL *, OUTPUT *, SYSTEM *, UNITS *,
-                        UPDATE *, int, double *, char[]);
+                        UPDATE *, int, double *, char**);
 
 /* Logging Functions */
 void LogOptionsAtmEsc(CONTROL *, FILE *);