Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Removes top-level tshirt models #597

Merged
merged 2 commits into from
Aug 8, 2023
Merged

Removes top-level tshirt models #597

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ce90ba
rm Bmi_C_Cfe_IT: this doesn't really make sense where it is the way i…
mattw-nws Aug 2, 2023
a6be61e
Remove tshirt, tshirt_c and related tests and data
mattw-nws Aug 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ if(NGEN_WITH_SQLITE3)
endif()

add_subdirectory("src/realizations/catchment")
add_subdirectory("src/models/tshirt")
add_subdirectory("src/models/kernels/reservoir")
add_subdirectory("src/models/kernels/evapotranspiration")
add_subdirectory("src/forcing")
Expand All @@ -236,7 +235,6 @@ target_link_libraries(ngen PUBLIC
#NGen::core_catchment_giuh
NGen::core_nexus
NGen::geojson
NGen::models_tshirt
NGen::realizations_catchment
NGen::kernels_reservoir
NGen::kernels_evapotranspiration
Expand Down
1 change: 0 additions & 1 deletion include/realizations/catchment/Bmi_C_Formulation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,6 @@ namespace realization {
// Unit test access
friend class ::Bmi_Formulation_Test;
friend class ::Bmi_C_Formulation_Test;
friend class ::Bmi_C_Cfe_IT;
friend class ::Bmi_C_Pet_IT;

private:
Expand Down
1 change: 0 additions & 1 deletion include/realizations/catchment/Bmi_Formulation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
// Forward declaration to provide access to protected items in testing
class Bmi_Formulation_Test;
class Bmi_C_Formulation_Test;
class Bmi_C_Cfe_IT;
class Bmi_C_Pet_IT;

using namespace std;
Expand Down
1 change: 0 additions & 1 deletion include/realizations/catchment/Bmi_Module_Formulation.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ class Bmi_Formulation_Test;
class Bmi_Multi_Formulation_Test;
class Bmi_C_Formulation_Test;
class Bmi_Cpp_Formulation_Test;
class Bmi_C_Cfe_IT;
class Bmi_C_Pet_IT;
class Bmi_Cpp_Multi_Array_Test;

Expand Down
4 changes: 0 additions & 4 deletions include/realizations/catchment/Formulation_Constructors.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
#include <boost/optional.hpp>

// Formulations
#include "Tshirt_Realization.hpp"
#include "Tshirt_C_Realization.hpp"
#include "Bmi_Cpp_Formulation.hpp"
#include "Bmi_C_Formulation.hpp"
#include "Bmi_Fortran_Formulation.hpp"
Expand Down Expand Up @@ -48,8 +46,6 @@ namespace realization {
#ifdef ACTIVATE_PYTHON
{"bmi_python", create_formulation_constructor<Bmi_Py_Formulation>()},
#endif // ACTIVATE_PYTHON
{"tshirt", create_formulation_constructor<Tshirt_Realization>()},
{"tshirt_c", create_formulation_constructor<Tshirt_C_Realization>()},
#ifdef NGEN_LSTM_TORCH_LIB_ACTIVE
,
{"lstm", create_formulation_constructor<LSTM_Realization>()}
Expand Down
Loading
Loading