Skip to content

output formatting #339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mcguirepatr wants to merge 3 commits into
base: main
Choose a base branch
from
Open

output formatting #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
78e03d2
initial commit of modifications
mcguirepatr Oct 11, 2023
3616fcf
update to handle GDD for too-short simulation periods
mcguirepatr Nov 7, 2023
2f54351
improved handling of GDD for too-short simulation periods
mcguirepatr Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/global.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5415,8 +5415,10 @@ real(dp) function SeasonalSumOfKcPot(TheDaysToCCini, TheGDDaysToCCini, L0, L12,
! 3. Calculate Sum
do Dayi = 1, L1234
! 3.1 calculate growing degrees for the day
!WRITE(*,*) Dayi,L1234,L123,GDDL1234
if (GetTemperatureFile() /= '(None)') then
read(fhandle, *) Tndayi, Txdayi
!WRITE(*,*) Tndayi, Txdayi
GDDi = DegreesDay(Tbase, Tupper, Tndayi, Txdayi, &
GetSimulParam_GDDMethod())
else
Expand Down
18 changes: 17 additions & 1 deletion src/project_input.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,8 @@ subroutine initialize_project_input(filename, NrRuns)

integer :: i, NrRuns_local

! write(*,*)'IPI',NrRuns

if (present(NrRuns)) then
NrRuns_local = NrRuns
else
Expand All @@ -169,6 +171,7 @@ subroutine initialize_project_input(filename, NrRuns)
do i = 1, NrRuns_local
call ProjectInput(i)%read_project_file(filename, i)
end do
! write(*,*)'IPI_local',NrRuns_local
end subroutine initialize_project_input


Expand Down Expand Up @@ -237,16 +240,26 @@ subroutine read_project_file(self, filename, NrRun)
iostat=rc)
read(fhandle, '(a)', iostat=rc) buffer
self%Description = trim(buffer)
! write(*,*)'RPF ',self%Description
read(fhandle, *, iostat=rc) self%VersionNr ! AquaCrop version Nr
! write(*,*)'RPF ',self%VersionNr
! write(*,*)'RPF ',NrRun

if (NrRun > 1) then
! Skip sections belonging to previous runs
do Runi = 1, (NrRun - 1)
do i = 1, 47
read(fhandle, *, iostat=rc) ! 5 + 42 lines with files
read(fhandle, *, iostat=rc) buffer ! 5 + 42 lines with files !buffer added
! if (i.eq.1) then
! write(*,*)'RPFSkip ',trim(buffer)
! end if
end do
end do
end if
if (NrRun > 127) then !PCM
read(fhandle, *, iostat=rc) buffer ! 5 + 42 lines with files !buffer added
! write(*,*)'RPFSkip ',trim(buffer)
end if

! 0. Year of cultivation and Simulation and Cropping period
read(fhandle, *, iostat=rc) self%Simulation_YearSeason
Expand All @@ -258,8 +271,10 @@ subroutine read_project_file(self, filename, NrRun)
! 1. Climate
read(fhandle, '(a)', iostat=rc) buffer
self%Climate_Info = trim(buffer)
! write(*,*)'RPF ',self%Climate_Info
read(fhandle, *, iostat=rc) buffer
self%Climate_Filename = trim(buffer)
! write(*,*)'RPF ',self%Climate_Filename
read(fhandle, *, iostat=rc) buffer
self%Climate_Directory = trim(buffer)

Expand All @@ -268,6 +283,7 @@ subroutine read_project_file(self, filename, NrRun)
self%Temperature_Info = trim(buffer)
read(fhandle, *, iostat=rc) buffer
self%Temperature_Filename = trim(buffer)
! write(*,*)'RPF ',self%Temperature_Filename
read(fhandle, *, iostat=rc) buffer
self%Temperature_Directory = trim(buffer)

Expand Down
Loading