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

Remove "auto" option for number of occupants #360

Merged
merged 8 commits into from
Jan 17, 2020

Conversation

joseph-robertson
Copy link
Contributor

@joseph-robertson joseph-robertson commented Jan 14, 2020

Addresses #[issue number here].

Pull Request Description

[description here]

Checklist

Not all may apply:

  • Unit tests have been added or updated
  • All rake tasks have been run, and pass
  • PAT project measures/outputs have been updated
  • Documentation has been modified appropriately
  • Any new options are added to project_testing
  • project_testing runs without any failures
  • No unexpected regression test changes
  • All tests are passing (green) on circleci
  • The changelog has been updated appropriately
  • This branch is up-to-date with master

For more information on how to perform these checklist items, see the documentation's Advanced Tutorial.

Copy link
Contributor

@ejhw ejhw left a comment

Choose a reason for hiding this comment

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

I suggest @shorowit take a quick look

@shorowit
Copy link
Contributor

What's the reasoning behind this?

@joseph-robertson
Copy link
Contributor Author

I'll let @ejhw take that question.

@ejhw
Copy link
Contributor

ejhw commented Jan 15, 2020

@shorowit We added a TSV for number of occupants. Joe suggested that we remove the auto option since it is no longer being used and the use of fractional numbers of occupants will no longer be supported by the new stochastic occupancy model.

@shorowit
Copy link
Contributor

It seems like there's no harm in continuing to allow someone to use it, but if you really want to remove it, I don't understand why this code isn't cleaned up more. For example, the argument should be changed from a string to a double and then you should remove all of the valid_float? and to_f stuff.

@ejhw
Copy link
Contributor

ejhw commented Jan 16, 2020

Thanks @shorowit.
@joseph-robertson I say do whatever is easiest since we'll be transitioning to hpxml.

@joseph-robertson
Copy link
Contributor Author

Let's remove Occupants=auto from the options lookup, but leave the ability to have num_occupants=auto in the measures. Sound ok?

@joseph-robertson joseph-robertson merged commit 6fd2201 into master Jan 17, 2020
@joseph-robertson joseph-robertson deleted the remove-auto-occupants branch January 17, 2020 20:41
@joseph-robertson joseph-robertson added this to the ResStock v2.2.0 milestone Jan 30, 2020
joseph-robertson added a commit that referenced this pull request Apr 24, 2020
…9ce73

8c8c659ce73 Handle more auto args and regenerate osws.
e5eec12dcfc Merge branch 'master' into build-res-hpxml
4edf532409e Merge pull request #364 from NREL/partition_wall_bugfix
70387966cf5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into partition_wall_bugfix
402ff3cb2e0 Merge pull request #357 from NREL/HPXML_measure_defaults
cfadd32ca41 Remove one line that does nothing.
8fe1418c0c9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into HPXML_measure_defaults
a5d3738b349 Relax tolerance.
f0a301755a1 Merge pull request #363 from NREL/epw-file-path
d80ae7a8601 Minor fix for interior partition walls. They should have drywall layers on both sides.
e259a9a9d58 Changes extension/EPWFileName to extension/EPWFilePath to allow absolute paths to be provided as an alternative to just the file name.
f8a7afd4f51 A few more minor docs updates. [ci skip]
c46d23a06b2 Code update.
89f3eb3b383 Docs clarification. [ci skip]
f9bcd7e1913 Bugfix and cleanup.
d6f340091d3 Remove more unused test osws.
91abdfbb975 Merge pull request #360 from NREL/natural_ventilation
666225911ff Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into natural_ventilation
1e2b5bf6e18 Bugfix.
f698739aab2 Re-enable all tests.
c33721792ab Merge pull request #362 from NREL/allow_small_tolerance_for_hvac_fractions_take2
77119cf71cc Remove solar evac tube test osw.
2851b809d6b Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into natural_ventilation
6f721b334c7 Simpler bugfix.
02e0ebf3c18 Add RE test when using UEF. Minor code simplification.
0831c08b8e5 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into HPXML_measure_defaults
20181415995 Fix test.
f80e3ecf838 Add test osw for indirect solar frac.
ff4c4f7ee57 Merge branch 'master' into build-res-hpxml
13a99cc4ceb Code update.
75848aed528 Prevent E+ from potentially modeling identical windows (that only differ based on FractionOperable).
3ae65880883 Merge branch 'HPXML_measure_defaults' of https://github.com/NREL/OpenStudio-HPXML into HPXML_measure_defaults
1c9f65ba3ec Add default recovery efficiency for storage water heaters Change some method names
ddd36e0a7ac Merge pull request #354 from NREL/solar_fraction
9cdad02204f Adds more documentation for default values.
e97b5fe6206 Tweak natural ventilation algorithm based on operable window input.
fd3c538ceba Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_fraction
395614e0419 Various documentation improvements (related to this branch and other stuff).
4286cb61ffa Add base-misc-defaults2.xml
fbd8b76e780 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into HPXML_measure_defaults
33003c3010f Code update.
e1014061105 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into HPXML_measure_defaults
f50858ffeba Add HPXML defaults including: - Hot water recirculation pump power - Hot water recirculation loop length - Hot water recirculation branch length - Solar thermal storage volume - Storage water heater capacity - Storage water heater tank volume
c32c3379a04 Bugfix for solar thermal hot water load reported.
0f7027787c6 Update invalid solar thermal test files to use the detailed solar inputs.
f1e723263b9 Merge branch 'master' of https://github.com/NREL/OpenStudio-HPXML into solar_fraction
a4debab7498 Minor docs update.
b89a9bf6dc5 ConnectedTo is now optional when SolarThermalSystem/SolarFraction is used. When not provided, it applies to all water heaters. Also allows solar fraction to apply to combi systems. Removed a few solar test files.

git-subtree-dir: resources/hpxml-measures
git-subtree-split: 8c8c659ce734be2b8c1ac9ef6069b42b28ece6a4
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.

3 participants