[Mat] Changed directory name of MaterialsLib

MaterialsLib/Adsorption/ReactionCaOH2.cpp → MaterialLib/Adsorption/ReactionCaOH2.cpp

@@ -11,7 +11,7 @@
 #include <cassert>
 #include <logog/include/logog.hpp>
 #include "BaseLib/Error.h"
-#include "MaterialsLib/PhysicalConstant.h"
+#include "MaterialLib/PhysicalConstant.h"
 #include "Adsorption.h"
 
 namespace Adsorption
@@ -20,9 +20,9 @@ namespace Adsorption
 const double ReactionCaOH2::_reaction_enthalpy = -1.12e+05;
 const double ReactionCaOH2::_reaction_entropy  = -143.5;
 const double ReactionCaOH2::_M_carrier =
-    MaterialsLib::PhysicalConstant::MolarMass::N2;
+    MaterialLib::PhysicalConstant::MolarMass::N2;
 const double ReactionCaOH2::_M_react =
-    MaterialsLib::PhysicalConstant::MolarMass::Water;
+    MaterialLib::PhysicalConstant::MolarMass::Water;
 
 const double ReactionCaOH2::_tol_l   = 1e-4;
 const double ReactionCaOH2::_tol_u   = 1.0 - 1e-4;
@@ -78,7 +78,7 @@ void ReactionCaOH2::calculateQR()
 // determine equilibrium temperature and pressure according to van't Hoff
 void ReactionCaOH2::setChemicalEquilibrium()
 {
-    const double R = MaterialsLib::PhysicalConstant::IdealGasConstant;
+    const double R = MaterialLib::PhysicalConstant::IdealGasConstant;
 
     _X_D = (_rho_s - rho_up - _tol_rho)/(rho_low - rho_up - 2.0*_tol_rho) ;
     _X_D = (_X_D < 0.5) ? std::max(_tol_l,_X_D) : std::min(_X_D,_tol_u); // constrain to interval [tol_l;tol_u]
@@ -95,7 +95,7 @@ void ReactionCaOH2::setChemicalEquilibrium()
 
 double ReactionCaOH2::CaHydration()
 {
-    const double R = MaterialsLib::PhysicalConstant::IdealGasConstant;
+    const double R = MaterialLib::PhysicalConstant::IdealGasConstant;
     double dXdt;
         // step 3, calculate dX/dt
 #ifdef SIMPLE_KINETICS

MaterialsLib/CMakeLists.txt → MaterialLib/CMakeLists.txt

@@ -3,7 +3,7 @@ GET_SOURCE_FILES(SOURCES)
 GET_SOURCE_FILES(SOURCES_ADSORPTION Adsorption)
 set(SOURCES ${SOURCES} ${SOURCES_ADSORPTION})
 
-add_library(MaterialsLib ${SOURCES} )
-target_link_libraries(MaterialsLib
+add_library(MaterialLib ${SOURCES} )
+target_link_libraries(MaterialLib
     BaseLib
 )

MaterialsLib/PhysicalConstant.h → MaterialLib/PhysicalConstant.h

@@ -9,7 +9,7 @@
 #ifndef MATERIALSLIB_PHYSICALCONSTANT_H
 #define MATERIALSLIB_PHYSICALCONSTANT_H
 
-namespace MaterialsLib
+namespace MaterialLib
 {
 /**
  * Namespace containing physical constants
@@ -88,5 +88,5 @@ namespace SpecificGasConstant
 const double WaterVapour = IdealGasConstant / MolarMass::Water;  // = 461.504;
 }  // namespace SpecificGasConstant
 }  // namespace PhysicalConstant
-}  // namespace MaterialsLib
+}  // namespace MaterialLib
 #endif  // MATERIALSLIB_PHYSICALCONSTANT_H

ProcessLib/CMakeLists.txt

@@ -14,7 +14,7 @@ APPEND_SOURCE_FILES(SOURCES Utils)
 add_library(ProcessLib ${SOURCES})
 
 target_link_libraries(ProcessLib
-    MaterialsLib
+    MaterialLib
     MeshGeoToolsLib
     NumLib # for shape matrices
     ${VTK_LIBRARIES}

ProcessLib/TES/TESAssemblyParams.h

@@ -13,8 +13,8 @@
 #include <Eigen/Eigen>
 #include <Eigen/Sparse>
 
-#include "MaterialsLib/PhysicalConstant.h"
-#include "MaterialsLib/Adsorption/Reaction.h"
+#include "MaterialLib/PhysicalConstant.h"
+#include "MaterialLib/Adsorption/Reaction.h"
 
 #include "ProcessLib/VariableTransformation.h"
 
@@ -59,8 +59,8 @@ struct AssemblyParams
 
     double rho_SR_dry = std::numeric_limits<double>::quiet_NaN();
 
-    const double M_inert = MaterialsLib::PhysicalConstant::MolarMass::N2;
-    const double M_react = MaterialsLib::PhysicalConstant::MolarMass::Water;
+    const double M_inert = MaterialLib::PhysicalConstant::MolarMass::N2;
+    const double M_react = MaterialLib::PhysicalConstant::MolarMass::Water;
 
     // TODO unify variable names
     double initial_solid_density = std::numeric_limits<double>::quiet_NaN();

ProcessLib/TES/TESLocalAssembler-impl.h

@@ -9,7 +9,7 @@
 #ifndef PROCESS_LIB_TES_FEM_IMPL_H_
 #define PROCESS_LIB_TES_FEM_IMPL_H_
 
-#include "MaterialsLib/Adsorption/Adsorption.h"
+#include "MaterialLib/Adsorption/Adsorption.h"
 #include "NumLib/Fem/FiniteElement/TemplateIsoparametric.h"
 #include "NumLib/Fem/ShapeMatrixPolicy.h"
 #include "NumLib/Function/Interpolation.h"

ProcessLib/TES/TESLocalAssemblerInner-impl.h

@@ -43,7 +43,7 @@ Eigen::Matrix3d TESLocalAssemblerInner<Traits>::getMassCoeffMatrix(
     // TODO: Dalton's law property
     const double dxn_dxm = Adsorption::AdsorptionReaction::dMolarFraction(
         _d.vapour_mass_fraction, _d.ap.M_react, _d.ap.M_inert);
-    const double R = MaterialsLib::PhysicalConstant::IdealGasConstant;
+    const double R = MaterialLib::PhysicalConstant::IdealGasConstant;
 
     const double M_pp = _d.ap.poro / _d.p * _d.rho_GR;
     const double M_pT = -_d.ap.poro / _d.T * _d.rho_GR;

ProcessLib/TES/TESOGS5MaterialModels.h

@@ -9,7 +9,7 @@
 #ifndef PROCESSLIB_TES_OGS5MATERIALMODELS
 #define PROCESSLIB_TES_OGS5MATERIALMODELS
 
-#include "MaterialsLib/PhysicalConstant.h"
+#include "MaterialLib/PhysicalConstant.h"
 #include "TESAssemblyParams.h"
 
 namespace ProcessLib
@@ -20,12 +20,12 @@ inline double fluid_density(const double p, const double T, const double x)
 {
     // OGS-5 density model 26
 
-    const double M0 = MaterialsLib::PhysicalConstant::MolarMass::N2;
-    const double M1 = MaterialsLib::PhysicalConstant::MolarMass::Water;
+    const double M0 = MaterialLib::PhysicalConstant::MolarMass::N2;
+    const double M1 = MaterialLib::PhysicalConstant::MolarMass::Water;
 
     const double xn = M0 * x / (M0 * x + M1 * (1.0 - x));
 
-    return p / (MaterialsLib::PhysicalConstant::IdealGasConstant * T) *
+    return p / (MaterialLib::PhysicalConstant::IdealGasConstant * T) *
            (M1 * xn + M0 * (1.0 - xn));
     ;
 }
@@ -187,9 +187,9 @@ inline double fluid_viscosity(const double p, const double T, const double x)
 {
     // OGS 5 viscosity model 26
 
-    const double M0 = MaterialsLib::PhysicalConstant::MolarMass::N2;
-    const double M1 = MaterialsLib::PhysicalConstant::MolarMass::Water;
-    const double R = MaterialsLib::PhysicalConstant::IdealGasConstant;
+    const double M0 = MaterialLib::PhysicalConstant::MolarMass::N2;
+    const double M1 = MaterialLib::PhysicalConstant::MolarMass::Water;
+    const double R = MaterialLib::PhysicalConstant::IdealGasConstant;
 
     // reactive component
     const double x0 =
@@ -225,7 +225,7 @@ struct FluidHeatConductivityN2
         const double eps = 138.08483e-23;
         const double N_A = 6.02213E26;
         const double R = 8.31434;
-        // const double R = MaterialsLib::PhysicalConstant::IdealGasConstant;
+        // const double R = MaterialLib::PhysicalConstant::IdealGasConstant;
         const double CCF = 4.173;  // mW/m/K
 
         const double c1 = 0.3125;
@@ -374,9 +374,9 @@ inline double fluid_heat_conductivity(const double p,
 {
     // OGS 5 fluid heat conductivity model 11
 
-    const double M0 = MaterialsLib::PhysicalConstant::MolarMass::N2;
-    const double M1 = MaterialsLib::PhysicalConstant::MolarMass::Water;
-    const double R = MaterialsLib::PhysicalConstant::IdealGasConstant;
+    const double M0 = MaterialLib::PhysicalConstant::MolarMass::N2;
+    const double M1 = MaterialLib::PhysicalConstant::MolarMass::Water;
+    const double R = MaterialLib::PhysicalConstant::IdealGasConstant;
 
     // TODO [CL] max() is redundant if the fraction is guaranteed to be between
     // 0 and 1.

ProcessLib/TES/TESReactionAdaptor.cpp

@@ -14,9 +14,9 @@
 #include "MathLib/Nonlinear/Root1D.h"
 #include "MathLib/ODE/ODESolverBuilder.h"
 
-#include "MaterialsLib/Adsorption/Adsorption.h"
-#include "MaterialsLib/Adsorption/ReactionInert.h"
-#include "MaterialsLib/Adsorption/ReactionSinusoidal.h"
+#include "MaterialLib/Adsorption/Adsorption.h"
+#include "MaterialLib/Adsorption/ReactionInert.h"
+#include "MaterialLib/Adsorption/ReactionSinusoidal.h"
 
 #include "TESLocalAssemblerInner.h"
 #include "TESReactionAdaptor.h"
@@ -109,7 +109,7 @@ TESFEMReactionAdaptorAdsorption::initReaction_slowDownUndershootStrategy(
         const double delta_pV = pV_eq - _d.p_V;
         const double delta_rhoV =
             delta_pV * _d.ap.M_react /
-            MaterialsLib::PhysicalConstant::IdealGasConstant / _d.T *
+            MaterialLib::PhysicalConstant::IdealGasConstant / _d.T *
             _d.ap.poro;
         const double delta_rhoSR = delta_rhoV / (_d.ap.poro - 1.0);
         double react_rate_R2 = delta_rhoSR / _d.ap.delta_t;
@@ -176,7 +176,7 @@ double TESFEMReactionAdaptorAdsorption::estimateAdsorptionEquilibrium(
         const double C_eq =
             _d.ap.react_sys->getEquilibriumLoading(pV, _d.T, _d.ap.M_react);
         return (pV - p_V0) * _d.ap.M_react /
-                   MaterialsLib::PhysicalConstant::IdealGasConstant / _d.T *
+                   MaterialLib::PhysicalConstant::IdealGasConstant / _d.T *
                    _d.ap.poro +
                (1.0 - _d.ap.poro) * (C_eq - C0) * _d.ap.rho_SR_dry;
     };

ProcessLib/TES/TESReactionAdaptor.h

@@ -13,7 +13,7 @@
 #include <memory>
 #include <vector>
 
-#include "MaterialsLib/Adsorption/ReactionCaOH2.h"
+#include "MaterialLib/Adsorption/ReactionCaOH2.h"
 #include "MathLib/ODE/ODESolver.h"
 
 namespace ProcessLib