diff --git a/MaterialsLib/Adsorption/Adsorption.cpp b/MaterialsLib/Adsorption/Adsorption.cpp
index 8ab6f26d350785fb466cde0eeb4c56a1a1d314f6..8fc5839badc1f07c8f2a508573cbdd569f650bb5 100644
--- a/MaterialsLib/Adsorption/Adsorption.cpp
+++ b/MaterialsLib/Adsorption/Adsorption.cpp
@@ -20,7 +20,7 @@ namespace {
}
}
-namespace Ads
+namespace Adsorption
{
//Saturation pressure for water used in Nunez
diff --git a/MaterialsLib/Adsorption/Adsorption.h b/MaterialsLib/Adsorption/Adsorption.h
index 5e584b2bee3a5c45b964cf8a446662782eb3634b..66493c5d7f0fa5ca511ae8c237e60545fea7e532 100644
--- a/MaterialsLib/Adsorption/Adsorption.h
+++ b/MaterialsLib/Adsorption/Adsorption.h
@@ -6,7 +6,7 @@
#include "Reaction.h"
-namespace Ads
+namespace Adsorption
{
constexpr double GAS_CONST = 8.3144621;
diff --git a/MaterialsLib/Adsorption/Density100MPa.cpp b/MaterialsLib/Adsorption/Density100MPa.cpp
index 77e82c92ccaccabbcc62ca31296579178613fcea..92f214e953263f2b7321377fcdf919ae6218f4f8 100644
--- a/MaterialsLib/Adsorption/Density100MPa.cpp
+++ b/MaterialsLib/Adsorption/Density100MPa.cpp
@@ -17,7 +17,7 @@ const double c[] = {
}
-namespace Ads
+namespace Adsorption
{
double Density100MPa::get_adsorbate_density(const double T_Ads) const
diff --git a/MaterialsLib/Adsorption/Density100MPa.h b/MaterialsLib/Adsorption/Density100MPa.h
index f0dc2c420a5c659020a04a3dcadc10b4e335373f..78bf2c0e08bcae674385a18597a43913c738e059 100644
--- a/MaterialsLib/Adsorption/Density100MPa.h
+++ b/MaterialsLib/Adsorption/Density100MPa.h
@@ -2,7 +2,7 @@
#include "Adsorption.h"
-namespace Ads
+namespace Adsorption
{
class Density100MPa : public Adsorption
diff --git a/MaterialsLib/Adsorption/DensityConst.cpp b/MaterialsLib/Adsorption/DensityConst.cpp
index 28af602a24948cbfabb45b4321ee15460aa12d08..5af46d852819ccc0724b01ddfb329ae0054bced9 100644
--- a/MaterialsLib/Adsorption/DensityConst.cpp
+++ b/MaterialsLib/Adsorption/DensityConst.cpp
@@ -18,7 +18,7 @@ const double c[] = {
}
-namespace Ads
+namespace Adsorption
{
double DensityConst::get_adsorbate_density(const double /*T_Ads*/) const
diff --git a/MaterialsLib/Adsorption/DensityConst.h b/MaterialsLib/Adsorption/DensityConst.h
index 64f3129c3b91450b52e4568c229fcae5411c1601..4d9d97603dd8080eb0bd906d6a99fde227f3804e 100644
--- a/MaterialsLib/Adsorption/DensityConst.h
+++ b/MaterialsLib/Adsorption/DensityConst.h
@@ -2,7 +2,7 @@
#include "Adsorption.h"
-namespace Ads
+namespace Adsorption
{
class DensityConst : public Adsorption
diff --git a/MaterialsLib/Adsorption/DensityCook.cpp b/MaterialsLib/Adsorption/DensityCook.cpp
index c90b24af83a36a3fdb7cb6cdf9f4af1227f5d132..5e2f905f78697e922165e24a21a55e45ba3d36a5 100644
--- a/MaterialsLib/Adsorption/DensityCook.cpp
+++ b/MaterialsLib/Adsorption/DensityCook.cpp
@@ -17,7 +17,7 @@ const double c[] = {
}
-namespace Ads
+namespace Adsorption
{
double DensityCook::get_adsorbate_density(const double T_Ads) const
diff --git a/MaterialsLib/Adsorption/DensityCook.h b/MaterialsLib/Adsorption/DensityCook.h
index 127da6951bf6acc62165f71da5d5c4f5994bbafa..6f6bc5fdf59ccc2c8fff50e66d550a83e73ee596 100644
--- a/MaterialsLib/Adsorption/DensityCook.h
+++ b/MaterialsLib/Adsorption/DensityCook.h
@@ -2,7 +2,7 @@
#include "Adsorption.h"
-namespace Ads
+namespace Adsorption
{
class DensityCook : public Adsorption
diff --git a/MaterialsLib/Adsorption/DensityDubinin.cpp b/MaterialsLib/Adsorption/DensityDubinin.cpp
index c961e5a85a020e5b6f9f65c059d8813960b28ba6..3b3138de4350e2fa928a55be92f62d99abbf1790 100644
--- a/MaterialsLib/Adsorption/DensityDubinin.cpp
+++ b/MaterialsLib/Adsorption/DensityDubinin.cpp
@@ -19,7 +19,7 @@ const double c[] = {
}
-namespace Ads
+namespace Adsorption
{
double DensityDubinin::get_adsorbate_density(const double T_Ads) const
diff --git a/MaterialsLib/Adsorption/DensityDubinin.h b/MaterialsLib/Adsorption/DensityDubinin.h
index b1e494458dbf112c2f24baff20963afbe44f8b35..a82738d54eaee80a776a00afda88ff004643b914 100644
--- a/MaterialsLib/Adsorption/DensityDubinin.h
+++ b/MaterialsLib/Adsorption/DensityDubinin.h
@@ -2,7 +2,7 @@
#include "Adsorption.h"
-namespace Ads
+namespace Adsorption
{
class DensityDubinin : public Adsorption
diff --git a/MaterialsLib/Adsorption/DensityHauer.cpp b/MaterialsLib/Adsorption/DensityHauer.cpp
index ec65077106c86bbe201a0de741bbbbd0706bdbd4..4e441676ecc4441d2c66d8c02c04e8cd9de6562a 100644
--- a/MaterialsLib/Adsorption/DensityHauer.cpp
+++ b/MaterialsLib/Adsorption/DensityHauer.cpp
@@ -17,7 +17,7 @@ const double c[] = {
}
-namespace Ads
+namespace Adsorption
{
double DensityHauer::get_adsorbate_density(const double T_Ads) const
diff --git a/MaterialsLib/Adsorption/DensityHauer.h b/MaterialsLib/Adsorption/DensityHauer.h
index 912dfec8129345ea1c04457f5f4f6d6174027b84..8180a7756ca050867de1aac472c1b2258722869e 100644
--- a/MaterialsLib/Adsorption/DensityHauer.h
+++ b/MaterialsLib/Adsorption/DensityHauer.h
@@ -3,7 +3,7 @@
#include "Adsorption.h"
#include "DensityCook.h"
-namespace Ads
+namespace Adsorption
{
class DensityHauer : public Adsorption
diff --git a/MaterialsLib/Adsorption/DensityLegacy.cpp b/MaterialsLib/Adsorption/DensityLegacy.cpp
index 2942170a9b0923ba078e7d8bac850aa6dac73c97..6969aa1448ac8c03d02492637f4741deb11a82e7 100644
--- a/MaterialsLib/Adsorption/DensityLegacy.cpp
+++ b/MaterialsLib/Adsorption/DensityLegacy.cpp
@@ -15,7 +15,7 @@ const double c[] = { 0.34102920966608297,
}
-namespace Ads
+namespace Adsorption
{
double DensityLegacy::get_adsorbate_density(const double T_Ads) const
diff --git a/MaterialsLib/Adsorption/DensityLegacy.h b/MaterialsLib/Adsorption/DensityLegacy.h
index aca37b64c60bd26f3c727fc0522dbd53867ab964..721155c7b51bc4d507489b01deb5d0861281c2d7 100644
--- a/MaterialsLib/Adsorption/DensityLegacy.h
+++ b/MaterialsLib/Adsorption/DensityLegacy.h
@@ -2,7 +2,7 @@
#include "Adsorption.h"
-namespace Ads
+namespace Adsorption
{
class DensityLegacy : public Adsorption
diff --git a/MaterialsLib/Adsorption/DensityMette.cpp b/MaterialsLib/Adsorption/DensityMette.cpp
index 44cd5877f2a0ec5d08f1d1920066472c43040726..f2f14c0cd0a0d4473d667f800e8dfa8bee9c47e6 100644
--- a/MaterialsLib/Adsorption/DensityMette.cpp
+++ b/MaterialsLib/Adsorption/DensityMette.cpp
@@ -16,7 +16,7 @@ const double c[] = {
};
}
-namespace Ads
+namespace Adsorption
{
double DensityMette::get_adsorbate_density(const double T_Ads) const
diff --git a/MaterialsLib/Adsorption/DensityMette.h b/MaterialsLib/Adsorption/DensityMette.h
index 9d26f035b1fb95fdfaf4e696452a1f910009b3de..42ddea7289a32a5077132365f4aeeab3bf408e00 100644
--- a/MaterialsLib/Adsorption/DensityMette.h
+++ b/MaterialsLib/Adsorption/DensityMette.h
@@ -2,7 +2,7 @@
#include "Adsorption.h"
-namespace Ads
+namespace Adsorption
{
class DensityMette : public Adsorption
diff --git a/MaterialsLib/Adsorption/DensityNunez.cpp b/MaterialsLib/Adsorption/DensityNunez.cpp
index dfb0199f3360199f4f6cb05324252f2eeeaaaa80..ab560501cb671ef43af5f4df236e34805dfaa44d 100644
--- a/MaterialsLib/Adsorption/DensityNunez.cpp
+++ b/MaterialsLib/Adsorption/DensityNunez.cpp
@@ -17,7 +17,7 @@ const double c[] = {
}
-namespace Ads
+namespace Adsorption
{
double DensityNunez::get_adsorbate_density(const double T_Ads) const
diff --git a/MaterialsLib/Adsorption/DensityNunez.h b/MaterialsLib/Adsorption/DensityNunez.h
index bdbf1cbe3bb798a3d8ec1ed0bcd242a2ab427ed5..e3eea37d9142f08ad13770f0e6eeb2f0a5ef84f2 100644
--- a/MaterialsLib/Adsorption/DensityNunez.h
+++ b/MaterialsLib/Adsorption/DensityNunez.h
@@ -2,7 +2,7 @@
#include "Adsorption.h"
-namespace Ads
+namespace Adsorption
{
class DensityNunez : public Adsorption
diff --git a/MaterialsLib/Adsorption/Reaction.cpp b/MaterialsLib/Adsorption/Reaction.cpp
index 7cddfcfe5539f6cf753854ae8faa3290a8d9f0fc..bc9c390779bf4cb4e1f4df061e4d6b3eac291765 100644
--- a/MaterialsLib/Adsorption/Reaction.cpp
+++ b/MaterialsLib/Adsorption/Reaction.cpp
@@ -25,7 +25,7 @@
#include "ReactionSinusoidal.h"
-namespace Ads
+namespace Adsorption
{
std::unique_ptr<Reaction>
diff --git a/MaterialsLib/Adsorption/Reaction.h b/MaterialsLib/Adsorption/Reaction.h
index 24359d56f272a552cacfd045b65634b9d611f37f..41468410d60c55e882ebc55a3235f1848b6c64ea 100644
--- a/MaterialsLib/Adsorption/Reaction.h
+++ b/MaterialsLib/Adsorption/Reaction.h
@@ -13,7 +13,7 @@
#include "BaseLib/ConfigTreeNew.h"
-namespace Ads
+namespace Adsorption
{
class Reaction
diff --git a/MaterialsLib/Adsorption/ReactionCaOH2.cpp b/MaterialsLib/Adsorption/ReactionCaOH2.cpp
index 24ad5ecf7556ae3a2c4be667522f8a52b1f1a657..1051d129b66abb4e2c5400bba841eb4cfbe46551 100644
--- a/MaterialsLib/Adsorption/ReactionCaOH2.cpp
+++ b/MaterialsLib/Adsorption/ReactionCaOH2.cpp
@@ -12,7 +12,7 @@
#include "ReactionCaOH2.h"
#include "Adsorption.h"
-namespace Ads
+namespace Adsorption
{
constexpr double ReactionCaOH2::tol_l;
@@ -58,7 +58,7 @@ void ReactionCaOH2::calculate_qR()
{
//Convert mass fraction into mole fraction
// const double mol_frac_react = get_mole_fraction(x_react);
- const double mol_frac_react = Ads::Adsorption::get_molar_fraction(x_react, M_react, M_carrier);
+ const double mol_frac_react = Adsorption::Adsorption::get_molar_fraction(x_react, M_react, M_carrier);
p_r_g = std::max(mol_frac_react * p_gas, 1.0e-3); //avoid illdefined log
set_chemical_equilibrium();
diff --git a/MaterialsLib/Adsorption/ReactionCaOH2.h b/MaterialsLib/Adsorption/ReactionCaOH2.h
index 29e7fc5d8c370b24e87e844bd0a99f60e3bad15f..f6da1806c1730f5ca64bb1e524d943638b2f00d9 100644
--- a/MaterialsLib/Adsorption/ReactionCaOH2.h
+++ b/MaterialsLib/Adsorption/ReactionCaOH2.h
@@ -18,7 +18,7 @@ template<typename>
class TESFEMReactionAdaptorCaOH2;
}
-namespace Ads
+namespace Adsorption
{
class ReactionCaOH2 final : public Reaction
@@ -57,7 +57,7 @@ private:
void set_chemical_equilibrium();
double Ca_hydration();
- static constexpr double R = Ads::GAS_CONST; // [J/mol/K]
+ static constexpr double R = GAS_CONST; // [J/mol/K]
double rho_s; // solid phase density
double p_gas; // gas phase pressure in unit bar
double p_r_g; // pressure of H2O on gas phase;
@@ -70,8 +70,8 @@ private:
double X_H; // mass fraction of hydration in the solid phase;
static constexpr double reaction_enthalpy = -1.12e+05; // in J/mol; negative for exothermic composition reaction
static constexpr double reaction_entropy = -143.5; // in J/mol/K
- static constexpr double M_carrier = Ads::M_N2; // inert component molar mass
- static constexpr double M_react = Ads::M_H2O; // reactive component molar mass
+ static constexpr double M_carrier = M_N2; // inert component molar mass
+ static constexpr double M_react = M_H2O; // reactive component molar mass
static constexpr double tol_l = 1e-4;
static constexpr double tol_u = 1.0 - 1e-4;
diff --git a/MaterialsLib/Adsorption/ReactionInert.h b/MaterialsLib/Adsorption/ReactionInert.h
index 7b9f330dc02e74e76e7bdbc5bbbffb4bf6e48ce3..75fb928a94b133f8e7e121e93909762855398512 100644
--- a/MaterialsLib/Adsorption/ReactionInert.h
+++ b/MaterialsLib/Adsorption/ReactionInert.h
@@ -11,7 +11,7 @@
#include "Reaction.h"
-namespace Ads
+namespace Adsorption
{
class ReactionInert final : public Reaction
diff --git a/MaterialsLib/Adsorption/ReactionSinusoidal.h b/MaterialsLib/Adsorption/ReactionSinusoidal.h
index 676499048f5c5ab56cb01507043240ae34bf6b88..8b9a3d13a202bc27d399c8fca4edb2f63fd0d14a 100644
--- a/MaterialsLib/Adsorption/ReactionSinusoidal.h
+++ b/MaterialsLib/Adsorption/ReactionSinusoidal.h
@@ -14,7 +14,7 @@
#include "Reaction.h"
#include "BaseLib/ConfigTree.h"
-namespace Ads
+namespace Adsorption
{
class ReactionSinusoidal final : public Reaction
diff --git a/MaterialsLib/Adsorption/density_inert.h.orig b/MaterialsLib/Adsorption/density_inert.h.orig
index e16f9c93b79c96772f52676f345e6d16f2fee779..c0813e0f7b25eda501e1206de4c22b04b1a17069 100644
--- a/MaterialsLib/Adsorption/density_inert.h.orig
+++ b/MaterialsLib/Adsorption/density_inert.h.orig
@@ -2,7 +2,7 @@
#include "adsorption.h"
-namespace Ads
+namespace Adsorption
{
class DensityInert final : public Adsorption