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

Feature/update kwt #36

Merged
merged 7 commits into from
Mar 5, 2018
Merged

Conversation

martynpclark
Copy link
Collaborator

Updating code to include kinematic wave routing

Copy link
Collaborator

@nmizukami nmizukami left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

only inline minor comments.

INTEGER(I4B), INTENT(IN) :: JRCH ! reach to process
integer(i4b), intent(in) :: ixDesire ! index of the desired reach
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

comment is not clear. should like " index of the reach to print the results on screen" or something like that?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@@ -655,6 +660,14 @@ SUBROUTINE REACH_LIST(&
structSEG(iRch)%var(ixSEG%totalArea)%dat(1) = structSEG(iRch)%var(ixSEG%basArea)%dat(1) + &
structSEG(iRch)%var(ixSEG%upsArea)%dat(1)

! ---------- define good basins ---------------------------------------------------------

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think need to define what the good basin is here.
"goodBasin" == Drainage area at the bottom of the reach is greater than threshold, "verySmall" value.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@@ -548,6 +551,7 @@ SUBROUTINE REACH_LIST(&
integer(i4b) , intent(out) :: ierr ! error code
character(*) , intent(out) :: message ! error message
! local variables
real(dp), parameter :: verySmall=tiny(1.0_dp) ! a very small number
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

verySmall is defined in public.f90.

Now, not clear what to be stored in public.f90, globalData.f90. maybe have to have some rule.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@@ -65,6 +68,7 @@ subroutine ntopo(&
! --------------------------------------------------------------------------------------------------------------
! local variables
character(len=strLen) :: cmessage ! error message of downwind routine
real(dp), parameter :: min_slope=1.e-6_dp ! minimum slope
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should this be in public.f90?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@@ -25,7 +25,7 @@ module kwt_route
public::qroute_rch

! common variables
integer(i4b),parameter :: ixPrint = -9999 ! the desired reach (set to negative to avoid any printing)
integer(i4b),save :: ixPrint = -9999 ! the desired reach (set to negative to avoid any printing)
real(dp),parameter :: verySmall=tiny(1.0_dp) ! a very small number
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

defined in public.f90?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed

@martynpclark
Copy link
Collaborator Author

Addressed all comments raised during code review.

@nmizukami nmizukami merged commit c2bb3fe into ESCOMP:develop Mar 5, 2018
nmizukami pushed a commit to nmizukami/mizuRoute that referenced this pull request Oct 22, 2020
ekluzek pushed a commit to ekluzek/mizuRoute that referenced this pull request Nov 30, 2022
Get DTEST NUOPC restart capability working
ekluzek pushed a commit to ekluzek/mizuRoute that referenced this pull request Dec 1, 2022
…build



Changes needed for the mksurfdata_esmf build

Fixes ESCOMP#36

I've only tested in the context of mksurfdata_esmf so far:

I also did the following tests on izumi and they PASS:

ERS_Ld3.f19_g17.X.izumi_intel
ERS_Ld3.f45_g37_rx1.A.izumi_intel
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants