Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Simplify sys params to closer match reality (#659)
* update borefield.py to accept a ghe_id when instantiated * add debug logging to get_param_by_id method * pass the list of ghes to borefield when instantiating in single_ghe test * WIP new test for multi-ghe * improve error message for missing g-function file * additional g-function files to match the test sys-param files * update borefield test to work in the multi-ghe paradigm * improve help text in CLI * more explicitly process different types of district sys-params * clean up generation call, load loop order, load multiple ghes * use new parameter for district_type argument * load ghe loop order in the correct place * move soil parameters out of ghe-specific and into all 5G parameters * use new location of soil parameters * don't require soil in the incorrect place, duh * use new fifth_generation tag properly in 5G tests * fix test sys-param files for 5G districts * add graceful error message when sizing output from TN is not found * remove outdated TODO message * remove unused test sys-param file * comment noisy debug log lines * update geojson and sys_param paths * add project folder for testing multi-ghe * update building load profiles * modify paths pointing to mos files and ghe_dir * add ghe sizing results to ghe_dir * move soil and add horizontal piping parameters * pre-commit formatting * read the loop order file for later use * py file for new distribution template * new distribution template file * new distribution template instance file * correct name * correct name * take out dis and temp sensors * move dis and sensor connections elsewhere * coupling no longer needed * new distribution couplings * read loop_order in district.py for use in couplings * remove accidental `endraw` tag in jinja template * new placeholder coupling templates * WIP: first steps in reading & handling multiple ghes during regular usage * update dependencies * linting & formatting * rename loop order file * update loop order file name * change how gmt access loop order * distribution network coupling for multi-ghe * fix and add _loop_order.json files where needed for tests * fix call to _loop_order.json in multi_ghe test * move endraw tags and use python indenting for modelica logic * make loop_order available the right way, at the right time * use number_of_loops in network instance * allow more statements in a method * hacky way to ensure we only include one GroundTemperatureResponse in the package_order * Rename coupling * Modify nSeg for ground coupling * pipe lengths in dis instance * remove repeated mo files * update nSou to be number of ghes * delete unneeded coupling * modify multi-ghe test * rename coupling dir * put brackets in proper place in unidirectionalseries template * update test loop_order file to be current style * fix iteration through _loop_order in multi-ghe test * rename multi-ghe tests for clarity in debugging * util function to parse loop_order.json * use util function to access loop_order info * use loop_order data in ground_coupling template * clean up main gmt workflow now that models can access loop_order * add endraw tags to template * remove accidental jinja tags from code * add python spacing to code inside jinja tags * empty coupling between time series and network distribution pump * remove unnecessary statement * linting & formatting * call out `id` instead of `ghe_id` * add additional coupling to pass info * use parameter directly from sys_params * only look for loop_order if sys params have ghe parameters * another blank 5G coupling * enable build tests for GMT_Lib that should always have been active * enforce Path type to load loop_order * fix typo in comment * linting & formatting * remove unneeded mo file * add new function for getting ghe_id * fix jinja bugs * change model name * new function for getting the other model in the coupling * apply to connection pipe mass flow rates * fix coupling between borefield and dis * fix coupling between dis and ground coupling * linting * use ghe_id for borefield id & name * add comment for loading loop_order * continue using uuid for borefield * new template for district data * coupling for district data * move datDes instance somewhere else * use loop_data to locate building order in loop for coupling * add connection between dis and next TIn * add additional couplings * this makes sure the model simulates * update geojson & sys-params with ghe sizes to meet load * hack to only keep a single autosize instance in Networks.order * linting & formatting * align with how load_base name buildings * fix for a single-ghe loop * add additional instances and couplings * update content for single ghe test * change ghe id to align with sys_params * fix for multi ghes * expand number of ports for multi ghes * fix dict lookup in instance template * allow more statements in ruff * linting & formatting * increase central pump head for the multi-ghe test * reduce flow rate per borehole * only simulate multi-ghe with Dymola, temporarily * clarify comment in test_uo_des.py * fix couplings so test_uo_des won't break * formatting * copy scenario file to test 13-building data dir * ignore new files generated by updated CLI test * Revert "ignore new files generated by updated CLI test" This reverts commit 10ca170. * Revert "copy scenario file to test 13-building data dir" This reverts commit 22b2061. * remove pump_design_head from individual ets properties * remove TN output that isn't necessary for our tests * clean up sys-params * put district parameters inside the correct layer in test sys-param files * remove non-sensical `central_pump_parameters` from 4G test files * don't require in 4G schemas * require at least one central plant for 4G schemas * remove one more unnecessary line from 4G schema * remove one more bit mistakenly missed when fixing merge conflicts * set more validation requirements in schema * update test sys-param files to conform to newly tightened schema requirements * update test to look for new sys-param value * require ETS parameters in schema * remove old tests that no longer make sense. Functionality captured in other tests * update sys-param tests to match new schema --------- Co-authored-by: Jing Wang <[email protected]>
- Loading branch information
1 parent
f8cd8d0
commit 40525ac