From 8bdb9364fb4ef5b367b00fdee02c0bf9ed5ada90 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Thu, 16 Apr 2020 21:23:59 +0200
Subject: [PATCH] [FileIO,MatL,PL] Fixes for Unity builds.

---
 Applications/FileIO/GocadIO/CoordinateSystem.h | 2 ++
 MaterialLib/Adsorption/Density100MPa.cpp       | 6 +++---
 MaterialLib/Adsorption/DensityConst.cpp        | 6 +++---
 MaterialLib/Adsorption/DensityCook.cpp         | 6 +++---
 MaterialLib/Adsorption/DensityDubinin.cpp      | 6 +++---
 MaterialLib/Adsorption/DensityHauer.cpp        | 6 +++---
 MaterialLib/Adsorption/DensityLegacy.cpp       | 6 +++---
 MaterialLib/Adsorption/DensityMette.cpp        | 6 +++---
 MaterialLib/Adsorption/DensityNunez.cpp        | 6 +++---
 MaterialLib/FractureModels/LogPenalty.h        | 2 ++
 ProcessLib/SourceTerms/LineSourceTermFEM.h     | 4 ++--
 11 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/Applications/FileIO/GocadIO/CoordinateSystem.h b/Applications/FileIO/GocadIO/CoordinateSystem.h
index 4328887cc17..cd500b6eb45 100644
--- a/Applications/FileIO/GocadIO/CoordinateSystem.h
+++ b/Applications/FileIO/GocadIO/CoordinateSystem.h
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#pragma once
+
 #include <fstream>
 
 namespace FileIO
diff --git a/MaterialLib/Adsorption/Density100MPa.cpp b/MaterialLib/Adsorption/Density100MPa.cpp
index f5efe3ce2f0..23e1dd81fc7 100644
--- a/MaterialLib/Adsorption/Density100MPa.cpp
+++ b/MaterialLib/Adsorption/Density100MPa.cpp
@@ -14,7 +14,7 @@ namespace
 
 // NaX_HighP_polyfrac_CC.pickle
 // date extracted 2015-06-23 15:38:35 file mtime 2015-06-23 15:19:57
