Skip to content
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.

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

Changes to NORTRIP_multiroad code #1

Merged
merged 44 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
44 commits
Select commit Hold shift + click to select a range
af42f02
Indent fixes
ecaas Feb 12, 2024
934c115
:construction: Introduce reading and writing of init and summary file…
ecaas Apr 5, 2024
840e749
:wastebasket: Removed obsolete subroutine NORTRIP_read_t2m500yr_netcd…
ecaas Apr 5, 2024
ace5c96
Merge commit '225ecadee8f38f079d1f90228e6f3000ef42698e'
ecaas Apr 23, 2024
aec5eb0
Merge commit '225ecadee8f38f079d1f90228e6f3000ef42698e' into dev_mult…
ecaas Apr 23, 2024
1629a58
:wastebasket: Remove commented out code and fix indentations
ecaas May 3, 2024
fc47d9d
Cleanup and indentation fixes
ecaas May 14, 2024
d2b1b08
:construction:
ecaas May 24, 2024
561d03c
Merge branch 'master' of https://github.com/ecaas/NORTRIP_multiroad
ecaas May 24, 2024
e21905f
Merged with newest changes from upstream
ecaas May 24, 2024
7ac6944
:construction:
ecaas May 28, 2024
457607d
:construction: Read frost observations from netcdf
ecaas May 30, 2024
16618f5
Customizations for the SmartKjemi forecasts.
ecaas Jul 2, 2024
fe77ca3
Merge pull request #1 from ecaas/dev_multiroad_branch
ecaas Jul 2, 2024
7fea986
Renamed variable "no_of_timesteps" to "timesteps_in_hour"
ecaas Jul 12, 2024
45f8f6b
Indent fixes and clean up
ecaas Jul 18, 2024
a45a67e
Read obs station names from the dimension "station_id" in the netcdf …
ecaas Jul 25, 2024
e262d22
:construction:
ecaas Jul 31, 2024
5513b79
Added warning message
ecaas Aug 1, 2024
d1eef6a
:bug: Fixed typo in reading forecast meteorology
ecaas Aug 2, 2024
64da7a1
Merge with metno upstream (commit 68f34699)
ecaas Aug 2, 2024
4ef1e2e
Hardcoded fix for using observed radiation at Flesland
ecaas Aug 5, 2024
f4725e9
:bug: Don't modify longwave radiation if no skyview info is found.
ecaas Aug 8, 2024
24efc1f
Read relaxation e-folding time from config file and corrected precip.…
ecaas Aug 14, 2024
9d3d0ca
Read observed cloud fraction
ecaas Aug 19, 2024
c2cfe0d
Changed the relaxation function for meteo variables
ecaas Aug 23, 2024
b846377
Fixes to avoid errors when observations are missing
ecaas Sep 25, 2024
d45eeaf
:bug: fixed bug in reading forecast precipitation
ecaas Sep 25, 2024
b13d23f
Changes before merge with upstream
ecaas Sep 27, 2024
edb4a34
:bug: Fix to prevent fail when forecast meteo is requested but not av…
ecaas Sep 30, 2024
2992058
Updates to saving of obs meteo
ecaas Oct 9, 2024
90f5a30
:bug: Fixed bug related to relaxation of meteo variables
ecaas Oct 17, 2024
a06364b
Simplify matching of obs and model dates + look for previous obs file…
ecaas Oct 31, 2024
ebd405f
Corrected when relaxation of meteo variables is applied.
ecaas Nov 6, 2024
3f3e511
Fix for meteo relaxation & dewpoint to RH test in meteo reading
ecaas Nov 25, 2024
55ef8bf
:construction: WIP for using MET_analysis in combination with MET_for…
ecaas Nov 25, 2024
9bbf353
save MET_Nordic_analysis after MET_Nordic_forecast, changed RH bias c…
ecaas Dec 11, 2024
6b3880e
Changes from upstream + remove unused code
ecaas Dec 16, 2024
22a082a
Interpolate Nordic_analysis meteo, change RH relaxation, fix projecti…
ecaas Dec 17, 2024
49d385e
Changed 'Timevariation type' option 'normal2' to 'normal' for reading…
ecaas Dec 18, 2024
763bbaa
Precipitation fixes
ecaas Jan 6, 2025
9d30066
Fix for reading EF data faster
ecaas Jan 21, 2025
d118726
Fix for reading traffic data when dt < 1 hour
ecaas Jan 21, 2025
4c0f8e0
Merge with upstream
ecaas Jan 27, 2025
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
451 changes: 0 additions & 451 deletions NBLM/NBLM_functions.for

This file was deleted.

131 changes: 131 additions & 0 deletions NILU/incrtm.f90
Original file line number Diff line number Diff line change
Expand Up @@ -140,3 +140,134 @@ subroutine incrtm(hhchange,yyyy,mm,dd,hh)

end subroutine incrtm

subroutine minute_increment(minute_change,yyyy,mm,dd,hh,minutes)

implicit none

! *** This subroutine changes the INOUT time: yy mm dd hh by the integer value "minute_change".

INTEGER, INTENT(in) :: minute_change
INTEGER, INTENT(inout) :: yyyy
INTEGER, INTENT(inout) :: mm
INTEGER, INTENT(inout) :: dd
INTEGER, INTENT(inout) :: hh
INTEGER, INTENT(inout) :: minutes


! *** Local variables:

INTEGER :: i
INTEGER :: nday(12)


! *** Local function

LOGICAL :: LEAP

! *** LEAP - If leap year then true else false


nday = (/31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31/)


if (minute_change > 0 ) then

! **** Increment "minute_change" hours forward in time:

do i = 1, minute_change

if ( LEAP(yyyy) ) nday(2) = 29

!Increment minutes:

minutes = minutes + 1

if (minutes <= 59) cycle

! *** Increment one hour:

hh = hh + 1
minutes = 0

if (hh <= 23) cycle

! *** New day:

dd = dd + 1

hh = 0

if (dd <= nday(mm)) cycle

! *** New month:

mm = mm + 1

dd = 1

if (mm <= 12) cycle

! *** New year:

yyyy = yyyy + 1

mm = 1

enddo ! do i = 1, minute_change

elseif (minute_change < 0 ) then



do i = 1, -minute_change

if ( LEAP(yyyy) ) nday(2) = 29

! *** Decrement one hour:

hh = hh - 1

if (hh >= 0) cycle

! *** New day:

dd = dd - 1

hh = 23

if (dd >= 0) cycle

! *** New month:

mm = mm - 1

if (mm >=1 ) then

else

! *** Last year:

yyyy = yyyy - 1

mm = 12

endif

dd = nday(mm)

enddo ! do i = 1, minute_change

endif



return



! *** End of subroutine minute_increment



end subroutine minute_increment

Loading