diff --git a/bin/summaMain b/bin/summaMain deleted file mode 100755 index 24376b8627f7bc2deab79c09fca792fd065ba2e4..0000000000000000000000000000000000000000 Binary files a/bin/summaMain and /dev/null differ diff --git a/build/compile_summa.sh b/build/compile_summa.sh index b0c4affd77b9878f51a746ff332db9b6686b8948..176d05b41eebd1c7ca840ed74b1a3b0c130ff049 100644 --- a/build/compile_summa.sh +++ b/build/compile_summa.sh @@ -7,7 +7,7 @@ module load openblas module load caf #### Specifiy Master Directory, parent of build directory -export F_MASTER= +export F_MASTER=/globalhome/kck540/HPC/SummaProjects/Summa-Actors #### Specifiy Compilers #### export FC=gfortran diff --git a/build/source/engine/access_forcing.f90 b/build/source/engine/access_forcing.f90 index 7b81303386aca7d3de7f4803652369bb8cc409b8..2e04300572caf7b527f406b407dcc54cc9cd5bac 100644 --- a/build/source/engine/access_forcing.f90 +++ b/build/source/engine/access_forcing.f90 @@ -86,7 +86,9 @@ subroutine access_forcingFile(forcFileInfo, iFile, stepsInFile, startGRU, numGRU nTimeSteps = forcFileInfo%ffile_list(iFile)%nTimeSteps forcingDataStruct(iFile)%nTimeSteps = nTimeSteps stepsInFile = nTimeSteps - allocate(vecTime(iFile)%dat(nTimeSteps)) + if(.not.allocated(vecTime(iFile)%dat))then + allocate(vecTime(iFile)%dat(nTimeSteps)) + end if ! Get Time Information err = nf90_inq_varid(ncid,'time',varId); @@ -97,8 +99,12 @@ subroutine access_forcingFile(forcFileInfo, iFile, stepsInFile, startGRU, numGRU ! Need to loop through vars and add forcing data nVars = forcFileInfo%ffile_list(iFile)%nVars forcingDataStruct(iFile)%nVars = nVars - allocate(forcingDataStruct(iFile)%var(nVars)) - allocate(forcingDataStruct(iFile)%var_ix(nVars)) + if (.not.allocated(forcingDataStruct(iFile)%var))then + allocate(forcingDataStruct(iFile)%var(nVars)) + endif + if (.not.allocated(forcingDataStruct(iFile)%var_ix))then + allocate(forcingDataStruct(iFile)%var_ix(nVars)) + endif forcingDataStruct(iFile)%var_ix(:) = integerMissing ! initialize flags for forcing data @@ -114,8 +120,9 @@ subroutine access_forcingFile(forcFileInfo, iFile, stepsInFile, startGRU, numGRU iVar = forcFileInfo%ffile_list(iFile)%var_ix(iNC) checkForce(iVar) = .true. - - allocate(forcingDataStruct(iFile)%var(iVar)%dataFromFile(numGRU,nTimeSteps)) + if (.not.allocated(forcingDataStruct(iFile)%var(iVar)%dataFromFile))then + allocate(forcingDataStruct(iFile)%var(iVar)%dataFromFile(numGRU,nTimeSteps)) + endif ! Get Forcing Data ! get variable name for error reporting diff --git a/build/source/interface/file_access_actor/cppwrap_fileAccess.f90 b/build/source/interface/file_access_actor/cppwrap_fileAccess.f90 index 74ee288fd26492eed60fe9326c3bb5d2c8182d7f..8691a802925af74f8d606d9ebd5cd2d7c2b4476b 100644 --- a/build/source/interface/file_access_actor/cppwrap_fileAccess.f90 +++ b/build/source/interface/file_access_actor/cppwrap_fileAccess.f90 @@ -439,22 +439,22 @@ subroutine FileAccessActor_DeallocateStructures(handle_forcFileInfo, handle_ncid end do ! Deallocate Forcing Structure - do iFile = 1, size(forcingDataStruct(:)) - do iVar = 1, size(forcingDataStruct(iFile)%var(:)) - if (allocated(forcingDataStruct(iFile)%var(iVar)%dataFromFile))then - deallocate(forcingDataStruct(iFile)%var(iVar)%dataFromFile) - endif - end do - deallocate(forcingDataStruct(iFile)%var_ix) - end do - deallocate(forcingDataStruct) + ! do iFile = 1, size(forcingDataStruct(:)) + ! do iVar = 1, size(forcingDataStruct(iFile)%var(:)) + ! if (allocated(forcingDataStruct(iFile)%var(iVar)%dataFromFile))then + ! deallocate(forcingDataStruct(iFile)%var(iVar)%dataFromFile) + ! endif + ! end do + ! deallocate(forcingDataStruct(iFile)%var_ix) + ! end do + ! deallocate(forcingDataStruct) deallocate(forcFileInfo) - deallocate(outputStructure) + ! deallocate(outputStructure) deallocate(outputTimeStep) deallocate(ncid) deallocate(failedHRUs) - if(allocated(vecTime)) then; deallocate(vecTime); endif + ! if(allocated(vecTime)) then; deallocate(vecTime); endif end subroutine FileAccessActor_DeallocateStructures diff --git a/build/source/interface/file_access_actor/initOutputStruc.f90 b/build/source/interface/file_access_actor/initOutputStruc.f90 index f9d48fd3ef4018dad57353b2ac2fcba7835ab4fa..111ad6a391c0d180d962da2423fbc894daff12f9 100644 --- a/build/source/interface/file_access_actor/initOutputStruc.f90 +++ b/build/source/interface/file_access_actor/initOutputStruc.f90 @@ -5,7 +5,6 @@ module summaActors_initOutputStruct contains subroutine initalizeOutput(forcFileInfo, maxSteps, nGRU, err) - USE globalData,only:outputStructure USE globalData,only:outputStructure USE globalData,only:time_meta,forc_meta,attr_meta,type_meta ! metadata structures USE globalData,only:prog_meta,diag_meta,flux_meta,id_meta ! metadata structures diff --git a/config/Summa_Actors_Settings.json b/config/Summa_Actors_Settings.json deleted file mode 100644 index 7e467cfc002c8f7e2094eddf1d170f4860be77d6..0000000000000000000000000000000000000000 --- a/config/Summa_Actors_Settings.json +++ /dev/null @@ -1,52 +0,0 @@ -{ - "Configuration": { - "controlVersion": "", - "simStartTime": "", - "simEndTime": "", - "tmZoneInfo": "", - "settingsPath": "", - "forcingPath": "", - "outputPath": "", - "forcingFreq": "", - "forcingStart": "", - "decisionsFile": "", - "outputControlFile": "", - "globalHruParamFile": "", - "globalGruParamFile": "", - "attributeFile": "", - "trialParamFile": "", - "forcingListFile": "", - "initConditionFile": "", - "outFilePrefix": "", - "vegTableFile": "", - "soilTableFile": "", - "generalTableFile": "", - "noahmpTableFile": "" - }, - "JobSubmissionParams": { - "cpus-per-task": 1, - "memory": "", - "job-name": "", - "account": "", - "numHRUs": 1, - "maxNumberOfJobs": 1, - "maxGRUsPerSubmission": 1, - "executablePath": "" - }, - "SummaActor": { - "OuputStructureSize": 1, - "maxGRUPerJob": 1 - }, - "FileAccessActor": { - "num_vectors_in_output_manager": 1 - }, - "JobActor": { - "FileManagerPath": "", - "outputCSV": "", - "csvPath": "" - }, - "HRUActor": { - "printOutput": "", - "outputFrequency": 1 - } -} \ No newline at end of file