Skip to content

322 use netcdf inputs for bios met #458

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

Closed
wants to merge 9 commits into from
Closed

322 use netcdf inputs for bios met #458

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
4029b65
Pipe BIOS met inputs through CRU routines
Whyborn Nov 4, 2024
723388a
Fix various minor things missed in previous commit
Whyborn Nov 4, 2024
2227ab8
Address some comments in PR458
Whyborn Nov 8, 2024
1a84a12
Added comment in cable_driver.F90 on unifying met routines.
Whyborn Nov 8, 2024
d5ddfb1
Added get_met_date routine to simplify prev/next day behaviour.
Whyborn Nov 8, 2024
2a4375a
Missed line concat and uncommented subroutine end
Whyborn Nov 8, 2024
32fd10a
Address feedback on PR
Whyborn Nov 18, 2024
6e157e5
Missed some closing blocks
Whyborn Nov 27, 2024
0a429f5
Removed now-superfluous code
Whyborn Nov 27, 2024
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
25 changes: 11 additions & 14 deletions offline/cable_cru_TRENDY.F90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,16 +537,6 @@ SUBROUTINE get_daily_met(CRU)
land_x, land_y, MetYear, MetDay, CRU%LeapYears, CRU%xDimSize,&
CRU%yDimSize, CRU%DirectRead)

!MetYear = CRU%cYear
!! If the variable is time recycled
!IF (CRU%isRecycled(VarIndx)) THEN
!MetYear = RecycledYear
!END IF

!! CRU%CTStep is the current day, which we use to index the netCDF arrays
!CALL read_metvals(CRU%MetDatasets(VarIndx), CRU%Met(VarIndx)%MetVals,&
!land_x, land_y, MetYear, CRU%CTStep, CRU%LeapYears, CRU%xDimSize,&
!CRU%yDimSize, CRU%DirectRead)
END DO IterateVariables

! Previous day variables
Expand Down Expand Up @@ -576,7 +566,7 @@ SUBROUTINE get_daily_met(CRU)
CRU%yDimSize, CRU%DirectRead)

! vph0900
CALL get_met_date(CRU%cYear, CRU%CTStep-1, CRU%IsRecycled(vph0900),&
CALL get_met_date(CRU%cYear, CRU%CTStep+1, CRU%IsRecycled(vph0900),&
CRU%RecycStartYear, CRU%MetRecycPeriod, CRU%LeapYears, MetYear,&
MetDay)
CALL read_metvals(CRU%MetDatasets(vph0900), CRU%Met(nextvph0900)%MetVals,&
Expand Down Expand Up @@ -742,7 +732,7 @@ SUBROUTINE get_met_date(SimYear, SimDay, IsRecycled, RecycleStart,&
! meteorology from 01/01/1951, and consequently some of the previos day's
! meteorology. The "previous day" with respect to the meteorology can be
! either 31/12/1950 or 31/12/1960, depending on when the MODULO is applied.
! The current approach would use 31/12/1949 as the previous day, which is less
! The current approach would use 31/12/1950 as the previous day, which is less
! likely to cause issues with large jumps in the time-local conditions.
! Also simplifies leap year handling. In that instance, we can simply check
! whether the new year is a leap year or not, instead of passing the new year
Expand All @@ -764,7 +754,14 @@ SUBROUTINE get_met_date(SimYear, SimDay, IsRecycled, RecycleStart,&
END IF

! Check the validity of the passed day
IF (SimDay <= 0) THEN
IF ((SimDay < -364) .OR. (SimDay > (DaysInYear + 365)) THEN
! Looking more than a year into the past/future- this routine was never
! meant for such tasks.
WRITE(ERROR_UNIT,*) "Looking too far into the past/future. "//&
"The get_met_date routine was only intended for nearby temporal "//&
"searching, not more than a year in the future/past."
EXIT 5
IF (SimDay < 1) THEN
! Go back to last year- set the day later, once we know whether the MetYear
! is a leapyear or not
MetYear = SimYear - 1
Expand All @@ -774,7 +771,7 @@ SUBROUTINE get_met_date(SimYear, SimDay, IsRecycled, RecycleStart,&
IF ((LeapYears) .AND. is_leapyear(MetYear)) THEN
MetDay = 366 + SimDay
END IF
ELSEIF (SimDay == (DaysInYear + 1)) THEN
ELSEIF (SimDay > DaysInYear) THEN
MetYear = SimYear + 1
MetDay = SimDay - DaysInYear
ELSE
Expand Down