From d6daf08e2fc636a728246f42ac0b9de8805e7bec Mon Sep 17 00:00:00 2001 From: Christoph Lehmann <christoph.lehmann@ufz.de> Date: Sat, 30 Apr 2016 00:28:58 +0200 Subject: [PATCH] [Ads] moved directory --- CMakeLists.txt | 2 +- MaterialsLib/{adsorption => Adsorption}/CMakeLists.txt | 0 MaterialsLib/{adsorption => Adsorption}/adsorption.cpp | 0 MaterialsLib/{adsorption => Adsorption}/adsorption.h | 0 MaterialsLib/{adsorption => Adsorption}/density_100MPa.cpp | 0 MaterialsLib/{adsorption => Adsorption}/density_100MPa.h | 0 MaterialsLib/{adsorption => Adsorption}/density_const.cpp | 0 MaterialsLib/{adsorption => Adsorption}/density_const.h | 0 MaterialsLib/{adsorption => Adsorption}/density_cook.cpp | 0 MaterialsLib/{adsorption => Adsorption}/density_cook.h | 0 MaterialsLib/{adsorption => Adsorption}/density_dubinin.cpp | 0 MaterialsLib/{adsorption => Adsorption}/density_dubinin.h | 0 MaterialsLib/{adsorption => Adsorption}/density_hauer.cpp | 0 MaterialsLib/{adsorption => Adsorption}/density_hauer.h | 0 MaterialsLib/{adsorption => Adsorption}/density_inert.h.orig | 0 MaterialsLib/{adsorption => Adsorption}/density_legacy.cpp | 0 MaterialsLib/{adsorption => Adsorption}/density_legacy.h | 0 MaterialsLib/{adsorption => Adsorption}/density_mette.cpp | 0 MaterialsLib/{adsorption => Adsorption}/density_mette.h | 0 MaterialsLib/{adsorption => Adsorption}/density_nunez.cpp | 0 MaterialsLib/{adsorption => Adsorption}/density_nunez.h | 0 MaterialsLib/{adsorption => Adsorption}/reaction.cpp | 0 MaterialsLib/{adsorption => Adsorption}/reaction.h | 0 MaterialsLib/{adsorption => Adsorption}/reaction_CaOH2.cpp | 0 MaterialsLib/{adsorption => Adsorption}/reaction_CaOH2.h | 0 MaterialsLib/{adsorption => Adsorption}/reaction_inert.h | 0 MaterialsLib/{adsorption => Adsorption}/reaction_sinusoidal.h | 0 Tests/MathLib/TestNonlinear1D_Zeolite.cpp | 2 +- 28 files changed, 2 insertions(+), 2 deletions(-) rename MaterialsLib/{adsorption => Adsorption}/CMakeLists.txt (100%) rename MaterialsLib/{adsorption => Adsorption}/adsorption.cpp (100%) rename MaterialsLib/{adsorption => Adsorption}/adsorption.h (100%) rename MaterialsLib/{adsorption => Adsorption}/density_100MPa.cpp (100%) rename MaterialsLib/{adsorption => Adsorption}/density_100MPa.h (100%) rename MaterialsLib/{adsorption => Adsorption}/density_const.cpp (100%) rename MaterialsLib/{adsorption => Adsorption}/density_const.h (100%) rename MaterialsLib/{adsorption => Adsorption}/density_cook.cpp (100%) rename MaterialsLib/{adsorption => Adsorption}/density_cook.h (100%) rename MaterialsLib/{adsorption => Adsorption}/density_dubinin.cpp (100%) rename MaterialsLib/{adsorption => Adsorption}/density_dubinin.h (100%) rename MaterialsLib/{adsorption => Adsorption}/density_hauer.cpp (100%) rename MaterialsLib/{adsorption => Adsorption}/density_hauer.h (100%) rename MaterialsLib/{adsorption => Adsorption}/density_inert.h.orig (100%) rename MaterialsLib/{adsorption => Adsorption}/density_legacy.cpp (100%) rename MaterialsLib/{adsorption => Adsorption}/density_legacy.h (100%) rename MaterialsLib/{adsorption => Adsorption}/density_mette.cpp (100%) rename MaterialsLib/{adsorption => Adsorption}/density_mette.h (100%) rename MaterialsLib/{adsorption => Adsorption}/density_nunez.cpp (100%) rename MaterialsLib/{adsorption => Adsorption}/density_nunez.h (100%) rename MaterialsLib/{adsorption => Adsorption}/reaction.cpp (100%) rename MaterialsLib/{adsorption => Adsorption}/reaction.h (100%) rename MaterialsLib/{adsorption => Adsorption}/reaction_CaOH2.cpp (100%) rename MaterialsLib/{adsorption => Adsorption}/reaction_CaOH2.h (100%) rename MaterialsLib/{adsorption => Adsorption}/reaction_inert.h (100%) rename MaterialsLib/{adsorption => Adsorption}/reaction_sinusoidal.h (100%) diff --git a/CMakeLists.txt b/CMakeLists.txt index 4cf4a281e35..a493dd9bb01 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -199,7 +199,7 @@ add_subdirectory( DataHolderLib ) add_subdirectory( FileIO ) add_subdirectory( GeoLib ) add_subdirectory( InSituLib ) -add_subdirectory( MaterialsLib/adsorption ) +add_subdirectory( MaterialsLib/Adsorption ) add_subdirectory( MathLib ) add_subdirectory( MeshLib ) add_subdirectory( MeshGeoToolsLib ) diff --git a/MaterialsLib/adsorption/CMakeLists.txt b/MaterialsLib/Adsorption/CMakeLists.txt similarity index 100% rename from MaterialsLib/adsorption/CMakeLists.txt rename to MaterialsLib/Adsorption/CMakeLists.txt diff --git a/MaterialsLib/adsorption/adsorption.cpp b/MaterialsLib/Adsorption/adsorption.cpp similarity index 100% rename from MaterialsLib/adsorption/adsorption.cpp rename to MaterialsLib/Adsorption/adsorption.cpp diff --git a/MaterialsLib/adsorption/adsorption.h b/MaterialsLib/Adsorption/adsorption.h similarity index 100% rename from MaterialsLib/adsorption/adsorption.h rename to MaterialsLib/Adsorption/adsorption.h diff --git a/MaterialsLib/adsorption/density_100MPa.cpp b/MaterialsLib/Adsorption/density_100MPa.cpp similarity index 100% rename from MaterialsLib/adsorption/density_100MPa.cpp rename to MaterialsLib/Adsorption/density_100MPa.cpp diff --git a/MaterialsLib/adsorption/density_100MPa.h b/MaterialsLib/Adsorption/density_100MPa.h similarity index 100% rename from MaterialsLib/adsorption/density_100MPa.h rename to MaterialsLib/Adsorption/density_100MPa.h diff --git a/MaterialsLib/adsorption/density_const.cpp b/MaterialsLib/Adsorption/density_const.cpp similarity index 100% rename from MaterialsLib/adsorption/density_const.cpp rename to MaterialsLib/Adsorption/density_const.cpp diff --git a/MaterialsLib/adsorption/density_const.h b/MaterialsLib/Adsorption/density_const.h similarity index 100% rename from MaterialsLib/adsorption/density_const.h rename to MaterialsLib/Adsorption/density_const.h diff --git a/MaterialsLib/adsorption/density_cook.cpp b/MaterialsLib/Adsorption/density_cook.cpp similarity index 100% rename from MaterialsLib/adsorption/density_cook.cpp rename to MaterialsLib/Adsorption/density_cook.cpp diff --git a/MaterialsLib/adsorption/density_cook.h b/MaterialsLib/Adsorption/density_cook.h similarity index 100% rename from MaterialsLib/adsorption/density_cook.h rename to MaterialsLib/Adsorption/density_cook.h diff --git a/MaterialsLib/adsorption/density_dubinin.cpp b/MaterialsLib/Adsorption/density_dubinin.cpp similarity index 100% rename from MaterialsLib/adsorption/density_dubinin.cpp rename to MaterialsLib/Adsorption/density_dubinin.cpp diff --git a/MaterialsLib/adsorption/density_dubinin.h b/MaterialsLib/Adsorption/density_dubinin.h similarity index 100% rename from MaterialsLib/adsorption/density_dubinin.h rename to MaterialsLib/Adsorption/density_dubinin.h diff --git a/MaterialsLib/adsorption/density_hauer.cpp b/MaterialsLib/Adsorption/density_hauer.cpp similarity index 100% rename from MaterialsLib/adsorption/density_hauer.cpp rename to MaterialsLib/Adsorption/density_hauer.cpp diff --git a/MaterialsLib/adsorption/density_hauer.h b/MaterialsLib/Adsorption/density_hauer.h similarity index 100% rename from MaterialsLib/adsorption/density_hauer.h rename to MaterialsLib/Adsorption/density_hauer.h diff --git a/MaterialsLib/adsorption/density_inert.h.orig b/MaterialsLib/Adsorption/density_inert.h.orig similarity index 100% rename from MaterialsLib/adsorption/density_inert.h.orig rename to MaterialsLib/Adsorption/density_inert.h.orig diff --git a/MaterialsLib/adsorption/density_legacy.cpp b/MaterialsLib/Adsorption/density_legacy.cpp similarity index 100% rename from MaterialsLib/adsorption/density_legacy.cpp rename to MaterialsLib/Adsorption/density_legacy.cpp diff --git a/MaterialsLib/adsorption/density_legacy.h b/MaterialsLib/Adsorption/density_legacy.h similarity index 100% rename from MaterialsLib/adsorption/density_legacy.h rename to MaterialsLib/Adsorption/density_legacy.h diff --git a/MaterialsLib/adsorption/density_mette.cpp b/MaterialsLib/Adsorption/density_mette.cpp similarity index 100% rename from MaterialsLib/adsorption/density_mette.cpp rename to MaterialsLib/Adsorption/density_mette.cpp diff --git a/MaterialsLib/adsorption/density_mette.h b/MaterialsLib/Adsorption/density_mette.h similarity index 100% rename from MaterialsLib/adsorption/density_mette.h rename to MaterialsLib/Adsorption/density_mette.h diff --git a/MaterialsLib/adsorption/density_nunez.cpp b/MaterialsLib/Adsorption/density_nunez.cpp similarity index 100% rename from MaterialsLib/adsorption/density_nunez.cpp rename to MaterialsLib/Adsorption/density_nunez.cpp diff --git a/MaterialsLib/adsorption/density_nunez.h b/MaterialsLib/Adsorption/density_nunez.h similarity index 100% rename from MaterialsLib/adsorption/density_nunez.h rename to MaterialsLib/Adsorption/density_nunez.h diff --git a/MaterialsLib/adsorption/reaction.cpp b/MaterialsLib/Adsorption/reaction.cpp similarity index 100% rename from MaterialsLib/adsorption/reaction.cpp rename to MaterialsLib/Adsorption/reaction.cpp diff --git a/MaterialsLib/adsorption/reaction.h b/MaterialsLib/Adsorption/reaction.h similarity index 100% rename from MaterialsLib/adsorption/reaction.h rename to MaterialsLib/Adsorption/reaction.h diff --git a/MaterialsLib/adsorption/reaction_CaOH2.cpp b/MaterialsLib/Adsorption/reaction_CaOH2.cpp similarity index 100% rename from MaterialsLib/adsorption/reaction_CaOH2.cpp rename to MaterialsLib/Adsorption/reaction_CaOH2.cpp diff --git a/MaterialsLib/adsorption/reaction_CaOH2.h b/MaterialsLib/Adsorption/reaction_CaOH2.h similarity index 100% rename from MaterialsLib/adsorption/reaction_CaOH2.h rename to MaterialsLib/Adsorption/reaction_CaOH2.h diff --git a/MaterialsLib/adsorption/reaction_inert.h b/MaterialsLib/Adsorption/reaction_inert.h similarity index 100% rename from MaterialsLib/adsorption/reaction_inert.h rename to MaterialsLib/Adsorption/reaction_inert.h diff --git a/MaterialsLib/adsorption/reaction_sinusoidal.h b/MaterialsLib/Adsorption/reaction_sinusoidal.h similarity index 100% rename from MaterialsLib/adsorption/reaction_sinusoidal.h rename to MaterialsLib/Adsorption/reaction_sinusoidal.h diff --git a/Tests/MathLib/TestNonlinear1D_Zeolite.cpp b/Tests/MathLib/TestNonlinear1D_Zeolite.cpp index 16fc7e21a29..5190083520c 100644 --- a/Tests/MathLib/TestNonlinear1D_Zeolite.cpp +++ b/Tests/MathLib/TestNonlinear1D_Zeolite.cpp @@ -4,7 +4,7 @@ #include "MathLib/Nonlinear/Root1D.h" -#include "MaterialsLib/adsorption/density_hauer.h" +#include "MaterialsLib/Adsorption/density_hauer.h" using namespace Ads; -- GitLab