Merge pull request #1335 from wenqing/change_dir_name

Changed directory name of MaterialsLib to MaterialLib

CMakeLists.txt

@@ -186,7 +186,7 @@ if(TARGET Boost)
     add_dependencies(BaseLib Boost)
 endif()
 add_subdirectory( GeoLib )
-add_subdirectory( MaterialsLib )
+add_subdirectory( MaterialLib )
 add_subdirectory( MathLib )
 add_subdirectory( MeshLib )
 add_subdirectory( MeshGeoToolsLib )

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

@@ -9,7 +9,7 @@
 
 #include "Adsorption.h"
 #include <logog/include/logog.hpp>
-#include "MaterialsLib/PhysicalConstant.h"
+#include "MaterialLib/PhysicalConstant.h"
 
 namespace {
     const double k_rate = 6.0e-3; // to be specified
@@ -112,8 +112,8 @@ void AdsorptionReaction::getDReactionRate(const double p_Ads, const double T_Ads
 {
     const double A = getPotential(p_Ads, T_Ads, M_Ads);
     const double p_S = getEquilibriumVapourPressure(T_Ads);
-    const double dAdT = MaterialsLib::PhysicalConstant::IdealGasConstant * log(p_S/p_Ads) / (M_Ads*1.e3);
-    const double dAdp = - MaterialsLib::PhysicalConstant::IdealGasConstant * T_Ads / M_Ads / p_Ads;
+    const double dAdT = MaterialLib::PhysicalConstant::IdealGasConstant * log(p_S/p_Ads) / (M_Ads*1.e3);
+    const double dAdp = - MaterialLib::PhysicalConstant::IdealGasConstant * T_Ads / M_Ads / p_Ads;
 
     const double W = characteristicCurve(A);
     const double dWdA = dCharacteristicCurve(A);
@@ -132,7 +132,7 @@ void AdsorptionReaction::getDReactionRate(const double p_Ads, const double T_Ads
 // Evaluate adsorbtion potential A
 double AdsorptionReaction::getPotential(const double p_Ads, double T_Ads, const double M_Ads) const
 {
-    double A = MaterialsLib::PhysicalConstant::IdealGasConstant * T_Ads * log(getEquilibriumVapourPressure(T_Ads)/p_Ads) / (M_Ads*1.e3); // in kJ/kg = J/g
+    double A = MaterialLib::PhysicalConstant::IdealGasConstant * T_Ads * log(getEquilibriumVapourPressure(T_Ads)/p_Ads) / (M_Ads*1.e3); // in kJ/kg = J/g
     return A;
 }
 

MaterialsLib/Adsorption/DensityDubinin.cpp → MaterialLib/Adsorption/DensityDubinin.cpp

@@ -8,7 +8,7 @@
  */
 
 #include "DensityDubinin.h"
-#include "MaterialsLib/PhysicalConstant.h"
+#include "MaterialLib/PhysicalConstant.h"
 #include "DensityCook.h"
 #include "Adsorption.h"
 
@@ -44,8 +44,8 @@ double DensityDubinin::getAdsorbateDensity(const double T_Ads) const
         // boiling point density
         const double rhob = rhoWaterDean(Tb);
         // state values
-        const double R = MaterialsLib::PhysicalConstant::IdealGasConstant;
-        const double M = MaterialsLib::PhysicalConstant::MolarMass::Water;
+        const double R = MaterialLib::PhysicalConstant::IdealGasConstant;
+        const double M = MaterialLib::PhysicalConstant::MolarMass::Water;
         const double b = R * Tc/(8. * pc); // m^3/mol
         const double rhom = M/b; // kg/m^3
         const double rho = rhob - (rhob-rhom)/(Tc-Tb)*(T_Ads-Tb);
@@ -67,8 +67,8 @@ double DensityDubinin::getAlphaT(const double T_Ads) const
         // boiling point density
         const double rhob = rhoWaterDean(Tb);
         // state values
-        const double R = MaterialsLib::PhysicalConstant::IdealGasConstant;
-        const double M = MaterialsLib::PhysicalConstant::MolarMass::Water;
+        const double R = MaterialLib::PhysicalConstant::IdealGasConstant;
+        const double M = MaterialLib::PhysicalConstant::MolarMass::Water;
         const double b = R * Tc/(8. * pc); // m^3/mol
         const double rhom = M/(b); // kg/m^3
         const double rho = rhob - (rhob-rhom)/(Tc-Tb)*(T_Ads-Tb);