From 1247c9dd439f0567db52e211dd524717acd8c4ac Mon Sep 17 00:00:00 2001 From: Steve Drake Date: Thu, 1 Aug 2024 14:17:22 -0700 Subject: [PATCH 1/2] Separate variable initialization from declaration --- src/share/ioModule.f90 | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/share/ioModule.f90 b/src/share/ioModule.f90 index ddadaee..0ac67b1 100644 --- a/src/share/ioModule.f90 +++ b/src/share/ioModule.f90 @@ -24,10 +24,11 @@ subroutine read_snow17_parameters(this, param_file_name, runinfo) ! local variables character(len=400) :: readline character(len=50) :: param - integer :: ios=0 ! specify i4b with nrtype? + integer :: ios integer :: pos integer :: n_params_read, nh ! counters + ios = 0 ! open parameter file open(unit=51,file=trim(param_file_name),status='old') @@ -163,7 +164,7 @@ SUBROUTINE init_forcing_files(namelist, runinfo, parameters) ! local variables character*480 :: filename logical :: lexist ! logical for whether the file specified by filename exists - integer :: ierr=0 ! error code returned by open(iostat = ierr) + integer :: ierr ! error code returned by open(iostat = ierr) integer :: nh ! loop counter ! local variables @@ -174,6 +175,7 @@ SUBROUTINE init_forcing_files(namelist, runinfo, parameters) print*, 'Initializing forcing files' ios = 0 found_start = 0 + ierr = 0 do nh=1, runinfo%n_hrus ! make filename to read @@ -260,12 +262,13 @@ subroutine read_areal_forcing(namelist, parameters, runinfo, forcing) type (forcing_type), intent(inout) :: forcing ! local variables - integer :: nh, ierr=0 + integer :: nh, ierr integer :: yr, mnth, dy, hr character(len=10) :: forcing_datehr !print*, "---"; print*, 'Current run datehr is ', runinfo%curr_datehr + ierr = 0 ! loop over sub-areas and read their forcings do nh=1, runinfo%n_hrus @@ -429,7 +432,7 @@ subroutine read_snow17_statefiles (modelvar, namelist, parameters, runinfo) ! local variables integer :: hru - integer :: ios = 0 + integer :: ios character(len=480) :: state_filename character(len=10) :: statefile_datehr character(len=10) :: state_datehr ! string to match date in input states @@ -437,6 +440,7 @@ subroutine read_snow17_statefiles (modelvar, namelist, parameters, runinfo) integer :: states_found ! counter to match hrus ! ---- code ----- + ios = 0 print*, 'Reading restart files' ! starting statefiles match format of statefile outputs (date then variables) From 79def2b1893912ef824420c48edc5e8db6bad198 Mon Sep 17 00:00:00 2001 From: Steve Drake Date: Thu, 1 Aug 2024 14:19:03 -0700 Subject: [PATCH 2/2] Initialize variables as parameters --- src/share/dateTimeUtilsModule.f90 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/share/dateTimeUtilsModule.f90 b/src/share/dateTimeUtilsModule.f90 index add68d6..e5db026 100644 --- a/src/share/dateTimeUtilsModule.f90 +++ b/src/share/dateTimeUtilsModule.f90 @@ -862,8 +862,8 @@ subroutine calendar_date (jdate, day, month, year) integer, intent (in) :: jdate integer, intent (out) :: day, month, year - integer :: y = 4716, j = 1401, m = 2, n = 12, r = 4, p = 1461 - integer :: v = 3, u = 5, s = 153, w = 2, b = 274277, c = - 38 + integer,parameter :: y = 4716, j = 1401, m = 2, n = 12, r = 4, p = 1461 + integer,parameter :: v = 3, u = 5, s = 153, w = 2, b = 274277, c = - 38 integer :: f, e, g, h f = jdate + j + (((4*jdate+b)/146097)*3) / 4 + c e = r * f + v