Skip to content

Commit

Permalink
no_snow_flag changed to snow_flag
Browse files Browse the repository at this point in the history
updates from Parker, including fix in climate_hru.f90
changed print of stress periods from I4 to I5
  • Loading branch information
rsregan committed Sep 6, 2024
1 parent 6721e1b commit b19cd08
Show file tree
Hide file tree
Showing 18 changed files with 162 additions and 152 deletions.
4 changes: 2 additions & 2 deletions GSFLOW/src/gsflow/gsflow_modflow.f
Original file line number Diff line number Diff line change
Expand Up @@ -442,7 +442,7 @@ SUBROUTINE MFNWT_RUN(AFR, Diversions, Idivert, EXCHANGE,
USE PRMS_CONSTANTS, ONLY: DEBUG_less, MODFLOW, ACTIVE, OFF,
& ERROR_time, ERROR_modflow, MODSIM_GSFLOW, GSFLOW, CANOPY,
& MODSIM_MODFLOW
USE PRMS_MODULE, ONLY: Kper_mfo, Kkiter, Timestep, no_snow_flag,
USE PRMS_MODULE, ONLY: Kper_mfo, Kkiter, Timestep, snow_flag,
& Init_vars_from_file, Mxsziter, Glacier_flag, AG_flag,
& PRMS_land_iteration_flag, activeHRU_inactiveCELL_flag,
& Model, GSFLOW_flag, Print_debug, Soilzone_module
Expand Down Expand Up @@ -666,7 +666,7 @@ SUBROUTINE MFNWT_RUN(AFR, Diversions, Idivert, EXCHANGE,
2 Model==MODSIM_GSFLOW) ) THEN
IF ( PRMS_land_iteration_flag==CANOPY ) THEN
retval = intcp()
IF ( no_snow_flag==OFF ) THEN
IF ( snow_flag==ACTIVE ) THEN
retval = snowcomp()
IF ( Glacier_flag==ACTIVE ) THEN
retval = glacr()
Expand Down
6 changes: 3 additions & 3 deletions GSFLOW/src/gsflow/gsflow_module.f90
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,12 @@ MODULE PRMS_MODULE
character(len=*), parameter :: PRMS_VERSION = 'Version 6.0.0 09/01/2024'
character(len=*), parameter :: githash = 'Github Commit Hash b7b217f master branch'
character(len=*), parameter :: Version_read_control_file = '2024-08-01'
character(len=*), parameter :: Version_read_parameter_file = '2024-06-21'
character(len=*), parameter :: Version_read_parameter_file = '2024-08-27'
character(len=*), parameter :: Version_read_data_file = '2023-06-02'
CHARACTER(LEN=8), SAVE :: Process
! Dimensions
INTEGER, SAVE :: Nratetbl, Nwateruse, Nexternal, Nconsumed, Npoigages, Ncascade, Ncascdgw, Ncbh
INTEGER, SAVE :: Nhru, Nssr, Ngw, Nsub, Nhrucell, Nlake, Ngwcell, Nlake_hrus
INTEGER, SAVE :: Nhru, Nssr, Ngw, Nsub, Nhrucell, Nlake, Ngwcell, Nlake_hrus, Nmonths
INTEGER, SAVE :: Ntemp, Nrain, Nsol, Nsegment, Ndepl, Nobs, Nevap, Ndeplval, Nmap2hru, Nmap, Nsnow
INTEGER, SAVE :: NLAKES_MF, Nreach
! Global
Expand Down Expand Up @@ -69,7 +69,7 @@ MODULE PRMS_MODULE
INTEGER, SAVE :: irrigation_apply_flag, Dyn_ag_frac_flag, Dyn_ag_soil_flag, activeHRU_inactiveCELL_flag
INTEGER, SAVE :: Dprst_add_water_use, Dprst_transfer_water_use
INTEGER, SAVE :: Snarea_curve_flag, Soilzone_aet_flag, snow_cloudcover_flag
INTEGER, SAVE :: seg2hru_flag, no_snow_flag, forcing_check_flag
INTEGER, SAVE :: seg2hru_flag, snow_flag, forcing_check_flag
CHARACTER(LEN=MAXFILE_LENGTH), SAVE :: Model_output_file, Var_init_file, Var_save_file
CHARACTER(LEN=MAXFILE_LENGTH), SAVE :: Gsflow_output_file, selectDatesFileName, Data_file, Stat_var_file
CHARACTER(LEN=MAXFILE_LENGTH), SAVE :: Csv_output_file, Model_control_file, Param_file
Expand Down
30 changes: 10 additions & 20 deletions GSFLOW/src/gsflow/gsflow_prms.f90
Original file line number Diff line number Diff line change
Expand Up @@ -453,7 +453,7 @@ SUBROUTINE gsflow_prms(Process_mode, AFR, MS_GSF_converge, Nsegshold, Nlakeshold
IF ( (PRMS_land_iteration_flag < 2 .AND. PRMS_flag==ACTIVE) .OR. Process_flag/=RUN ) THEN
ierr = intcp()

IF ( no_snow_flag==OFF ) THEN
IF ( snow_flag==ACTIVE ) THEN
ierr = snowcomp()

IF ( Glacier_flag==ACTIVE ) ierr = glacr()
Expand Down Expand Up @@ -680,7 +680,6 @@ SUBROUTINE setdims(AFR, Diversions, Idivert, EXCHANGE, DELTAVOL, LAKEVOL, Nsegsh
IF ( Model_mode(:5)=='PRMS5' .OR. Model_mode(:5)=='prms5' ) PRMS4_flag = OFF
IF ( Model_mode(:5)=='PRMS6' .OR. Model_mode(:5)=='prms6' ) THEN
PRMS4_flag = OFF
Model = PRMS6
PRMS6_flag = ACTIVE
ENDIF
PRMS_only = ACTIVE
Expand Down Expand Up @@ -1055,7 +1054,7 @@ SUBROUTINE setdims(AFR, Diversions, Idivert, EXCHANGE, DELTAVOL, LAKEVOL, Nsegsh
IF ( decldim('nmap', 0, MAXDIM, 'Number of mapped values')/=0 ) CALL read_error(7, 'nmap')
! 0 = no glacier simulation; 1 = glacr_melt (Ashley) simulation; 2 = Anderson method
IF ( control_integer(Glacier_flag, 'glacier_flag')/=0 ) Glacier_flag = OFF
IF ( control_integer(no_snow_flag, 'no_snow_flag')/=0 ) no_snow_flag = OFF
IF ( control_integer(snow_flag, 'snow_flag')/=0 ) snow_flag = ACTIVE
IF ( control_integer(Frozen_flag, 'frozen_flag')/=0 ) Frozen_flag = OFF
IF ( control_integer(Dyn_imperv_flag, 'dyn_imperv_flag')/=0 ) Dyn_imperv_flag = OFF
IF ( control_integer(Dyn_intcp_flag, 'dyn_intcp_flag')/=0 ) Dyn_intcp_flag = OFF
Expand Down Expand Up @@ -1120,9 +1119,9 @@ SUBROUTINE setdims(AFR, Diversions, Idivert, EXCHANGE, DELTAVOL, LAKEVOL, Nsegsh

! cascade
! if cascade_flag = 2 (CASCADE_HRU_SEGMENT), use hru_segment parameter for cascades, ncascade=ncascdgw=nhru (typical polygon HRUs)
IF ( control_integer(Cascade_flag, 'cascade_flag')/=0 ) Cascade_flag = ACTIVE
IF ( control_integer(Cascade_flag, 'cascade_flag')/=0 ) Cascade_flag = CASCADE_NORMAL
! if cascadegw_flag = 2 (CASCADEGW_SAME), use same cascades as HRUs
IF ( control_integer(Cascadegw_flag, 'cascadegw_flag')/=0 ) Cascadegw_flag = OFF
IF ( control_integer(Cascadegw_flag, 'cascadegw_flag')/=0 ) Cascadegw_flag = CASCADE_NORMAL

! spatial units
IF ( decldim('ngw', 1, MAXDIM, 'Number of GWRs')/=0 ) CALL read_error(7, 'ngw')
Expand Down Expand Up @@ -1158,6 +1157,7 @@ SUBROUTINE setdims(AFR, Diversions, Idivert, EXCHANGE, DELTAVOL, LAKEVOL, Nsegsh
IF ( declfix('ndays', MAX_DAYS_PER_YEAR, MAX_DAYS_PER_YEAR, 'Maximum number of days in a year ')/=0 ) &
& CALL read_error(7, 'ndays')
IF ( declfix('nmonths', 12, 12, 'Number of months in a year')/=0 ) CALL read_error(7, 'nmonths')
Nmonths = 12
IF ( declfix('one', 1, 1, 'Number of values for scaler array')/=0 ) CALL read_error(7, 'one')

IF ( Inputerror_flag==1 ) THEN
Expand Down Expand Up @@ -1591,20 +1591,20 @@ SUBROUTINE gsflow_prms_restart(In_out)
INTRINSIC :: TRIM
! Local Variables
INTEGER :: nhru_test, dprst_test, nsegment_test, temp_test, et_test, ierr, time_step
INTEGER :: cascade_test, cascdgw_test, nhrucell_test, nlake_test, transp_test, start_time(6), end_time(6)
INTEGER :: nhrucell_test, nlake_test, transp_test, start_time(6), end_time(6)
CHARACTER(LEN=MAXCONTROL_LENGTH) :: model_test
CHARACTER(LEN=11) :: module_name
!***********************************************************************
IF ( In_out==SAVE_INIT ) THEN
IF ( text_restart_flag==OFF ) THEN
WRITE ( Restart_outunit ) MODNAME
WRITE ( Restart_outunit ) Timestep, Nhru, Dprst_flag, Nsegment, Temp_flag, Et_flag, &
& Cascade_flag, Cascadegw_flag, Nhrucell, Nlake, Transp_flag, Model_mode
& Nhrucell, Nlake, Transp_flag, Model_mode
WRITE ( Restart_outunit ) Starttime, Endtime
ELSE
WRITE ( Restart_outunit, * ) MODNAME
WRITE ( Restart_outunit, * ) Timestep, Nhru, Dprst_flag, Nsegment, Temp_flag, Et_flag, &
Cascade_flag, Cascadegw_flag, Nhrucell, Nlake, Transp_flag, Model_mode
Nhrucell, Nlake, Transp_flag, Model_mode
WRITE ( Restart_outunit, * ) Starttime, Endtime
ENDIF
ELSE
Expand All @@ -1613,13 +1613,13 @@ SUBROUTINE gsflow_prms_restart(In_out)
READ ( Restart_inunit ) module_name
CALL check_restart(MODNAME, module_name)
READ ( Restart_inunit ) time_step, nhru_test, dprst_test, nsegment_test, temp_test, et_test, &
& cascade_test, cascdgw_test, nhrucell_test, nlake_test, transp_test, model_test
& nhrucell_test, nlake_test, transp_test, model_test
READ ( Restart_inunit ) start_time, end_time
ELSE
READ ( Restart_inunit, * ) module_name
CALL check_restart(MODNAME, module_name)
READ ( Restart_inunit, * ) time_step, nhru_test, dprst_test, nsegment_test, temp_test, et_test, &
cascade_test, cascdgw_test, nhrucell_test, nlake_test, transp_test, model_test
nhrucell_test, nlake_test, transp_test, model_test
READ ( Restart_inunit, * ) start_time, end_time
ENDIF
IF ( Print_debug>DEBUG_minimum ) PRINT 4, EQULS, 'Simulation time period of Restart File:', &
Expand All @@ -1639,16 +1639,6 @@ SUBROUTINE gsflow_prms_restart(In_out)
PRINT *, ' Current model has dprst_flag=', Dprst_flag, ' they must be equal'
ierr = 1
ENDIF
IF ( Cascade_flag/=cascade_test ) THEN
PRINT *, 'ERROR, Initial Conditions File saved for model with cascade_flag=', cascade_test
PRINT *, ' Current model has cascade_flag=', Cascade_flag, ' they must be equal'
ierr = 1
ENDIF
IF ( Cascadegw_flag/=cascdgw_test ) THEN
PRINT *, 'ERROR, Initial Conditions File saved for model with cascadegw_flag=', cascdgw_test
PRINT *, ' Current model has cascadegw_flag=', Cascadegw_flag, ' they must be equal'
ierr = 1
ENDIF
CALL check_restart_dimen('nsegment', nsegment_test, Nsegment, ierr)
! Temp_flag (1=temp_1sta; 2=temp_laps; 3=temp_dist2; 5=ide_dist; 6=xyz_dist; 7=climate_hru; 8=temp_sta
IF ( Temp_flag/=temp_test ) THEN
Expand Down
26 changes: 13 additions & 13 deletions GSFLOW/src/modflow/gwf2bas7_NWT.f
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ SUBROUTINE GWF2BAS7ST(KPER,IGRID)
C
C1------WRITE STRESS PERIOD INFORMATION
WRITE (IOUT,1) KPER,PERLEN(KPER),NSTP(KPER),TSMULT(KPER)
1 FORMAT('1',/28X,'STRESS PERIOD NO. ',I4,', LENGTH =',G15.7,/
1 FORMAT('1',/28X,'STRESS PERIOD NO. ',I5,', LENGTH =',G15.7,/
1 28X,47('-'),//
2 30X,'NUMBER OF TIME STEPS =',I6,//
3 31X,'MULTIPLIER FOR DELT =',F10.3)
Expand Down Expand Up @@ -579,7 +579,7 @@ SUBROUTINE GWF2BAS7OT(KSTP,KPER,ICNVG,ISA,IGRID,BUDPERC)
IF(ISA.EQ.0) THEN
WRITE(IOUT,9) KSTP,KPER
9 FORMAT(1X,/9X,'NO FLOW EQUATION TO SOLVE IN TIME STEP',I5,
1 ' OF STRESS PERIOD',I3,/1X,'ALL HEADS ARE 0.0')
1 ' OF STRESS PERIOD',I5,/1X,'ALL HEADS ARE 0.0')
IPFLG=1
END IF
C
Expand All @@ -588,7 +588,7 @@ SUBROUTINE GWF2BAS7OT(KSTP,KPER,ICNVG,ISA,IGRID,BUDPERC)
WRITE(IOUT,17) KSTP,KPER
17 FORMAT(1X,/9X,
1 '****FAILED TO MEET SOLVER CONVERGENCE CRITERIA IN TIME STEP',
2 I5,' OF STRESS PERIOD ',I4,'****')
2 I5,' OF STRESS PERIOD ',I5,'****')
IPFLG=1
END IF
C
Expand Down Expand Up @@ -683,7 +683,7 @@ SUBROUTINE SGWF2BAS7ARDIS(IUDIS,IOUT)
WRITE(IOUT,15) NLAY,NROW,NCOL
15 FORMAT(1X,I4,' LAYERS',I10,' ROWS',I10,' COLUMNS')
WRITE(IOUT,20) NPER
20 FORMAT(1X,I4,' STRESS PERIOD(S) IN SIMULATION')
20 FORMAT(1X,I5,' STRESS PERIOD(S) IN SIMULATION')
C
C5------SELECT AND PRINT A MESSAGE SHOWING TIME UNIT.
IF(ITMUNI.LT.0 .OR. ITMUNI.GT.5) ITMUNI=0
Expand Down Expand Up @@ -915,7 +915,7 @@ SUBROUTINE SGWF2BAS7D(KSTP,KPER,IPFLG,ISA)
IF(IOFLG(K,4).EQ.0) GO TO 79
IF(IFIRST.EQ.1) WRITE(IOUT,74) IDDNUN,KSTP,KPER
74 FORMAT(1X,/1X,'DRAWDOWN WILL BE SAVED ON UNIT ',I4,
1 ' AT END OF TIME STEP',I5,', STRESS PERIOD ',I4)
1 ' AT END OF TIME STEP',I5,', STRESS PERIOD ',I5)
IFIRST=0
IF(CDDNFM.EQ.' ') THEN
CALL ULASAV(BUFF(:,:,K),TEXT,KSTP,KPER,PERTIM,TOTIM,NCOL,
Expand Down Expand Up @@ -1010,7 +1010,7 @@ SUBROUTINE SGWF2BAS7H(KSTP,KPER,IPFLG,ISA)
IF(IOFLG(K,3).EQ.0) GO TO 79
IF(IFIRST.EQ.1) WRITE(IOUT,74) IHEDUN,KSTP,KPER
74 FORMAT(1X,/1X,'HEAD WILL BE SAVED ON UNIT ',I4,
1 ' AT END OF TIME STEP',I5,', STRESS PERIOD ',I4)
1 ' AT END OF TIME STEP',I5,', STRESS PERIOD ',I5)
IFIRST=0
IF(CHEDFM.EQ.' ') THEN
CALL ULASAV(BUFF(:,:,K),TEXT,KSTP,KPER,PERTIM,TOTIM,NCOL,
Expand Down Expand Up @@ -1061,7 +1061,7 @@ SUBROUTINE SGWF2BAS7IB(KSTP,KPER)
IF(IOFLG(K,5).EQ.0) GO TO 79
IF(IFIRST.EQ.1) WRITE(IOUT,74) IBOUUN,KSTP,KPER
74 FORMAT(1X,/1X,'IBOUND WILL BE SAVED ON UNIT ',I4,
1 ' AT END OF TIME STEP',I5,', STRESS PERIOD ',I4)
1 ' AT END OF TIME STEP',I5,', STRESS PERIOD ',I5)
IFIRST=0
CALL ULASV3(IBOUND(:,:,K),TEXT,KSTP,KPER,PERTIM,TOTIM,NCOL,
1 NROW,KK,IBOUUN,CBOUFM,LBBOSV)
Expand Down Expand Up @@ -1367,7 +1367,7 @@ SUBROUTINE SGWF2BAS7T(KSTP,KPER,DELT,PERTIM,TOTIM,ITMUNI,IOUT)
C ------------------------------------------------------------------
WRITE(IOUT,199) KSTP,KPER
199 FORMAT(1X,///9X,'TIME SUMMARY AT END OF TIME STEP',I5,
1 ' IN STRESS PERIOD ',I4)
1 ' IN STRESS PERIOD ',I5)
C
C1------USE TIME UNIT INDICATOR TO GET FACTOR TO CONVERT TO SECONDS.
ZERO=0.
Expand Down Expand Up @@ -1572,7 +1572,7 @@ SUBROUTINE SGWF2BAS7V(MSUM,VBNM,VBVL,KSTP,KPER,IOUT,BUDPERC)
C ---FORMATS
C
260 FORMAT('1',/2X,'VOLUMETRIC BUDGET FOR ENTIRE MODEL AT END OF'
1,' TIME STEP',I5,', STRESS PERIOD',I4/2X,78('-'))
1,' TIME STEP',I5,', STRESS PERIOD',I5/2X,78('-'))
265 FORMAT(1X,/5X,'CUMULATIVE VOLUMES',6X,'L**3',7X
1,'RATES FOR THIS TIME STEP',6X,'L**3/T'/5X,18('-'),17X,24('-')
2//11X,'IN:',38X,'IN:'/11X,'---',38X,'---')
Expand Down Expand Up @@ -1605,8 +1605,8 @@ SUBROUTINE SGWF2BAS7N(KPER,KSTP,INOC,IOUT,NLAY)
5 FORMAT(1X,/1X,'OUTPUT CONTROL WAS SPECIFIED FOR A NONEXISTENT',
1 ' TIME STEP',/
2 1X,'OR OUTPUT CONTROL DATA ARE NOT ENTERED IN ASCENDING ORDER',
3 /1X,'OUTPUT CONTROL STRESS PERIOD ',I4,' TIME STEP',I5,/
4 1X,'MODEL STRESS PERIOD ',I4,' TIME STEP',I5,/
3 /1X,'OUTPUT CONTROL STRESS PERIOD ',I5,' TIME STEP',I5,/
4 1X,'MODEL STRESS PERIOD ',I5,' TIME STEP',I5,/
5 1X,'APPLYING THE SPECIFIED OUTPUT CONTROL TO THE CURRENT TIME',
6 ' STEP')
IPEROC=KPER
Expand All @@ -1627,15 +1627,15 @@ SUBROUTINE SGWF2BAS7N(KPER,KSTP,INOC,IOUT,NLAY)
C3------AND RETURN.
IF(IPEROC.NE.KPER .OR. ITSOC.NE.KSTP) THEN
WRITE(IOUT,11) KPER,KSTP
11 FORMAT(1X,/1X,'NO OUTPUT CONTROL FOR STRESS PERIOD ',I4,
11 FORMAT(1X,/1X,'NO OUTPUT CONTROL FOR STRESS PERIOD ',I5,
1 ' TIME STEP',I5)
RETURN
END IF
C
C4------OUTPUT CONTROL TIME STEP MATCHES SIMULATION TIME STEP.
IDDREF=IDDREFNEW
WRITE(IOUT,12) IPEROC,ITSOC
12 FORMAT(1X,/1X,'OUTPUT CONTROL FOR STRESS PERIOD ',I4,
12 FORMAT(1X,/1X,'OUTPUT CONTROL FOR STRESS PERIOD ',I5,
1 ' TIME STEP',I5)
IF(IDDREFNEW.NE.0) WRITE(IOUT,52)
52 FORMAT(1X,'Drawdown Reference will be reset at the',
Expand Down
2 changes: 1 addition & 1 deletion GSFLOW/src/modflow/gwf2uzf1_NWT.f
Original file line number Diff line number Diff line change
Expand Up @@ -4256,7 +4256,7 @@ SUBROUTINE GWF2UZF1BD(Kkstp, Kkper, Iunitlak, Iunitsfr, Igrid)
IF ( IBUDFL.GT.0 ) WRITE (IOUT, 9015)
C67-----FORMATS.
9002 FORMAT (1X//,'UNSATURATED ZONE PACKAGE VOLUMETRIC BUDGET FOR ',
+ ' TIME STEP', I6, ' STRESS PERIOD ', I4, /2X, 78('-')//) !gsf
+ ' TIME STEP', I6, ' STRESS PERIOD ', I5, /2X, 78('-')//) !gsf
9003 FORMAT (1X, /5X, 'CUMULATIVE VOLUMES', 6X, 'L**3', 7X,
+ 'RATES FOR THIS TIME STEP', 6X, 'L**3/T'/5X, 18('-'), 17X,
+ 24('-')//11X, 'IN:', 38X, 'IN:'/11X, '---', 38X, '---')
Expand Down
15 changes: 15 additions & 0 deletions GSFLOW/src/prms/basin.f90
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,8 @@ MODULE PRMS_BASIN
INTEGER, SAVE, ALLOCATABLE :: Gwr_type(:), Hru_route_order(:), Gwr_route_order(:)
INTEGER, SAVE :: Weir_gate_flag, Puls_lin_flag
DOUBLE PRECISION, SAVE, ALLOCATABLE :: Hru_area_dble(:), Lake_area(:)
!! LOGICAL, ALLOCATABLE, SAVE :: active_mask(:)
!! INTEGER, ALLOCATABLE, SAVE :: active_mask_hru(:)
! Declared Variables
REAL, SAVE, ALLOCATABLE :: Hru_frac_perv(:), Ag_area(:)
REAL, SAVE, ALLOCATABLE :: Hru_frac_imperv(:), Hru_frac_dprst(:)
Expand Down Expand Up @@ -599,6 +601,19 @@ INTEGER FUNCTION basinit()
Active_hrus = j
Active_area = Land_area + Water_area

!! ! Create mask of only active HRUs
!! allocate( active_mask(nhru)
!! active_mask = .false.
!! where (hru_type /= INACTIVE) active_mask = .true.
!! active_mask_hru(Active_hrus) )
!! j = 0
!! do i = 1, Nhru
!! if ( active_mask(i) ) then
!! j = j + 1
!! active_mask_hru(j) = i
!! endif
!! enddo

Active_gwrs = Active_hrus
IF ( gwflow_flag==ACTIVE .OR. activeHRU_inactiveCELL_flag == ACTIVE ) THEN
Gwr_type = Hru_type
Expand Down
2 changes: 1 addition & 1 deletion GSFLOW/src/prms/c_read_parameter_file.f90
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ module PRMS_READ_PARAM_FILE
integer, pointer :: values_int_1d(:)
integer, pointer :: values_int_2d(:, :)
real :: maximum, minimum, default_real
character(LEN=16), pointer :: values_char_1d(:)
character(LEN=16), pointer :: values_char_1d(:), values_char_0d
end type PRMS_parameter

type(PRMS_parameter), save, allocatable :: Parameter_data(:)
Expand Down
4 changes: 2 additions & 2 deletions GSFLOW/src/prms/climate_hru.f90
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ INTEGER FUNCTION climate_hru()
IF ( istop==0 ) THEN
IF ( cbh_active_flag==ACTIVE ) THEN
Swrad = -999.0
DO i = i, Ncbh
DO i = 1, Ncbh
Swrad(cbh_hru_id(i)) = values(i)
ENDDO
ENDIF
Expand All @@ -190,7 +190,7 @@ INTEGER FUNCTION climate_hru()
IF ( istop==0 ) THEN
IF ( cbh_active_flag==ACTIVE ) THEN
Transp_on = -999
DO i = i, Ncbh
DO i = 1, Ncbh
Transp_on(cbh_hru_id(i)) = ivalues(i)
ENDDO
ENDIF
Expand Down
6 changes: 3 additions & 3 deletions GSFLOW/src/prms/climateflow.f90
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ INTEGER FUNCTION climateflow_decl()
& Strmflow_module, Temp_module, Stream_order_flag, PRMS6_flag, &
& Precip_module, Solrad_module, Transp_module, Et_module, PRMS4_flag, &
& Soilzone_module, Srunoff_module, Call_cascade, Et_flag, Dprst_flag, Solrad_flag, Humidity_cbh_flag, &
& AG_flag, PRMS_land_iteration_flag, GSFLOW_flag, no_snow_flag, gwflow_flag, Nhrucell
& AG_flag, PRMS_land_iteration_flag, GSFLOW_flag, snow_flag, gwflow_flag, Nhrucell
use PRMS_MMFAPI, only: declvar_int, declvar_dble, declvar_real
use PRMS_READ_PARAM_FILE, only: declparam
USE PRMS_CLIMATEVARS
Expand Down Expand Up @@ -648,7 +648,7 @@ INTEGER FUNCTION climateflow_decl()
ALLOCATE ( Snowmelt(Nhru) )
ALLOCATE ( Pptmix_nopack(Nhru) )
ALLOCATE ( It0_pkwater_equiv(Nhru) )
IF ( no_snow_flag==OFF ) THEN
IF ( snow_flag==ACTIVE ) THEN
CALL declvar_dble('snowcomp', 'basin_pweqv', 'one', 1, &
& 'Basin area-weighted average snowpack water equivalent (not including glacier)', &
& 'inches', Basin_pweqv)
Expand Down Expand Up @@ -1097,7 +1097,7 @@ INTEGER FUNCTION climateflow_init()
IF ( getparam_real(Temp_module, 'tmax_adj', Nhru*MONTHS_PER_YEAR, Tmax_aspect_adjust)/=0 ) &
CALL read_error(2, 'tmax_adj')
ENDIF
ENDIF
ENDIF

IF ( getparam_int(Temp_module, 'temp_units', 1, Temp_units)/=0 ) CALL read_error(2, 'temp_units')

Expand Down
6 changes: 3 additions & 3 deletions GSFLOW/src/prms/dynamic_param_read.f90
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ MODULE PRMS_DYNAMIC_PARAM_READ
REAL, SAVE, ALLOCATABLE :: Temp(:), Potet_coef(:, :)
! Control Parameters
CHARACTER(LEN=MAXFILE_LENGTH) :: wrain_intcp_dynamic, srain_intcp_dynamic, snow_intcp_dynamic, covtype_dynamic
CHARACTER(LEN=MAXFILE_LENGTH) :: potetcoef_dynamic, transpbeg_dynamic, transpend_dynamic
CHARACTER(LEN=MAXFILE_LENGTH) :: potet_coef_dynamic, transpbeg_dynamic, transpend_dynamic
CHARACTER(LEN=MAXFILE_LENGTH) :: radtrncf_dynamic, dynamic_param_log_file
CHARACTER(LEN=MAXFILE_LENGTH) :: fallfrost_dynamic, springfrost_dynamic, transp_on_dynamic, snareathresh_dynamic
CHARACTER(LEN=MAXFILE_LENGTH) :: covden_sum_dynamic, covden_win_dynamic, sro2dprst_perv_dyn, sro2dprst_imperv_dyn
Expand Down Expand Up @@ -165,8 +165,8 @@ INTEGER FUNCTION dynparaminit()

IF ( Dyn_potet_flag>OFF ) THEN
ALLOCATE ( Potet_coef(Nhru,MONTHS_PER_YEAR) )
IF ( control_string(potetcoef_dynamic, 'potetcoef_dynamic')/=0 ) CALL read_error(5, 'potetcoef_dynamic')
CALL find_header_end(Potetcoef_unit, potetcoef_dynamic, ierr)
IF ( control_string(potet_coef_dynamic, 'potet_coef_dynamic')/=0 ) CALL read_error(5, 'potet_coef_dynamic')
CALL find_header_end(Potetcoef_unit, potet_coef_dynamic, ierr)
IF ( ierr==0 ) THEN
CALL find_current_file_time(Potetcoef_unit, year, month, day, Potetcoef_next_yr, Potetcoef_next_mo, Potetcoef_next_day)
ELSE
Expand Down
Loading

0 comments on commit b19cd08

Please sign in to comment.