diff --git a/build/includes/global/global.hpp b/build/includes/global/global.hpp index 69b695bae52f83121c48f10cc2974ebc649992f1..3d2914c44c958258e69f185ba5bf395063540f1c 100644 --- a/build/includes/global/global.hpp +++ b/build/includes/global/global.hpp @@ -21,6 +21,7 @@ int getSettingsTest(std::vector<std::string> keys, T return_value) { return 0; } + /** * Return the time between to time points */ diff --git a/build/includes/global/var_lookup.hpp b/build/includes/global/var_lookup.hpp new file mode 100644 index 0000000000000000000000000000000000000000..e7dfc23f8f4e8aee020e6579aaa7a70154929720 --- /dev/null +++ b/build/includes/global/var_lookup.hpp @@ -0,0 +1,18 @@ +#pragma once + +struct iLookVarType { + // These values should be one index less than the Fortran structure + // This is so they align with C++ vectors that start at 0 + int scalarv = -9999; + int wLength = -9999; + int midSnow = -9999; + int midSoil = -9999; + int midToto = -9999; + int ifcSnow = -9999; + int ifcSoil = -9999; + int ifcToto = -9999; + int parSoil = -9999; + int routing = -9999; + int outstat = -9999; + int unknown = -9999; +}; \ No newline at end of file diff --git a/build/source/actors/global/global.cpp b/build/source/actors/global/global.cpp index c906fd559dcfc90ea91d391b1e3c2ffe7f6852f3..0ef698918431e2ebc9d0b716a04030e5e5ca4b6c 100644 --- a/build/source/actors/global/global.cpp +++ b/build/source/actors/global/global.cpp @@ -1,24 +1,6 @@ #include "global.hpp" #include <chrono> -struct iLookVarType { - // These values should be one index less than the Fortran structure - // This is so they align with C++ vectors that start at 0 - int scalarv = -9999; - int wLength = -9999; - int midSnow = -9999; - int midSoil = -9999; - int midToto = -9999; - int ifcSnow = -9999; - int ifcSoil = -9999; - int ifcToto = -9999; - int parSoil = -9999; - int routing = -9999; - int outstat = -9999; - int unknown = -9999; -}; - - double calculateTime(std::chrono::time_point<std::chrono::system_clock> start, diff --git a/build/source/actors/job_actor/job_actor.cpp b/build/source/actors/job_actor/job_actor.cpp index 1c0924a307b6150ad347659d78bffc4a8e9d3d60..11e5b6dec8dfac2aa400fb7f1054759e6e55006a 100644 --- a/build/source/actors/job_actor/job_actor.cpp +++ b/build/source/actors/job_actor/job_actor.cpp @@ -42,7 +42,6 @@ behavior job_actor(stateful_actor<job_state>* self, int start_gru, int num_gru, self->quit(); return {}; // Failure } - self->state.output_csv = getSettings(self->state.config_path, "JobActor", "outputCSV", self->state.output_csv).value_or(false); if (self->state.output_csv) { @@ -89,10 +88,10 @@ behavior job_actor(stateful_actor<job_state>* self, int start_gru, int num_gru, return {}; // Failure } + initCsvOutputFile(self); - - initCsvOutputFile(self); + // Spawn the file_access_actor. This will return the number of forcing files we are working with self->state.file_access_actor = self->spawn(file_access_actor, self->state.start_gru, self->state.num_gru,