diff --git a/.vscode/caf-application.conf b/.vscode/caf-application.conf deleted file mode 100644 index 3e1e4479dbe11afb9ba9bf8bd0e7d564b6010a35..0000000000000000000000000000000000000000 --- a/.vscode/caf-application.conf +++ /dev/null @@ -1,3 +0,0 @@ -caf { - max-threads = 1 -} \ No newline at end of file diff --git a/build/includes/file_access_actor/file_access_actor_subroutine_wrappers.hpp b/build/includes/file_access_actor/file_access_actor_subroutine_wrappers.hpp index 88ce743d0d42c5b748769ed231a59aaed3e6772f..d4240f270aea69cc23a19f623efe62215ce1f776 100644 --- a/build/includes/file_access_actor/file_access_actor_subroutine_wrappers.hpp +++ b/build/includes/file_access_actor/file_access_actor_subroutine_wrappers.hpp @@ -4,7 +4,7 @@ extern "C" { // initalizeFileAccessActor void ffile_info(int* indxGRU, void* forcFileInfo, int* numFiles, int* err); - void mDecisions(int* numSteps, int* err); + void mDecisions_C(int* numSteps, int* err); void read_pinit_C(int* err); void read_vegitationTables(int* err); void initFailedHRUTracker(int* numGRU); 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 a79f1432e66cb7e7d303b93e795cdb2fec4a8929..62ef5d24c3be21088dc3ac6e6b2471484183df0e 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 @@ -267,7 +267,7 @@ void initalizeFileAccessActor(stateful_actor<file_access_state>* self) { } // save model decisions as named integers - mDecisions(&self->state.num_steps, &err); + mDecisions_C(&self->state.num_steps, &err); if (err != 0) { aout(self) << "\033[31mFile_Access_Actor: Error in mDecisions\033[0m\n"; std::string function = "mDecisions"; diff --git a/build/source/actors/file_access_actor/fortran_code/cppwrap_fileAccess.f90 b/build/source/actors/file_access_actor/fortran_code/cppwrap_fileAccess.f90 index e3ccb081f2c30d831aab9c997fb393e9db40ccd7..de44faf9c506f9b085b94fdebc8c98843e9bb1fd 100644 --- a/build/source/actors/file_access_actor/fortran_code/cppwrap_fileAccess.f90 +++ b/build/source/actors/file_access_actor/fortran_code/cppwrap_fileAccess.f90 @@ -10,6 +10,7 @@ module cppwrap_fileAccess implicit none + public::mDecisions_C public::read_pinit_C public::read_vegitationTables public::FileAccessActor_DeallocateStructures @@ -17,6 +18,23 @@ module cppwrap_fileAccess contains +subroutine mDecisions_C(num_steps, err) bind(C, name='mDecisions_C') + USE mDecisions_module,only:mDecisions ! module to read model decisions + + ! Read in number of Time Steps after the call to mDecisions + USE globalData,only:numtim ! number of time steps in the simulation + + implicit none + integer(c_int),intent(out) :: num_steps + integer(c_int),intent(out) :: err ! error code + character(len=256) :: message ! error message + + call mDecisions(err,message) + if(err/=0)then; print*, char(27),'[33m',message,char(27),'[0m'; return; endif + + num_steps = numtim +end subroutine mDecisions_C + ! Read in the inital parameters, from the txt files that are give to summa as input LocalParamInfo.txt BasinParamInfo.txt subroutine read_pinit_C(err) bind(C, name='read_pinit_C')