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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Timelog #632

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Timelog #632

wants to merge 2 commits into from

Conversation

AminTorabi-NOAA
Copy link
Contributor

Update time-logging issue #625

Additions

Removals

Changes

Testing

Screenshots

Notes

Todos

Checklist

  • PR has an informative and human-readable title
  • Changes are limited to a single goal (no scope creep)
  • Code can be automatically merged (no conflicts)
  • Code follows project standards (link if applicable)
  • Passes all existing automated tests
  • Any change in functionality is tested
  • New functions are documented (with a description, list of inputs, and expected output)
  • Placeholder code is flagged / future todos are captured in comments
  • Visually tested in supported browsers and devices (see checklist below 馃憞)
  • Project documentation has been updated (including the "Unreleased" section of the CHANGELOG)
  • Reviewers requested with the Reviewers tool 鉃★笍

Testing checklist

Target Environment support

  • Windows
  • Linux
  • Browser

Accessibility

  • Keyboard friendly
  • Screen reader friendly

Other

  • Is useable without CSS
  • Is useable without JS
  • Flexible from small to large screens
  • No linting errors or warnings
  • JavaScript tests are passing

Copy link
Contributor

@shorvath-noaa shorvath-noaa left a comment

Choose a reason for hiding this comment

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

Mostly these changes have to do with rebasing this branch to ensure all of the upstream changes to t-route are incorporated. Once that is complete I can properly test these timing functions.

Comment on lines +97 to +98
segment_attributes=self._segment_attributes,
waterbody_attributes=self._waterbody_attributes)
Copy link
Contributor

Choose a reason for hiding this comment

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

It looks like your branch has not been rebased with recent changes to the master branch. These two lines are attempting to undo an edit in PR#622. Can you rebase this branch locally?

'data_assimilation_time' : 0,

}
# self.main_start_time = time.time()
Copy link
Contributor

Choose a reason for hiding this comment

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

Can you delete this line rather than commenting out?

self._network._qlateral = pd.DataFrame(index=self._network.segment_index).join(
pd.DataFrame(values['land_surface_water_source__volume_flow_rate'],
index=values['land_surface_water_source__id'])
index=values['segment_id'])
Copy link
Contributor

Choose a reason for hiding this comment

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

This too is attempting to revert changes from PR#622.

Comment on lines -130 to -135
# Trim the time-extent of the streamflow_da usgs_df
# what happens if there are timeslice files missing on the front-end?
# if the first column is some timestamp greater than t0, then this will throw
# an error. Need to think through this more.
if not self._data_assimilation.usgs_df.empty:
self._data_assimilation._usgs_df = self._data_assimilation.usgs_df.loc[:,self._network.t0:]
Copy link
Contributor

Choose a reason for hiding this comment

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

Same thing here, reverting changes from PR#622

# update t0
self._network.new_t0(self._time_step, nts)

# get reservoir DA initial parameters for next loop iteration
self._data_assimilation.update_after_compute(self._run_results, self._time_step*nts)
Copy link
Contributor

Choose a reason for hiding this comment

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

Here again, PR#622

Comment on lines +337 to +354
routelink_attr = {
#link????
"key": "id",
"downstream": "toid",
"dx": "length_m",
"n": "n", # TODO: rename to `manningn`
"ncc": "nCC", # TODO: rename to `mannningncc`
"s0": "So",
"bw": "BtmWdth", # TODO: rename to `bottomwidth`
#waterbody: "NHDWaterbodyComID",
"tw": "TopWdth", # TODO: rename to `topwidth`
"twcc": "TopWdthCC", # TODO: rename to `topwidthcc`
"alt": "alt",
"musk": "MusK",
"musx": "MusX",
"cs": "ChSlp" # TODO: rename to `sideslope`
}
supernetwork_parameters["columns"] = routelink_attr
Copy link
Contributor

Choose a reason for hiding this comment

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

Also here, PR#622

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.

None yet

2 participants