From 018ae7db36c74a20e12ffce71be004eab0f15221 Mon Sep 17 00:00:00 2001
From: Christoph Lehmann <christoph.lehmann@ufz.de>
Date: Sat, 30 Apr 2016 00:59:05 +0200
Subject: [PATCH] [Ads] renamed namespace
---
MaterialsLib/Adsorption/Adsorption.cpp | 2 +-
MaterialsLib/Adsorption/Adsorption.h | 2 +-
MaterialsLib/Adsorption/Density100MPa.cpp | 2 +-
MaterialsLib/Adsorption/Density100MPa.h | 2 +-
MaterialsLib/Adsorption/DensityConst.cpp | 2 +-
MaterialsLib/Adsorption/DensityConst.h | 2 +-
MaterialsLib/Adsorption/DensityCook.cpp | 2 +-
MaterialsLib/Adsorption/DensityCook.h | 2 +-
MaterialsLib/Adsorption/DensityDubinin.cpp | 2 +-
MaterialsLib/Adsorption/DensityDubinin.h | 2 +-
MaterialsLib/Adsorption/DensityHauer.cpp | 2 +-
MaterialsLib/Adsorption/DensityHauer.h | 2 +-
MaterialsLib/Adsorption/DensityLegacy.cpp | 2 +-
MaterialsLib/Adsorption/DensityLegacy.h | 2 +-
MaterialsLib/Adsorption/DensityMette.cpp | 2 +-
MaterialsLib/Adsorption/DensityMette.h | 2 +-
MaterialsLib/Adsorption/DensityNunez.cpp | 2 +-
MaterialsLib/Adsorption/DensityNunez.h | 2 +-
MaterialsLib/Adsorption/Reaction.cpp | 2 +-
MaterialsLib/Adsorption/Reaction.h | 2 +-
MaterialsLib/Adsorption/ReactionCaOH2.cpp | 4 ++--
MaterialsLib/Adsorption/ReactionCaOH2.h | 8 ++++----
MaterialsLib/Adsorption/ReactionInert.h | 2 +-
MaterialsLib/Adsorption/ReactionSinusoidal.h | 2 +-
MaterialsLib/Adsorption/density_inert.h.orig | 2 +-
25 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/MaterialsLib/Adsorption/Adsorption.cpp b/MaterialsLib/Adsorption/Adsorption.cpp
index 8ab6f26d350..8fc5839badc 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 5e584b2bee3..66493c5d7f0 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 77e82c92cca..92f214e9532 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 f0dc2c420a5..78bf2c0e08b 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 28af602a249..5af46d85281 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 64f3129c3b9..4d9d97603dd 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 c90b24af83a..5e2f905f786 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 127da6951bf..6f6bc5fdf59 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 c961e5a85a0..3b3138de435 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 b1e494458db..a82738d54ea 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 ec65077106c..4e441676ecc 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 912dfec8129..8180a7756ca 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 2942170a9b0..6969aa1448a 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 aca37b64c60..721155c7b51 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 44cd5877f2a..f2f14c0cd0a 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 9d26f035b1f..42ddea7289a 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 dfb0199f336..ab560501cb6 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 bdbf1cbe3bb..e3eea37d914 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 7cddfcfe553..bc9c390779b 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 24359d56f27..41468410d60 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 24ad5ecf755..1051d129b66 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 29e7fc5d8c3..f6da1806c17 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 7b9f330dc02..75fb928a94b 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 676499048f5..8b9a3d13a20 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 e16f9c93b79..c0813e0f7b2 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
--
GitLab