{"push_id":1149891431,"size":125,"distinct_size":1,"ref":"refs/heads/master","head":"ba03606bf81bb968f4e4a9ed83dfe21417ae2660","before":"301fd43f9375a64809885e27ab18e713f5dfe173","commits":[{"sha":"880eaf1f5def10456a933e18ac0f8083186b49b8","author":{"name":"phylroy","email":"959da7f7783988fbdbe649a6002a8d131134d80f@gmail.com"},"message":"Added necb space type mappings to Prototype files.","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/880eaf1f5def10456a933e18ac0f8083186b49b8"},{"sha":"f11a66c16142595c6779b539694ce9dfcaadf28b","author":{"name":"phylroy","email":"959da7f7783988fbdbe649a6002a8d131134d80f@gmail.com"},"message":"Added include path to /lib/openstudio-standards.rb so it these tests can be run from Netbeans.","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/f11a66c16142595c6779b539694ce9dfcaadf28b"},{"sha":"4ee70a53eab1ec9a301696aeffbf05464fe0e2a9","author":{"name":"phylroy","email":"959da7f7783988fbdbe649a6002a8d131134d80f@gmail.com"},"message":"Added include path to /lib/openstudio-standards.rb so it these tests can be run from Netbeans.","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/4ee70a53eab1ec9a301696aeffbf05464fe0e2a9"},{"sha":"cd076f0fee0ca47dcff70cd1313dbb323ac1fa9d","author":{"name":"phylroy","email":"959da7f7783988fbdbe649a6002a8d131134d80f@gmail.com"},"message":"Merge branch 'migrate_necb_loads_to_standards' of https://github.com/NREL/openstudio-standards into migrate_necb_loads_to_standards","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/cd076f0fee0ca47dcff70cd1313dbb323ac1fa9d"},{"sha":"cf15049607cebae454a64608a385290c85dffe7b","author":{"name":"phylroy","email":"959da7f7783988fbdbe649a6002a8d131134d80f@gmail.com"},"message":"missing else statement.","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/cf15049607cebae454a64608a385290c85dffe7b"},{"sha":"f68a0d9b1ff1a707ad8ef9cc827abcbefbcf51f7","author":{"name":"phylroy","email":"959da7f7783988fbdbe649a6002a8d131134d80f@gmail.com"},"message":"Small change to test git email notifications.","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/f68a0d9b1ff1a707ad8ef9cc827abcbefbcf51f7"},{"sha":"056dcc3ac88ce8c6d44f8ef5e7affaaf35558224","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"This commit starts process of including NECB space types into NREL methodology. Work in progress.\n\nNext step: deal with schedules for \"common space types\"; the schedules assigned to these space types have * in their name.","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/056dcc3ac88ce8c6d44f8ef5e7affaaf35558224"},{"sha":"8d32d514c6bc41e47ee5fa267be5563412c6ecaa","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"Merge branch 'migrate_necb_loads_to_standards' of https://github.com/NREL/openstudio-standards into migrate_necb_loads_to_standards","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/8d32d514c6bc41e47ee5fa267be5563412c6ecaa"},{"sha":"b6ade3c78595f54031774d8425b317bb8477c3bd","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"Added argument to routines add_loads and add_space_types. This is necessary for NECB 2011 space types which are not a function of building type, in order to determine the appropriate operating schedules for common spaces that don't have defined schedules.\n\nAlso updated Standards spreadsheet to include necessary inputs for load definitions.\n\nWork in progress: defining correct ventilation load for NECB space types.","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/b6ade3c78595f54031774d8425b317bb8477c3bd"},{"sha":"073bfd31ffaf6d7d0028d1bae704070c130c911b","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"pass ventilation ach as result of convert function - this resolves overloaded method error.","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/073bfd31ffaf6d7d0028d1bae704070c130c911b"},{"sha":"0db8d62c8e85f94cd7b71b6d8888c89b3e514e62","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"Merge remote-tracking branch 'remotes/origin/HEAD' into migrate_necb_loads_to_standards\n\nConflicts:\n\topenstudio-standards/data/standards/OpenStudio_Standards.xlsx\n\topenstudio-standards/data/standards/OpenStudio_Standards_schedules.json","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/0db8d62c8e85f94cd7b71b6d8888c89b3e514e62"},{"sha":"232cf266859bed34d82ab9f6453dbe76be07a7cf","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"Updated standards spreadsheet and json files. Final changes before weekend.","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/232cf266859bed34d82ab9f6453dbe76be07a7cf"},{"sha":"b193c70ac7d9e3a4326a62cd6587482279e187ab","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"This commit adds dummy schedules for NECB common space types (example, elec/mech rooms, corridors). These dummy schedules will be replaced by autozone/autosytem routine (bTAP/NECB).","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/b193c70ac7d9e3a4326a62cd6587482279e187ab"},{"sha":"6a2ecda3d09589f91397158f1341bebb97a7f16a","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"Changed order of call to routine that sets weather file (for creation of NECB 2011 prototype).","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/6a2ecda3d09589f91397158f1341bebb97a7f16a"},{"sha":"99c0be434d73b826351d8e8a1f724f3e0638cc32","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"Troubleshooting - adding constructions and calling routine to set U-values to NECB 2011.","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/99c0be434d73b826351d8e8a1f724f3e0638cc32"},{"sha":"0efb4777d0c159263dd37e604debf497056a801f","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"Update spreadsheet (latest from GoogleDocs) plus construction entries for NECB 2011, large office.\nTO DO: add entries for other NECB 2011 archetypes.\nTO DO: TEST","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/0efb4777d0c159263dd37e604debf497056a801f"},{"sha":"6f360458f848690be2e5f1cb3c96ef504897278b","author":{"name":"khaddad","email":"ef4be4579f51a89311ef34fd2a541e2bdbbaa86c@gmail.com"},"message":"Implement NECB rules for sizing of chillers,boilers, and cooling towers.","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/6f360458f848690be2e5f1cb3c96ef504897278b"},{"sha":"5b6ed2751364183b9108c26f3d704bb4813e0b75","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"Merge remote-tracking branch 'remotes/origin/master' into migrate_necb_loads_to_standards\n\nConflicts:\n\topenstudio-standards/data/standards/OpenStudio_Standards.xlsx\n\topenstudio-standards/data/standards/OpenStudio_Standards_construction_properties.json\n\topenstudio-standards/data/standards/OpenStudio_Standards_constructions.json\n\topenstudio-standards/data/standards/OpenStudio_Standards_materials.json\n\topenstudio-standards/data/standards/OpenStudio_Standards_prototype_inputs.json\n\topenstudio-standards/data/standards/OpenStudio_Standards_schedules.json\n\topenstudio-standards/data/standards/OpenStudio_Standards_space_types.json\n\topenstudio-standards/lib/openstudio-standards/prototypes/Prototype.Model.rb\n\topenstudio-standards/lib/openstudio-standards/prototypes/Prototype.mid_rise_apartment.rb\n\topenstudio-standards/lib/openstudio-standards/prototypes/Prototype.secondary_school.rb\n\topenstudio-standards/lib/openstudio-standards/standards/Standards.Model.rb\n\topenstudio-standards/openstudio-standards.gemspec","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/5b6ed2751364183b9108c26f3d704bb4813e0b75"},{"sha":"fa8e33bfe2881be1667630efb54166d62a3a8f90","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"Resolved conflicts resulting from merge with master","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/fa8e33bfe2881be1667630efb54166d62a3a8f90"},{"sha":"95985c673e54208aa6ca410fe93ee1970608fd22","author":{"name":"mariamottillo","email":"43a1d984cb5a9a8afbcbb25a7b559f74e0cb7a4a@nrcan.gc.ca"},"message":"Update OpenStudio_Standards.xlsx with latest version on Google Sheets, resolve conflict in gemspec (from merge with master)","distinct":false,"url":"https://api.github.com/repos/NREL/openstudio-standards/commits/95985c673e54208aa6ca410fe93ee1970608fd22"}]}
{"actor":{"display_login":"asparke2"}}