-const double c[] = {
+const double Density100MPa_c[] = {
     0.3490302932983226,        /* a0 */
     -0.0014061345691831226,    /* a1 */
     -0.0007399303393402753,    /* a2 */
@@ -46,7 +46,7 @@ double Density100MPa::getAlphaT(const double T_Ads) const
 // Characteristic curve. Return W (A)
 double Density100MPa::characteristicCurve(const double A) const
 {
-    double W = curvePolyfrac(c, A); // cm^3/g
+    double W = curvePolyfrac(Density100MPa_c, A); // cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -57,7 +57,7 @@ double Density100MPa::characteristicCurve(const double A) const
 
 double Density100MPa::dCharacteristicCurve(const double A) const
 {
-    return dCurvePolyfrac(c, A);
+    return dCurvePolyfrac(Density100MPa_c, A);
 }
 
 }  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityConst.cpp b/MaterialLib/Adsorption/DensityConst.cpp
index b3048a2044a..07a87c3e49a 100644
--- a/MaterialLib/Adsorption/DensityConst.cpp
+++ b/MaterialLib/Adsorption/DensityConst.cpp
@@ -15,7 +15,7 @@ namespace
 
 // NaX_Constant_polyfrac_CC.pickle
 // date extracted 2015-06-23 15:38:35 file mtime 2015-06-23 15:20:05
-const double c[] = {
+const double DensityConst_c[] = {
     0.3824098506898007,            /* a0 */
     -0.001316857559708455,        /* a1 */
     -0.0007935756090263691,        /* a2 */
@@ -43,7 +43,7 @@ double DensityConst::getAlphaT(const double /*T_Ads*/) const
 // Characteristic curve. Return W (A)
 double DensityConst::characteristicCurve(const double A) const
 {
-    double W = curvePolyfrac(c, A); //cm^3/g
+    double W = curvePolyfrac(DensityConst_c, A); //cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -54,7 +54,7 @@ double DensityConst::characteristicCurve(const double A) const
 
 double DensityConst::dCharacteristicCurve(const double A) const
 {
-    return dCurvePolyfrac(c, A);
+    return dCurvePolyfrac(DensityConst_c, A);
 }
 
 }  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityCook.cpp b/MaterialLib/Adsorption/DensityCook.cpp
index d78f6d57811..ab71403c0cc 100644
--- a/MaterialLib/Adsorption/DensityCook.cpp
+++ b/MaterialLib/Adsorption/DensityCook.cpp
@@ -14,7 +14,7 @@ namespace
 
 // NaX_Dean_polyfrac_CC.pickle
 // date extracted 2015-06-23 15:38:35 file mtime 2015-06-23 15:19:42
-const double c[] = {
+const double DensityCook_c[] = {
     0.3632627555646154,        /* a0 */
     -0.0014090624975800715,    /* a1 */
     -0.0007717609035743321,    /* a2 */
@@ -42,7 +42,7 @@ double DensityCook::getAlphaT(const double T_Ads) const
 // Characteristic curve. Return W (A)
 double DensityCook::characteristicCurve(const double A) const
 {
-    double W = curvePolyfrac(c, A); //cm^3/g
+    double W = curvePolyfrac(DensityCook_c, A); //cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -53,7 +53,7 @@ double DensityCook::characteristicCurve(const double A) const
 
 double DensityCook::dCharacteristicCurve(const double A) const
 {
-    return dCurvePolyfrac(c, A);
+    return dCurvePolyfrac(DensityCook_c, A);
 }
 
 }  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityDubinin.cpp b/MaterialLib/Adsorption/DensityDubinin.cpp
index 7587fd75f9d..c55e65ccf65 100644
--- a/MaterialLib/Adsorption/DensityDubinin.cpp
+++ b/MaterialLib/Adsorption/DensityDubinin.cpp
@@ -17,7 +17,7 @@ namespace
 
 // NaX_Dubinin_polyfrac_CC.pickle
 // date extracted 2015-06-23 16:47:50 file mtime 2015-06-23 16:47:23
-const double c[] = {
+const double DensityDubinin_c[] = {
     0.3635538371322433,        /* a0 */
     -0.0014521033261199435,    /* a1 */
     -0.0007855160157616825,    /* a2 */
@@ -77,7 +77,7 @@ double DensityDubinin::getAlphaT(const double T_Ads) const
 // Characteristic curve. Return W (A)
 double DensityDubinin::characteristicCurve(const double A) const
 {
-    double W = curvePolyfrac(c, A); // cm^3/g
+    double W = curvePolyfrac(DensityDubinin_c, A); // cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -88,7 +88,7 @@ double DensityDubinin::characteristicCurve(const double A) const
 
 double DensityDubinin::dCharacteristicCurve(const double A) const
 {
-    return dCurvePolyfrac(c, A);
+    return dCurvePolyfrac(DensityDubinin_c, A);
 }
 
 }  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityHauer.cpp b/MaterialLib/Adsorption/DensityHauer.cpp
index b0777ecd597..e40af09893f 100644
--- a/MaterialLib/Adsorption/DensityHauer.cpp
+++ b/MaterialLib/Adsorption/DensityHauer.cpp
@@ -14,7 +14,7 @@ namespace
 
 // NaX_Hauer_polyfrac_CC.pickle
 // date extracted 2015-06-23 15:38:35 file mtime 2015-06-23 15:19:19
-const double c[] = {
+const double DensityHauer_c[] = {
     0.36490158988356747,    /* a0 */
     -0.0013723270478333963,    /* a1 */
     -0.0007655780628099964,    /* a2 */
@@ -47,7 +47,7 @@ double DensityHauer::getAlphaT(const double T_Ads) const
 // Characteristic curve. Return W (A)
 double DensityHauer::characteristicCurve(const double A) const
 {
-    double W = curvePolyfrac(c, A); // cm^3/g
+    double W = curvePolyfrac(DensityHauer_c, A); // cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -58,7 +58,7 @@ double DensityHauer::characteristicCurve(const double A) const
 
 double DensityHauer::dCharacteristicCurve(const double A) const
 {
-    return dCurvePolyfrac(c, A);
+    return dCurvePolyfrac(DensityHauer_c, A);
 }
 
 }  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityLegacy.cpp b/MaterialLib/Adsorption/DensityLegacy.cpp
index 38f612676ae..cabf257d5bf 100644
--- a/MaterialLib/Adsorption/DensityLegacy.cpp
+++ b/MaterialLib/Adsorption/DensityLegacy.cpp
@@ -13,7 +13,7 @@ namespace
 {
 
 //parameters from least squares fit (experimental data)
-const double c[] = { 0.34102920966608297,
+const double DensityLegacy_c[] = { 0.34102920966608297,
                      -0.0013106032830951296,
                      -0.00060754147575378876,
                      3.7843404172683339e-07,
@@ -50,7 +50,7 @@ double DensityLegacy::getAlphaT(const double T_Ads) const
 // Characteristic curve. Return W (A)
 double DensityLegacy::characteristicCurve(const double A) const
 {
-    double W = curvePolyfrac(c, A); // cm^3/g
+    double W = curvePolyfrac(DensityLegacy_c, A); // cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -61,7 +61,7 @@ double DensityLegacy::characteristicCurve(const double A) const
 
 double DensityLegacy::dCharacteristicCurve(const double A) const
 {
-    return dCurvePolyfrac(c, A);
+    return dCurvePolyfrac(DensityLegacy_c, A);
 }
 
 }  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityMette.cpp b/MaterialLib/Adsorption/DensityMette.cpp
index 325d53f3821..c2b26e7f9b7 100644
--- a/MaterialLib/Adsorption/DensityMette.cpp
+++ b/MaterialLib/Adsorption/DensityMette.cpp
@@ -14,7 +14,7 @@ namespace
 {
 // NaX_Mette_polyfrac_CC.pickle
 // date extracted 2015-06-23 15:38:35 file mtime 2015-06-23 15:19:26
-const double c[] = {
+const double DensityMette_c[] = {
     0.36340572890087813,    /* a0 */
     -0.0013449597038375108,    /* a1 */
     -0.0007581210111121073,    /* a2 */
@@ -49,7 +49,7 @@ double DensityMette::getAlphaT(const double T_Ads) const
 // Characteristic curve. Return W (A)
 double DensityMette::characteristicCurve(const double A) const
 {
-    double W = curvePolyfrac(c, A); // cm^3/g
+    double W = curvePolyfrac(DensityMette_c, A); // cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -60,7 +60,7 @@ double DensityMette::characteristicCurve(const double A) const
 
 double DensityMette::dCharacteristicCurve(const double A) const
 {
-    return dCurvePolyfrac(c, A);
+    return dCurvePolyfrac(DensityMette_c, A);
 }
 
 }  // namespace Adsorption
diff --git a/MaterialLib/Adsorption/DensityNunez.cpp b/MaterialLib/Adsorption/DensityNunez.cpp
index 23ae5dcbc59..a516fba6df7 100644
--- a/MaterialLib/Adsorption/DensityNunez.cpp
+++ b/MaterialLib/Adsorption/DensityNunez.cpp
@@ -14,7 +14,7 @@ namespace
 
 // NaX_Nunez_polyfrac_CC.pickle
 // date extracted 2015-06-23 15:38:35 file mtime 2015-06-23 15:19:34
-const double c[] = {
+const double DensityNunez_c[] = {
     0.3631900485031771,        /* a0 */
     -0.0014242280940080726,    /* a1 */
     -0.0007751726942386291,    /* a2 */
@@ -57,7 +57,7 @@ double DensityNunez::getAlphaT(const double T_Ads) const
 // Characteristic curve. Return W (A)
 double DensityNunez::characteristicCurve(const double A) const
 {
-    double W = curvePolyfrac(c, A); // cm^3/g
+    double W = curvePolyfrac(DensityNunez_c, A); // cm^3/g
 
     if (W < 0.0) {
         W = 0.0; // TODO [CL] debug output
@@ -68,7 +68,7 @@ double DensityNunez::characteristicCurve(const double A) const
 
 double DensityNunez::dCharacteristicCurve(const double A) const
 {
-    return dCurvePolyfrac(c, A);
+    return dCurvePolyfrac(DensityNunez_c, A);
 }
 
 }  // namespace Adsorption
diff --git a/MaterialLib/FractureModels/LogPenalty.h b/MaterialLib/FractureModels/LogPenalty.h
index 68aaffa3ce9..af37f240511 100644
--- a/MaterialLib/FractureModels/LogPenalty.h
+++ b/MaterialLib/FractureModels/LogPenalty.h
@@ -7,6 +7,8 @@
  *              http://www.opengeosys.org/project/license
  */
 
+#pragma once
+
 #include "LinearElasticIsotropic.h"
 
 namespace MaterialLib
diff --git a/ProcessLib/SourceTerms/LineSourceTermFEM.h b/ProcessLib/SourceTerms/LineSourceTermFEM.h
index 6face473020..1e394307a34 100644
--- a/ProcessLib/SourceTerms/LineSourceTermFEM.h
+++ b/ProcessLib/SourceTerms/LineSourceTermFEM.h
@@ -31,13 +31,13 @@ public:
     virtual ~LineSourceTermLocalAssemblerInterface() = default;
 };
 
-const unsigned NUM_NODAL_DOF = 1;
-
 template <typename ShapeFunction, typename IntegrationMethod,
           unsigned GlobalDim>
 class LineSourceTermLocalAssembler final
     : public LineSourceTermLocalAssemblerInterface
 {
+    static const unsigned NUM_NODAL_DOF = 1;
+
     using ShapeMatricesType = ShapeMatrixPolicyType<ShapeFunction, GlobalDim>;
 
     using LocalAssemblerTraits = ProcessLib::LocalAssemblerTraits<
-- 
GitLab