Skip to content
Snippets Groups Projects
Commit 9ee8ed6e authored by Kyle's avatar Kyle
Browse files

passed laugh tests after adding lookupstruct

parent e6ef90ad
No related branches found
No related tags found
No related merge requests found
...@@ -43,6 +43,13 @@ behavior file_access_actor(stateful_actor<file_access_state>* self, int startGRU ...@@ -43,6 +43,13 @@ behavior file_access_actor(stateful_actor<file_access_state>* self, int startGRU
aout(self) << "Initalizing Output Structure" << std::endl; aout(self) << "Initalizing Output Structure" << std::endl;
Init_OutputStruct(self->state.handle_forcing_file_info, &self->state.outputStrucSize, Init_OutputStruct(self->state.handle_forcing_file_info, &self->state.outputStrucSize,
&self->state.numGRU, &self->state.err); &self->state.numGRU, &self->state.err);
if (self->state.err != 0) {
aout(self) << "ERROR: FILE_ACCESS_ACTOR init_OutputStruct \n";
std::string function = "init_OutputStruc";
self->send(self->state.parent, file_access_actor_err_v, function);
self->quit();
return;
}
}, },
[=](write_param, int indxGRU, int indxHRU) { [=](write_param, int indxGRU, int indxHRU) {
......
...@@ -207,18 +207,21 @@ subroutine initalizeOutput(forcFileInfo, maxSteps, num_gru, err) ...@@ -207,18 +207,21 @@ subroutine initalizeOutput(forcFileInfo, maxSteps, num_gru, err)
! Statistics ! Statistics
call alloc_outputStruc(statBvar_meta(:)%var_info,outputStructure(1)%bvarStat(1)%gru(iGRU)%hru(iHRU), & call alloc_outputStruc(statBvar_meta(:)%var_info,outputStructure(1)%bvarStat(1)%gru(iGRU)%hru(iHRU), &
maxSteps,nSnow=0,nSoil=0,err=err,message=message); ! basin-average variables maxSteps,nSnow=0,nSoil=0,err=err,message=message); ! basin-average variables
case('deriv'); cycle case('deriv'); cycle
case('lookup'); cycle
case default; err=20; message='unable to find structure name: '//trim(structInfo(iStruct)%structName) case default; err=20; message='unable to find structure name: '//trim(structInfo(iStruct)%structName)
end select end select
! check errors ! check errors
if(err/=0)then if(err/=0)then
message=trim(message)//'initOutputStruc.f90 - [structure = '//trim(structInfo(iStruct)%structName)//']' message=trim(message)//'initOutputStruc.f90 - [structure = '//trim(structInfo(iStruct)%structName)//']'
print*, "message"
return return
endif endif
end do ! looping through data structures end do ! looping through data structures
! Finalize stats structure for writing to output file ! Finalize stats structure for writing to output file
print*, "HERE"
allocate(outputStructure(1)%finalizeStats(1)%gru(iGRU)%hru(iHRU)%tim(maxSteps)) allocate(outputStructure(1)%finalizeStats(1)%gru(iGRU)%hru(iHRU)%tim(maxSteps))
do iStep = 1, maxSteps do iStep = 1, maxSteps
allocate(outputStructure(1)%finalizeStats(1)%gru(iGRU)%hru(iHRU)%tim(iStep)%dat(1:maxVarFreq)) allocate(outputStructure(1)%finalizeStats(1)%gru(iGRU)%hru(iHRU)%tim(iStep)%dat(1:maxVarFreq))
......
...@@ -234,10 +234,8 @@ subroutine summaActors_writeToOutputStruc(& ...@@ -234,10 +234,8 @@ subroutine summaActors_writeToOutputStruc(&
outputTimeStep%var(:)=1 outputTimeStep%var(:)=1
end if ! if defining a new file end if ! if defining a new file
! If we do not do this looping we segfault - I am not sure why ! If we do not do this looping we segfault - I am not sure why
do iDat=1,size(outputStructure(1)%finalizeStats(1)%gru(indxGRU)%hru(indxHRU)%tim(outputStep)%dat) outputStructure(1)%finalizeStats(1)%gru(indxGRU)%hru(indxHRU)%tim(outputStep)%dat(:) = finalizeStats%dat(:)
outputStructure(1)%finalizeStats(1)%gru(indxGRU)%hru(indxHRU)%tim(outputStep)%dat(iDat) = finalizeStats%dat(iDat)
end do
! **************************************************************************** ! ****************************************************************************
! *** calculate output statistics ! *** calculate output statistics
! **************************************************************************** ! ****************************************************************************
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment