Changes to NORTRIP_multiroad code

NILU/incrtm.f90

@@ -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
+

NORTRIP_multiroad_control_64bit.f90

@@ -119,12 +119,10 @@ subroutine NORTRIP_multiroad_control_64bit
 
     call NORTRIP_multiroad_read_activity_data
 
-    !Reorder the links and traffic data to fit the selection. Don't do it for the road weather option
+    !Reorder the links and traffic data to fit the selection.
     !It also sets the gridding flags so needs to be called
-    !if (index(calculation_type,'road weather').eq.0) then
-        call NORTRIP_multiroad_reorder_staticroadlink_data
-    !endif
-
+    call NORTRIP_multiroad_reorder_staticroadlink_data
+
     !Read DEM input data and make skyview file
     call process_terrain_data_64bit
 
@@ -139,9 +137,11 @@ subroutine NORTRIP_multiroad_control_64bit
         !Read in meteo data from MEPs or METCOOP data. This is standard
         call NORTRIP_read_metcoop_netcdf4 
         if (replace_meteo_with_yr.eq.1) then
-            !call NORTRIP_read_t2m500yr_netcdf4
             call NORTRIP_read_analysismeteo_netcdf4
         endif
+        if (replace_meteo_with_met_forecast.eq.1) then
+            call NORTRIP_read_MET_Nordic_forecast_netcdf4
+        endif
     elseif (index(meteo_data_type,'nora3').gt.0) then
         !Read in meteo data from MEPs or METCOOP data. This is standard
         call NORTRIP_read_nora3_netcdf4 
@@ -165,7 +165,11 @@ subroutine NORTRIP_multiroad_control_64bit
     endif
 
     !Read and replace meteo model data with meteo obs data
-    call NORTRIP_multiroad_read_meteo_obs_data
+    if ( read_obs_from_netcdf ) then
+        call NORTRIP_multiroad_read_meteo_obs_data_netcdf
+    else
+        call NORTRIP_multiroad_read_meteo_obs_data
+    end if
 
     !Set the number of road links to be save
     !n_roadlinks=10