From 0556082ec828deae508af9e97754b0c3dfe17b8d Mon Sep 17 00:00:00 2001
From: Kyle <kyle.c.klenk@gmail.com>
Date: Thu, 3 Nov 2022 23:00:35 +0000
Subject: [PATCH] got rid of more old code
---
.../file_access_actor/file_access_actor.hpp | 3 -
build/includes/global/message_atoms.hpp | 58 +------------------
.../cpp_code/file_access_actor.cpp | 3 -
.../actors/hru_actor/cpp_code/hru_actor.cpp | 21 -------
4 files changed, 1 insertion(+), 84 deletions(-)
diff --git a/build/includes/file_access_actor/file_access_actor.hpp b/build/includes/file_access_actor/file_access_actor.hpp
index e2f239c..0c787e7 100644
--- a/build/includes/file_access_actor/file_access_actor.hpp
+++ b/build/includes/file_access_actor/file_access_actor.hpp
@@ -131,7 +131,4 @@ void readAttributes(stateful_actor<file_access_state>* self);
// read in the parameters for all HRUs that are in the run-domain
void readParameters(stateful_actor<file_access_state>* self);
-// deallocate all dynamically allocated structures
-void cleanup(stateful_actor<file_access_state>* self);
-
} // end namespace
\ No newline at end of file
diff --git a/build/includes/global/message_atoms.hpp b/build/includes/global/message_atoms.hpp
index 3d4b916..e60f5f7 100644
--- a/build/includes/global/message_atoms.hpp
+++ b/build/includes/global/message_atoms.hpp
@@ -22,14 +22,6 @@ CAF_BEGIN_TYPE_ID_BLOCK(summa, first_custom_type_id)
// Summary:
CAF_ADD_ATOM(summa, done_init_gru)
// Sender:
- // Reciever:
- // Summary:
- CAF_ADD_ATOM(summa, done_reading_forcingFile)
- // Sender:
- // Reciever:
- // Summary:
- CAF_ADD_ATOM(summa, done_reading_first_forcing_file)
- // Sender:
// Reciever:
// Summary:
CAF_ADD_ATOM(summa, init_hru)
@@ -44,18 +36,10 @@ CAF_BEGIN_TYPE_ID_BLOCK(summa, first_custom_type_id)
// Sender:
// Reciever:
// Summary:
- CAF_ADD_ATOM(summa, doneFile)
- // Sender:
- // Reciever:
- // Summary:
CAF_ADD_ATOM(summa, done_hru)
// Sender:
// Reciever:
// Summary:
- CAF_ADD_ATOM(summa, done_final_write)
- // Sender:
- // Reciever:
- // Summary:
CAF_ADD_ATOM(summa, run_failure)
// Sender:
// Reciever:
@@ -72,18 +56,10 @@ CAF_BEGIN_TYPE_ID_BLOCK(summa, first_custom_type_id)
// Sender:
// Reciever:
// Summary:
- CAF_ADD_ATOM(summa, initalize_outputStructure)
- // Sender:
- // Reciever:
- // Summary:
CAF_ADD_ATOM(summa, access_forcing)
// Sender:
// Reciever:
// Summary:
- CAF_ADD_ATOM(summa, access_first_forcing_file)
- // Sender:
- // Reciever:
- // Summary:
CAF_ADD_ATOM(summa, access_forcing_internal)
// Sender:
// Reciever:
@@ -92,28 +68,8 @@ CAF_BEGIN_TYPE_ID_BLOCK(summa, first_custom_type_id)
// Sender:
// Reciever:
// Summary:
- CAF_ADD_ATOM(summa, write_output_final)
- // Sender:
- // Reciever:
- // Summary:
CAF_ADD_ATOM(summa, deallocate_structures)
- // Sender:
- // Reciever:
- // Summary:
- CAF_ADD_ATOM(summa, update_completed)
- // Sender:
- // Reciever:
- // Summary:
- CAF_ADD_ATOM(summa, update_failed)
- // Sender:
- // Reciever:
- // Summary:
- CAF_ADD_ATOM(summa, reset_outputCounter)
- // Sender:
- // Reciever:
- // Summary:
- CAF_ADD_ATOM(summa, read_and_write)
- // Sender:
+ // Sender:
// Reciever:
// Summary:
CAF_ADD_ATOM(summa, write_param)
@@ -121,10 +77,6 @@ CAF_BEGIN_TYPE_ID_BLOCK(summa, first_custom_type_id)
// Reciever:
// Summary:
CAF_ADD_ATOM(summa, restart_failures)
- // Sender:
- // Reciever:
- // Summary:
- CAF_ADD_ATOM(summa, serialized_hru_data)
// Sender:
// Reciever:
// Summary:
@@ -140,17 +92,9 @@ CAF_BEGIN_TYPE_ID_BLOCK(summa, first_custom_type_id)
// Sender:
// Reciever:
// Summary:
- CAF_ADD_ATOM(summa, file_information)
- // Sender:
- // Reciever:
- // Summary:
CAF_ADD_ATOM(summa, dt_init_factor)
// Sender:
// Reciever:
- // Summary:
- CAF_ADD_ATOM(summa, serialize_data)
- // Sender:
- // Reciever:
// Summary:
CAF_ADD_ATOM(summa, connect_to_server)
// Sender:
diff --git a/build/source/actors/file_access_actor/cpp_code/file_access_actor.cpp b/build/source/actors/file_access_actor/cpp_code/file_access_actor.cpp
index 29308d0..2b81ae6 100644
--- a/build/source/actors/file_access_actor/cpp_code/file_access_actor.cpp
+++ b/build/source/actors/file_access_actor/cpp_code/file_access_actor.cpp
@@ -425,7 +425,4 @@ void readParameters(stateful_actor<file_access_state>* self) {
}
-void cleanup(stateful_actor<file_access_state>* self) {
-
-}
} // end namespace
\ No newline at end of file
diff --git a/build/source/actors/hru_actor/cpp_code/hru_actor.cpp b/build/source/actors/hru_actor/cpp_code/hru_actor.cpp
index 83967b4..13ca962 100644
--- a/build/source/actors/hru_actor/cpp_code/hru_actor.cpp
+++ b/build/source/actors/hru_actor/cpp_code/hru_actor.cpp
@@ -222,27 +222,6 @@ behavior hru_actor(stateful_actor<hru_state>* self, int refGRU, int indxGRU,
self->send(self, run_hru_v, self->state.stepsInCurrentFFile);
},
- [=](run_hru, int stepsInCurrentFFile) {
- self->state.hru_timing.updateStartPoint("total_duration");
-
- bool keepRunning = true;
- int err = 0;
- self->state.stepsInCurrentFFile = stepsInCurrentFFile;
-
- while( keepRunning ) {
-
- err = Run_HRU(self); // Simulate a Timestep
-
- self->send(self->state.file_access_actor, serialized_hru_data_v, self);
-
- keepRunning = check_HRU(self, err); // check if we are done, need to write
-
- }
-
- self->state.hru_timing.updateEndPoint("total_duration");
-
- },
-
[=](dt_init_factor, int dt_init_factor) {
aout(self) << "Recieved New dt_init_factor to attempt on next run \n";
self->state.dt_init_factor = dt_init_factor;
--
GitLab