Remove Timeseries (it is replaced by ScalarForcing)

pism · Aug 30, 2021 · bdd8187 · bdd8187
1 parent dcd8c42
commit bdd8187
Show file tree

Hide file tree

Showing 8 changed files with 2 additions and 426 deletions.
diff --git a/doc/browser/mainpage.md b/doc/browser/mainpage.md
@@ -44,7 +44,7 @@ these classes*. (This is a summary.)
 - pism::IceGrid (computational grid)
 - pism::Component and pism::Component_TS (interface shared by most sub-models)
 - pism::IceModelVec2S, pism::IceModelVec2Stag, pism::IceModelVec2V, and pism::IceModelVec3 (storage)
-- pism::Timeseries (scalar forcing)
+- pism::ScalarForcing (scalar time-dependent forcing)
 - pism::IceModelVec2T (2D time-dependent forcing)
 - pism::VariableMetadata (variable metadata such as physical units)
 - pism::Config (configuration parameter database)
@@ -56,7 +56,6 @@ these classes*. (This is a summary.)
 - [Organization of PISM's computational grid](@ref computational_grid)
 - [pism::IceModelVec and friends: storing, reading, writing, accessing 2D and 3D fields](@ref icemodelvec_use)
 - [PISM's model components and their interface](@ref pism_components)
-- [Reading scalar time-series (Timeseries)](@ref timeseries_overview)
 
 ### Other PISM documentation
 

diff --git a/src/pythonbindings/CMakeLists.txt b/src/pythonbindings/CMakeLists.txt
@@ -19,7 +19,6 @@ if (Pism_BUILD_PYTHON_BINDINGS)
     pism_SIA.i
     pism_SSA.i
     pism_blatter.i
-    pism_Timeseries.i
     pism_VariableMetadata.i
     pism_Vars.i
     pism_Vec.i

diff --git a/src/pythonbindings/PISM.i b/src/pythonbindings/PISM.i
@@ -250,9 +250,6 @@
 /* make sure pism_File.i is included before VariableMetadata.hh */
 %include pism_VariableMetadata.i
 
-/* Timeseries uses IceGrid and VariableMetadata so they have to be wrapped first. */
-%include pism_Timeseries.i
-
 /* IceModelVec uses IceGrid and VariableMetadata so they have to be wrapped first. */
 %include pism_IceModelVec.i
 

diff --git a/src/pythonbindings/pism_Timeseries.i b/src/pythonbindings/pism_Timeseries.i
diff --git a/src/util/CMakeLists.txt b/src/util/CMakeLists.txt
@@ -21,7 +21,6 @@ set(PISMUTIL_SRC
   Vars.cc
   Profiling.cc
   TerminationReason.cc
-  Timeseries.cc
   VariableMetadata.cc
   error_handling.cc
   iceModelVec.cc

diff --git a/src/util/Timeseries.cc b/src/util/Timeseries.cc
diff --git a/src/util/Timeseries.hh b/src/util/Timeseries.hh