Skip to content

Commit 5de4be1

Browse files
crazyzljcrazyzlj
committed
Update to 2012Rev637
1 parent 5607f13 commit 5de4be1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+881
-752
lines changed

‎VERSIONS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
VERSION_MAJOR 2012
2-
VERSION_MINOR 627
2+
VERSION_MINOR 637
33
VERSION_PATCH

‎src/addh.f‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,8 @@ subroutine addh
88
!! hhvaroute(:,:,:)|varies |routing storage array for hourly time step
99
!! ievent |none |rainfall/runoff code
1010
!! |0 daily rainfall/curve number technique
11-
!! |1 daily rainfall/Green&Ampt technique/daily
11+
!! |1 sub-daily rainfall/Green&Ampt/hourly
1212
!! | routing
13-
!! |2 sub-daily rainfall/Green&Ampt technique/
14-
!! | daily routing
15-
!! |3 sub-daily rainfall/Green&Ampt/hourly routing
1613
!! ihout |none |outflow hydrograph storage location number
1714
!! inum1 |none |hydrograph storage location number of
1815
!! |first dataset to be added
@@ -70,7 +67,7 @@ subroutine addh
7067

7168

7269
!! add hydrograph points (hourly time step)
73-
if (ievent > 2) then
70+
if (ievent > 0) then
7471
! do kk = 1, 24
7572
do kk = 1, nstep ! modified for urban modeling by J.Jeong 4/15/2008
7673
if (hhvaroute(2,inum1,kk) + hhvaroute(2,inum2,kk) > 0.1) then

‎src/allocate_parms.f‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,12 @@ subroutine allocate_parms
6464
motot = 600 !! (50 years limit)
6565

6666
allocate (surlag(mhru))
67+
allocate (cdn(mhru))
68+
allocate (cmn(mhru))
69+
allocate (nperco(mhru))
70+
allocate (phoskd(mhru))
71+
allocate (psp(mhru))
72+
allocate (sdnco(mhru))
6773
!!!!!!!!!! drains
6874
allocate (wnan(mlyr))
6975

@@ -355,7 +361,11 @@ subroutine allocate_parms
355361
allocate (rammo_mo(motot,msub))
356362
allocate (drydep_no3_mo(motot,msub))
357363
allocate (drydep_nh4_mo(motot,msub))
358-
!!! atmospheric deposition by month
364+
!!! atmospheric deposition by day
365+
allocate (rcn_d(msub))
366+
allocate (rammo_d(msub))
367+
allocate (drydep_no3_d(msub))
368+
allocate (drydep_nh4_d(msub))
359369

360370
allocate (fcst_reg(msub))
361371
allocate (harg_petco(msub))
@@ -380,6 +390,7 @@ subroutine allocate_parms
380390
allocate (phutot(msub))
381391
allocate (plaps(msub))
382392
allocate (rammo_sub(msub))
393+
allocate (atmo_day(msub))
383394
allocate (rcn_sub(msub))
384395
allocate (sub_bactlp(msub))
385396
allocate (sub_bactp(msub))
@@ -598,6 +609,10 @@ subroutine allocate_parms
598609
allocate (lkspst_bry(mres))
599610
allocate (lkspst_conc(mres))
600611
allocate (lkspst_rea(mres))
612+
allocate (theta_n(mres))
613+
allocate (theta_p(mres))
614+
allocate (con_nirr(mres))
615+
allocate (con_pirr(mres))
601616
allocate (mores(mres))
602617
allocate (ndtargr(mres))
603618
allocate (oflowmn_fps(mres))
@@ -1197,7 +1212,9 @@ subroutine allocate_parms
11971212
allocate (potlagi(mhru))
11981213

11991214
allocate (pplnt(mhru))
1200-
allocate (prf(mch)) !Moriasi 4/8/14
1215+
allocate (prf(mch)) !Moriasi 4/8/14
1216+
allocate (spcon(mch))
1217+
allocate (spexp(mch))
12011218
allocate (qdr(mhru))
12021219
allocate (qdayout(mhru))
12031220
allocate (rch_dakm(mxsubch))

‎src/alph.f‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,8 @@ subroutine alph(iwave)
1414
!! |precipitation data for sub-daily modeling
1515
!! ievent |none |rainfall/runoff code
1616
!! |0 daily rainfall/curve number technique
17-
!! |1 daily rainfall/Green&Ampt technique/daily
17+
!! |1 sub-daily rainfall/Green&Ampt/hourly
1818
!! | routing
19-
!! |2 sub-daily rainfall/Green&Ampt technique/
20-
!! | daily routing
21-
!! |3 sub-daily rainfall/Green&Ampt/hourly routing
2219
!! ihru |none |HRU number
2320
!! iwave |none |flag to differentiate calculation of HRU and
2421
!! |subbasin sediment calculation
@@ -79,7 +76,7 @@ subroutine alph(iwave)
7976
ab = 0.02083
8077

8178
select case (ievent)
82-
case(0, 1) !! daily rainfall, estimate al5
79+
case(0) !! daily rainfall, estimate al5
8380
preceff = 0.
8481
if (iwave > 0) then
8582
!! subbasin sediment calculations
@@ -110,7 +107,7 @@ subroutine alph(iwave)
110107
al5 = amp_r(i_mo,hru_sub(j))
111108
end if
112109

113-
case default !! subdaily rainfall, get from pcp data
110+
case (1) !! subdaily rainfall, get from pcp data
114111
if (idt <= 30) then
115112
k = 0
116113
k = 30 / idt

‎src/anfert.f‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -341,7 +341,7 @@ subroutine anfert
341341

342342
if (imgt == 1) then
343343
write (143, 1000) subnum(j), hruno(j), iyr, i_mo, iida,
344-
* " ",
344+
* hru_km(j), " ",
345345
* "AUTOFERT", phubase(j), phuacc(j), sol_sw(j),bio_ms(j),
346346
* sol_rsd(1,j),sol_sumno3(j),sol_sumsolp(j), dwfert,
347347
* fertno3, fertnh3, fertorgn, fertsolp, fertorgp
@@ -350,7 +350,7 @@ subroutine anfert
350350
endif
351351

352352

353-
1000 format (a5,1x,a4,3i6,2a15,7f10.2,20x,f10.2,10x,5f10.2)
353+
1000 format (a5,1x,a4,3i6,1x,e10.5,1x,2a15,7f10.2,20x,f10.2,10x,5f10.2)
354354

355355
return
356356
end subroutine

‎src/apex_day.f‎

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,8 @@ subroutine apex_day
1111
!! id1 |julian date |first day of simulation in year
1212
!! ievent |none |rainfall/runoff code
1313
!! |0 daily rainfall/curve number technique
14-
!! |1 daily rainfall/Green&Ampt technique/daily
14+
!! |1 sub-daily rainfall/Green&Ampt/hourly
1515
!! | routing
16-
!! |2 sub-daily rainfall/Green&Ampt technique/
17-
!! | daily routing
18-
!! |3 sub-daily rainfall/Green&Ampt/hourly routing
1916
!! inum1 |none |reach number
2017
!! ifirstr(:) |none |measured data search code
2118
!! |0 first day of measured data located in file
@@ -108,7 +105,7 @@ subroutine apex_day
108105

109106
do j = 1, mvaro
110107
varoute(j,ihout) = 0.
111-
if (ievent > 1) then
108+
if (ievent > 0) then
112109
do ii = 1, nstep
113110
hhvaroute(j,ihout,ii) = 0.
114111
end do
@@ -145,14 +142,16 @@ subroutine apex_day
145142
varoute(15,ihout) = 0.0
146143
varoute(16,ihout) = 0.0
147144
varoute(17,ihout) = 0.0
148-
varoute(18,ihout) = 0.0
145+
varoute(18,ihout) = 0.0
149146
varoute(19,ihout) = 0.0
150147
varoute(20,ihout) = 0.0
151148
varoute(21,ihout) = 0.0
152-
varoute(22,ihout) = 0.0
153-
read (112+inum1,*) idapa(inum1), iypa(inum1), flodaya(inum1),
149+
varoute(22,ihout) = 0.0
150+
if (curyr /= nbyr .and. iida /= idal) then
151+
read (112+inum1,*) idapa(inum1), iypa(inum1), flodaya(inum1),
154152
& seddaya(inum1), orgndaya(inum1), orgpdaya(inum1), no3daya(inum1),
155153
& minpdaya(inum1)
154+
endif
156155
else
157156
varoute(2,ihout) = 0.0
158157
varoute(3,ihout) = 0.0
@@ -176,7 +175,7 @@ subroutine apex_day
176175
varoute(22,ihout) = 0.0
177176
endif
178177

179-
if (ievent > 2) then
178+
if (ievent > 0) then
180179
do ii = 1, nstep
181180
hhvaroute(2,ihout,ii) = flodaya(inum1) / real(nstep)
182181
hhvaroute(3,ihout,ii) = seddaya(inum1) / real(nstep)

‎src/autoirr.f‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ subroutine autoirr
183183

184184
if (imgt == 1) then
185185
write (143, 1000) subnum(j), hruno(j), iyr, i_mo, iida,
186-
* " ", " AUTOIRR", phubase(j), phuacc(j)
186+
* hru_km(j), " ", " AUTOIRR", phubase(j), phuacc(j)
187187
* , sol_sw(j),bio_ms(j), sol_rsd(1,j),sol_sumno3(j)
188188
* ,sol_sumsolp(j), aird(j)
189189
* ,irrsc(j), irrno(j)
@@ -192,7 +192,8 @@ subroutine autoirr
192192
endif
193193
end if
194194

195-
1000 format (a5,1x,a4,3i6,2a15,7f10.2,10x,f10.2,70x,i10,10x,i10)
195+
1000 format (a5,1x,a4,3i6,1x,e10.5,1x,2a15,7f10.2,10x,f10.2,70x,i10,
196+
* 10x,i10)
196197

197198
return
198199
end

0 commit comments

Comments
 (0)