Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfixes and minor improvements #452

Merged
merged 43 commits into from
May 28, 2021
Merged
Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
e71c83b
reduce time step if snow layer melts entirely
Oct 10, 2020
319eae7
added GRU index and hruId reporting to run_oneGru & run_oneHru
Dec 3, 2020
5e183fa
removed unnecessary whitespace in run_oneGru
Dec 3, 2020
bad8436
Merge pull request #435 from martynpclark/bugFix/tooMuchMelt
arbennett Dec 3, 2020
a3837a2
bugfix of error reporting in coupled_em balance checks: incorrect sol…
Jan 2, 2021
85bd9fa
Merge pull request #439 from wknoben/feature/GruHruIdInError
arbennett Jan 5, 2021
ea09226
moved and split comments across multiple lines as requested in PR
Jan 5, 2021
6d872f1
fix water balance error associated with transpiration
martynpclark Jan 7, 2021
1c6bdd5
Fix for segfault
arbennett Jan 11, 2021
c2da2bf
Fix typo
arbennett Jan 11, 2021
1d83cc5
Merge pull request #445 from arbennett/bugfix/mw_exp-segfault
bartnijssen Jan 12, 2021
9c37240
Merge pull request #442 from wknoben/bugfix/opSplittinCouplingId
arbennett Jan 12, 2021
45af60b
Merge pull request #444 from martynpclark/bugFix/opSplittingTranspira…
arbennett Jan 20, 2021
bdd30a1
Added precision tolerance to balance check in updatState.f90 to avoid…
Feb 28, 2021
0667540
Add whatsnew, rename github folder
arbennett Mar 2, 2021
d699446
Merge pull request #450 from arbennett/feature/templates_and_whatsnew
arbennett Mar 2, 2021
f75949b
Merge branch 'master' into develop
arbennett Mar 2, 2021
0505428
Merge remote-tracking branch 'upstream/develop' into develop
Mar 2, 2021
8437cb0
udpated whatsnew
Mar 2, 2021
a165ac7
Merge pull request #451 from andywood/develop
arbennett Mar 2, 2021
657151d
BUG FIX: correcting calculation of averageRoutedRunoff in run_oneGRU.…
Apr 4, 2021
92c5591
Minor cleanup on PR #454 (A. Wood) to add solar radiation functionali…
Apr 5, 2021
c5f9ef9
Added note to docs about how SUMMA expects gru/hru order in nc files
wknoben Apr 7, 2021
b57d766
update to run_oneGRU to organize the total_runoff calculations, summi…
Apr 7, 2021
5774f6b
First pass on single precision, compiles, but does not run
arbennett May 12, 2021
81d2085
Move summa_prec -> rk
arbennett May 12, 2021
eab783f
Merge branch 'develop' into feature/single_precision
arbennett May 12, 2021
6129934
Update whatsnew
arbennett May 12, 2021
445ff63
Merge pull request #458 from arbennett/feature/single_precision
martynpclark May 12, 2021
434c013
Merge pull request #455 from wknoben/docs/netcdf-hru-order
arbennett May 12, 2021
c7e5eef
Fix merge conflicts
arbennett May 12, 2021
6d42d13
update Makefile
martynpclark May 26, 2021
b8d0dc8
Merge pull request #459 from martynpclark/bugfix/Makefile
arbennett May 26, 2021
73546f1
Merge pull request #1 from arbennett/conflicts/pr454
andywood May 26, 2021
34f07e7
enable writing parameters for the GRUs
martynpclark May 26, 2021
b425d44
Merge pull request #460 from martynpclark/bugfix/writeGRUparams
arbennett May 26, 2021
bda78e9
Revert "Create new unified real kind datatype"
arbennett May 26, 2021
7cb25d6
Merge pull request #461 from NCAR/revert-458-feature/single_precision
arbennett May 26, 2021
c151a50
Merge pull request #454 from andywood/develop
arbennett May 26, 2021
90df88d
Fix basin variable reference/initialization
arbennett May 26, 2021
f9d427d
Merge pull request #462 from arbennett/bugfix/basin_soil_drainage_in_…
arbennett May 26, 2021
89f760a
ensure write full GRU vector
martynpclark May 28, 2021
7e1c0c3
Merge pull request #463 from martynpclark/bugfix/writeGRUparams
arbennett May 28, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions build/source/engine/run_oneGRU.f90
Original file line number Diff line number Diff line change
Expand Up @@ -135,7 +135,7 @@ subroutine run_oneGRU(&
logical(lgt) :: computeVegFluxFlag ! flag to indicate if we are computing fluxes over vegetation (.false. means veg is buried with snow)

! initialize error control
err=0; message='run_oneGRU/'
err=0; write(message, '(A24,I0,A2)' ) 'run_oneGRU (gru index = ',gruInfo%gru_nc,')/'

! ----- basin initialization --------------------------------------------------------------------------------------------

Expand Down Expand Up @@ -194,7 +194,7 @@ subroutine run_oneGRU(&
! error control
err,cmessage) ! intent(out): error control
if(err/=0)then; err=20; message=trim(message)//trim(cmessage); return; endif

! update layer numbers that could be changed in run_oneHRU -- needed for model output
gruInfo%hruInfo(iHRU)%nSnow = nSnow
gruInfo%hruInfo(iHRU)%nSoil = nSoil
Expand Down
2 changes: 1 addition & 1 deletion build/source/engine/run_oneHRU.f90
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ subroutine run_oneHRU(&
real(dp) , allocatable :: zSoilReverseSign(:) ! height at bottom of each soil layer, negative downwards (m)

! initialize error control
err=0; message='run_oneHRU/'
err=0; write(message, '(A20,I0,A2)' ) 'run_oneHRU (hruId = ',hruId,')/'

! ----- hru initialization ---------------------------------------------------------------------------------------------

Expand Down