Commit aa19b692 authored by Xiaoqiang Yang's avatar Xiaoqiang Yang
Browse files

branches:nitrate-mhm5.7:revert changes on hydrological source code

parent 89743b60
No preview for this file type
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -152,10 +152,10 @@ Simulation Period (1)+(2) 2 1 1993 31 12 2015
--------------------------------------------------
Gauge No. Basin Id Qmax[m3/s] Qmin[m3/s]
1 1 0.066 0.006
2 1 -9999.000 -9999.000
3 1 -9999.000 -9999.000
2 1 0.036 0.001
3 1 0.006 0.000
4 1 0.029 0.003
5 1 -9999.000 -9999.000
5 1 0.007 0.000
--------------------------------------------------------------------------------
Basin-wise Configuration
......
......@@ -174,7 +174,7 @@ CONTAINS
aet_sealed = 0.0_dp
if (frac_sealed > 0.0_dp) then
tmp = storage_sealed + prec_effec* frac_sealed
tmp = storage_sealed + prec_effec!* frac_sealed
if (tmp > water_thresh_sealed) then
runoff_sealed = tmp - water_thresh_sealed
......@@ -186,7 +186,7 @@ CONTAINS
! aET from sealed area is propotional to the available water content
if(water_thresh_sealed .gt. eps_dp ) then
aet_sealed = frac_sealed *( pet / evap_coeff - aet_canopy) * (storage_sealed / water_thresh_sealed)
aet_sealed = ( pet / evap_coeff - aet_canopy) * (storage_sealed / water_thresh_sealed)
! numerical problem
if (aet_sealed .lt. 0.0_dp) aet_sealed = 0.0_dp
else
......@@ -210,7 +210,7 @@ CONTAINS
infiltration(:) = 0.0_dp
! for 1st layer input is prec_effec
prec_effec_soil = prec_effec* (1-frac_sealed)
prec_effec_soil = prec_effec!* (1-frac_sealed)
do hh = 1, size(soil_moist_sat,1) ! nHorizons
! input for other layers is the infiltration from its immediate upper layer will be input
......
......@@ -837,14 +837,14 @@ contains
call read_timeseries(trim(fName), udischarge, &
start_tmp, end_tmp, optimize, opti_function, &
data_dp_1d, mask=mask_1d, nMeasPerDay=nMeasPerDay)
! if ( .NOT. (all(mask_1d)) ) then
! call message()
! call message('***ERROR: Nodata values in inflow gauge time series. File: ', trim(fName))
! call message(' During simulation period from ', num2str(simPer(iBasin)%yStart) &
! ,' to ', num2str(simPer(iBasin)%yEnd))
! stop
! end if
! commonted by X.Yang 2017-08
if ( .NOT. (all(mask_1d)) ) then
call message()
call message('***ERROR: Nodata values in inflow gauge time series. File: ', trim(fName))
call message(' During simulation period from ', num2str(simPer(iBasin)%yStart) &
,' to ', num2str(simPer(iBasin)%yEnd))
stop
end if
data_dp_1d = merge(data_dp_1d, nodata_dp, mask_1d)
call paste(InflowGauge%Q, data_dp_1d, nodata_dp)
deallocate (data_dp_1d)
......
......@@ -511,7 +511,7 @@ CONTAINS
qOut) ! Intent INOUT
use mo_kind, only: i4, dp
use mo_mrm_constants, only: nodata_dp !added by yangx 2017-09
!use mo_mrm_constants, only: nodata_dp !added by yangx 2017-09
implicit none
! input variables
......@@ -531,7 +531,7 @@ CONTAINS
! discharge for inflow gauges (e.g. for missing upstream catchments) is added here
! should be put after UH attenuation because it is measured runoff at this cell
if (nInflowGauges .gt. 0) then
where (QInflow .eq. nodata_dp) QInflow = 0.0_dp
!where (QInflow .eq. nodata_dp) QInflow = 0.0_dp
do ii = 1, nInflowGauges
if (InflowHeadwater(ii)) then
! add inflowing water to water produced by upstream/headwater cells
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment