Update to 2012rev692 #15
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
main.f - date change of revision;
The following changes were made to fix the rooting depth issue that was found in the HAWQS simulations.
(Email notes: We found that the limitation (example 2000.0 printed in the ‘input.std’ file when it was actually 2030.0 in the *.sol file) was coming from the ‘rdmx’ (max rooting depth; input in meters) in ‘plants.plt’.
Jeff wasn’t satisfied with the coding of this and has made a few changes in the SWAT code.
plantop.f -
These statements were commented:
!nly = sol_nly(j)
!sol_zmx(ihru) = sol_z(nly,j)
!plt_zmx = 1000. * rdmx(idplt(j))
!sol_zmx(ihru) = Min(sol_zmx(ihru),plt_zmx)
readsol.f -
These statements were comments:
!if (sol_zmx(ihru) <= 0.001) sol_zmx(ihru) = sol_z(nly,ihru)
!plt_zmx = 0.
!if (idplt(ihru) > 0) then
! if (idc(idplt(ihru)) > 0) then
! plt_zmx = 1000. * rdmx(idplt(ihru))
! end if
!end if
!if (sol_zmx(ihru) > 1. .and. plt_zmx > 1.) then
! sol_zmx(ihru) = Min(sol_zmx(ihru),plt_zmx)
!else
...
! sol_zmx(ihru) = Max(sol_zmx(ihru),plt_zmx)
!end if
swu.f - This whole section of code edited for the root depth problem;
real :: rdmax
...
if (idplt(j) > 0) then
rdmax = min (sol_zmx(j), 1000. * rdmx(idplt(j)))
else
rdmax = sol_zmx(j)
end if
...
sol_rd = 2.5 * phuacc(j) * rdmax
if (sol_rd > rdmax) sol_rd = rdmax
...
sol_rd = rdmax
routres.f - commented line change - mispelled reservoir;
Version 691
Summary of changes:
main.f - date of version change;
subbasin.f - change in computing the pet_day/ppet variable:
surface.f - correction in the argument in the following line (k should have been kk);
old: if (hrnopcp(sb,k) > 96) then ! four days
new: if (hrnopcp(sb,kk) > 96) then ! four days
Version 690
This version contains all the suggestions Doctor Fortran suggested
when Srin's staff found that the debug and release versions of
the model were not matching. The main culprit was with the EXPO
function, which was deleted and recoded with the EXP function. (NS - emails including subject 'Intel Fortran Compiler Optimization Difficulties' for more information and lists on suggestions).
allocate_parms.f - PPET for tropical growth added (Rev 689)
The following subroutines were edited to remove the EXPO function and an additional check was included in each occurrence (see notes):
alph.f
eiusle.f
etact.f
pgenhr.f
pkq.f
command.f - the input variable added in the ‘basins.bsn’ file for Srini’s simulations to read in previous run that SAVEed daily output in the fig.fig file.
input code variable name is : ISUB_SAV and if == 0, the model executes the subbasin command in fig.fig. If ISUB_SAV ==1, it does not.
hruallo.f - extended the number of management operations in the *.mgt file from 1000 to 2000;
modparm.f - added ISUB_SAV as integer;
deleted the function expo source code;
readbsn.f - added the read for new input variable in 'basins.bsn' file named ISUB_SAV; default == 0;
readfig.f - edited to be able to have unlimited save commands in the fig.fig file;
The unit numbers had to be changed to prevent affecting other files;
save.f - edit for unlimited number of save commands in fig.fig; previous limit was 10 commands;
virtual.f - changed function amax1 to max
surqno3(j) = max(1.d-12,surqno3(j))
latno3(j) = max(1.d-12,latno3(j))
no3gw(j) = max(1.d-12,no3gw(j))
surqsolp(j) = max(1.d-12,surqsolp(j))
minpgw(j) = max(1.d-12,minpgw(j))
sedorgn(j) = max(1.d-12,sedorgn(j))
sedorgp(j) = max(1.d-12,sedorgp(j))
sedminpa(j) = max(1.d-12,sedminpa(j))
sedminps(j) = max(1.d-12,sedminps(j))
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.