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

Updating CWEC2020 weather data and including ability to use HDD from either weather file or NECB #1666

Merged
merged 478 commits into from
Jan 16, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
478 commits
Select commit Hold shift + click to select a range
3710796
remove sizing methods in Siz.ThermalZone.rb
mdahlhausen Aug 25, 2023
c694b20
Fix inheritance.
lymereJ Aug 25, 2023
e38bfc3
remove Siz.HVACComponent.rb
mdahlhausen Aug 25, 2023
21f74ae
Merge remote-tracking branch 'origin/master' into nrcan_master_merge
ckirney Aug 25, 2023
1f9c89d
remove Siz.HeatingCoolingFuels.rb and Siz.ThermalZone.rb
mdahlhausen Aug 25, 2023
27e38db
remove overloaded prm method plant_loop_total_cooling_capacity
mdahlhausen Aug 25, 2023
8b99e87
calculate fan power
mdahlhausen Aug 25, 2023
89be23d
remove getAutosizedValueFromEquipmentSummary
mdahlhausen Aug 25, 2023
e8ec7ec
remove output_fan_report
mdahlhausen Aug 25, 2023
6d0c652
Delete Siz.Model.rb
mdahlhausen Aug 25, 2023
f922844
Make proposed model creation false by default.
lymereJ Aug 25, 2023
361656c
Wrap save.
lymereJ Aug 26, 2023
2f0b5fd
Rubocop + move computer room schedule to PRM method.
lymereJ Aug 28, 2023
a2b247b
remove require to Siz.Model
mdahlhausen Aug 28, 2023
c0d0304
remove prm air_loop_hvac_multizone_vav_optimization_required?
mdahlhausen Aug 28, 2023
fa415a6
remove prm air_loop_hvac_set_vsd_curve_type
mdahlhausen Aug 28, 2023
f14ee79
remove 90.1-2019 prm model_baseline_system_vav_fan_type
mdahlhausen Aug 28, 2023
6b8460e
remove model_prm_baseline_system_group_minimum_area method
mdahlhausen Aug 28, 2023
d2fa12e
remove duplicated model_prm_baseline_system_change_fuel_type
mdahlhausen Aug 28, 2023
1c54b8e
grammar fix
mdahlhausen Aug 28, 2023
ccb3692
remove prm boiler_hot_water_find_search_criteria
mdahlhausen Aug 28, 2023
c431a4d
remove coil_heating_gas_find_capacity
mdahlhausen Aug 28, 2023
b0fb278
remove boiler_hot_water_standard_minimum_thermal_efficiency
mdahlhausen Aug 28, 2023
a327312
Merge pull request #1581 from NREL/fix_inheritance
weilixu Aug 28, 2023
cd00156
format modify to trigger CI
weilixu Aug 28, 2023
b95fc18
remove duplicate model_prm_baseline_system_number
mdahlhausen Aug 28, 2023
091c8b5
remove prm cooling_tower_apply_minimum_power_per_flow
mdahlhausen Aug 28, 2023
e5f78d6
remove prm chiller_electric_eir_standard_minimum_full_load_efficiency
mdahlhausen Aug 28, 2023
d495b08
Handle proposed model residential lighting power.
lymereJ Aug 28, 2023
0293dc8
remove prm chiller_electric_eir_find_search_criteria
mdahlhausen Aug 28, 2023
81c4e59
remove prm model_apply_constructions
mdahlhausen Aug 28, 2023
927274f
fix OptionalDouble error
mdahlhausen Aug 28, 2023
e08f6b3
added support to vary slab setpoint based on outdoor temperature
carlosduarteroa Aug 29, 2023
54dd618
implmented a schedule with occupied hours to determine when to calcul…
carlosduarteroa Aug 29, 2023
b471c4a
added occupancy arguments into method to create low temp radiant
carlosduarteroa Aug 29, 2023
e0158df
remove prm CoolingTower file requires
mdahlhausen Aug 29, 2023
dac0750
Merge pull request #1579 from NREL/appx_g/enhancement/model_prm_basel…
weilixu Aug 29, 2023
2ad720d
get value of FuelType Enums
mdahlhausen Aug 29, 2023
55ebe66
Updating nrcan_master_merge from nrcan branch.
ckirney Aug 29, 2023
331078a
added method to convert plant into a 2-pipe system with availability …
carlosduarteroa Aug 29, 2023
f7d9499
refactor design load to be w not w_per_m2
mdahlhausen Aug 29, 2023
88c696e
added 2-pipe plant mode based on zone heating cooling demand
carlosduarteroa Aug 29, 2023
0fd35ed
add radiant occupancy tests
mdahlhausen Aug 29, 2023
5e6293f
Merge pull request #1571 from NREL/feature/radiant_controls_zone_occu…
mdahlhausen Aug 29, 2023
e9945f7
Merge branch 'master' into feature/radiant_controls_2_pipe_plant_redo
carlosduarteroa Aug 29, 2023
4fb660b
Revert "remove prm model_apply_constructions"
mdahlhausen Aug 29, 2023
229e051
add method to get radiant thermal zones from plant loop
carlosduarteroa Aug 30, 2023
aa9f9b8
added tests for testing two pipe plant system
carlosduarteroa Aug 30, 2023
64d5371
Adds details to sizing run start/end messages for runtime profiling
asparke2 Aug 24, 2023
2e3dc1d
Merge remote-tracking branch 'origin/master' into feature/sizing_run_…
asparke2 Aug 30, 2023
2a331e9
Merge pull request #1566 from NREL/nrcan_master_merge
mdahlhausen Aug 30, 2023
ac51ed0
check for OptionalDouble
mdahlhausen Aug 30, 2023
98e58b9
Update YARD comments to functions
weilixu Aug 30, 2023
7d20c94
fix .get typo for double
mdahlhausen Aug 31, 2023
f026041
resolve the duplicate schedule issue reported in issue #1527
weilixu Aug 31, 2023
fe5a6df
Fix bug in the lighting power density search.
weilixu Aug 31, 2023
e79863a
Update Standards.ThermalZone.rb
mdahlhausen Aug 31, 2023
b5e222b
Large Office cooling tower regression update
mdahlhausen Aug 31, 2023
b1aa834
Revert "remove prm air_loop_hvac_set_vsd_curve_type"
mdahlhausen Aug 31, 2023
9cc75f2
update regression and performance results
mdahlhausen Aug 31, 2023
7173d56
added plant setpoint manager to vary plant water supply temperature b…
carlosduarteroa Aug 31, 2023
f65b785
update data file
weilixu Sep 1, 2023
3c6b9c1
remove extra argument
mdahlhausen Sep 1, 2023
e1b4925
Merge pull request #1587 from NREL/appx_g/enhancement/yard_comments
weilixu Sep 1, 2023
4747666
Include fenestration types_to_modify to apply correct PRM constructio…
weilixu Sep 1, 2023
5106d18
Merge branch 'AppendixG_Dev' of https://github.com/NREL/openstudio-st…
weilixu Sep 1, 2023
b2a83a5
remove the exception handlers to an empty hash - prevent failing beca…
weilixu Sep 1, 2023
ab4faaa
Merge pull request #1583 from NREL/remove_duplicate_prm_methods
mdahlhausen Sep 1, 2023
9aa6c6b
Merge branch 'master' into remove_sizing_methods
mdahlhausen Sep 2, 2023
a7bd20d
fix app g method call typos
mdahlhausen Sep 2, 2023
5c1ecf0
update to reboot the CI
weilixu Sep 2, 2023
74dfe75
update to reboot the CI
weilixu Sep 2, 2023
6515638
add exterior doors to fix the wwr error.
weilixu Sep 2, 2023
4c124da
Update test_performance_expected_dd_results.csv
mdahlhausen Sep 2, 2023
40e49f4
check app G fuel type against array
mdahlhausen Sep 2, 2023
81d4a02
Merge pull request #1588 from NREL/appx_g/bugfix/duplicate_ltg_schedules
weilixu Sep 4, 2023
be65ec5
fix infiltration randomness
leijerry888 Sep 5, 2023
68a7d20
Merge branch 'AppendixG_Dev' of https://github.com/NREL/openstudio-st…
weilixu Sep 5, 2023
b5d0f55
Merge pull request #1589 from NREL/appx_g/bugfix/exterior_window_inco…
weilixu Sep 5, 2023
483611a
Merge branch 'master' of https://github.com/NREL/openstudio-standards…
weilixu Sep 6, 2023
97840e9
update test failures
mdahlhausen Sep 7, 2023
4d4da95
Merge pull request #1582 from NREL/remove_sizing_methods
mdahlhausen Sep 7, 2023
4de34f1
two pipe method edits
mdahlhausen Sep 7, 2023
9539744
Including latest changes from master. (#1593)
ckirney Sep 8, 2023
81b5e6a
Update openstudio-standards.gemspec
ckirney Sep 8, 2023
529093f
Update btap_datapoint.rb
ckirney Sep 8, 2023
6793bae
Incorporating changes from master into nrcan_master_merge branch (#1594)
ckirney Sep 8, 2023
2be8a41
Merge pull request #1592 from NREL/appx_g/merge_master_09062023
weilixu Sep 8, 2023
89dcb6f
Merge pull request #1586 from NREL/feature/radiant_controls_2_pipe_pl…
mdahlhausen Sep 8, 2023
37c5f34
Merge pull request #1591 from NREL/feature/sizing_run_profiling
mdahlhausen Sep 8, 2023
c597fb7
Including recent changes from master.
ckirney Sep 11, 2023
bb9cf41
consolidate DCV functions in the standard to one function
weilixu Sep 11, 2023
9583b4f
Include changes from nrcan branch.
ckirney Sep 11, 2023
409f78e
Merge branch 'master' into feature/radiant_controls_oa_based_swt_redo
carlosduarteroa Sep 11, 2023
42723eb
moved heat cool request program to its own method for reuse
carlosduarteroa Sep 12, 2023
b63e183
added support to control swt based on zone demand
carlosduarteroa Sep 12, 2023
f28ec4a
added tests for supply water temperature control
carlosduarteroa Sep 12, 2023
d4cb1b4
add OsLib_Schedules methods
mdahlhausen Sep 12, 2023
67eb898
remove one schedule module level
mdahlhausen Sep 12, 2023
e7e24e8
fix yard documentation
mdahlhausen Sep 12, 2023
671295b
fix yard documentation
mdahlhausen Sep 12, 2023
9812d2b
Create pull_request_template.md
mdahlhausen Sep 12, 2023
9e6bdf7
Merge pull request #1597 from NREL/feature/pr_template
mdahlhausen Sep 13, 2023
a6633e8
minor return consistency edit
mdahlhausen Sep 13, 2023
7049071
add OsLib_ModelGeneration methods
mdahlhausen Sep 13, 2023
815554a
fix model_identify_return_air_type return type
mdahlhausen Sep 13, 2023
130489a
Create pull_request_template.md (#1599)
ckirney Sep 13, 2023
5f1f920
Include changes from nrcan branch.
ckirney Sep 13, 2023
65f7cc8
Apply Black formatting.
lymereJ Sep 13, 2023
8637313
Merge pull request #1600 from NREL/apply_black_fmt
mdahlhausen Sep 13, 2023
e44894a
Merge changes from master branch (#1601)
ckirney Sep 13, 2023
3b7abc3
refactor create_typical methods
mdahlhausen Sep 13, 2023
769d6f3
fix tests by adding weather file
mdahlhausen Sep 13, 2023
074f5b9
Fix multiplier and space type issue.
lymereJ Sep 13, 2023
3395f64
Merge pull request #1596 from NREL/fix/yard_documentation
mdahlhausen Sep 14, 2023
0bea314
Merge branch 'master' into feature/extension_gem
mdahlhausen Sep 14, 2023
2d936ae
minor yard syntax update
mdahlhausen Sep 14, 2023
c1d68cd
rubocop fixes
mdahlhausen Sep 14, 2023
abcb73d
merge ComStock changes to create typical
mdahlhausen Sep 14, 2023
69ac71a
Include changes from master. (#1604)
ckirney Sep 14, 2023
ea3aa5b
Merge dev branch in.
lymereJ Sep 14, 2023
915bc7f
Include changes from master (#1605)
ckirney Sep 15, 2023
e5216a2
Fix typo.
lymereJ Sep 15, 2023
9faa678
Merge pull request #1602 from NREL/feature/extension_gem
mdahlhausen Sep 15, 2023
60329f2
Merge branch 'master' into feature/radiant_controls_oa_based_swt_redo
mdahlhausen Sep 15, 2023
d3e3c27
Edit log message.
lymereJ Sep 15, 2023
4c69c45
Merge pull request #1556 from NREL/apxg_proposed_model
weilixu Sep 15, 2023
56dd7f2
update user code.
weilixu Sep 15, 2023
d061cb2
Merge branch 'AppendixG_Dev' of https://github.com/NREL/openstudio-st…
weilixu Sep 15, 2023
2d70132
syntax and rubocop edits
mdahlhausen Sep 18, 2023
2fac650
Merge pull request #1595 from NREL/feature/radiant_controls_oa_based_…
mdahlhausen Sep 18, 2023
8ee396e
rubocop autocorrect edits
mdahlhausen Sep 18, 2023
1b20e81
Update the some csv files to include more user data tests.
weilixu Sep 18, 2023
28d153e
Merge branch 'master' into feature/radiant_controls_no_ems
mdahlhausen Sep 18, 2023
54376eb
rubocop and yard doc edits
mdahlhausen Sep 18, 2023
3919122
added user data generation class
weilixu Sep 19, 2023
1d603ee
change the typo in the motor is exempt
weilixu Sep 19, 2023
ee81697
Merge pull request #1609 from NREL/fix/rubocop_edits
mdahlhausen Sep 19, 2023
ad88419
Merge pull request #1608 from NREL/appx_g/enhancement/restructure_use…
weilixu Sep 19, 2023
9683581
Merge branch 'AppendixG_Dev' of https://github.com/NREL/openstudio-st…
weilixu Sep 19, 2023
c7534cc
remove error statement
weilixu Sep 19, 2023
db64c62
Merge branch 'master' of https://github.com/NREL/openstudio-standards…
weilixu Sep 19, 2023
a48a68b
add function that generates the user data from a user model
weilixu Sep 19, 2023
3b0115f
Merge branch 'AppendixG_Dev' of https://github.com/NREL/openstudio-st…
weilixu Sep 19, 2023
b966c5c
add missing YARD comments
weilixu Sep 19, 2023
0d72438
Merge branch 'master' into feature/radiant_controls_no_ems
mdahlhausen Sep 19, 2023
a019516
remove duplicate 8760 method
mdahlhausen Sep 19, 2023
8dc71da
Merge pull request #1584 from NREL/feature/radiant_controls_no_ems
mdahlhausen Sep 19, 2023
dff50b7
Incorporating changes from master.
ckirney Sep 19, 2023
a7af27d
modify format to trigger CI
weilixu Sep 20, 2023
a3a7c76
Fix issues in psz-vav system using water heating coil
weilixu Sep 20, 2023
f043468
revise test case assertion
weilixu Sep 20, 2023
07a935f
temporary path to fix user data processing in the proposed model
weilixu Sep 21, 2023
1050631
add patch code to remove the nil situation in the index.
weilixu Sep 21, 2023
e843556
Merge pull request #1611 from NREL/appx_g/feature/export_user_data_pa…
weilixu Sep 21, 2023
efa8b4d
geometry method updates
mdahlhausen Sep 21, 2023
c74925c
Merge branch 'AppendixG_Dev' into appx_g/merge_master_09192023
weilixu Sep 22, 2023
e06088d
Merge pull request #1610 from NREL/appx_g/merge_master_09192023
weilixu Sep 22, 2023
9c79517
Merge branch 'master' of https://github.com/NREL/openstudio-standards…
weilixu Sep 22, 2023
dfdc7c4
Fix YARD comment and run rubocop.
weilixu Sep 22, 2023
2816d24
address comments
weilixu Sep 22, 2023
1a870b0
1. Remove the non test methods in the test_appendix_g_prm to prm_test…
weilixu Sep 23, 2023
02f3da9
Add surface wwr function to fix error sin prm baseline bldg tests.
weilixu Sep 25, 2023
dca854b
rubocop and yard edits
mdahlhausen Sep 26, 2023
0548f6d
adds missing input limits to curves
eringold Sep 26, 2023
c0296c8
Merge pull request #1612 from NREL/AppendixG_Dev
mdahlhausen Sep 26, 2023
33aacf6
Add back missing refrigeration curve
mdahlhausen Sep 27, 2023
8ebd4ea
update ci links
mdahlhausen Sep 27, 2023
ccf1ae4
Merge pull request #1614 from NREL/update_ci_link
mdahlhausen Sep 27, 2023
eebae6a
Merge pull request #1613 from NREL/fix/curve_limits
mdahlhausen Sep 27, 2023
efd34ee
change typical_building_from_model to create_typical_building_from_model
mdahlhausen Sep 28, 2023
a36d45e
syntax to add _get to methods that return values
mdahlhausen Sep 28, 2023
1ffe484
rubocop edits
mdahlhausen Sep 28, 2023
7832d63
OsLib_Geometry methods
mdahlhausen Sep 28, 2023
6f617ba
Update create_bar.rb
mdahlhausen Sep 29, 2023
ec024d1
snake case sch variable names
mdahlhausen Sep 29, 2023
2ae5fd6
add create geometry tests
mdahlhausen Sep 29, 2023
5baf392
set Coil<X>WaterToAirHeatPumpEquationFit curves
mdahlhausen Oct 1, 2023
e9bb6ce
fix hp coefficients
mdahlhausen Oct 2, 2023
4a51fd0
Update DistrictHeating fuel type enums
mdahlhausen Oct 2, 2023
bacb4ca
syntax typos
mdahlhausen Oct 2, 2023
e93a329
fix typo
mdahlhausen Oct 3, 2023
f9413d2
remove double call to add_internal_mass
eringold Oct 3, 2023
31b1fbf
move add_internal_mass after tstat creation
eringold Oct 3, 2023
4b06bfb
Merge pull request #1616 from NREL/fix/os3_7_develop
mdahlhausen Oct 3, 2023
d5be65d
add cbecs hvac
mdahlhausen Oct 4, 2023
c6c3138
add constructions module
mdahlhausen Oct 4, 2023
afd6ff7
add geometry tests
mdahlhausen Oct 5, 2023
c3aae3b
rename circleci_tests to ci_tests
mdahlhausen Oct 5, 2023
2c77d9e
move module tests to test/modules
mdahlhausen Oct 5, 2023
678d70e
add module tests to ci_tests
mdahlhausen Oct 5, 2023
e9945da
update path to minitest helper
mdahlhausen Oct 5, 2023
8c3c388
fix module tests
mdahlhausen Oct 6, 2023
92f368c
hash look typo fix
mdahlhausen Oct 6, 2023
ddc0921
add space type blending methods and tests
mdahlhausen Oct 7, 2023
9195bc8
replace TODO with @todo
mdahlhausen Oct 7, 2023
7e10d48
add DEER enumerations
mdahlhausen Oct 7, 2023
0e847e3
add schedule_ruleset_get_start_and_end_times
mdahlhausen Oct 7, 2023
2c07d6d
rubocop edits
mdahlhausen Oct 7, 2023
88b6a5e
add qaqc methods
mdahlhausen Oct 7, 2023
12cfe90
fix typos
mdahlhausen Oct 8, 2023
da09a1d
add part load ratio qaqc check
mdahlhausen Oct 8, 2023
0fca84f
add qaqc test
mdahlhausen Oct 8, 2023
df0485f
Merge branch 'master' into feature/extension_gem_merge
mdahlhausen Oct 8, 2023
ad936d9
add check that sql file is available
mdahlhausen Oct 9, 2023
e2f937b
add QAQC reporting
mdahlhausen Oct 10, 2023
33ba974
add weather information module
mdahlhausen Oct 10, 2023
d84d42b
adopt create_ naming
mdahlhausen Oct 10, 2023
4486de5
add daylight sensor method
mdahlhausen Oct 10, 2023
471066d
add more tests
mdahlhausen Oct 10, 2023
0cabb31
Merge pull request #1619 from NREL/feature/extension_gem_merge
mdahlhausen Oct 11, 2023
b68abaa
create_ instead of model_create_
mdahlhausen Oct 11, 2023
a4e4b29
add DistrictHeatingWater and DistrictHeatingSteam
mdahlhausen Oct 12, 2023
54dc5ea
add PLF curve to water to air heat pumps
mdahlhausen Oct 12, 2023
39364aa
fix unitary system deprecated method warnings
mdahlhausen Oct 12, 2023
f64ef99
fix hospital performance tests
mdahlhausen Oct 13, 2023
c63bbf2
Merge pull request #1621 from NREL/fix/os_3_7_release
mdahlhausen Oct 13, 2023
682d3b2
Update version.rb
mdahlhausen Oct 13, 2023
bae3340
remove duplicate hash assignment
mdahlhausen Oct 17, 2023
26b2a03
Merge pull request #1625 from NREL/fix/remove_duplicate_qsr_wwr
mdahlhausen Oct 19, 2023
e303ab0
remove interpolate to timestep from parametric sch
eringold Oct 19, 2023
90b68b9
Updating license from LGBL to BSD to match OpenStudio, ext gem, and m…
DavidGoldwasser Oct 24, 2023
81b425d
remove Modified BSD license add
mdahlhausen Oct 24, 2023
4dee6c3
Merge pull request #1629 from NREL/license_update
mdahlhausen Oct 25, 2023
bc2dfc1
Merge remote-tracking branch 'origin/master' into remove_sch_interp
eringold Oct 26, 2023
18e3a88
Update version.rb
mdahlhausen Oct 30, 2023
8e7e38d
Merge pull request #1632 from NREL/remove_sch_interp
mdahlhausen Nov 1, 2023
829d358
Add reference to the database repository.
lymereJ Nov 1, 2023
665f068
Merge pull request #1639 from NREL/master
ckirney Nov 16, 2023
a05b126
Merging nrcan branch into nrcan_master_merge branch.
ckirney Nov 16, 2023
f9e644d
Merge pull request #1644 from NREL/nrcan
ckirney Dec 6, 2023
24981f4
Updating weather files to use standard Canadian weather locations.
ckirney Dec 8, 2023
c8efd73
Deleting empty or commented out files.
ckirney Dec 12, 2023
024e4fc
Non-standard Canadian weather locations.
ckirney Dec 12, 2023
9b035ca
Deleting un-used costing folder.
ckirney Dec 12, 2023
9d3b260
Updating unit test results to reflect change to weather file. Removi…
ckirney Dec 12, 2023
ebe050e
Updating unit test results to reflect change to weather file.
ckirney Dec 12, 2023
23d8606
Including option to use HDD from weather .stat file rather than NECB.
ckirney Dec 14, 2023
5d4e347
Ensuring more methods using the get_necb_hdd18 method call it with th…
ckirney Dec 21, 2023
a5f2616
Replacing CWEC2016 weather files with CWEC2020 weather files.
ckirney Dec 21, 2023
1c19106
Replacing CWEC2016 weather files with CWEC2020 weather files.
ckirney Dec 22, 2023
1569173
Replacing CWEC2016 weather files with CWEC2020 weather files.
ckirney Dec 22, 2023
638c810
Passing necb_hdd variable properly and calling get_necb_hdd18 properly.
ckirney Dec 22, 2023
ba57f02
Adding test of using NECB or weather file HDD. Also including expect…
ckirney Dec 22, 2023
a1716cd
Updating test expected result files to reflect use of CWEC2020 weathe…
ckirney Jan 10, 2024
c2a817a
Updating test_necb_constructions_fdwr.rb test to call the get_necb_hd…
ckirney Jan 10, 2024
7e9124f
Merge pull request #1661 from NREL/nrcan
ckirney Jan 12, 2024
144a674
Adjusting convert_arg_to_bool method to check for string arguments.
ckirney Jan 12, 2024
42bc525
Merge pull request #1664 from NREL/nrcan
ckirney Jan 16, 2024
7f95d0f
Updating to resolve conflicts with test_necb_loop_rules.rb from nrcan…
ckirney Jan 16, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
12 changes: 9 additions & 3 deletions .yardopts
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,19 @@ lib/openstudio-standards/prototypes/**/*.rb
lib/openstudio-standards/utilities/**/*.rb
lib/openstudio-standards/weather/**/*.rb
lib/openstudio-standards/refs/references.rb
lib/openstudio-standards/schedules/**/*.rb
lib/openstudio-standards/geometry/**/*.rb
lib/openstudio-standards/create_typical/**/*.rb
lib/openstudio-standards/hvac/**/*.rb
lib/openstudio-standards/constructions/**/*.rb
lib/openstudio-standards/daylighting/**/*.rb
lib/openstudio-standards/qaqc/**/*.rb

-
docs/Home.md
docs/UserQuickStartGuide.md
docs/Features.md
docs/DeveloperInformation.md
docs/RepositoryStructure.md
docs/CodeArchitecture.md
docs/AddingAStandard.md
License.txt
LGPL-2.1
LICENSE.md
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/tijcolem/nrel_cbci_jenkins_libs
//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs

@Library('cbci_shared_libs') _

Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile_develop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/tijcolem/nrel_cbci_jenkins_libs
//Jenkins pipelines are stored in shared libaries. Please see: https://github.com/NREL/cbci_jenkins_libs

@Library('cbci_shared_libs') _

Expand Down
503 changes: 0 additions & 503 deletions LGPL-2.1

This file was deleted.

33 changes: 33 additions & 0 deletions LICENSE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
OpenStudio(R), Copyright (c) 2008-2023, Alliance for Sustainable Energy, LLC.

Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
following conditions are met:

(1) Redistributions of source code must retain the above copyright notice, this list of conditions and the following
disclaimer.

(2) Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided with the distribution.

(3) Redistribution of this software, without modification, must refer to the software by the same designation.
Redistribution of a modified version of this software (i) may not refer to the modified version by the same designation,
or by any confusingly similar designation, and (ii) must refer to the underlying software originally provided by
Alliance as “OpenStudio(R)”. Except to comply with the foregoing, the term “OpenStudio(R)”, or any confusingly similar
designation may not be used to refer to any modified version of this software or any modified version of the underlying
software originally provided by Alliance without the prior written consent of Alliance.

Neither the name of the copyright holder nor the names of any contributors may be used to endorse or promote products
derived from this software without specific prior written permission from the respective party.

(4) The name of the copyright holder(s), any contributors, the United States Government, the United States Department
of Energy, or any of their employees may not be used to endorse or promote products derived from this software without
specific prior written permission from the respective party.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER(S) AND ANY CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER(S), ANY CONTRIBUTORS, THE UNITED STATES GOVERNMENT, OR THE UNITED
STATES DEPARTMENT OF ENERGY, NOR ANY OF THEIR EMPLOYEES, BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
65 changes: 0 additions & 65 deletions License.txt

This file was deleted.

9 changes: 4 additions & 5 deletions Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -12,17 +12,17 @@ end
require 'rake/testtask'
namespace :test do
full_file_list = nil
if File.exist?('test/circleci_tests.txt')
if File.exist?('test/ci_tests.txt')
# load test files from file.
full_file_list = FileList.new(File.readlines('test/circleci_tests.txt'))
full_file_list = FileList.new(File.readlines('test/ci_tests.txt'))
# Select only .rb files that exist
full_file_list.select! { |item| item.include?('rb') && File.exist?(File.absolute_path("test/#{item.strip}")) }
full_file_list.map! { |item| File.absolute_path("test/#{item.strip}") }
File.open('test/circleci_tests.json', 'w') do |f|
File.open('test/ci_tests.json', 'w') do |f|
f.write(JSON.pretty_generate(full_file_list.to_a))
end
else
puts 'Could not find list of files to test at test/circleci_tests.txt'
puts 'Could not find list of files to test at test/ci_tests.txt'
return false
end

Expand All @@ -38,7 +38,6 @@ namespace :test do
t.verbose = false
end


# These tests only available in the CI environment
if ENV['CI'] == 'true'

Expand Down
Loading