From cdb8afb98c567e84c99f4e0b49e3b97084d827eb Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Fri, 16 Oct 2020 11:41:03 -0700 Subject: [PATCH 01/11] Moved modules to a single module folder --- assert/Makefile.mk | 23 - climate/Makefile.mk | 23 - commercial/Makefile.mk | 19 - commercial/autotest/.gitignore | 1 - connection/json_link/doc/Makefile | 177 ---- connection/json_link/doc/html/.buildinfo | 4 - .../faults/mast_raw_start_alive0.json | 1 - .../faults/mast_raw_start_bad_dlen.json | 1 - .../faults/mast_raw_start_bad_hlen.json | 1 - .../faults/mast_raw_start_bad_jver.json | 1 - .../faults/mast_raw_start_bad_rcode.json | 1 - .../faults/mast_raw_start_bad_type.json | 1 - .../faults/mast_raw_start_bad_ver.json | 1 - .../json_link/faults/mast_raw_start_ok.json | 1 - .../faults/slv_raw_start_alive0.json | 1 - .../faults/slv_raw_start_bad_dlen.json | 1 - .../faults/slv_raw_start_bad_hlen.json | 1 - .../faults/slv_raw_start_bad_jver.json | 1 - .../faults/slv_raw_start_bad_rcode.json | 1 - .../faults/slv_raw_start_bad_type.json | 1 - .../faults/slv_raw_start_bad_ver.json | 1 - .../json_link/faults/slv_raw_start_ok.json | 1 - .../json_link/faults/sync_bad-dict_c5.json | 1 - .../json_link/faults/sync_bad-json_c5.json | 1 - .../faults/sync_drop_c[5,12,13].json | 1 - .../json_link/faults/sync_drop_c[5,40].json | 1 - .../json_link/faults/sync_drop_count5.json | 1 - .../json_link/faults/sync_drop_test.json | 1 - custom.mk | 8 +- customize | 8 +- generators/Makefile.mk | 39 - industrial/Makefile.mk | 14 - influxdb/Makefile.mk | 19 - market/Makefile.mk | 36 - module/assert/Makefile.mk | 17 + {assert => module/assert}/assert.cpp | 0 {assert => module/assert}/assert.h | 0 {assert => module/assert}/assert.vcproj | 0 .../assert}/autotest/test_assert.glm | 0 .../assert}/autotest/test_assert_group.glm | 0 .../assert}/autotest/test_assert_hold.glm | 0 .../assert}/autotest/test_assert_hold_err.glm | 0 .../autotest/test_assert_start_err.glm | 0 .../assert}/autotest/test_complex_assert.glm | 0 .../test_complex_assert_angle_err.glm | 0 .../test_complex_assert_imaginary_err.glm | 0 .../test_complex_assert_magnitude_err.glm | 0 .../autotest/test_complex_assert_real_err.glm | 0 .../assert}/autotest/test_double_assert.glm | 0 .../autotest/test_double_assert_err.glm | 0 .../assert}/autotest/test_enum_assert.glm | 0 .../assert}/autotest/test_enum_assert_err.glm | 0 .../assert}/autotest/test_int_assert.glm | 0 {assert => module/assert}/complex_assert.cpp | 0 {assert => module/assert}/complex_assert.h | 0 {assert => module/assert}/double_assert.cpp | 0 {assert => module/assert}/double_assert.h | 0 {assert => module/assert}/enum_assert.cpp | 0 {assert => module/assert}/enum_assert.h | 0 {assert => module/assert}/init.cpp | 0 {assert => module/assert}/int_assert.cpp | 0 {assert => module/assert}/int_assert.h | 0 {assert => module/assert}/main.cpp | 0 module/climate/Makefile.mk | 17 + .../climate}/autotest/cloud_insolation.player | 0 .../autotest/cloud_insolation_tmy3.player | 0 .../climate}/autotest/test_WA-Yakima-tmy3.glm | 0 .../climate}/autotest/test_cloud_tmy3_opt.glm | 0 .../climate}/autotest/test_csvreader_dst.glm | 0 .../test_csvreader_exercise_5_1_2.glm | 0 .../test_singleHouseSolarInverter.glm | 0 .../climate}/autotest/test_solar_opt.glm | 0 .../climate}/autotest/weather.csv | 0 .../climate}/autotest/weather_dst.csv | 0 {climate => module/climate}/climate.cpp | 0 {climate => module/climate}/climate.h | 0 {climate => module/climate}/climate.vcproj | 0 {climate => module/climate}/csv_reader.cpp | 0 {climate => module/climate}/csv_reader.h | 0 {climate => module/climate}/init.cpp | 0 {climate => module/climate}/main.cpp | 0 {climate => module/climate}/solar_angles.cpp | 0 {climate => module/climate}/solar_angles.h | 0 {climate => module/climate}/weather.cpp | 0 {climate => module/climate}/weather.h | 0 .../climate}/weather_reader.cpp | 0 {climate => module/climate}/weather_reader.h | 0 module/commercial/Makefile.mk | 18 + .../commercial}/autotest/FCZ01_AOFF.csv | 0 .../commercial}/autotest/FCZ01_AWHS.csv | 0 .../commercial}/autotest/FCZ01_COLL.csv | 0 .../commercial}/autotest/FCZ01_GROC.csv | 0 .../commercial}/autotest/FCZ01_HLTH.csv | 0 .../commercial}/autotest/FCZ01_LODG.csv | 0 .../commercial}/autotest/FCZ01_LOFF.csv | 0 .../commercial}/autotest/FCZ01_MISC.csv | 0 .../commercial}/autotest/FCZ01_REFW.csv | 0 .../commercial}/autotest/FCZ01_REST.csv | 0 .../commercial}/autotest/FCZ01_RETL.csv | 0 .../commercial}/autotest/FCZ01_SCHL.csv | 0 .../commercial}/autotest/FCZ01_SOFF.csv | 0 .../commercial}/autotest/energy_f.player | 0 .../commercial}/autotest/energy_pf.player | 0 .../commercial}/autotest/generic_demand.glt | 0 .../autotest/generic_demand_pf.glt | 0 .../commercial}/autotest/load_f.player | 0 .../commercial}/autotest/load_heatgain.player | 0 .../commercial}/autotest/load_pf.player | 0 .../commercial}/autotest/office_assert.player | 0 .../commercial}/autotest/office_energy.player | 0 .../autotest/office_hvac_ECON_assert.player | 0 .../autotest/office_hvac_energy.player | 0 .../autotest/office_interior_temp.player | 0 .../commercial}/autotest/test_ceus.glm | 0 .../autotest/test_ceus_saveplots.py | 0 .../test_commercial_HVAC_load_pf_opt.glm | 0 .../autotest/test_commercial_Qi.glm | 0 .../test_commercial_const_air_temp.glm | 0 ...test_commercial_cooling_cop_sanity_err.glm | 0 .../autotest/test_commercial_energy_opt.glm | 0 ...test_commercial_exterior_ua_sanity_err.glm | 0 .../test_commercial_floor_area_sanity_err.glm | 0 ...est_commercial_floor_height_sanity_err.glm | 0 ...test_commercial_heating_cop_sanity_err.glm | 0 .../test_commercial_hvac_AUX_load_opt.glm | 0 .../test_commercial_hvac_COOL_load_opt.glm | 0 .../test_commercial_hvac_ECON_load_opt.glm | 0 .../test_commercial_hvac_HEAT_load_opt.glm | 0 .../test_commercial_hvac_OFF_load_opt.glm | 0 .../test_commercial_hvac_VENT_load_opt.glm | 0 .../test_commercial_hvac_air_temp.glm | 0 .../test_commercial_hvac_air_temp2.glm | 0 .../test_commercial_hvac_energy_opt.glm | 0 ...st_commercial_hvac_heat_cap_sanity_err.glm | 0 ...st_commercial_interior_mass_sanity_err.glm | 0 ...test_commercial_interior_ua_sanity_err.glm | 0 .../test_commercial_lights_energy_f.glm | 0 .../test_commercial_lights_energy_pf_opt.glm | 0 .../test_commercial_lights_heatgains_opt.glm | 0 .../test_commercial_lights_load_f.glm | 0 .../test_commercial_lights_load_pf.glm | 0 .../test_commercial_mass_temperature_opt.glm | 0 .../test_commercial_plugs_energy_f.glm | 0 .../test_commercial_plugs_energy_pf_opt.glm | 0 .../test_commercial_plugs_heatgains.glm | 0 .../autotest/test_commercial_plugs_load_f.glm | 0 .../test_commercial_plugs_load_pf.glm | 0 ...st_commercial_temp_deadband_sanity_err.glm | 0 ...t_commercial_temp_setpoints_sanity_err.glm | 0 .../test_commercial_total_load_opt.glm | 0 .../commercial}/autotest/test_parking.glm | 0 {commercial => module/commercial}/ceus.cpp | 0 {commercial => module/commercial}/ceus.h | 0 .../commercial}/commercial.h | 0 .../commercial}/commercial.vcproj | 0 .../commercial}/docs/Parking.ipynb | 0 {commercial => module/commercial}/hvac.cpp | 0 {commercial => module/commercial}/hvac.h | 0 {commercial => module/commercial}/init.cpp | 0 {commercial => module/commercial}/main.cpp | 0 .../commercial}/multizone.cpp | 0 {commercial => module/commercial}/multizone.h | 0 {commercial => module/commercial}/office.cpp | 2 +- {commercial => module/commercial}/office.h | 0 {commercial => module/commercial}/parking.cpp | 0 {commercial => module/commercial}/parking.h | 0 {commercial => module/commercial}/solvers.cpp | 0 {commercial => module/commercial}/solvers.h | 0 {connection => module/connection}/Makefile.mk | 0 .../autotest/test_fncs_msg_client.glm | 0 .../connection}/autotest/test_json_client.glm | 0 .../connection}/autotest/test_json_server.glm | 0 .../autotest/test_native_client.glm | 0 .../autotest/test_native_server.glm | 0 .../connection}/autotest/test_xml_client.glm | 0 .../connection}/autotest/test_xml_server.glm | 0 {connection => module/connection}/cache.cpp | 0 {connection => module/connection}/cache.h | 0 {connection => module/connection}/client.cpp | 0 {connection => module/connection}/client.h | 0 .../connection}/connection.cpp | 0 .../connection}/connection.h | 0 .../connection}/connection.pptx | Bin .../connection}/connection.vcproj | 0 .../connection.vcproj.PNL.fish334.user | 0 .../connection}/fncs_msg.cpp | 0 .../connection}/fncs_msg.cpp.bak | 0 {connection => module/connection}/fncs_msg.h | 0 .../connection}/fncs_msg.h.bak | 0 {connection => module/connection}/init.cpp | 0 {connection => module/connection}/jsmn.c | 0 {connection => module/connection}/jsmn.h | 0 {connection => module/connection}/json.cpp | 0 {connection => module/connection}/json.h | 0 .../connection}/json_link/__init__.py | 0 .../connection}/json_link/bin/__init__.py | 0 .../json_link/bin/json_link_tester.py | 0 .../json_link/doc/html/_modules/index.html | 0 .../json_link/bin/json_link_tester.html | 0 .../json_link/faults/fault_inject.html | 0 .../html/_modules/json_link/json_link.html | 0 .../json_link/json_link/json_link.html | 0 .../json_link/json_link/raw_xchg.html | 0 .../_modules/json_link/test/fault_inject.html | 0 .../json_link/test/json_link_tester.html | 0 .../_modules/json_link/xchg/raw_xchg.html | 0 .../json_link/doc/html/_sources/index.txt | 0 .../doc/html/_sources/json_link.bin.txt | 0 .../doc/html/_sources/json_link.faults.txt | 0 .../doc/html/_sources/json_link.json_link.txt | 0 .../doc/html/_sources/json_link.test.txt | 0 .../json_link/doc/html/_sources/json_link.txt | 0 .../doc/html/_sources/json_link.xchg.txt | 0 .../json_link/doc/html/_sources/modules.txt | 0 .../doc/html/_static/ajax-loader.gif | Bin .../json_link/doc/html/_static/basic.css | 0 .../doc/html/_static/comment-bright.png | Bin .../doc/html/_static/comment-close.png | Bin .../json_link/doc/html/_static/comment.png | Bin .../json_link/doc/html/_static/contents.png | Bin .../json_link/doc/html/_static/default.css | 0 .../json_link/doc/html/_static/doctools.js | 0 .../doc/html/_static/down-pressed.png | Bin .../json_link/doc/html/_static/down.png | Bin .../json_link/doc/html/_static/file.png | Bin .../json_link/doc/html/_static/jquery.js | 0 .../json_link/doc/html/_static/minus.png | Bin .../json_link/doc/html/_static/navigation.png | Bin .../json_link/doc/html/_static/plus.png | Bin .../json_link/doc/html/_static/pygments.css | 0 .../json_link/doc/html/_static/searchtools.js | 0 .../json_link/doc/html/_static/sidebar.js | 0 .../json_link/doc/html/_static/sphinxdoc.css | 0 .../json_link/doc/html/_static/underscore.js | 0 .../json_link/doc/html/_static/up-pressed.png | Bin .../json_link/doc/html/_static/up.png | Bin .../json_link/doc/html/_static/websupport.js | 0 .../json_link/doc/html/genindex.html | 0 .../connection}/json_link/doc/html/index.html | 0 .../json_link/doc/html/json_link.bin.html | 0 .../json_link/doc/html/json_link.faults.html | 0 .../json_link/doc/html/json_link.html | 0 .../doc/html/json_link.json_link.html | 0 .../json_link/doc/html/json_link.test.html | 0 .../json_link/doc/html/json_link.xchg.html | 0 .../json_link/doc/html/modules.html | 0 .../json_link/doc/html/objects.inv | Bin .../json_link/doc/html/py-modindex.html | 0 .../json_link/doc/html/search.html | 0 .../json_link/doc/html/searchindex.js | 0 .../connection}/json_link/doc/make.bat | 0 .../connection}/json_link/doc/source/conf.py | 0 .../json_link/doc/source/index.rst | 0 .../json_link/doc/source/json_link.bin.rst | 0 .../json_link/doc/source/json_link.faults.rst | 0 .../json_link/doc/source/json_link.rst | 0 .../json_link/doc/source/json_link.test.rst | 0 .../json_link/doc/source/json_link.xchg.rst | 0 .../connection}/json_link/faults/__init__.py | 0 .../json_link/faults/fault_inject.py | 0 .../connection}/json_link/json_link.py | 0 .../connection}/json_link/test/__init__.py | 0 .../json_link/test/test_json_link.py | 0 .../connection}/json_link/xchg/__init__.py | 0 .../connection}/json_link/xchg/raw_xchg.py | 0 .../connection}/json_link_demo.py | 0 {connection => module/connection}/main.cpp | 0 {connection => module/connection}/message.h | 0 {connection => module/connection}/native.cpp | 0 {connection => module/connection}/native.h | 0 {connection => module/connection}/server.cpp | 0 {connection => module/connection}/server.h | 0 {connection => module/connection}/socket.cpp | 0 {connection => module/connection}/socket.h | 0 {connection => module/connection}/tcp.cpp | 0 {connection => module/connection}/tcp.h | 0 .../connection}/transport.cpp | 0 {connection => module/connection}/transport.h | 0 {connection => module/connection}/udp.cpp | 0 {connection => module/connection}/udp.h | 0 {connection => module/connection}/validate.no | 0 {connection => module/connection}/varmap.cpp | 0 {connection => module/connection}/varmap.h | 0 {connection => module/connection}/xml.cpp | 0 {connection => module/connection}/xml.h | 0 module/generators/Makefile.mk | 39 + .../generators}/autotest/CDGCLoad.player | 0 .../generators}/autotest/MPINV_OUT1.player | 0 .../generators}/autotest/Standard_Weather.csv | 0 .../generators}/autotest/VSI_droop_VA.csv | 0 .../autotest/VSI_droop_frequency.csv | 0 .../autotest/VSI_isochronous_VA.csv | 0 .../autotest/VSI_isochronous_droop_VA.csv | 0 .../autotest/Yakima_Insolation.player | 0 .../Yakima_ambient_temperature.player | 0 .../autotest/Yakima_wind_speed.player | 0 .../cdgc_test_meter_power_assert.player | 0 ...nstantPFmeterPower_multi_efficiency.player | 0 ...stantPFmeterPower_static_efficiency.player | 0 .../generators}/autotest/constantPQ_PV.csv | 0 .../generators}/autotest/constantPQ_PV_VA.csv | 0 .../autotest/constantPQ_battery_VA.csv | 0 .../autotest/constantPQ_diesel_dg.csv | 0 .../autotest/constantPQ_diesel_dg_speed.csv | 0 ...nstantPQmeterPower_multi_efficiency.player | 0 ...stantPQmeterPower_static_efficiency.player | 0 .../generators}/autotest/constantP_PV_VA.csv | 0 .../autotest/constantP_battery_VA.csv | 0 .../autotest/constantP_diesel_dg_speed.csv | 0 .../generators}/autotest/constantQ_PV.csv | 0 .../generators}/autotest/constantQ_PV_VA.csv | 0 .../autotest/constantQ_battery_VA.csv | 0 .../autotest/constantQ_diesel_dg_speed.csv | 0 .../autotest/data_Bus1_voltageA.csv | 0 .../autotest/data_G1SpeedAssert.csv | 0 .../autotest/data_PID_inverter_current_A.csv | 0 .../autotest/data_PID_inverter_current_B.csv | 0 .../autotest/data_PID_inverter_current_C.csv | 0 .../autotest/data_PI_inverter_current_A.csv | 0 .../autotest/data_PI_inverter_current_B.csv | 0 .../autotest/data_PI_inverter_current_C.csv | 0 .../autotest/data_error_Bus1_voltageA.csv | 0 .../autotest/data_error_G1SpeedAssert.csv | 0 .../data_inv_voltage_player_A_test.csv | 0 .../data_inv_voltage_player_B_test.csv | 0 .../data_inv_voltage_player_C_test.csv | 0 .../autotest/default_solar_Insolation.player | 0 .../autotest/default_solar_VA_out.player | 0 .../autotest/diesel_brake_hp.player | 0 .../diesel_deltamode_load_player_A.csv | 0 ...diesel_deltamode_load_player_A_1Gen.player | 0 ...esel_deltamode_load_player_A_1Gen_2.player | 0 ...esel_deltamode_load_player_A_1Gen_3.player | 0 .../diesel_deltamode_load_player_B.csv | 0 ...diesel_deltamode_load_player_B_1Gen.player | 0 ...esel_deltamode_load_player_B_1Gen_2.player | 0 ...esel_deltamode_load_player_B_1Gen_3.player | 0 .../diesel_deltamode_load_player_C.csv | 0 ...diesel_deltamode_load_player_C_1Gen.player | 0 ...esel_deltamode_load_player_C_1Gen_2.player | 0 ...esel_deltamode_load_player_C_1Gen_3.player | 0 .../autotest/fixed_20_S_VA_out.player | 0 .../autotest/fixed_45_E_VA_out.player | 0 .../autotest/fixed_45_N_VA_out.player | 0 .../autotest/fixed_45_S_Insolation.player | 0 .../autotest/fixed_45_S_VA_out.player | 0 ...fixed_45_S_shading_Insolation_15min.player | 0 .../fixed_45_S_shading_VA_out_15min.player | 0 .../autotest/fixed_45_W_VA_out.player | 0 .../autotest/fixed_90_S_Insolation.player | 0 .../autotest/fixed_90_S_VA_out.player | 0 .../autotest/fqm_constant_pq_power.player | 0 .../autotest/fqm_constant_pq_soc.player | 0 .../autotest/fqm_constant_pq_status.player | 0 .../fqm_group_lf_batt633_power.player | 0 .../fqm_group_lf_batt684_power.player | 0 .../autotest/fqm_group_lf_load.player | 0 .../autotest/fqm_group_lf_status.player | 0 .../autotest/fqm_pf_reg_load.player | 0 .../autotest/fqm_pf_reg_power.player | 0 .../autotest/fqm_pf_reg_status.player | 0 .../inv_loadflow_battery_soc_out.player | 0 ..._loadflow_meter_measured_power_imag.player | 0 ..._loadflow_meter_measured_power_real.player | 0 .../inverter_VA_out_default_solar.player | 0 .../mltpt_efficiency_inverter_VA_out.player | 0 .../generators}/autotest/solar_Vout.player | 0 .../autotest/solar_playerval_VA_Out.player | 0 .../substationSwitch_diesel_dg_speed.csv | 0 ...test_1_isochronous_VSI_1_droop_VSI_err.glm | 0 .../autotest/test_1isochronous_VSI_err.glm | 0 ...est_1isochronous_dg_1PQconstant_PV_err.glm | 0 ...isochronous_dg_1PQconstant_battery_opt.glm | 0 ...est_1isochronous_dg_1PQconstant_dg_err.glm | 0 ...sochronous_dg_1Pconstant_Qdroop_PV_err.glm | 0 ...onous_dg_1Pconstant_Qdroop_battery_opt.glm | 0 ...sochronous_dg_1Pconstant_Qdroop_dg_err.glm | 0 ...sochronous_dg_1Pdroop_Qconstant_PV_opt.glm | 0 ...onous_dg_1Pdroop_Qconstant_battery_opt.glm | 0 ...sochronous_dg_1Pdroop_Qconstant_dg_opt.glm | 0 .../autotest/test_2droop_VSI_err.glm | 0 ...uad_inv_modes_PF_PQ_default_efficiency.glm | 0 ..._inv_modes_PF_PQ_multipoint_efficiency.glm | 0 .../autotest/test_PMSG_windturb.glm | 0 .../generators}/autotest/test_Vout_PV.glm | 0 .../autotest/test_Vout_PV_solar_no_Parent.glm | 0 .../autotest/test_central_dg_control.glm | 0 .../test_deltamode_diesel_dg_assert_err.glm | 0 ...st_deltamode_diesel_dg_assert_once_err.glm | 0 .../test_deltamode_diesel_dg_complex_err.glm | 0 .../test_deltamode_diesel_dg_double_err.glm | 0 .../autotest/test_deltamode_diesel_dg_err.glm | 0 .../test_deltamode_diesel_dg_pctests_err.glm | 0 .../generators}/autotest/test_diesel_dg.glm | 0 .../autotest/test_fqm_constant_pq.glm | 0 .../autotest/test_fqm_group_lf.glm | 0 .../generators}/autotest/test_fqm_pf_reg.glm | 0 .../test_generators_inverter_volt_var.glm | 0 ...nerators_inverter_volt_var_voltageA.player | 0 ...nerators_inverter_volt_var_voltageB.player | 0 ...nerators_inverter_volt_var_voltageC.player | 0 ...est_generators_inverter_vv_output_A.player | 0 ...est_generators_inverter_vv_output_B.player | 0 ...est_generators_inverter_vv_output_C.player | 0 .../test_inverter_PID_deltamode_err.glm | 0 .../test_inverter_PI_deltamode_opt.glm | 0 .../autotest/test_inverter_loadfollow_FBS.glm | 0 .../autotest/test_inverter_loadfollow_NR.glm | 0 .../autotest/test_multipoint_inverter.glm | 0 .../test_solar_climate_default_playerval.glm | 0 .../autotest/test_solar_orientation.glm | 0 .../autotest/test_solar_output_efficiency.glm | 0 .../autotest/test_solar_parent_err.glm | 0 .../autotest/test_solar_shading.glm | 0 .../generators}/autotest/test_solar_tilt.glm | 0 .../autotest/test_windturbine_FBS.glm | 0 .../autotest/test_windturbine_NR.glm | 0 .../generators}/autotest/trigger.player | 0 .../autotest/windpower_assert.player | 0 {generators => module/generators}/battery.cpp | 0 {generators => module/generators}/battery.h | 0 .../generators}/central_dg_control.cpp | 0 .../generators}/central_dg_control.h | 0 .../generators}/controller_dg.cpp | 0 .../generators}/controller_dg.h | 0 .../generators}/dc_dc_converter.cpp | 0 .../generators}/dc_dc_converter.h | 0 .../generators}/diesel_dg.cpp | 0 {generators => module/generators}/diesel_dg.h | 0 .../generators}/energy_storage.cpp | 0 .../generators}/energy_storage.h | 0 .../generators}/generators.h | 0 .../generators}/generators.vcproj | 0 {generators => module/generators}/init.cpp | 0 .../generators}/inverter.cpp | 0 {generators => module/generators}/inverter.h | 0 {generators => module/generators}/main.cpp | 0 .../generators}/microturbine.cpp | 0 .../generators}/microturbine.h | 0 .../generators}/power_electronics.cpp | 0 .../generators}/power_electronics.h | 0 .../generators}/rectifier.cpp | 0 {generators => module/generators}/rectifier.h | 0 {generators => module/generators}/solar.cpp | 0 {generators => module/generators}/solar.h | 0 .../generators}/windturb_dg.cpp | 0 .../generators}/windturb_dg.h | 0 module/industrial/Makefile.mk | 14 + .../industrial}/autotest/test_industrial.glm | 0 .../autotest/test_industrial_variable.glm | 0 .../industrial}/data/MECS2014_Table_11-1.xlsx | Bin .../industrial}/data/MECS2014_Table_5-1.xlsx | Bin .../industrial}/data/MECS2014_Table_9-1.xlsx | Bin .../industrial}/data/config.py | 0 .../industrial}/data/mecs.py | 0 .../industrial}/data/mecs_data.csv | 0 .../industrial}/data/nerc_data.csv | 0 .../industrial}/industrial.cpp | 0 .../industrial}/industrial.h | 0 {industrial => module/industrial}/init.cpp | 0 .../industrial}/naics_data_file.csv | 0 module/influxdb/Makefile.mk | 20 + .../autotest/test_local_database.glm | 0 {influxdb => module/influxdb}/collector.cpp | 0 {influxdb => module/influxdb}/collector.h | 0 {influxdb => module/influxdb}/database.cpp | 0 {influxdb => module/influxdb}/database.h | 0 {influxdb => module/influxdb}/influxdb.cpp | 0 {influxdb => module/influxdb}/influxdb.h | 0 {influxdb => module/influxdb}/jsondata.h | 0 {influxdb => module/influxdb}/player.cpp | 0 {influxdb => module/influxdb}/player.h | 0 {influxdb => module/influxdb}/recorder.cpp | 0 {influxdb => module/influxdb}/recorder.h | 0 {influxdb => module/influxdb}/validate.no | 0 module/market/Makefile.mk | 36 + {market => module/market}/auction.cpp | 0 {market => module/market}/auction.h | 0 .../autotest/ColumbusWeather2009_Correct.csv | 0 ...ultiplier_Critical_With_Two_TierCPP.player | 0 ...lier_NonCritical_With_Three_TierCPP.player | 0 ...iplier_NonCritical_With_Two_TierCPP.player | 0 ...sticity_Multiplier_Three_Tier_Price.player | 0 ...lasticity_Multiplier_Two_Tier_Price.player | 0 .../market}/autotest/Price_Changing.player | 0 .../market}/autotest/Price_Static.player | 0 .../market}/autotest/TOU_Pricing.player | 0 .../TOU_Pricing_2Tier_OnlyCritical.glm | 0 .../TOU_Pricing_2Tier_OnlyCritical.player | 0 .../TOU_Pricing_2Tier_OnlyHigh.player | 0 .../market}/autotest/TOU_Pricing_3Tier.player | 0 .../market}/autotest/appliance_schedules.glm | 0 .../autotest/dutycycle_CPP_player.player | 0 .../autotest/dutycycle_TOU_player.player | 0 .../market}/autotest/lastP_static.player | 0 .../autotest/negative_price_bids.player | 0 .../autotest/negative_quantity_bids.player | 0 .../market}/autotest/repeated_bids.player | 0 ...ticity_Model_Critical_Three_Tier_Price.glm | 0 ...asticity_Model_Critical_Two_Tier_Price.glm | 0 ...y_Model_NonCritical_With_Three_TierCPP.glm | 0 ...ity_Model_NonCritical_With_Two_TierCPP.glm | 0 .../autotest/test_controller_override.glm | 0 ...test_controller_override_is_COOL_on.player | 0 .../test_controller_override_value.player | 0 .../market}/autotest/test_dutycycle_CPP.glm | 0 .../market}/autotest/test_dutycycle_TOU.glm | 0 .../test_market_auction_advanced_1.glm | 0 .../test_market_auction_clearing_3.glm | 0 ...t_market_auction_clearing_6_morebuyers.glm | 0 ..._market_auction_clearing_6_moresellers.glm | 0 .../autotest/test_market_auction_timing_1.glm | 0 .../autotest/test_market_auction_timing_2.glm | 0 .../autotest/test_market_auction_timing_4.glm | 0 .../autotest/test_market_auction_timing_5.glm | 0 .../autotest/test_market_exercise_4_4_1.glm | 0 ...e_controller_RAMP_mode_matching_period.glm | 0 ...ontroller_RAMP_mode_nonmatching_period.glm | 0 .../test_market_quantity_conversion.glm | 0 .../test_markets_auction_buyer_rebid.glm | 0 .../test_markets_auction_buyer_seller_alt.glm | 0 .../test_markets_auction_buyers_first.glm | 0 .../test_markets_auction_cases_4_and_5.glm | 0 ...t_markets_auction_large_balanced_exact.glm | 0 ...ion_large_unbalanced_bid_resubmissions.glm | 0 ...markets_auction_large_unbalanced_exact.glm | 0 ...rkets_auction_large_unbalanced_failure.glm | 0 ...uction_large_unbalanced_marginal_buyer.glm | 0 ...uction_large_unbalanced_marginal_price.glm | 0 ...ction_large_unbalanced_marginal_seller.glm | 0 ...uction_large_unbalanced_no_buyers_null.glm | 0 ...ction_large_unbalanced_no_sellers_null.glm | 0 ..._markets_auction_large_unbalanced_null.glm | 0 ...arkets_auction_negative_all_quantities.glm | 0 ...uction_negative_buyer_and_seller_price.glm | 0 ...t_markets_auction_negative_buyer_price.glm | 0 ...arkets_auction_negative_buyer_quantity.glm | 0 ...st_markets_auction_negative_price_bids.glm | 0 ...markets_auction_negative_quantity_bids.glm | 0 ..._markets_auction_negative_seller_price.glm | 0 ...rkets_auction_negative_seller_quantity.glm | 0 .../test_markets_auction_no_buyers.glm | 0 .../test_markets_auction_no_sellers.glm | 0 .../test_markets_auction_null_market.glm | 0 .../test_markets_auction_repeated_bids.glm | 0 .../test_markets_auction_seller_buyer_alt.glm | 0 .../test_markets_auction_seller_rebid.glm | 0 .../test_markets_auction_sellers_first.glm | 0 .../test_markets_auction_simultaneous.glm | 0 ...ets_auction_unresponsive_buyer_failure.glm | 0 ...oller_cooling_deadband_matching_period.glm | 0 ...ts_controller_cooling_inelastic_double.glm | 0 ...ller_cooling_inelastic_matching_period.glm | 0 ..._cooling_inelastic_nonmatching_periods.glm | 0 ...oller_heating_deadband_matching_period.glm | 0 ...ts_controller_heating_inelastic_double.glm | 0 ...ller_heating_inelastic_matching_period.glm | 0 ...r_heating_inelastic_nonmatching_period.glm | 0 .../autotest/test_markets_stubauction_opt.glm | 0 ..._auction_large_balanced_marginal_buyer.glm | 0 ..._auction_large_balanced_marginal_price.glm | 0 ...auction_large_balanced_marginal_seller.glm | 0 .../market}/autotest/test_skew_DST_fall.glm | 0 .../market}/autotest/test_skew_DST_spring.glm | 0 .../market}/autotest/test_skew_leap_years.glm | 0 .../autotest/test_skew_year_transitions.glm | 0 .../market}/autotest/test_stubauction.glm | 0 .../test_unitless_bid_quantity_err.glm | 0 {market => module/market}/bid.cpp | 0 {market => module/market}/bid.h | 0 {market => module/market}/collect.cpp | 0 {market => module/market}/collect.h | 0 {market => module/market}/controller.cpp | 0 {market => module/market}/controller.h | 0 {market => module/market}/controller2.cpp | 0 {market => module/market}/controller2.h | 0 {market => module/market}/curve.cpp | 0 {market => module/market}/curve.h | 0 .../market}/double_controller.cpp | 0 {market => module/market}/double_controller.h | 0 .../market}/generator_controller.cpp | 0 .../market}/generator_controller.h | 0 {market => module/market}/init.cpp | 0 {market => module/market}/main.cpp | 0 {market => module/market}/market.h | 0 {market => module/market}/market.vcproj | 0 .../market}/passive_controller.cpp | 0 .../market}/passive_controller.h | 0 {market => module/market}/stub_bidder.cpp | 0 {market => module/market}/stub_bidder.h | 0 {market => module/market}/stubauction.cpp | 0 {market => module/market}/stubauction.h | 0 .../market}/supervisory_control.cpp | 0 .../market}/supervisory_control.h | 0 .../mysql}/MYSQL_specific.vsprops | 0 module/mysql/Makefile.mk | 24 + .../mysql}/autotest/test_mysql_collector.glm | 0 .../mysql}/autotest/test_mysql_player.csv | 0 .../mysql}/autotest/test_mysql_player.glm | 0 .../autotest/test_mysql_player_init.sql | 0 .../mysql}/autotest/test_mysql_recorder.glm | 0 .../autotest/test_mysql_recorder_init.sql | 0 .../autotest/test_mysql_recorder_sync.sql | 0 .../autotest/test_mysql_recorder_term.sql | 0 {mysql => module/mysql}/collector.cpp | 0 {mysql => module/mysql}/collector.h | 0 {mysql => module/mysql}/database.cpp | 0 {mysql => module/mysql}/database.h | 0 {mysql => module/mysql}/init.cpp | 0 {mysql => module/mysql}/main.cpp | 0 {mysql => module/mysql}/mysql.vcproj | 0 {mysql => module/mysql}/player.cpp | 0 {mysql => module/mysql}/player.h | 0 {mysql => module/mysql}/recorder.cpp | 0 {mysql => module/mysql}/recorder.h | 0 {mysql => module/mysql}/validate.no | 0 module/optimize/Makefile.mk | 13 + .../optimize}/autotest/test_extremum_opt.glm | 0 .../optimize}/autotest/test_maximum_err.glm | 0 .../optimize}/autotest/test_minimum.glm | 0 {optimize => module/optimize}/main.cpp | 0 {optimize => module/optimize}/optimize.h | 0 {optimize => module/optimize}/optimize.vcproj | 0 .../optimize}/particle_swarm_optimization.cpp | 0 .../optimize}/particle_swarm_optimization.h | 0 {optimize => module/optimize}/simple.cpp | 0 {optimize => module/optimize}/simple.h | 0 module/powerflow/Makefile.mk | 80 ++ .../powerflow}/OHLConductors.glm | 0 .../autotest/IEEE_13_node_impedance_dump.glm | 0 .../powerflow}/autotest/PSV.player | 0 .../powerflow}/autotest/SPIM_frequency.player | 0 .../powerflow}/autotest/SPIM_override.player | 0 .../autotest/SPIM_power_assert.player | 0 .../autotest/SPIM_reconnect_assert.player | 0 .../autotest/SPIM_status_assert.player | 0 .../autotest/SPIM_trip_assert.player | 0 .../powerflow}/autotest/SPIM_voltage.player | 0 .../powerflow}/autotest/SPIM_wr_assert.player | 0 .../powerflow}/autotest/billing_power.player | 0 .../autotest/cap_current_A_indiv_volt.player | 0 .../autotest/cap_current_B_indiv_volt.player | 0 .../autotest/cap_current_C_indiv_volt.player | 0 .../autotest/cap_manual_switch.player | 0 .../autotest/cap_volt_A_BANK_VAR_dwell.player | 0 .../autotest/cap_volt_A_bank_dwell.player | 0 .../autotest/cap_volt_A_indiv_VAR.player | 0 .../autotest/cap_volt_A_indiv_VAR_B_NR.player | 0 .../autotest/cap_volt_A_indiv_VAR_NR.player | 0 .../cap_volt_A_indiv_VAR_dwell.player | 0 .../cap_volt_A_indiv_VAR_dwell_NR.player | 0 .../autotest/cap_volt_A_indiv_VOLTVAR.player | 0 .../cap_volt_A_indiv_VOLTVAR_NR.player | 0 .../cap_volt_A_indiv_VOLTVAR_dwell.player | 0 .../autotest/cap_volt_A_indiv_dwell.player | 0 .../autotest/cap_volt_A_indiv_dwell_NR.player | 0 .../autotest/cap_volt_A_indiv_volt.player | 0 .../autotest/cap_volt_A_indiv_volt_NR.player | 0 .../cap_volt_A_indiv_volt_NR_Y.player | 0 .../autotest/cap_volt_A_manual_ts.player | 0 .../autotest/cap_volt_B_BANK_VAR_dwell.player | 0 .../autotest/cap_volt_B_bank_dwell.player | 0 .../autotest/cap_volt_B_indiv_VAR.player | 0 .../autotest/cap_volt_B_indiv_VAR_B_NR.player | 0 .../autotest/cap_volt_B_indiv_VAR_NR.player | 0 .../cap_volt_B_indiv_VAR_dwell.player | 0 .../cap_volt_B_indiv_VAR_dwell_NR.player | 0 .../autotest/cap_volt_B_indiv_VOLTVAR.player | 0 .../cap_volt_B_indiv_VOLTVAR_NR.player | 0 .../cap_volt_B_indiv_VOLTVAR_dwell.player | 0 .../autotest/cap_volt_B_indiv_dwell.player | 0 .../autotest/cap_volt_B_indiv_dwell_NR.player | 0 .../autotest/cap_volt_B_indiv_volt.player | 0 .../autotest/cap_volt_B_indiv_volt_NR.player | 0 .../cap_volt_B_indiv_volt_NR_Y.player | 0 .../autotest/cap_volt_B_manual_ts.player | 0 .../autotest/cap_volt_C_BANK_VAR_dwell.player | 0 .../autotest/cap_volt_C_bank_dwell.player | 0 .../autotest/cap_volt_C_indiv_VAR.player | 0 .../autotest/cap_volt_C_indiv_VAR_B_NR.player | 0 .../autotest/cap_volt_C_indiv_VAR_NR.player | 0 .../cap_volt_C_indiv_VAR_dwell.player | 0 .../cap_volt_C_indiv_VAR_dwell_NR.player | 0 .../autotest/cap_volt_C_indiv_VOLTVAR.player | 0 .../cap_volt_C_indiv_VOLTVAR_NR.player | 0 .../cap_volt_C_indiv_VOLTVAR_dwell.player | 0 .../autotest/cap_volt_C_indiv_dwell.player | 0 .../autotest/cap_volt_C_indiv_dwell_NR.player | 0 .../autotest/cap_volt_C_indiv_volt.player | 0 .../autotest/cap_volt_C_indiv_volt_NR.player | 0 .../cap_volt_C_indiv_volt_NR_Y.player | 0 .../autotest/cap_volt_C_manual_ts.player | 0 .../center_tapped_basic_energy.player | 0 .../center_tapped_complex_energy.player | 0 .../autotest/controller_1_armed.player | 0 .../autotest/controller_1_method.player | 0 .../autotest/controller_1_status.player | 0 .../powerflow}/autotest/data_SPIM_Vset.player | 0 .../data_SPIM_triplex_measured_phaseA.csv | 0 .../data_SPIM_triplex_measured_phaseB.csv | 0 .../data_SPIM_triplex_measured_phaseC.csv | 0 .../data_SPIM_triplex_motor_A_speed.csv | 0 .../data_SPIM_triplex_motor_B_speed.csv | 0 .../data_SPIM_triplex_motor_C_speed.csv | 0 .../autotest/data_ZIP_test_base_power.csv | 0 .../data_assert_swing_pq_voltage_A.csv | 0 .../data_assert_swing_pq_voltage_B.csv | 0 .../data_assert_swing_pq_voltage_C.csv | 0 .../powerflow}/autotest/data_cap_service.csv | 0 .../data_cap_service_test_power_measure.csv | 0 .../data_configurations_delta_123node.glm | 0 .../autotest/data_delta_load_voltage_A.csv | 0 .../autotest/data_delta_load_voltage_B.csv | 0 .../autotest/data_delta_load_voltage_C.csv | 0 .../autotest/data_delta_player_load_A.csv | 0 .../autotest/data_delta_player_load_B.csv | 0 .../autotest/data_delta_player_load_C.csv | 0 .../autotest/data_delta_powermeas_assert.csv | 0 .../data_delta_triplex_load_power.csv | 0 .../data_delta_triplex_load_voltage_1.csv | 0 .../data_delta_triplex_load_voltage_12.csv | 0 .../data_delta_triplex_load_voltage_2.csv | 0 .../autotest/data_delta_triplex_player.csv | 0 .../data_inrush_LineFlowCurrentOut_A.csv | 0 .../data_inrush_LineFlowCurrentOut_B.csv | 0 .../data_inrush_LineFlowCurrentOut_C.csv | 0 .../autotest/data_inrush_Voltage_node2_A.csv | 0 .../autotest/data_inrush_Voltage_node2_B.csv | 0 .../autotest/data_inrush_Voltage_node2_C.csv | 0 .../autotest/data_multi_load4B_phaseA.csv | 0 .../autotest/data_multi_load4B_phaseB.csv | 0 .../autotest/data_multi_load4B_phaseC.csv | 0 .../autotest/data_multi_load4C_phaseA.csv | 0 .../autotest/data_multi_load4C_phaseB.csv | 0 .../autotest/data_multi_load4C_phaseC.csv | 0 .../autotest/data_multi_load4_phaseA.csv | 0 .../autotest/data_multi_load4_phaseB.csv | 0 .../autotest/data_multi_load4_phaseC.csv | 0 .../data_swing_pq_voltage_player_A.csv | 0 .../data_swing_pq_voltage_player_B.csv | 0 .../data_swing_pq_voltage_player_C.csv | 0 .../data_triplex_parent_test_housebus.csv | 0 .../data_triplex_parent_test_parentbus.csv | 0 .../data_triplex_parent_test_swingbus.csv | 0 .../autotest/data_vfd_currRecorderA.csv | 0 .../autotest/data_vfd_currRecorderB.csv | 0 .../autotest/data_vfd_currRecorderC.csv | 0 .../autotest/data_vfd_in_rec_curr_A.csv | 0 .../autotest/data_vfd_in_rec_curr_B.csv | 0 .../autotest/data_vfd_in_rec_curr_C.csv | 0 .../autotest/data_vfd_in_rec_pow_A.csv | 0 .../autotest/data_vfd_in_rec_pow_B.csv | 0 .../autotest/data_vfd_in_rec_pow_C.csv | 0 .../data_vfd_load_volt_out_volt_A.csv | 0 .../data_vfd_load_volt_out_volt_B.csv | 0 .../data_vfd_load_volt_out_volt_C.csv | 0 .../autotest/data_vfd_out_rec_curr_A.csv | 0 .../autotest/data_vfd_out_rec_curr_B.csv | 0 .../autotest/data_vfd_out_rec_curr_C.csv | 0 .../autotest/data_vfd_out_rec_pow_A.csv | 0 .../autotest/data_vfd_out_rec_pow_B.csv | 0 .../autotest/data_vfd_out_rec_pow_C.csv | 0 .../autotest/data_vfd_powRecorderA.csv | 0 .../autotest/data_vfd_powRecorderB.csv | 0 .../autotest/data_vfd_powRecorderC.csv | 0 .../data_vfd_speedPlayer_delta.player | 0 .../autotest/data_zip_measload_phaseA.csv | 0 .../autotest/data_zip_measload_phaseB.csv | 0 .../autotest/data_zip_measload_phaseC.csv | 0 .../autotest/dist_volt_A_Aref.player | 0 .../autotest/dist_volt_B_Aref.player | 0 .../autotest/dist_volt_C_Aref.player | 0 .../autotest/dutycycle_player.player | 0 .../powerflow}/autotest/feeder_schedules.glm | 0 .../powerflow}/autotest/flat.player | 0 .../autotest/fuse_assert_status_B.player | 0 .../autotest/fuse_assert_status_C.player | 0 .../powerflow}/autotest/fuse_load_B.player | 0 .../autotest/fuse_ph_A_status.player | 0 .../autotest/fuse_ph_B_status.player | 0 .../autotest/fuse_ph_C_status.player | 0 .../autotest/linearLoadIncrease.player | 0 .../autotest/load_tracker_setpoint.player | 0 .../powerflow}/autotest/loader_fastA.player | 0 .../autotest/loader_fastA_NR.player | 0 .../autotest/loader_fastA_induct.player | 0 .../powerflow}/autotest/loader_fastB.player | 0 .../autotest/loader_fastB_NR.player | 0 .../autotest/loader_fastB_induct.player | 0 .../powerflow}/autotest/loader_fastC.player | 0 .../autotest/loader_fastC_NR.player | 0 .../autotest/loader_fastC_induct.player | 0 .../meter_reactive_energy_delta.player | 0 .../autotest/meter_real_energy_delta.player | 0 .../autotest/regulator_load_phA.player | 0 .../autotest/regulator_load_phB.player | 0 .../autotest/regulator_load_phC.player | 0 .../regulator_manual_YY_assert_A.player | 0 .../regulator_manual_YY_assert_A_TypeB.player | 0 .../regulator_manual_YY_assert_B.player | 0 .../regulator_manual_YY_assert_B_TypeB.player | 0 .../regulator_manual_YY_assert_C.player | 0 .../regulator_manual_YY_assert_C_TypeB.player | 0 .../autotest/regulator_manual_YY_tap_A.player | 0 .../autotest/regulator_manual_YY_tap_B.player | 0 .../autotest/regulator_manual_YY_tap_C.player | 0 .../powerflow}/autotest/solver_ml.conf | 0 .../powerflow}/autotest/solver_ml_check.py | 0 .../powerflow}/autotest/solver_py.conf | 0 .../powerflow}/autotest/solver_py.py | 0 .../autotest/stub_bill_price.player | 0 .../autotest/stub_nofee_bill_value.player | 0 .../powerflow}/autotest/test_IEEE-123_FBS.glm | 0 .../powerflow}/autotest/test_IEEE-13_FBS.glm | 0 .../test_IEEE123_zero_voltages_FBS.glm | 0 .../test_IEEE123_zero_voltages_NR.glm | 0 .../powerflow}/autotest/test_IEEE_13_FBS.glm | 0 .../autotest/test_IEEE_13_FBS_AMI.glm | 0 .../autotest/test_IEEE_13_FBS_AMI_24hr.glm | 0 .../test_IEEE_13_FBS_AMI_24hr_Mod_Res.glm | 0 .../test_IEEE_13_FBS_AMI_LinearLoadChange.glm | 0 ...t_IEEE_13_FBS_AMI_LinearLoadChangeTrim.glm | 0 ...st_IEEE_13_FBS_AMI_StepParameterChange.glm | 0 ...est_IEEE_13_FBS_AMI_StepPropertyChange.glm | 0 ...st_IEEE_13_FBS_AMI_StepPropertyChange2.glm | 0 .../powerflow}/autotest/test_IEEE_13_ML.glm | 0 .../powerflow}/autotest/test_IEEE_13_NR.glm | 0 .../powerflow}/autotest/test_IEEE_13_PY.glm | 0 .../powerflow}/autotest/test_IEEE_37node.glm | 0 .../autotest/test_NR_matrix_dump.glm | 0 .../powerflow}/autotest/test_SPIM_err.glm | 0 .../autotest/test_SPIM_triplex_err.glm | 0 .../test_Simple_Switch_Fault_InRush_err.glm | 0 .../autotest/test_ZIPLoad_ZeroBase_FBS.glm | 0 .../autotest/test_ZIPLoad_ZeroBase_NR.glm | 0 .../autotest/test_balanced_stepdown_D-D.glm | 0 .../test_balanced_stepdown_D-D_NR.glm | 0 .../autotest/test_balanced_stepdown_D-grY.glm | 0 .../test_balanced_stepdown_D-grY_NR.glm | 0 .../test_balanced_stepdown_D-grY_phA.glm | 0 .../test_balanced_stepdown_D-grY_phAB.glm | 0 .../test_balanced_stepdown_D-grY_phB.glm | 0 .../test_balanced_stepdown_D-grY_phC.glm | 0 .../test_balanced_stepdown_D_D_phA.glm | 0 .../test_balanced_stepdown_D_D_phAB.glm | 0 .../test_balanced_stepdown_D_D_phB.glm | 0 .../test_balanced_stepdown_D_D_phC.glm | 0 .../test_balanced_stepdown_grY-grY.glm | 0 .../test_balanced_stepdown_grY-grY_NR.glm | 0 .../test_balanced_stepdown_grY-grY_phA.glm | 0 .../test_balanced_stepdown_grY-grY_phAB.glm | 0 .../test_balanced_stepdown_grY-grY_phB.glm | 0 .../test_balanced_stepdown_grY-grY_phC.glm | 0 .../autotest/test_balanced_stepup_D-D.glm | 0 .../autotest/test_balanced_stepup_D-D_NR.glm | 0 .../autotest/test_balanced_stepup_D-D_phA.glm | 0 .../test_balanced_stepup_D-D_phAB.glm | 0 .../autotest/test_balanced_stepup_D-D_phB.glm | 0 .../autotest/test_balanced_stepup_D-D_phC.glm | 0 .../autotest/test_balanced_stepup_D-grY.glm | 0 .../test_balanced_stepup_D-grY_NR.glm | 0 .../test_balanced_stepup_D-grY_phA.glm | 0 .../test_balanced_stepup_D-grY_phAB.glm | 0 .../test_balanced_stepup_D-grY_phB.glm | 0 .../test_balanced_stepup_D-grY_phC.glm | 0 .../autotest/test_balanced_stepup_grY-grY.glm | 0 .../test_balanced_stepup_grY-grY_NR.glm | 0 .../test_balanced_stepup_grY-grY_phA.glm | 0 .../test_balanced_stepup_grY-grY_phAB.glm | 0 .../test_balanced_stepup_grY-grY_phB.glm | 0 .../test_balanced_stepup_grY-grY_phC.glm | 0 ...est_c_matrix_line_capacitance_balanced.glm | 0 ..._c_matrix_line_capacitance_balanced_NR.glm | 0 .../test_capacitor_CURRENT_ABC_indiv.glm | 0 .../test_capacitor_CURRENT_ABC_indiv_NR.glm | 0 .../test_capacitor_VAR_ABC_BANK_B.glm | 0 .../test_capacitor_VAR_ABC_BANK_B_NR.glm | 0 .../autotest/test_capacitor_VAR_ABC_indiv.glm | 0 .../test_capacitor_VAR_ABC_indiv_NR.glm | 0 .../test_capacitor_VAR_ABC_indiv_Y.glm | 0 .../test_capacitor_VAR_ABC_indiv_Y_NR.glm | 0 .../test_capacitor_VAR_ABC_indiv_dwell.glm | 0 .../test_capacitor_VAR_ABC_indiv_dwell_NR.glm | 0 .../test_capacitor_VAR_VOLT_ABC_indiv.glm | 0 .../test_capacitor_VAR_VOLT_ABC_indiv_NR.glm | 0 ...est_capacitor_VAR_VOLT_ABC_indiv_dwell.glm | 0 ..._capacitor_VAR_VOLT_ABC_indiv_dwell_NR.glm | 0 .../autotest/test_capacitor_counters.glm | 0 ..._capacitor_manual_ABC_bank_time_series.glm | 0 ...pacitor_manual_ABC_bank_time_series_NR.glm | 0 .../test_capacitor_manual_ABC_time_series.glm | 0 ...st_capacitor_manual_ABC_time_series_NR.glm | 0 .../test_capacitor_manual_single_ABBCD.glm | 0 .../test_capacitor_manual_single_ABBCD_NR.glm | 0 .../test_capacitor_manual_single_ABBCD_Y.glm | 0 ...est_capacitor_manual_single_ABBCD_Y_NR.glm | 0 ..._capacitor_manual_single_ABBCD_service.glm | 0 .../test_capacitor_manual_single_ABCAD.glm | 0 .../test_capacitor_manual_single_ABCAD_NR.glm | 0 .../test_capacitor_manual_single_ABCAD_Y.glm | 0 ...est_capacitor_manual_single_ABCAD_Y_NR.glm | 0 .../test_capacitor_manual_single_ABD.glm | 0 .../test_capacitor_manual_single_ABD_NR.glm | 0 .../test_capacitor_manual_single_ABD_Y.glm | 0 .../test_capacitor_manual_single_ABD_Y_NR.glm | 0 .../test_capacitor_manual_single_ABN.glm | 0 .../test_capacitor_manual_single_ABN_NR.glm | 0 .../test_capacitor_manual_single_AN.glm | 0 .../test_capacitor_manual_single_AN_NR.glm | 0 .../test_capacitor_manual_single_All_D.glm | 0 .../test_capacitor_manual_single_All_D_NR.glm | 0 .../test_capacitor_manual_single_All_D_Y.glm | 0 ...est_capacitor_manual_single_All_D_Y_NR.glm | 0 .../test_capacitor_manual_single_All_N.glm | 0 .../test_capacitor_manual_single_All_N_NR.glm | 0 .../test_capacitor_manual_single_BCCAD.glm | 0 .../test_capacitor_manual_single_BCCAD_NR.glm | 0 .../test_capacitor_manual_single_BCCAD_Y.glm | 0 ...est_capacitor_manual_single_BCCAD_Y_NR.glm | 0 .../test_capacitor_manual_single_BCD.glm | 0 .../test_capacitor_manual_single_BCD_NR.glm | 0 .../test_capacitor_manual_single_BCD_Y.glm | 0 .../test_capacitor_manual_single_BCD_Y_NR.glm | 0 .../test_capacitor_manual_single_BCN.glm | 0 .../test_capacitor_manual_single_BCN_NR.glm | 0 .../test_capacitor_manual_single_BN.glm | 0 .../test_capacitor_manual_single_BN_NR.glm | 0 .../test_capacitor_manual_single_CAD.glm | 0 .../test_capacitor_manual_single_CAD_NR.glm | 0 .../test_capacitor_manual_single_CAD_Y.glm | 0 .../test_capacitor_manual_single_CAD_Y_NR.glm | 0 .../test_capacitor_manual_single_CAN.glm | 0 .../test_capacitor_manual_single_CAN_NR.glm | 0 .../test_capacitor_manual_single_CN.glm | 0 .../test_capacitor_manual_single_CN_NR.glm | 0 .../test_capacitor_manual_single_allOff.glm | 0 ...test_capacitor_manual_single_allOff_NR.glm | 0 .../test_capacitor_volt_ABC_BANK_A.glm | 0 .../test_capacitor_volt_ABC_BANK_A_NR.glm | 0 .../test_capacitor_volt_ABC_indiv.glm | 0 .../test_capacitor_volt_ABC_indiv_NR.glm | 0 .../test_capacitor_volt_ABC_indiv_Y.glm | 0 .../test_capacitor_volt_ABC_indiv_Y_NR.glm | 0 .../test_capacitor_volt_ABC_indiv_dwell.glm | 0 ...test_capacitor_volt_ABC_indiv_dwell_NR.glm | 0 ...st_capacitor_volt_single_ABBCD_service.glm | 0 .../autotest/test_center_tapped_basic.glm | 0 .../autotest/test_center_tapped_basic_NR.glm | 0 .../autotest/test_center_tapped_complex.glm | 0 .../test_center_tapped_complex_NR.glm | 0 .../autotest/test_combination_loads_FBS.glm | 0 .../autotest/test_combination_loads_NR.glm | 0 ...est_delta_IEEE_123node_cap_service_err.glm | 0 .../test_delta_IEEE_123node_test_err.glm | 0 .../test_different_load_parent_Delta_NR.glm | 0 .../test_different_load_parent_Wye_NR.glm | 0 .../autotest/test_disconnected_node.glm | 0 .../autotest/test_duplicate_NR_err.glm | 0 .../powerflow}/autotest/test_dutycycle.glm | 0 .../powerflow}/autotest/test_fuse.glm | 0 .../test_fuse_switched_out_of_service.glm | 0 .../powerflow}/autotest/test_line_sensor.glm | 0 .../test_link_same_from_and_to_FBS_err.glm | 0 .../test_link_same_from_and_to_NR_err.glm | 0 .../powerflow}/autotest/test_load_tracker.glm | 0 .../autotest/test_load_tracker_NR.glm | 0 .../autotest/test_load_tracker_damped.glm | 0 .../autotest/test_load_tracker_damped_NR.glm | 0 .../autotest/test_load_tracker_double.glm | 0 .../autotest/test_load_tracker_double_NR.glm | 0 .../powerflow}/autotest/test_meter_delta.glm | 0 .../powerflow}/autotest/test_multi_island.glm | 0 .../autotest/test_multi_island_SWING_PQ.glm | 0 .../test_node_phaseS_check_FBS_err.glm | 0 .../test_node_phaseS_check_NR_err.glm | 0 .../test_nonzero_initial_meter_reading.glm | 0 .../test_opt_reg_linedropcomp2_YY_A_NR.glm | 0 .../test_opt_reg_linedropcomp2_YY_A_NR_ts.glm | 0 .../test_opt_reg_linedropcomp2_YY_B_NR.glm | 0 .../test_opt_reg_linedropcomp2_YY_B_NR_ts.glm | 0 ...est_opt_regulator_linedropcomp_YY_A_NR.glm | 0 ..._opt_regulator_linedropcomp_YY_A_NR_ts.glm | 0 ...est_opt_regulator_linedropcomp_YY_B_NR.glm | 0 ..._opt_regulator_linedropcomp_YY_B_NR_ts.glm | 0 .../powerflow}/autotest/test_pole.csv | 0 .../powerflow}/autotest/test_pole.glm | 0 .../powerflow}/autotest/test_pole_NR.glm | 0 .../powerflow}/autotest/test_pole_err.glm | 0 .../autotest/test_powerflow_NR_network.glm | 0 .../test_powerflow_exercise_4_1_3.glm | 0 ...ev_flow_control_current_pos_tap_pos.player | 0 ...nk_rev_flow_control_neutral_tap_pos.player | 0 ..._bank_reverse_flow_control_current_pos.glm | 0 ..._reg_bank_reverse_flow_control_neutral.glm | 0 .../autotest/test_powerflow_reg_counters.glm | 0 ..._flow_control_current_pos_tap_pos_A.player | 0 ..._flow_control_current_pos_tap_pos_B.player | 0 ..._flow_control_current_pos_tap_pos_C.player | 0 ..._rev_flow_control_neutral_tap_pos_A.player | 0 ..._rev_flow_control_neutral_tap_pos_B.player | 0 ..._rev_flow_control_neutral_tap_pos_C.player | 0 ...g_ind_reverse_flow_control_current_pos.glm | 0 ...w_reg_ind_reverse_flow_control_neutral.glm | 0 ..._reg_rev_flow_control_neutral_ind_A.player | 0 ..._reg_rev_flow_control_neutral_ind_B.player | 0 ..._reg_rev_flow_control_neutral_ind_C.player | 0 ...st_powerflow_transformer_thermal_model.glm | 0 .../autotest/test_powerflow_triplex_load.glm | 0 .../powerflow}/autotest/test_reg.player | 0 .../test_regulator_linedropcomp2_YY_A.glm | 0 .../test_regulator_linedropcomp2_YY_A_ts.glm | 0 .../test_regulator_linedropcomp2_YY_B.glm | 0 .../test_regulator_linedropcomp2_YY_B_ts.glm | 0 .../test_regulator_linedropcomp_YY_A.glm | 0 .../test_regulator_linedropcomp_YY_A_ts.glm | 0 .../test_regulator_linedropcomp_YY_B.glm | 0 .../test_regulator_linedropcomp_YY_B_ts.glm | 0 .../autotest/test_regulator_manual_YY_A.glm | 0 .../test_regulator_manual_YY_A_1ph.glm | 0 .../test_regulator_manual_YY_A_1ph_NR.glm | 0 .../test_regulator_manual_YY_A_2ph.glm | 0 .../test_regulator_manual_YY_A_2ph_NR.glm | 0 .../test_regulator_manual_YY_A_NR.glm | 0 .../autotest/test_regulator_manual_YY_B.glm | 0 .../test_regulator_manual_YY_B_NR.glm | 0 .../test_regulator_outputvolt_YY_A.glm | 0 .../test_regulator_outputvolt_YY_A_NR.glm | 0 .../test_regulator_outputvolt_YY_A_NR_ts.glm | 0 .../test_regulator_outputvolt_YY_A_ts.glm | 0 .../test_regulator_outputvolt_YY_B.glm | 0 .../test_regulator_outputvolt_YY_B_NR.glm | 0 .../test_regulator_outputvolt_YY_B_NR_ts.glm | 0 .../test_regulator_outputvolt_YY_B_ts.glm | 0 .../test_regulator_remotesense_YY_A.glm | 0 .../test_regulator_remotesense_YY_A_NR.glm | 0 .../test_regulator_remotesense_YY_A_NR_ts.glm | 0 .../test_regulator_remotesense_YY_A_ts.glm | 0 .../test_regulator_remotesense_YY_B.glm | 0 .../test_regulator_remotesense_YY_B_NR.glm | 0 .../test_regulator_remotesense_YY_B_NR_ts.glm | 0 .../test_regulator_remotesense_YY_B_ts.glm | 0 .../autotest/test_reversed_lines_NR.glm | 0 .../autotest/test_substation_PSV_driven.glm | 0 .../autotest/test_substation_normal_node.glm | 0 .../autotest/test_substation_swing_node.glm | 0 .../autotest/test_switch_coordinator.glm | 0 .../test_switch_coordinator_method.glm | 0 .../autotest/test_transformer_losses_FBS.glm | 0 .../autotest/test_transformer_losses_NR.glm | 0 .../autotest/test_triplex_billing_stub.glm | 0 .../test_triplex_billing_tiered_fee.glm | 0 .../test_triplex_billing_tiered_nofee.glm | 0 .../test_triplex_billing_uniform_fee.glm | 0 .../test_triplex_billing_uniform_nofee.glm | 0 ...test_triplex_invalid_conductor_FBS_err.glm | 0 .../test_triplex_invalid_conductor_NR_err.glm | 0 .../test_triplex_meter_parent_accum_FBS.glm | 0 .../test_triplex_meter_parent_accum_NR.glm | 0 .../autotest/test_unbalanced_stepdown_D-D.glm | 0 .../test_unbalanced_stepdown_D-D_NR.glm | 0 .../test_unbalanced_stepdown_D-grY.glm | 0 .../test_unbalanced_stepdown_D-grY_NR.glm | 0 .../test_unbalanced_stepdown_grY-grY.glm | 0 .../test_unbalanced_stepdown_grY-grY_NR.glm | 0 .../autotest/test_unbalanced_stepup_D-D.glm | 0 .../test_unbalanced_stepup_D-D_NR.glm | 0 .../autotest/test_unbalanced_stepup_D-grY.glm | 0 .../test_unbalanced_stepup_D-grY_NR.glm | 0 .../test_unbalanced_stepup_grY-grY.glm | 0 .../test_unbalanced_stepup_grY-grY_NR.glm | 0 .../test_unbalanced_unity_grY-grY.glm | 0 .../test_unbalanced_unity_grY-grY_NR.glm | 0 .../test_underground_TapeShielded_cond.glm | 0 .../autotest/test_vfd_delta_opt.glm | 0 ...triplex_meter_reactive_energy_delta.player | 0 .../triplex_meter_real_energy_delta.player | 0 .../powerflow}/autotest/voltage.csv | 0 {powerflow => module/powerflow}/billdump.cpp | 0 {powerflow => module/powerflow}/billdump.h | 0 {powerflow => module/powerflow}/capacitor.cpp | 0 {powerflow => module/powerflow}/capacitor.h | 0 {powerflow => module/powerflow}/currdump.cpp | 0 {powerflow => module/powerflow}/currdump.h | 0 .../powerflow}/docs/pole_loading.pdf | Bin .../powerflow}/docs/pole_service_life.pdf | Bin .../powerflow}/docs/pole_top_degradation.pdf | Bin {powerflow => module/powerflow}/emissions.cpp | 0 {powerflow => module/powerflow}/emissions.h | 0 .../powerflow}/fault_check.cpp | 0 {powerflow => module/powerflow}/fault_check.h | 0 .../powerflow}/frequency_gen.cpp | 0 .../powerflow}/frequency_gen.h | 0 {powerflow => module/powerflow}/fuse.cpp | 0 {powerflow => module/powerflow}/fuse.h | 0 .../powerflow}/impedance_dump.cpp | 0 .../powerflow}/impedance_dump.h | 0 {powerflow => module/powerflow}/init.cpp | 0 {powerflow => module/powerflow}/line.cpp | 0 {powerflow => module/powerflow}/line.h | 0 .../powerflow}/line_configuration.cpp | 0 .../powerflow}/line_configuration.h | 0 .../powerflow}/line_sensor.cpp | 0 {powerflow => module/powerflow}/line_sensor.h | 0 .../powerflow}/line_spacing.cpp | 0 .../powerflow}/line_spacing.h | 0 {powerflow => module/powerflow}/link.cpp | 0 {powerflow => module/powerflow}/link.h | 0 {powerflow => module/powerflow}/load.cpp | 0 {powerflow => module/powerflow}/load.h | 0 .../powerflow}/load_tracker.cpp | 0 .../powerflow}/load_tracker.h | 0 {powerflow => module/powerflow}/main.cpp | 0 {powerflow => module/powerflow}/meter.cpp | 0 {powerflow => module/powerflow}/meter.h | 0 {powerflow => module/powerflow}/motor.cpp | 0 {powerflow => module/powerflow}/motor.h | 0 {powerflow => module/powerflow}/node.cpp | 0 {powerflow => module/powerflow}/node.h | 0 .../powerflow}/overhead_line.cpp | 0 .../powerflow}/overhead_line.h | 0 .../powerflow}/overhead_line_conductor.cpp | 0 .../powerflow}/overhead_line_conductor.h | 0 {powerflow => module/powerflow}/pole.cpp | 0 {powerflow => module/powerflow}/pole.h | 0 .../powerflow}/pole_configuration.cpp | 0 .../powerflow}/pole_configuration.h | 0 .../powerflow}/power_metrics.cpp | 0 .../powerflow}/power_metrics.h | 0 {powerflow => module/powerflow}/powerflow.cpp | 0 {powerflow => module/powerflow}/powerflow.h | 0 .../powerflow}/powerflow.vcproj | 0 .../powerflow}/powerflow_library.cpp | 0 .../powerflow}/powerflow_library.h | 0 .../powerflow}/powerflow_object.cpp | 0 .../powerflow}/powerflow_object.h | 0 {powerflow => module/powerflow}/pqload.cpp | 0 {powerflow => module/powerflow}/pqload.h | 0 {powerflow => module/powerflow}/recloser.cpp | 0 {powerflow => module/powerflow}/recloser.h | 0 {powerflow => module/powerflow}/regulator.cpp | 0 {powerflow => module/powerflow}/regulator.h | 0 .../powerflow}/regulator_configuration.cpp | 0 .../powerflow}/regulator_configuration.h | 0 .../powerflow}/restoration.cpp | 0 {powerflow => module/powerflow}/restoration.h | 0 .../powerflow}/sectionalizer.cpp | 0 .../powerflow}/sectionalizer.h | 0 .../powerflow}/series_reactor.cpp | 0 .../powerflow}/series_reactor.h | 0 .../powerflow}/solver_ml_branchdump.h | 0 {powerflow => module/powerflow}/solver_nr.cpp | 0 {powerflow => module/powerflow}/solver_nr.h | 0 .../powerflow}/solver_py.conf | 0 {powerflow => module/powerflow}/solver_py.cpp | 0 {powerflow => module/powerflow}/solver_py.h | 0 .../powerflow}/substation.cpp | 0 {powerflow => module/powerflow}/substation.h | 0 .../powerflow}/switch_coordinator.cpp | 0 .../powerflow}/switch_coordinator.h | 0 .../powerflow}/switch_object.cpp | 0 .../powerflow}/switch_object.h | 0 .../powerflow}/transformer.cpp | 0 {powerflow => module/powerflow}/transformer.h | 0 .../powerflow}/transformer_configuration.cpp | 0 .../powerflow}/transformer_configuration.h | 0 .../powerflow}/triplex_line.cpp | 0 .../powerflow}/triplex_line.h | 0 .../powerflow}/triplex_line_conductor.cpp | 0 .../powerflow}/triplex_line_conductor.h | 0 .../powerflow}/triplex_line_configuration.cpp | 0 .../powerflow}/triplex_line_configuration.h | 0 .../powerflow}/triplex_load.cpp | 0 .../powerflow}/triplex_load.h | 0 .../powerflow}/triplex_meter.cpp | 0 .../powerflow}/triplex_meter.h | 0 .../powerflow}/triplex_node.cpp | 0 .../powerflow}/triplex_node.h | 0 .../powerflow}/underground_line.cpp | 0 .../powerflow}/underground_line.h | 0 .../powerflow}/underground_line_conductor.cpp | 0 .../powerflow}/underground_line_conductor.h | 0 {powerflow => module/powerflow}/vfd.cpp | 0 {powerflow => module/powerflow}/vfd.h | 0 .../powerflow}/volt_var_control.cpp | 0 .../powerflow}/volt_var_control.h | 0 {powerflow => module/powerflow}/voltdump.cpp | 0 {powerflow => module/powerflow}/voltdump.h | 0 module/powernet/Makefile.mk | 18 + {powernet => module/powernet}/agent.cpp | 0 {powernet => module/powernet}/agent.h | 0 .../powernet}/autotest/test_agent_method.glm | 0 {powernet => module/powernet}/house.cpp | 0 {powernet => module/powernet}/house.h | 0 {powernet => module/powernet}/main.cpp | 0 {powernet => module/powernet}/message.cpp | 0 {powernet => module/powernet}/message.h | 0 {powernet => module/powernet}/powernet.h | 0 {powernet => module/powernet}/validate.no | 0 module/reliability/Makefile.mk | 17 + ...ta_deltamode_deterministic_eventgen.player | 0 .../data_deltamode_random_eventgen.player | 0 .../autotest/deterministic_CAIDI.csv | 0 .../autotest/deterministic_CAIDI_int.csv | 0 .../autotest/deterministic_MAIFI.csv | 0 .../autotest/deterministic_MAIFI_int.csv | 0 .../autotest/deterministic_SAIDI.csv | 0 .../autotest/deterministic_SAIDI_int.csv | 0 .../autotest/deterministic_SAIFI.csv | 0 .../autotest/deterministic_SAIFI_int.csv | 0 .../autotest/deterministic_minTS_CAIDI.csv | 0 .../deterministic_minTS_CAIDI_int.csv | 0 .../autotest/deterministic_minTS_MAIFI.csv | 0 .../deterministic_minTS_MAIFI_int.csv | 0 .../autotest/deterministic_minTS_SAIDI.csv | 0 .../deterministic_minTS_SAIDI_int.csv | 0 .../autotest/deterministic_minTS_SAIFI.csv | 0 .../deterministic_minTS_SAIFI_int.csv | 0 .../deterministic_minTS_measured_A.csv | 0 .../autotest/deterministic_powerA.csv | 0 .../autotest/fault_bus_A_within.player | 0 .../autotest/fault_bus_B_within.player | 0 .../autotest/fault_bus_C_within.player | 0 .../autotest/fault_bus_fault_current_A.player | 0 .../autotest/fault_bus_fault_current_B.player | 0 .../autotest/fault_bus_fault_current_C.player | 0 .../autotest/fuse_limit_manipulate.player | 0 .../reliability}/autotest/random_CAIDI.csv | 0 .../autotest/random_CAIDI_int.csv | 0 .../reliability}/autotest/random_MAIFI.csv | 0 .../autotest/random_MAIFI_int.csv | 0 .../reliability}/autotest/random_SAIDI.csv | 0 .../autotest/random_SAIDI_int.csv | 0 .../reliability}/autotest/random_SAIFI.csv | 0 .../autotest/random_SAIFI_int.csv | 0 .../autotest/random_minTS_CAIDI.csv | 0 .../autotest/random_minTS_CAIDI_int.csv | 0 .../autotest/random_minTS_MAIFI.csv | 0 .../autotest/random_minTS_MAIFI_Int.csv | 0 .../autotest/random_minTS_SAIDI.csv | 0 .../autotest/random_minTS_SAIDI_Int.csv | 0 .../autotest/random_minTS_SAIFI.csv | 0 .../autotest/random_minTS_SAIFI_Int.csv | 0 .../autotest/swing_bus_A_within.player | 0 .../autotest/swing_bus_B_within.player | 0 .../autotest/swing_bus_C_within.player | 0 .../autotest/swing_bus_fault_current_A.player | 0 .../autotest/swing_bus_fault_current_B.player | 0 .../autotest/swing_bus_fault_current_C.player | 0 .../reliability}/autotest/test_cost.glm | 0 .../autotest/test_cost_outage.csv | 0 .../test_deltamode_deterministic_err.glm | 0 .../test_deltamode_eventgen_overrun_err.glm | 0 .../autotest/test_deltamode_random_err.glm | 0 .../autotest/test_deterministic.glm | 0 .../autotest/test_deterministic_minTS.glm | 0 .../autotest/test_eventgen_random.glm | 0 .../autotest/test_eventgen_random_minTS.glm | 0 .../autotest/test_fault_current_4_node.glm | 0 {reliability => module/reliability}/cost.cpp | 0 {reliability => module/reliability}/cost.h | 0 .../reliability}/eventgen.cpp | 0 .../reliability}/eventgen.h | 0 {reliability => module/reliability}/init.cpp | 0 {reliability => module/reliability}/main.cpp | 0 .../reliability}/metrics.cpp | 0 {reliability => module/reliability}/metrics.h | 0 .../reliability}/reliability.h | 0 .../reliability}/reliability.vcproj | 0 module/residential/Makefile.mk | 35 + .../residential}/appliance.cpp | 0 .../residential}/appliance.h | 0 .../residential}/autotest/Dishwasher.glm | 0 .../residential}/autotest/Dryer.glm | 0 .../residential}/autotest/Range.glm | 0 .../residential}/autotest/Refrigerator.glm | 0 .../autotest/appliance_schedules.glm | 0 .../residential}/autotest/clotheswasher.glm | 0 .../autotest/clotheswasher_out.player | 0 .../autotest/clotheswasher_output.player | 0 .../autotest/data_EV_det_output_m1.player | 0 .../data_EV_det_output_m1_default.player | 0 .../autotest/data_Vtrigger_house.player | 0 .../data_min_new_EV_det_output_m1.player | 0 .../autotest/data_sample_NHTS.csv | 0 .../autotest/dishwasher_output.player | 0 .../autotest/dr_mode_normal.player | 0 .../residential}/autotest/dryer_output.player | 0 .../residential}/autotest/generic_demand.glt | 0 .../generic_fail_demand(range0-1).glt | 0 .../residential}/autotest/lights_power.m | 0 .../residential}/autotest/plot_paneldump.py | 0 .../plugload_demand_range_bounds.player | 0 .../autotest/plugload_enduse_load.player | 0 .../autotest/plugload_energy_meter.player | 0 .../autotest/plugload_internal_gains.player | 0 .../plugload_internal_gains_hf.player | 0 .../residential}/autotest/range_output.player | 0 .../autotest/refrigerator_out.player | 0 .../autotest/setpoint_schedule.glm | 0 .../autotest/test_HVAC_balance.glm | 0 .../autotest/test_HVAC_common_cool.glm | 0 .../autotest/test_HVAC_common_heat.glm | 0 .../autotest/test_HVAC_peak_cool.glm | 0 .../autotest/test_HVAC_peak_heat.glm | 0 .../autotest/test_Refrigerator_opt.glm | 0 .../autotest/test_appliance_opt.glm | 0 ..._clotheswasher_explicit_energy_swd_opt.glm | 0 ..._clotheswasher_explicit_energy_swy_opt.glm | 0 ..._clotheswasher_explicit_energy_wwd_opt.glm | 0 ..._clotheswasher_explicit_energy_wwy_opt.glm | 0 .../autotest/test_clotheswasher_implicit.glm | 0 .../autotest/test_clotheswasher_opt.glm | 0 .../autotest/test_deltamode_single_house.glm | 0 .../residential}/autotest/test_dishwasher.glm | 0 .../test_dishwasher_explicit_power1_opt.glm | 0 .../test_dishwasher_explicit_power2_opt.glm | 0 .../autotest/test_dishwasher_implicit.glm | 0 .../residential}/autotest/test_dryer.glm | 0 .../test_dryer_explicit_energy_swd_opt.glm | 0 .../test_dryer_explicit_energy_swy_opt.glm | 0 .../test_dryer_explicit_energy_wwd_opt.glm | 0 .../test_dryer_explicit_energy_wwy_opt.glm | 0 .../autotest/test_dryer_implicit.glm | 0 .../autotest/test_evcharger_det_m1.glm | 0 .../test_evcharger_det_m1_default.glm | 0 .../autotest/test_evcharger_det_m1_minTS.glm | 0 .../autotest/test_freezer_deadband_opt.glm | 0 .../autotest/test_freezer_implicit_opt.glm | 0 .../test_generic_limit_demand(range0-1).glt | 0 .../autotest/test_generic_limit_demand.player | 0 .../autotest/test_house_paneldump_energy.glm | 0 .../autotest/test_house_paneldump_power.glm | 0 .../autotest/test_implicit_eia2015_loads.glm | 0 .../autotest/test_implicit_gasenduses.glm | 0 .../residential}/autotest/test_lights_exp.glm | 0 .../autotest/test_lights_explicit_power1.glm | 0 .../test_lights_explicit_power1.player | 0 .../autotest/test_lights_explicit_power2.glm | 0 .../test_lights_explicit_power2.player | 0 .../autotest/test_lights_explicit_power3.glm | 0 .../test_lights_explicit_power3.player | 0 .../autotest/test_lights_explicit_power4.glm | 0 .../test_lights_explicit_power4.player | 0 .../residential}/autotest/test_lights_imp.glm | 0 .../autotest/test_lights_implicit_power1.glm | 0 .../autotest/test_lights_implicit_power2.glm | 0 .../autotest/test_lights_implicit_power3.glm | 0 .../autotest/test_lights_implicit_power4.glm | 0 .../autotest/test_lights_standalone.glm | 0 ...test_microwave_cycle_length_limits_err.glm | 0 .../test_microwave_demand_limits_opt.glm | 0 .../autotest/test_microwave_energy.glt | 0 .../autotest/test_microwave_energy.m | 0 .../autotest/test_microwave_energy.player | 0 .../test_microwave_energy_accumulation.glm | 0 .../test_microwave_energy_accumulation.m | 0 .../test_microwave_energy_accumulation.player | 0 .../autotest/test_microwave_energy_opt.glm | 0 .../test_microwave_explicit_swd_opt.glm | 0 .../test_microwave_explicit_swy_opt.glm | 0 .../test_microwave_explicit_wwd_opt.glm | 0 .../test_microwave_explicit_wwy_opt.glm | 0 .../autotest/test_microwave_implicit.glm | 0 .../test_microwave_implicit_swd_opt.glm | 0 .../test_microwave_implicit_swy_opt.glm | 0 .../test_microwave_implicit_wwd_opt.glm | 0 .../test_microwave_implicit_wwy_opt.glm | 0 .../test_microwave_internal_gains_0.player | 0 .../test_microwave_internal_gains_1.player | 0 .../test_microwave_internal_gains_opt.glm | 0 ...test_microwave_standby_power_limits.player | 0 ...est_microwave_standby_power_limits_opt.glm | 0 .../test_occupantload_enduse_load0.glm | 0 .../test_plugload_demand_range_bounds_opt.glm | 0 .../autotest/test_plugload_enduse_load.glm | 0 .../test_plugload_enduse_load_swd.player | 0 .../test_plugload_enduse_load_swy.player | 0 .../test_plugload_enduse_load_wwy.player | 0 .../test_plugload_energy_meter_opt.glm | 0 .../autotest/test_plugload_energy_swd.player | 0 .../autotest/test_plugload_energy_swy.player | 0 .../autotest/test_plugload_energy_wwd.player | 0 .../autotest/test_plugload_energy_wwy.player | 0 .../autotest/test_plugload_explicit_swd.glm | 0 .../autotest/test_plugload_explicit_swy.glm | 0 .../test_plugload_explicit_wwd_opt.glm | 0 .../autotest/test_plugload_explicit_wwy.glm | 0 .../test_plugload_heatgain_swd.player | 0 .../test_plugload_heatgain_swy.player | 0 .../test_plugload_heatgain_wwd.player | 0 .../test_plugload_heatgain_wwy.player | 0 .../test_plugload_implicit_swd_opt.glm | 0 .../test_plugload_implicit_swy_opt.glm | 0 .../test_plugload_implicit_wwd_opt.glm | 0 .../test_plugload_implicit_wwy_opt.glm | 0 .../test_plugload_internal_gains_hf.glm | 0 .../test_plugload_internal_gains_opt.glm | 0 .../test_range_explicit_energy1_opt.glm | 0 .../test_range_explicit_energy2_opt.glm | 0 .../test_range_explicit_energy3_opt.glm | 0 .../test_range_explicit_energy4_opt.glm | 0 .../autotest/test_range_implicit_opt.glm | 0 .../residential}/autotest/test_range_opt.glm | 0 .../autotest/test_range_power.player | 0 .../autotest/test_range_power_opt.glm | 0 .../autotest/test_refrigerator_implicit.glm | 0 .../test_residential_exercise_5_2_1.glm | 0 .../test_residentialenduse_standalone.glm | 0 .../test_residentialenduse_standalone_err.glm | 0 .../residential}/autotest/test_solargains.glm | 0 .../autotest/test_thermal_storage_SOC.player | 0 .../test_thermal_storage_autotest.glm | 0 .../test_thermal_storage_energy.player | 0 .../autotest/test_waterheater_explicit_1.glm | 0 .../autotest/test_waterheater_explicit_2.glm | 0 .../autotest/test_waterheater_implicit.glm | 0 .../test_wh_explicit_1_temperature.player | 0 .../autotest/test_wh_explicit_2_height.player | 0 .../test_wh_explicit_2_temperature.player | 0 .../autotest/test_zipload_pow_en_hg.glm | 0 .../residential}/autotest/water_schedule.glm | 0 ...terheater_demand_waveform_sawtooth1.player | 0 ...terheater_demand_waveform_sawtooth2.player | 0 .../waterheater_demand_waveform_sine.player | 0 .../waterheater_demand_waveform_square.player | 0 .../residential}/clotheswasher.cpp | 0 .../residential}/clotheswasher.h | 0 .../residential}/data/evcharger/home-work.csv | 0 .../residential}/data/evcharger/home-work.xls | Bin .../residential}/dishwasher.cpp | 0 .../residential}/dishwasher.h | 0 .../residential}/docs/evcharger.ppt | Bin .../residential}/docs/evcharger/Slide1.PNG | Bin .../residential}/docs/evcharger/Slide2.PNG | Bin {residential => module/residential}/dryer.cpp | 0 {residential => module/residential}/dryer.h | 0 {residential => module/residential}/eia2015.h | 0 .../residential}/elcap1990.h | 0 .../residential}/elcap2010.h | 0 .../residential}/evcharger.cpp | 0 .../residential}/evcharger.h | 0 .../residential}/evcharger_det.cpp | 0 .../residential}/evcharger_det.h | 0 .../residential}/freezer.cpp | 0 {residential => module/residential}/freezer.h | 0 .../residential}/house_e.cpp | 0 {residential => module/residential}/house_e.h | 0 {residential => module/residential}/init.cpp | 0 .../residential}/lights.cpp | 0 {residential => module/residential}/lights.h | 0 {residential => module/residential}/main.cpp | 0 .../residential}/microwave.cpp | 0 .../residential}/microwave.h | 0 .../residential}/occupantload.cpp | 0 .../residential}/occupantload.h | 0 .../residential}/plugload.cpp | 0 .../residential}/plugload.h | 0 {residential => module/residential}/range.cpp | 0 {residential => module/residential}/range.h | 0 {residential => module/residential}/rbsa.cpp | 0 {residential => module/residential}/rbsa.h | 0 .../residential}/rbsa2014.h | 0 .../residential}/rbsa2014_discrete.h | 0 .../residential}/refrigerator.cpp | 0 .../residential}/refrigerator.h | 0 .../residential}/residential.h | 0 .../residential}/residential.vcproj | 0 .../residential}/residential_enduse.cpp | 0 .../residential}/residential_enduse.h | 0 .../residential}/solvers.cpp | 0 {residential => module/residential}/solvers.h | 0 .../residential}/thermal_storage.cpp | 0 .../residential}/thermal_storage.h | 0 .../residential}/waterheater.cpp | 0 .../residential}/waterheater.h | 0 .../residential}/zipload.cpp | 0 {residential => module/residential}/zipload.h | 0 module/revenue/Makefile.mk | 15 + .../revenue}/autotest/house.glm | 0 .../revenue}/autotest/pgande_res_200301.glm | 0 .../revenue}/autotest/test_billing.glm | 0 .../revenue}/autotest/test_billing.py | 0 {revenue => module/revenue}/billing.cpp | 0 {revenue => module/revenue}/billing.h | 0 {revenue => module/revenue}/main.cpp | 0 {revenue => module/revenue}/revenue.h | 0 {revenue => module/revenue}/tariff.cpp | 0 {revenue => module/revenue}/tariff.h | 0 module/tape/Makefile.mk | 32 + .../data_configurations_delta_123node.glm | 0 .../autotest/data_delta_player_load_A.csv | 0 .../data_delta_player_load_A_check.csv | 0 .../tape}/autotest/data_loadchange.csv | 0 .../tape}/autotest/exercise_2_1_1.player | 0 .../tape}/autotest/recorder_flush_test2.csv | 0 .../test_collector_exercise_2_4_2.glm | 0 .../test_collector_multiple_properties.glm | 0 .../autotest/test_collector_triplex_meter.glm | 0 ..._delta_player_first_delta_timestep_err.glm | 0 .../test_deltamode_player_endtime_err.glm | 0 .../tape}/autotest/test_histogram_basic.glm | 0 .../autotest/test_histogram_count_int.glm | 0 .../tape}/autotest/test_histogram_enum.glm | 0 .../tape}/autotest/test_histogram_set.glm | 0 ...est_multi_recorder_multiple_properties.glm | 0 ...ulti_recorder_multiple_properties_long.glm | 0 .../autotest/test_multirecorder_global.glm | 0 .../tape}/autotest/test_player_buffer.glm | 0 .../tape}/autotest/test_player_buffer.player | 0 .../autotest/test_player_exercise_2_1_2.glm | 0 .../tape}/autotest/test_recorder_epoch.glm | 0 .../autotest/test_recorder_exercise_2_2_2.glm | 0 .../tape}/autotest/test_recorder_flush_0.glm | 0 .../autotest/test_recorder_flush_1_err.glm | 0 .../autotest/test_recorder_flush_300.glm | 0 .../autotest/test_recorder_flush_sync.py | 0 .../tape}/autotest/test_recorder_global.glm | 0 .../autotest/test_recorder_interval_err.glm | 0 .../test_recorder_multiple_properties.glm | 0 .../test_recorder_strftime_format.glm | 0 .../tape}/autotest/test_tape_whitespace.glm | 0 .../water_and_setpoint_schedule_v3.glm | 0 {tape => module/tape}/collector.cpp | 0 {tape => module/tape}/file.cpp | 0 {tape => module/tape}/file.h | 0 {tape => module/tape}/group_recorder.cpp | 0 {tape => module/tape}/group_recorder.h | 0 {tape => module/tape}/histogram.cpp | 0 {tape => module/tape}/histogram.h | 0 {tape => module/tape}/loadshape.cpp | 0 {tape => module/tape}/loadshape.h | 0 {tape => module/tape}/main.cpp | 0 {tape => module/tape}/memory.cpp | 0 {tape => module/tape}/memory.h | 0 {tape => module/tape}/metrics_collector.cpp | 0 {tape => module/tape}/metrics_collector.h | 0 .../tape}/metrics_collector_writer.cpp | 0 .../tape}/metrics_collector_writer.h | 0 {tape => module/tape}/multi_recorder.cpp | 0 {tape => module/tape}/odbc.cpp | 0 {tape => module/tape}/odbc.h | 0 {tape => module/tape}/player.cpp | 0 {tape => module/tape}/recorder.cpp | 0 {tape => module/tape}/schedule.cpp | 0 {tape => module/tape}/schedule.h | 0 {tape => module/tape}/shaper.cpp | 0 {tape => module/tape}/tape.cpp | 0 {tape => module/tape}/tape.h | 0 {tape => module/tape}/tape.vcproj | 0 {tape => module/tape}/violation_recorder.cpp | 0 {tape => module/tape}/violation_recorder.h | 0 module/tape_file/Makefile.mk | 12 + {tape_file => module/tape_file}/ReadMe.txt | 0 {tape_file => module/tape_file}/tape_file.cpp | 4 +- {tape_file => module/tape_file}/tape_file.h | 0 .../tape_file}/tape_file.vcproj | 0 .../tape_memory}/tape_memory.cpp | 0 .../tape_memory}/tape_memory.h | 0 .../tape_memory}/tape_memory.vcproj | 0 module/tape_plot/Makefile.mk | 12 + {tape_plot => module/tape_plot}/ReadMe.txt | 0 {tape_plot => module/tape_plot}/tape_plot.cpp | 2 +- {tape_plot => module/tape_plot}/tape_plot.h | 0 .../tape_plot}/tape_plot.vcproj | 0 module/tariff/Makefile.mk | 13 + .../autotest/Res_Inclu_TOU_Current.xlsx | Bin {tariff => module/tariff}/main.cpp | 0 module/transactive/Makefile.mk | 20 + {transactive => module/transactive}/agent.cpp | 0 {transactive => module/transactive}/agent.h | 0 .../autotest/test_agent_method.glm | 0 .../transactive}/doc/transactive.tex | 0 {transactive => module/transactive}/house.cpp | 0 {transactive => module/transactive}/house.h | 0 {transactive => module/transactive}/main.cpp | 0 .../transactive}/transactive.h | 0 .../transactive}/validate.no | 0 modules.mk | 30 +- mysql/Makefile.mk | 24 - mysql/autotest/test_mysql_recorder.xml | 143 --- optimize/Makefile.mk | 13 - powerflow/Makefile.mk | 127 --- .../autotest/IEEE_13_node_impedance_dump.xml | 992 ------------------ powernet/Makefile.mk | 18 - reliability/Makefile.mk | 17 - residential/.gitignore | 1 - residential/Makefile.mk | 57 - revenue/Makefile.mk | 15 - tape/Makefile.mk | 41 - tape_file/Makefile.mk | 13 - tape_plot/Makefile.mk | 13 - tariff/Makefile.mk | 13 - transactive/Makefile.mk | 20 - 1593 files changed, 479 insertions(+), 1911 deletions(-) delete mode 100644 assert/Makefile.mk delete mode 100644 climate/Makefile.mk delete mode 100644 commercial/Makefile.mk delete mode 100644 commercial/autotest/.gitignore delete mode 100644 connection/json_link/doc/Makefile delete mode 100644 connection/json_link/doc/html/.buildinfo delete mode 100644 connection/json_link/faults/mast_raw_start_alive0.json delete mode 100644 connection/json_link/faults/mast_raw_start_bad_dlen.json delete mode 100644 connection/json_link/faults/mast_raw_start_bad_hlen.json delete mode 100644 connection/json_link/faults/mast_raw_start_bad_jver.json delete mode 100644 connection/json_link/faults/mast_raw_start_bad_rcode.json delete mode 100644 connection/json_link/faults/mast_raw_start_bad_type.json delete mode 100644 connection/json_link/faults/mast_raw_start_bad_ver.json delete mode 100644 connection/json_link/faults/mast_raw_start_ok.json delete mode 100644 connection/json_link/faults/slv_raw_start_alive0.json delete mode 100644 connection/json_link/faults/slv_raw_start_bad_dlen.json delete mode 100644 connection/json_link/faults/slv_raw_start_bad_hlen.json delete mode 100644 connection/json_link/faults/slv_raw_start_bad_jver.json delete mode 100644 connection/json_link/faults/slv_raw_start_bad_rcode.json delete mode 100644 connection/json_link/faults/slv_raw_start_bad_type.json delete mode 100644 connection/json_link/faults/slv_raw_start_bad_ver.json delete mode 100644 connection/json_link/faults/slv_raw_start_ok.json delete mode 100644 connection/json_link/faults/sync_bad-dict_c5.json delete mode 100644 connection/json_link/faults/sync_bad-json_c5.json delete mode 100644 connection/json_link/faults/sync_drop_c[5,12,13].json delete mode 100644 connection/json_link/faults/sync_drop_c[5,40].json delete mode 100644 connection/json_link/faults/sync_drop_count5.json delete mode 100644 connection/json_link/faults/sync_drop_test.json delete mode 100644 generators/Makefile.mk delete mode 100644 industrial/Makefile.mk delete mode 100644 influxdb/Makefile.mk delete mode 100644 market/Makefile.mk create mode 100644 module/assert/Makefile.mk rename {assert => module/assert}/assert.cpp (100%) rename {assert => module/assert}/assert.h (100%) rename {assert => module/assert}/assert.vcproj (100%) rename {assert => module/assert}/autotest/test_assert.glm (100%) rename {assert => module/assert}/autotest/test_assert_group.glm (100%) rename {assert => module/assert}/autotest/test_assert_hold.glm (100%) rename {assert => module/assert}/autotest/test_assert_hold_err.glm (100%) rename {assert => module/assert}/autotest/test_assert_start_err.glm (100%) rename {assert => module/assert}/autotest/test_complex_assert.glm (100%) rename {assert => module/assert}/autotest/test_complex_assert_angle_err.glm (100%) rename {assert => module/assert}/autotest/test_complex_assert_imaginary_err.glm (100%) rename {assert => module/assert}/autotest/test_complex_assert_magnitude_err.glm (100%) rename {assert => module/assert}/autotest/test_complex_assert_real_err.glm (100%) rename {assert => module/assert}/autotest/test_double_assert.glm (100%) rename {assert => module/assert}/autotest/test_double_assert_err.glm (100%) rename {assert => module/assert}/autotest/test_enum_assert.glm (100%) rename {assert => module/assert}/autotest/test_enum_assert_err.glm (100%) rename {assert => module/assert}/autotest/test_int_assert.glm (100%) rename {assert => module/assert}/complex_assert.cpp (100%) rename {assert => module/assert}/complex_assert.h (100%) rename {assert => module/assert}/double_assert.cpp (100%) rename {assert => module/assert}/double_assert.h (100%) rename {assert => module/assert}/enum_assert.cpp (100%) rename {assert => module/assert}/enum_assert.h (100%) rename {assert => module/assert}/init.cpp (100%) rename {assert => module/assert}/int_assert.cpp (100%) rename {assert => module/assert}/int_assert.h (100%) rename {assert => module/assert}/main.cpp (100%) create mode 100644 module/climate/Makefile.mk rename {climate => module/climate}/autotest/cloud_insolation.player (100%) rename {climate => module/climate}/autotest/cloud_insolation_tmy3.player (100%) rename {climate => module/climate}/autotest/test_WA-Yakima-tmy3.glm (100%) rename {climate => module/climate}/autotest/test_cloud_tmy3_opt.glm (100%) rename {climate => module/climate}/autotest/test_csvreader_dst.glm (100%) rename {climate => module/climate}/autotest/test_csvreader_exercise_5_1_2.glm (100%) rename {climate => module/climate}/autotest/test_singleHouseSolarInverter.glm (100%) rename {climate => module/climate}/autotest/test_solar_opt.glm (100%) rename {climate => module/climate}/autotest/weather.csv (100%) rename {climate => module/climate}/autotest/weather_dst.csv (100%) rename {climate => module/climate}/climate.cpp (100%) rename {climate => module/climate}/climate.h (100%) rename {climate => module/climate}/climate.vcproj (100%) rename {climate => module/climate}/csv_reader.cpp (100%) rename {climate => module/climate}/csv_reader.h (100%) rename {climate => module/climate}/init.cpp (100%) rename {climate => module/climate}/main.cpp (100%) rename {climate => module/climate}/solar_angles.cpp (100%) rename {climate => module/climate}/solar_angles.h (100%) rename {climate => module/climate}/weather.cpp (100%) rename {climate => module/climate}/weather.h (100%) rename {climate => module/climate}/weather_reader.cpp (100%) rename {climate => module/climate}/weather_reader.h (100%) create mode 100644 module/commercial/Makefile.mk rename {commercial => module/commercial}/autotest/FCZ01_AOFF.csv (100%) rename {commercial => module/commercial}/autotest/FCZ01_AWHS.csv (100%) rename {commercial => module/commercial}/autotest/FCZ01_COLL.csv (100%) rename {commercial => module/commercial}/autotest/FCZ01_GROC.csv (100%) rename {commercial => module/commercial}/autotest/FCZ01_HLTH.csv (100%) rename {commercial => module/commercial}/autotest/FCZ01_LODG.csv (100%) rename {commercial => module/commercial}/autotest/FCZ01_LOFF.csv (100%) rename {commercial => module/commercial}/autotest/FCZ01_MISC.csv (100%) rename {commercial => module/commercial}/autotest/FCZ01_REFW.csv (100%) rename {commercial => module/commercial}/autotest/FCZ01_REST.csv (100%) rename {commercial => module/commercial}/autotest/FCZ01_RETL.csv (100%) rename {commercial => module/commercial}/autotest/FCZ01_SCHL.csv (100%) rename {commercial => module/commercial}/autotest/FCZ01_SOFF.csv (100%) rename {commercial => module/commercial}/autotest/energy_f.player (100%) rename {commercial => module/commercial}/autotest/energy_pf.player (100%) rename {commercial => module/commercial}/autotest/generic_demand.glt (100%) rename {commercial => module/commercial}/autotest/generic_demand_pf.glt (100%) rename {commercial => module/commercial}/autotest/load_f.player (100%) rename {commercial => module/commercial}/autotest/load_heatgain.player (100%) rename {commercial => module/commercial}/autotest/load_pf.player (100%) rename {commercial => module/commercial}/autotest/office_assert.player (100%) rename {commercial => module/commercial}/autotest/office_energy.player (100%) rename {commercial => module/commercial}/autotest/office_hvac_ECON_assert.player (100%) rename {commercial => module/commercial}/autotest/office_hvac_energy.player (100%) rename {commercial => module/commercial}/autotest/office_interior_temp.player (100%) rename {commercial => module/commercial}/autotest/test_ceus.glm (100%) rename {commercial => module/commercial}/autotest/test_ceus_saveplots.py (100%) rename {commercial => module/commercial}/autotest/test_commercial_HVAC_load_pf_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_Qi.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_const_air_temp.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_cooling_cop_sanity_err.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_energy_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_exterior_ua_sanity_err.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_floor_area_sanity_err.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_floor_height_sanity_err.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_heating_cop_sanity_err.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_hvac_AUX_load_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_hvac_COOL_load_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_hvac_ECON_load_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_hvac_HEAT_load_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_hvac_OFF_load_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_hvac_VENT_load_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_hvac_air_temp.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_hvac_air_temp2.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_hvac_energy_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_hvac_heat_cap_sanity_err.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_interior_mass_sanity_err.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_interior_ua_sanity_err.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_lights_energy_f.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_lights_energy_pf_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_lights_heatgains_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_lights_load_f.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_lights_load_pf.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_mass_temperature_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_plugs_energy_f.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_plugs_energy_pf_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_plugs_heatgains.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_plugs_load_f.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_plugs_load_pf.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_temp_deadband_sanity_err.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_temp_setpoints_sanity_err.glm (100%) rename {commercial => module/commercial}/autotest/test_commercial_total_load_opt.glm (100%) rename {commercial => module/commercial}/autotest/test_parking.glm (100%) rename {commercial => module/commercial}/ceus.cpp (100%) rename {commercial => module/commercial}/ceus.h (100%) rename {commercial => module/commercial}/commercial.h (100%) rename {commercial => module/commercial}/commercial.vcproj (100%) rename {commercial => module/commercial}/docs/Parking.ipynb (100%) rename {commercial => module/commercial}/hvac.cpp (100%) rename {commercial => module/commercial}/hvac.h (100%) rename {commercial => module/commercial}/init.cpp (100%) rename {commercial => module/commercial}/main.cpp (100%) rename {commercial => module/commercial}/multizone.cpp (100%) rename {commercial => module/commercial}/multizone.h (100%) rename {commercial => module/commercial}/office.cpp (99%) rename {commercial => module/commercial}/office.h (100%) rename {commercial => module/commercial}/parking.cpp (100%) rename {commercial => module/commercial}/parking.h (100%) rename {commercial => module/commercial}/solvers.cpp (100%) rename {commercial => module/commercial}/solvers.h (100%) rename {connection => module/connection}/Makefile.mk (100%) rename {connection => module/connection}/autotest/test_fncs_msg_client.glm (100%) rename {connection => module/connection}/autotest/test_json_client.glm (100%) rename {connection => module/connection}/autotest/test_json_server.glm (100%) rename {connection => module/connection}/autotest/test_native_client.glm (100%) rename {connection => module/connection}/autotest/test_native_server.glm (100%) rename {connection => module/connection}/autotest/test_xml_client.glm (100%) rename {connection => module/connection}/autotest/test_xml_server.glm (100%) rename {connection => module/connection}/cache.cpp (100%) rename {connection => module/connection}/cache.h (100%) rename {connection => module/connection}/client.cpp (100%) rename {connection => module/connection}/client.h (100%) rename {connection => module/connection}/connection.cpp (100%) rename {connection => module/connection}/connection.h (100%) rename {connection => module/connection}/connection.pptx (100%) rename {connection => module/connection}/connection.vcproj (100%) rename {connection => module/connection}/connection.vcproj.PNL.fish334.user (100%) rename {connection => module/connection}/fncs_msg.cpp (100%) rename {connection => module/connection}/fncs_msg.cpp.bak (100%) rename {connection => module/connection}/fncs_msg.h (100%) rename {connection => module/connection}/fncs_msg.h.bak (100%) rename {connection => module/connection}/init.cpp (100%) rename {connection => module/connection}/jsmn.c (100%) rename {connection => module/connection}/jsmn.h (100%) rename {connection => module/connection}/json.cpp (100%) rename {connection => module/connection}/json.h (100%) rename {connection => module/connection}/json_link/__init__.py (100%) rename {connection => module/connection}/json_link/bin/__init__.py (100%) rename {connection => module/connection}/json_link/bin/json_link_tester.py (100%) rename {connection => module/connection}/json_link/doc/html/_modules/index.html (100%) rename {connection => module/connection}/json_link/doc/html/_modules/json_link/bin/json_link_tester.html (100%) rename {connection => module/connection}/json_link/doc/html/_modules/json_link/faults/fault_inject.html (100%) rename {connection => module/connection}/json_link/doc/html/_modules/json_link/json_link.html (100%) rename {connection => module/connection}/json_link/doc/html/_modules/json_link/json_link/json_link.html (100%) rename {connection => module/connection}/json_link/doc/html/_modules/json_link/json_link/raw_xchg.html (100%) rename {connection => module/connection}/json_link/doc/html/_modules/json_link/test/fault_inject.html (100%) rename {connection => module/connection}/json_link/doc/html/_modules/json_link/test/json_link_tester.html (100%) rename {connection => module/connection}/json_link/doc/html/_modules/json_link/xchg/raw_xchg.html (100%) rename {connection => module/connection}/json_link/doc/html/_sources/index.txt (100%) rename {connection => module/connection}/json_link/doc/html/_sources/json_link.bin.txt (100%) rename {connection => module/connection}/json_link/doc/html/_sources/json_link.faults.txt (100%) rename {connection => module/connection}/json_link/doc/html/_sources/json_link.json_link.txt (100%) rename {connection => module/connection}/json_link/doc/html/_sources/json_link.test.txt (100%) rename {connection => module/connection}/json_link/doc/html/_sources/json_link.txt (100%) rename {connection => module/connection}/json_link/doc/html/_sources/json_link.xchg.txt (100%) rename {connection => module/connection}/json_link/doc/html/_sources/modules.txt (100%) rename {connection => module/connection}/json_link/doc/html/_static/ajax-loader.gif (100%) rename {connection => module/connection}/json_link/doc/html/_static/basic.css (100%) rename {connection => module/connection}/json_link/doc/html/_static/comment-bright.png (100%) rename {connection => module/connection}/json_link/doc/html/_static/comment-close.png (100%) rename {connection => module/connection}/json_link/doc/html/_static/comment.png (100%) rename {connection => module/connection}/json_link/doc/html/_static/contents.png (100%) rename {connection => module/connection}/json_link/doc/html/_static/default.css (100%) rename {connection => module/connection}/json_link/doc/html/_static/doctools.js (100%) rename {connection => module/connection}/json_link/doc/html/_static/down-pressed.png (100%) rename {connection => module/connection}/json_link/doc/html/_static/down.png (100%) rename {connection => module/connection}/json_link/doc/html/_static/file.png (100%) rename {connection => module/connection}/json_link/doc/html/_static/jquery.js (100%) rename {connection => module/connection}/json_link/doc/html/_static/minus.png (100%) rename {connection => module/connection}/json_link/doc/html/_static/navigation.png (100%) rename {connection => module/connection}/json_link/doc/html/_static/plus.png (100%) rename {connection => module/connection}/json_link/doc/html/_static/pygments.css (100%) rename {connection => module/connection}/json_link/doc/html/_static/searchtools.js (100%) rename {connection => module/connection}/json_link/doc/html/_static/sidebar.js (100%) rename {connection => module/connection}/json_link/doc/html/_static/sphinxdoc.css (100%) rename {connection => module/connection}/json_link/doc/html/_static/underscore.js (100%) rename {connection => module/connection}/json_link/doc/html/_static/up-pressed.png (100%) rename {connection => module/connection}/json_link/doc/html/_static/up.png (100%) rename {connection => module/connection}/json_link/doc/html/_static/websupport.js (100%) rename {connection => module/connection}/json_link/doc/html/genindex.html (100%) rename {connection => module/connection}/json_link/doc/html/index.html (100%) rename {connection => module/connection}/json_link/doc/html/json_link.bin.html (100%) rename {connection => module/connection}/json_link/doc/html/json_link.faults.html (100%) rename {connection => module/connection}/json_link/doc/html/json_link.html (100%) rename {connection => module/connection}/json_link/doc/html/json_link.json_link.html (100%) rename {connection => module/connection}/json_link/doc/html/json_link.test.html (100%) rename {connection => module/connection}/json_link/doc/html/json_link.xchg.html (100%) rename {connection => module/connection}/json_link/doc/html/modules.html (100%) rename {connection => module/connection}/json_link/doc/html/objects.inv (100%) rename {connection => module/connection}/json_link/doc/html/py-modindex.html (100%) rename {connection => module/connection}/json_link/doc/html/search.html (100%) rename {connection => module/connection}/json_link/doc/html/searchindex.js (100%) rename {connection => module/connection}/json_link/doc/make.bat (100%) rename {connection => module/connection}/json_link/doc/source/conf.py (100%) rename {connection => module/connection}/json_link/doc/source/index.rst (100%) rename {connection => module/connection}/json_link/doc/source/json_link.bin.rst (100%) rename {connection => module/connection}/json_link/doc/source/json_link.faults.rst (100%) rename {connection => module/connection}/json_link/doc/source/json_link.rst (100%) rename {connection => module/connection}/json_link/doc/source/json_link.test.rst (100%) rename {connection => module/connection}/json_link/doc/source/json_link.xchg.rst (100%) rename {connection => module/connection}/json_link/faults/__init__.py (100%) rename {connection => module/connection}/json_link/faults/fault_inject.py (100%) rename {connection => module/connection}/json_link/json_link.py (100%) rename {connection => module/connection}/json_link/test/__init__.py (100%) rename {connection => module/connection}/json_link/test/test_json_link.py (100%) rename {connection => module/connection}/json_link/xchg/__init__.py (100%) rename {connection => module/connection}/json_link/xchg/raw_xchg.py (100%) rename {connection => module/connection}/json_link_demo.py (100%) rename {connection => module/connection}/main.cpp (100%) rename {connection => module/connection}/message.h (100%) rename {connection => module/connection}/native.cpp (100%) rename {connection => module/connection}/native.h (100%) rename {connection => module/connection}/server.cpp (100%) rename {connection => module/connection}/server.h (100%) rename {connection => module/connection}/socket.cpp (100%) rename {connection => module/connection}/socket.h (100%) rename {connection => module/connection}/tcp.cpp (100%) rename {connection => module/connection}/tcp.h (100%) rename {connection => module/connection}/transport.cpp (100%) rename {connection => module/connection}/transport.h (100%) rename {connection => module/connection}/udp.cpp (100%) rename {connection => module/connection}/udp.h (100%) rename {connection => module/connection}/validate.no (100%) rename {connection => module/connection}/varmap.cpp (100%) rename {connection => module/connection}/varmap.h (100%) rename {connection => module/connection}/xml.cpp (100%) rename {connection => module/connection}/xml.h (100%) create mode 100644 module/generators/Makefile.mk rename {generators => module/generators}/autotest/CDGCLoad.player (100%) rename {generators => module/generators}/autotest/MPINV_OUT1.player (100%) rename {generators => module/generators}/autotest/Standard_Weather.csv (100%) rename {generators => module/generators}/autotest/VSI_droop_VA.csv (100%) rename {generators => module/generators}/autotest/VSI_droop_frequency.csv (100%) rename {generators => module/generators}/autotest/VSI_isochronous_VA.csv (100%) rename {generators => module/generators}/autotest/VSI_isochronous_droop_VA.csv (100%) rename {generators => module/generators}/autotest/Yakima_Insolation.player (100%) rename {generators => module/generators}/autotest/Yakima_ambient_temperature.player (100%) rename {generators => module/generators}/autotest/Yakima_wind_speed.player (100%) rename {generators => module/generators}/autotest/cdgc_test_meter_power_assert.player (100%) rename {generators => module/generators}/autotest/constantPFmeterPower_multi_efficiency.player (100%) rename {generators => module/generators}/autotest/constantPFmeterPower_static_efficiency.player (100%) rename {generators => module/generators}/autotest/constantPQ_PV.csv (100%) rename {generators => module/generators}/autotest/constantPQ_PV_VA.csv (100%) rename {generators => module/generators}/autotest/constantPQ_battery_VA.csv (100%) rename {generators => module/generators}/autotest/constantPQ_diesel_dg.csv (100%) rename {generators => module/generators}/autotest/constantPQ_diesel_dg_speed.csv (100%) rename {generators => module/generators}/autotest/constantPQmeterPower_multi_efficiency.player (100%) rename {generators => module/generators}/autotest/constantPQmeterPower_static_efficiency.player (100%) rename {generators => module/generators}/autotest/constantP_PV_VA.csv (100%) rename {generators => module/generators}/autotest/constantP_battery_VA.csv (100%) rename {generators => module/generators}/autotest/constantP_diesel_dg_speed.csv (100%) rename {generators => module/generators}/autotest/constantQ_PV.csv (100%) rename {generators => module/generators}/autotest/constantQ_PV_VA.csv (100%) rename {generators => module/generators}/autotest/constantQ_battery_VA.csv (100%) rename {generators => module/generators}/autotest/constantQ_diesel_dg_speed.csv (100%) rename {generators => module/generators}/autotest/data_Bus1_voltageA.csv (100%) rename {generators => module/generators}/autotest/data_G1SpeedAssert.csv (100%) rename {generators => module/generators}/autotest/data_PID_inverter_current_A.csv (100%) rename {generators => module/generators}/autotest/data_PID_inverter_current_B.csv (100%) rename {generators => module/generators}/autotest/data_PID_inverter_current_C.csv (100%) rename {generators => module/generators}/autotest/data_PI_inverter_current_A.csv (100%) rename {generators => module/generators}/autotest/data_PI_inverter_current_B.csv (100%) rename {generators => module/generators}/autotest/data_PI_inverter_current_C.csv (100%) rename {generators => module/generators}/autotest/data_error_Bus1_voltageA.csv (100%) rename {generators => module/generators}/autotest/data_error_G1SpeedAssert.csv (100%) rename {generators => module/generators}/autotest/data_inv_voltage_player_A_test.csv (100%) rename {generators => module/generators}/autotest/data_inv_voltage_player_B_test.csv (100%) rename {generators => module/generators}/autotest/data_inv_voltage_player_C_test.csv (100%) rename {generators => module/generators}/autotest/default_solar_Insolation.player (100%) rename {generators => module/generators}/autotest/default_solar_VA_out.player (100%) rename {generators => module/generators}/autotest/diesel_brake_hp.player (100%) rename {generators => module/generators}/autotest/diesel_deltamode_load_player_A.csv (100%) rename {generators => module/generators}/autotest/diesel_deltamode_load_player_A_1Gen.player (100%) rename {generators => module/generators}/autotest/diesel_deltamode_load_player_A_1Gen_2.player (100%) rename {generators => module/generators}/autotest/diesel_deltamode_load_player_A_1Gen_3.player (100%) rename {generators => module/generators}/autotest/diesel_deltamode_load_player_B.csv (100%) rename {generators => module/generators}/autotest/diesel_deltamode_load_player_B_1Gen.player (100%) rename {generators => module/generators}/autotest/diesel_deltamode_load_player_B_1Gen_2.player (100%) rename {generators => module/generators}/autotest/diesel_deltamode_load_player_B_1Gen_3.player (100%) rename {generators => module/generators}/autotest/diesel_deltamode_load_player_C.csv (100%) rename {generators => module/generators}/autotest/diesel_deltamode_load_player_C_1Gen.player (100%) rename {generators => module/generators}/autotest/diesel_deltamode_load_player_C_1Gen_2.player (100%) rename {generators => module/generators}/autotest/diesel_deltamode_load_player_C_1Gen_3.player (100%) rename {generators => module/generators}/autotest/fixed_20_S_VA_out.player (100%) rename {generators => module/generators}/autotest/fixed_45_E_VA_out.player (100%) rename {generators => module/generators}/autotest/fixed_45_N_VA_out.player (100%) rename {generators => module/generators}/autotest/fixed_45_S_Insolation.player (100%) rename {generators => module/generators}/autotest/fixed_45_S_VA_out.player (100%) rename {generators => module/generators}/autotest/fixed_45_S_shading_Insolation_15min.player (100%) rename {generators => module/generators}/autotest/fixed_45_S_shading_VA_out_15min.player (100%) rename {generators => module/generators}/autotest/fixed_45_W_VA_out.player (100%) rename {generators => module/generators}/autotest/fixed_90_S_Insolation.player (100%) rename {generators => module/generators}/autotest/fixed_90_S_VA_out.player (100%) rename {generators => module/generators}/autotest/fqm_constant_pq_power.player (100%) rename {generators => module/generators}/autotest/fqm_constant_pq_soc.player (100%) rename {generators => module/generators}/autotest/fqm_constant_pq_status.player (100%) rename {generators => module/generators}/autotest/fqm_group_lf_batt633_power.player (100%) rename {generators => module/generators}/autotest/fqm_group_lf_batt684_power.player (100%) rename {generators => module/generators}/autotest/fqm_group_lf_load.player (100%) rename {generators => module/generators}/autotest/fqm_group_lf_status.player (100%) rename {generators => module/generators}/autotest/fqm_pf_reg_load.player (100%) rename {generators => module/generators}/autotest/fqm_pf_reg_power.player (100%) rename {generators => module/generators}/autotest/fqm_pf_reg_status.player (100%) rename {generators => module/generators}/autotest/inv_loadflow_battery_soc_out.player (100%) rename {generators => module/generators}/autotest/inv_loadflow_meter_measured_power_imag.player (100%) rename {generators => module/generators}/autotest/inv_loadflow_meter_measured_power_real.player (100%) rename {generators => module/generators}/autotest/inverter_VA_out_default_solar.player (100%) rename {generators => module/generators}/autotest/mltpt_efficiency_inverter_VA_out.player (100%) rename {generators => module/generators}/autotest/solar_Vout.player (100%) rename {generators => module/generators}/autotest/solar_playerval_VA_Out.player (100%) rename {generators => module/generators}/autotest/substationSwitch_diesel_dg_speed.csv (100%) rename {generators => module/generators}/autotest/test_1_isochronous_VSI_1_droop_VSI_err.glm (100%) rename {generators => module/generators}/autotest/test_1isochronous_VSI_err.glm (100%) rename {generators => module/generators}/autotest/test_1isochronous_dg_1PQconstant_PV_err.glm (100%) rename {generators => module/generators}/autotest/test_1isochronous_dg_1PQconstant_battery_opt.glm (100%) rename {generators => module/generators}/autotest/test_1isochronous_dg_1PQconstant_dg_err.glm (100%) rename {generators => module/generators}/autotest/test_1isochronous_dg_1Pconstant_Qdroop_PV_err.glm (100%) rename {generators => module/generators}/autotest/test_1isochronous_dg_1Pconstant_Qdroop_battery_opt.glm (100%) rename {generators => module/generators}/autotest/test_1isochronous_dg_1Pconstant_Qdroop_dg_err.glm (100%) rename {generators => module/generators}/autotest/test_1isochronous_dg_1Pdroop_Qconstant_PV_opt.glm (100%) rename {generators => module/generators}/autotest/test_1isochronous_dg_1Pdroop_Qconstant_battery_opt.glm (100%) rename {generators => module/generators}/autotest/test_1isochronous_dg_1Pdroop_Qconstant_dg_opt.glm (100%) rename {generators => module/generators}/autotest/test_2droop_VSI_err.glm (100%) rename {generators => module/generators}/autotest/test_4quad_inv_modes_PF_PQ_default_efficiency.glm (100%) rename {generators => module/generators}/autotest/test_4quad_inv_modes_PF_PQ_multipoint_efficiency.glm (100%) rename {generators => module/generators}/autotest/test_PMSG_windturb.glm (100%) rename {generators => module/generators}/autotest/test_Vout_PV.glm (100%) rename {generators => module/generators}/autotest/test_Vout_PV_solar_no_Parent.glm (100%) rename {generators => module/generators}/autotest/test_central_dg_control.glm (100%) rename {generators => module/generators}/autotest/test_deltamode_diesel_dg_assert_err.glm (100%) rename {generators => module/generators}/autotest/test_deltamode_diesel_dg_assert_once_err.glm (100%) rename {generators => module/generators}/autotest/test_deltamode_diesel_dg_complex_err.glm (100%) rename {generators => module/generators}/autotest/test_deltamode_diesel_dg_double_err.glm (100%) rename {generators => module/generators}/autotest/test_deltamode_diesel_dg_err.glm (100%) rename {generators => module/generators}/autotest/test_deltamode_diesel_dg_pctests_err.glm (100%) rename {generators => module/generators}/autotest/test_diesel_dg.glm (100%) rename {generators => module/generators}/autotest/test_fqm_constant_pq.glm (100%) rename {generators => module/generators}/autotest/test_fqm_group_lf.glm (100%) rename {generators => module/generators}/autotest/test_fqm_pf_reg.glm (100%) rename {generators => module/generators}/autotest/test_generators_inverter_volt_var.glm (100%) rename {generators => module/generators}/autotest/test_generators_inverter_volt_var_voltageA.player (100%) rename {generators => module/generators}/autotest/test_generators_inverter_volt_var_voltageB.player (100%) rename {generators => module/generators}/autotest/test_generators_inverter_volt_var_voltageC.player (100%) rename {generators => module/generators}/autotest/test_generators_inverter_vv_output_A.player (100%) rename {generators => module/generators}/autotest/test_generators_inverter_vv_output_B.player (100%) rename {generators => module/generators}/autotest/test_generators_inverter_vv_output_C.player (100%) rename {generators => module/generators}/autotest/test_inverter_PID_deltamode_err.glm (100%) rename {generators => module/generators}/autotest/test_inverter_PI_deltamode_opt.glm (100%) rename {generators => module/generators}/autotest/test_inverter_loadfollow_FBS.glm (100%) rename {generators => module/generators}/autotest/test_inverter_loadfollow_NR.glm (100%) rename {generators => module/generators}/autotest/test_multipoint_inverter.glm (100%) rename {generators => module/generators}/autotest/test_solar_climate_default_playerval.glm (100%) rename {generators => module/generators}/autotest/test_solar_orientation.glm (100%) rename {generators => module/generators}/autotest/test_solar_output_efficiency.glm (100%) rename {generators => module/generators}/autotest/test_solar_parent_err.glm (100%) rename {generators => module/generators}/autotest/test_solar_shading.glm (100%) rename {generators => module/generators}/autotest/test_solar_tilt.glm (100%) rename {generators => module/generators}/autotest/test_windturbine_FBS.glm (100%) rename {generators => module/generators}/autotest/test_windturbine_NR.glm (100%) rename {generators => module/generators}/autotest/trigger.player (100%) rename {generators => module/generators}/autotest/windpower_assert.player (100%) rename {generators => module/generators}/battery.cpp (100%) rename {generators => module/generators}/battery.h (100%) rename {generators => module/generators}/central_dg_control.cpp (100%) rename {generators => module/generators}/central_dg_control.h (100%) rename {generators => module/generators}/controller_dg.cpp (100%) rename {generators => module/generators}/controller_dg.h (100%) rename {generators => module/generators}/dc_dc_converter.cpp (100%) rename {generators => module/generators}/dc_dc_converter.h (100%) rename {generators => module/generators}/diesel_dg.cpp (100%) rename {generators => module/generators}/diesel_dg.h (100%) rename {generators => module/generators}/energy_storage.cpp (100%) rename {generators => module/generators}/energy_storage.h (100%) rename {generators => module/generators}/generators.h (100%) rename {generators => module/generators}/generators.vcproj (100%) rename {generators => module/generators}/init.cpp (100%) rename {generators => module/generators}/inverter.cpp (100%) rename {generators => module/generators}/inverter.h (100%) rename {generators => module/generators}/main.cpp (100%) rename {generators => module/generators}/microturbine.cpp (100%) rename {generators => module/generators}/microturbine.h (100%) rename {generators => module/generators}/power_electronics.cpp (100%) rename {generators => module/generators}/power_electronics.h (100%) rename {generators => module/generators}/rectifier.cpp (100%) rename {generators => module/generators}/rectifier.h (100%) rename {generators => module/generators}/solar.cpp (100%) rename {generators => module/generators}/solar.h (100%) rename {generators => module/generators}/windturb_dg.cpp (100%) rename {generators => module/generators}/windturb_dg.h (100%) create mode 100644 module/industrial/Makefile.mk rename {industrial => module/industrial}/autotest/test_industrial.glm (100%) rename {industrial => module/industrial}/autotest/test_industrial_variable.glm (100%) rename {industrial => module/industrial}/data/MECS2014_Table_11-1.xlsx (100%) rename {industrial => module/industrial}/data/MECS2014_Table_5-1.xlsx (100%) rename {industrial => module/industrial}/data/MECS2014_Table_9-1.xlsx (100%) rename {industrial => module/industrial}/data/config.py (100%) rename {industrial => module/industrial}/data/mecs.py (100%) rename {industrial => module/industrial}/data/mecs_data.csv (100%) rename {industrial => module/industrial}/data/nerc_data.csv (100%) rename {industrial => module/industrial}/industrial.cpp (100%) rename {industrial => module/industrial}/industrial.h (100%) rename {industrial => module/industrial}/init.cpp (100%) rename {industrial => module/industrial}/naics_data_file.csv (100%) create mode 100644 module/influxdb/Makefile.mk rename {influxdb => module/influxdb}/autotest/test_local_database.glm (100%) rename {influxdb => module/influxdb}/collector.cpp (100%) rename {influxdb => module/influxdb}/collector.h (100%) rename {influxdb => module/influxdb}/database.cpp (100%) rename {influxdb => module/influxdb}/database.h (100%) rename {influxdb => module/influxdb}/influxdb.cpp (100%) rename {influxdb => module/influxdb}/influxdb.h (100%) rename {influxdb => module/influxdb}/jsondata.h (100%) rename {influxdb => module/influxdb}/player.cpp (100%) rename {influxdb => module/influxdb}/player.h (100%) rename {influxdb => module/influxdb}/recorder.cpp (100%) rename {influxdb => module/influxdb}/recorder.h (100%) rename {influxdb => module/influxdb}/validate.no (100%) create mode 100644 module/market/Makefile.mk rename {market => module/market}/auction.cpp (100%) rename {market => module/market}/auction.h (100%) rename {market => module/market}/autotest/ColumbusWeather2009_Correct.csv (100%) rename {market => module/market}/autotest/Elasticity_Multiplier_Critical_With_Two_TierCPP.player (100%) rename {market => module/market}/autotest/Elasticity_Multiplier_NonCritical_With_Three_TierCPP.player (100%) rename {market => module/market}/autotest/Elasticity_Multiplier_NonCritical_With_Two_TierCPP.player (100%) rename {market => module/market}/autotest/Elasticity_Multiplier_Three_Tier_Price.player (100%) rename {market => module/market}/autotest/Elasticity_Multiplier_Two_Tier_Price.player (100%) rename {market => module/market}/autotest/Price_Changing.player (100%) rename {market => module/market}/autotest/Price_Static.player (100%) rename {market => module/market}/autotest/TOU_Pricing.player (100%) rename {market => module/market}/autotest/TOU_Pricing_2Tier_OnlyCritical.glm (100%) rename {market => module/market}/autotest/TOU_Pricing_2Tier_OnlyCritical.player (100%) rename {market => module/market}/autotest/TOU_Pricing_2Tier_OnlyHigh.player (100%) rename {market => module/market}/autotest/TOU_Pricing_3Tier.player (100%) rename {market => module/market}/autotest/appliance_schedules.glm (100%) rename {market => module/market}/autotest/dutycycle_CPP_player.player (100%) rename {market => module/market}/autotest/dutycycle_TOU_player.player (100%) rename {market => module/market}/autotest/lastP_static.player (100%) rename {market => module/market}/autotest/negative_price_bids.player (100%) rename {market => module/market}/autotest/negative_quantity_bids.player (100%) rename {market => module/market}/autotest/repeated_bids.player (100%) rename {market => module/market}/autotest/test_Zip_Load_Elasticity_Model_Critical_Three_Tier_Price.glm (100%) rename {market => module/market}/autotest/test_Zip_Load_Elasticity_Model_Critical_Two_Tier_Price.glm (100%) rename {market => module/market}/autotest/test_Zip_Load_Elasticity_Model_NonCritical_With_Three_TierCPP.glm (100%) rename {market => module/market}/autotest/test_Zip_Load_Elasticity_Model_NonCritical_With_Two_TierCPP.glm (100%) rename {market => module/market}/autotest/test_controller_override.glm (100%) rename {market => module/market}/autotest/test_controller_override_is_COOL_on.player (100%) rename {market => module/market}/autotest/test_controller_override_value.player (100%) rename {market => module/market}/autotest/test_dutycycle_CPP.glm (100%) rename {market => module/market}/autotest/test_dutycycle_TOU.glm (100%) rename {market => module/market}/autotest/test_market_auction_advanced_1.glm (100%) rename {market => module/market}/autotest/test_market_auction_clearing_3.glm (100%) rename {market => module/market}/autotest/test_market_auction_clearing_6_morebuyers.glm (100%) rename {market => module/market}/autotest/test_market_auction_clearing_6_moresellers.glm (100%) rename {market => module/market}/autotest/test_market_auction_timing_1.glm (100%) rename {market => module/market}/autotest/test_market_auction_timing_2.glm (100%) rename {market => module/market}/autotest/test_market_auction_timing_4.glm (100%) rename {market => module/market}/autotest/test_market_auction_timing_5.glm (100%) rename {market => module/market}/autotest/test_market_exercise_4_4_1.glm (100%) rename {market => module/market}/autotest/test_market_passive_controller_RAMP_mode_matching_period.glm (100%) rename {market => module/market}/autotest/test_market_passive_controller_RAMP_mode_nonmatching_period.glm (100%) rename {market => module/market}/autotest/test_market_quantity_conversion.glm (100%) rename {market => module/market}/autotest/test_markets_auction_buyer_rebid.glm (100%) rename {market => module/market}/autotest/test_markets_auction_buyer_seller_alt.glm (100%) rename {market => module/market}/autotest/test_markets_auction_buyers_first.glm (100%) rename {market => module/market}/autotest/test_markets_auction_cases_4_and_5.glm (100%) rename {market => module/market}/autotest/test_markets_auction_large_balanced_exact.glm (100%) rename {market => module/market}/autotest/test_markets_auction_large_unbalanced_bid_resubmissions.glm (100%) rename {market => module/market}/autotest/test_markets_auction_large_unbalanced_exact.glm (100%) rename {market => module/market}/autotest/test_markets_auction_large_unbalanced_failure.glm (100%) rename {market => module/market}/autotest/test_markets_auction_large_unbalanced_marginal_buyer.glm (100%) rename {market => module/market}/autotest/test_markets_auction_large_unbalanced_marginal_price.glm (100%) rename {market => module/market}/autotest/test_markets_auction_large_unbalanced_marginal_seller.glm (100%) rename {market => module/market}/autotest/test_markets_auction_large_unbalanced_no_buyers_null.glm (100%) rename {market => module/market}/autotest/test_markets_auction_large_unbalanced_no_sellers_null.glm (100%) rename {market => module/market}/autotest/test_markets_auction_large_unbalanced_null.glm (100%) rename {market => module/market}/autotest/test_markets_auction_negative_all_quantities.glm (100%) rename {market => module/market}/autotest/test_markets_auction_negative_buyer_and_seller_price.glm (100%) rename {market => module/market}/autotest/test_markets_auction_negative_buyer_price.glm (100%) rename {market => module/market}/autotest/test_markets_auction_negative_buyer_quantity.glm (100%) rename {market => module/market}/autotest/test_markets_auction_negative_price_bids.glm (100%) rename {market => module/market}/autotest/test_markets_auction_negative_quantity_bids.glm (100%) rename {market => module/market}/autotest/test_markets_auction_negative_seller_price.glm (100%) rename {market => module/market}/autotest/test_markets_auction_negative_seller_quantity.glm (100%) rename {market => module/market}/autotest/test_markets_auction_no_buyers.glm (100%) rename {market => module/market}/autotest/test_markets_auction_no_sellers.glm (100%) rename {market => module/market}/autotest/test_markets_auction_null_market.glm (100%) rename {market => module/market}/autotest/test_markets_auction_repeated_bids.glm (100%) rename {market => module/market}/autotest/test_markets_auction_seller_buyer_alt.glm (100%) rename {market => module/market}/autotest/test_markets_auction_seller_rebid.glm (100%) rename {market => module/market}/autotest/test_markets_auction_sellers_first.glm (100%) rename {market => module/market}/autotest/test_markets_auction_simultaneous.glm (100%) rename {market => module/market}/autotest/test_markets_auction_unresponsive_buyer_failure.glm (100%) rename {market => module/market}/autotest/test_markets_controller_cooling_deadband_matching_period.glm (100%) rename {market => module/market}/autotest/test_markets_controller_cooling_inelastic_double.glm (100%) rename {market => module/market}/autotest/test_markets_controller_cooling_inelastic_matching_period.glm (100%) rename {market => module/market}/autotest/test_markets_controller_cooling_inelastic_nonmatching_periods.glm (100%) rename {market => module/market}/autotest/test_markets_controller_heating_deadband_matching_period.glm (100%) rename {market => module/market}/autotest/test_markets_controller_heating_inelastic_double.glm (100%) rename {market => module/market}/autotest/test_markets_controller_heating_inelastic_matching_period.glm (100%) rename {market => module/market}/autotest/test_markets_controller_heating_inelastic_nonmatching_period.glm (100%) rename {market => module/market}/autotest/test_markets_stubauction_opt.glm (100%) rename {market => module/market}/autotest/test_opt_markets_auction_large_balanced_marginal_buyer.glm (100%) rename {market => module/market}/autotest/test_opt_markets_auction_large_balanced_marginal_price.glm (100%) rename {market => module/market}/autotest/test_opt_markets_auction_large_balanced_marginal_seller.glm (100%) rename {market => module/market}/autotest/test_skew_DST_fall.glm (100%) rename {market => module/market}/autotest/test_skew_DST_spring.glm (100%) rename {market => module/market}/autotest/test_skew_leap_years.glm (100%) rename {market => module/market}/autotest/test_skew_year_transitions.glm (100%) rename {market => module/market}/autotest/test_stubauction.glm (100%) rename {market => module/market}/autotest/test_unitless_bid_quantity_err.glm (100%) rename {market => module/market}/bid.cpp (100%) rename {market => module/market}/bid.h (100%) rename {market => module/market}/collect.cpp (100%) rename {market => module/market}/collect.h (100%) rename {market => module/market}/controller.cpp (100%) rename {market => module/market}/controller.h (100%) rename {market => module/market}/controller2.cpp (100%) rename {market => module/market}/controller2.h (100%) rename {market => module/market}/curve.cpp (100%) rename {market => module/market}/curve.h (100%) rename {market => module/market}/double_controller.cpp (100%) rename {market => module/market}/double_controller.h (100%) rename {market => module/market}/generator_controller.cpp (100%) rename {market => module/market}/generator_controller.h (100%) rename {market => module/market}/init.cpp (100%) rename {market => module/market}/main.cpp (100%) rename {market => module/market}/market.h (100%) rename {market => module/market}/market.vcproj (100%) rename {market => module/market}/passive_controller.cpp (100%) rename {market => module/market}/passive_controller.h (100%) rename {market => module/market}/stub_bidder.cpp (100%) rename {market => module/market}/stub_bidder.h (100%) rename {market => module/market}/stubauction.cpp (100%) rename {market => module/market}/stubauction.h (100%) rename {market => module/market}/supervisory_control.cpp (100%) rename {market => module/market}/supervisory_control.h (100%) rename {mysql => module/mysql}/MYSQL_specific.vsprops (100%) create mode 100644 module/mysql/Makefile.mk rename {mysql => module/mysql}/autotest/test_mysql_collector.glm (100%) rename {mysql => module/mysql}/autotest/test_mysql_player.csv (100%) rename {mysql => module/mysql}/autotest/test_mysql_player.glm (100%) rename {mysql => module/mysql}/autotest/test_mysql_player_init.sql (100%) rename {mysql => module/mysql}/autotest/test_mysql_recorder.glm (100%) rename {mysql => module/mysql}/autotest/test_mysql_recorder_init.sql (100%) rename {mysql => module/mysql}/autotest/test_mysql_recorder_sync.sql (100%) rename {mysql => module/mysql}/autotest/test_mysql_recorder_term.sql (100%) rename {mysql => module/mysql}/collector.cpp (100%) rename {mysql => module/mysql}/collector.h (100%) rename {mysql => module/mysql}/database.cpp (100%) rename {mysql => module/mysql}/database.h (100%) rename {mysql => module/mysql}/init.cpp (100%) rename {mysql => module/mysql}/main.cpp (100%) rename {mysql => module/mysql}/mysql.vcproj (100%) rename {mysql => module/mysql}/player.cpp (100%) rename {mysql => module/mysql}/player.h (100%) rename {mysql => module/mysql}/recorder.cpp (100%) rename {mysql => module/mysql}/recorder.h (100%) rename {mysql => module/mysql}/validate.no (100%) create mode 100644 module/optimize/Makefile.mk rename {optimize => module/optimize}/autotest/test_extremum_opt.glm (100%) rename {optimize => module/optimize}/autotest/test_maximum_err.glm (100%) rename {optimize => module/optimize}/autotest/test_minimum.glm (100%) rename {optimize => module/optimize}/main.cpp (100%) rename {optimize => module/optimize}/optimize.h (100%) rename {optimize => module/optimize}/optimize.vcproj (100%) rename {optimize => module/optimize}/particle_swarm_optimization.cpp (100%) rename {optimize => module/optimize}/particle_swarm_optimization.h (100%) rename {optimize => module/optimize}/simple.cpp (100%) rename {optimize => module/optimize}/simple.h (100%) create mode 100644 module/powerflow/Makefile.mk rename {powerflow => module/powerflow}/OHLConductors.glm (100%) rename {powerflow => module/powerflow}/autotest/IEEE_13_node_impedance_dump.glm (100%) rename {powerflow => module/powerflow}/autotest/PSV.player (100%) rename {powerflow => module/powerflow}/autotest/SPIM_frequency.player (100%) rename {powerflow => module/powerflow}/autotest/SPIM_override.player (100%) rename {powerflow => module/powerflow}/autotest/SPIM_power_assert.player (100%) rename {powerflow => module/powerflow}/autotest/SPIM_reconnect_assert.player (100%) rename {powerflow => module/powerflow}/autotest/SPIM_status_assert.player (100%) rename {powerflow => module/powerflow}/autotest/SPIM_trip_assert.player (100%) rename {powerflow => module/powerflow}/autotest/SPIM_voltage.player (100%) rename {powerflow => module/powerflow}/autotest/SPIM_wr_assert.player (100%) rename {powerflow => module/powerflow}/autotest/billing_power.player (100%) rename {powerflow => module/powerflow}/autotest/cap_current_A_indiv_volt.player (100%) rename {powerflow => module/powerflow}/autotest/cap_current_B_indiv_volt.player (100%) rename {powerflow => module/powerflow}/autotest/cap_current_C_indiv_volt.player (100%) rename {powerflow => module/powerflow}/autotest/cap_manual_switch.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_BANK_VAR_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_bank_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_VAR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_VAR_B_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_VAR_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_VAR_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_VAR_dwell_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_VOLTVAR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_VOLTVAR_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_VOLTVAR_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_dwell_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_volt.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_volt_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_indiv_volt_NR_Y.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_A_manual_ts.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_BANK_VAR_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_bank_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_VAR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_VAR_B_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_VAR_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_VAR_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_VAR_dwell_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_VOLTVAR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_VOLTVAR_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_VOLTVAR_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_dwell_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_volt.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_volt_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_indiv_volt_NR_Y.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_B_manual_ts.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_BANK_VAR_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_bank_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_VAR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_VAR_B_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_VAR_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_VAR_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_VAR_dwell_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_VOLTVAR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_VOLTVAR_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_VOLTVAR_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_dwell.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_dwell_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_volt.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_volt_NR.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_indiv_volt_NR_Y.player (100%) rename {powerflow => module/powerflow}/autotest/cap_volt_C_manual_ts.player (100%) rename {powerflow => module/powerflow}/autotest/center_tapped_basic_energy.player (100%) rename {powerflow => module/powerflow}/autotest/center_tapped_complex_energy.player (100%) rename {powerflow => module/powerflow}/autotest/controller_1_armed.player (100%) rename {powerflow => module/powerflow}/autotest/controller_1_method.player (100%) rename {powerflow => module/powerflow}/autotest/controller_1_status.player (100%) rename {powerflow => module/powerflow}/autotest/data_SPIM_Vset.player (100%) rename {powerflow => module/powerflow}/autotest/data_SPIM_triplex_measured_phaseA.csv (100%) rename {powerflow => module/powerflow}/autotest/data_SPIM_triplex_measured_phaseB.csv (100%) rename {powerflow => module/powerflow}/autotest/data_SPIM_triplex_measured_phaseC.csv (100%) rename {powerflow => module/powerflow}/autotest/data_SPIM_triplex_motor_A_speed.csv (100%) rename {powerflow => module/powerflow}/autotest/data_SPIM_triplex_motor_B_speed.csv (100%) rename {powerflow => module/powerflow}/autotest/data_SPIM_triplex_motor_C_speed.csv (100%) rename {powerflow => module/powerflow}/autotest/data_ZIP_test_base_power.csv (100%) rename {powerflow => module/powerflow}/autotest/data_assert_swing_pq_voltage_A.csv (100%) rename {powerflow => module/powerflow}/autotest/data_assert_swing_pq_voltage_B.csv (100%) rename {powerflow => module/powerflow}/autotest/data_assert_swing_pq_voltage_C.csv (100%) rename {powerflow => module/powerflow}/autotest/data_cap_service.csv (100%) rename {powerflow => module/powerflow}/autotest/data_cap_service_test_power_measure.csv (100%) rename {powerflow => module/powerflow}/autotest/data_configurations_delta_123node.glm (100%) rename {powerflow => module/powerflow}/autotest/data_delta_load_voltage_A.csv (100%) rename {powerflow => module/powerflow}/autotest/data_delta_load_voltage_B.csv (100%) rename {powerflow => module/powerflow}/autotest/data_delta_load_voltage_C.csv (100%) rename {powerflow => module/powerflow}/autotest/data_delta_player_load_A.csv (100%) rename {powerflow => module/powerflow}/autotest/data_delta_player_load_B.csv (100%) rename {powerflow => module/powerflow}/autotest/data_delta_player_load_C.csv (100%) rename {powerflow => module/powerflow}/autotest/data_delta_powermeas_assert.csv (100%) rename {powerflow => module/powerflow}/autotest/data_delta_triplex_load_power.csv (100%) rename {powerflow => module/powerflow}/autotest/data_delta_triplex_load_voltage_1.csv (100%) rename {powerflow => module/powerflow}/autotest/data_delta_triplex_load_voltage_12.csv (100%) rename {powerflow => module/powerflow}/autotest/data_delta_triplex_load_voltage_2.csv (100%) rename {powerflow => module/powerflow}/autotest/data_delta_triplex_player.csv (100%) rename {powerflow => module/powerflow}/autotest/data_inrush_LineFlowCurrentOut_A.csv (100%) rename {powerflow => module/powerflow}/autotest/data_inrush_LineFlowCurrentOut_B.csv (100%) rename {powerflow => module/powerflow}/autotest/data_inrush_LineFlowCurrentOut_C.csv (100%) rename {powerflow => module/powerflow}/autotest/data_inrush_Voltage_node2_A.csv (100%) rename {powerflow => module/powerflow}/autotest/data_inrush_Voltage_node2_B.csv (100%) rename {powerflow => module/powerflow}/autotest/data_inrush_Voltage_node2_C.csv (100%) rename {powerflow => module/powerflow}/autotest/data_multi_load4B_phaseA.csv (100%) rename {powerflow => module/powerflow}/autotest/data_multi_load4B_phaseB.csv (100%) rename {powerflow => module/powerflow}/autotest/data_multi_load4B_phaseC.csv (100%) rename {powerflow => module/powerflow}/autotest/data_multi_load4C_phaseA.csv (100%) rename {powerflow => module/powerflow}/autotest/data_multi_load4C_phaseB.csv (100%) rename {powerflow => module/powerflow}/autotest/data_multi_load4C_phaseC.csv (100%) rename {powerflow => module/powerflow}/autotest/data_multi_load4_phaseA.csv (100%) rename {powerflow => module/powerflow}/autotest/data_multi_load4_phaseB.csv (100%) rename {powerflow => module/powerflow}/autotest/data_multi_load4_phaseC.csv (100%) rename {powerflow => module/powerflow}/autotest/data_swing_pq_voltage_player_A.csv (100%) rename {powerflow => module/powerflow}/autotest/data_swing_pq_voltage_player_B.csv (100%) rename {powerflow => module/powerflow}/autotest/data_swing_pq_voltage_player_C.csv (100%) rename {powerflow => module/powerflow}/autotest/data_triplex_parent_test_housebus.csv (100%) rename {powerflow => module/powerflow}/autotest/data_triplex_parent_test_parentbus.csv (100%) rename {powerflow => module/powerflow}/autotest/data_triplex_parent_test_swingbus.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_currRecorderA.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_currRecorderB.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_currRecorderC.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_in_rec_curr_A.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_in_rec_curr_B.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_in_rec_curr_C.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_in_rec_pow_A.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_in_rec_pow_B.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_in_rec_pow_C.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_load_volt_out_volt_A.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_load_volt_out_volt_B.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_load_volt_out_volt_C.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_out_rec_curr_A.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_out_rec_curr_B.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_out_rec_curr_C.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_out_rec_pow_A.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_out_rec_pow_B.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_out_rec_pow_C.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_powRecorderA.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_powRecorderB.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_powRecorderC.csv (100%) rename {powerflow => module/powerflow}/autotest/data_vfd_speedPlayer_delta.player (100%) rename {powerflow => module/powerflow}/autotest/data_zip_measload_phaseA.csv (100%) rename {powerflow => module/powerflow}/autotest/data_zip_measload_phaseB.csv (100%) rename {powerflow => module/powerflow}/autotest/data_zip_measload_phaseC.csv (100%) rename {powerflow => module/powerflow}/autotest/dist_volt_A_Aref.player (100%) rename {powerflow => module/powerflow}/autotest/dist_volt_B_Aref.player (100%) rename {powerflow => module/powerflow}/autotest/dist_volt_C_Aref.player (100%) rename {powerflow => module/powerflow}/autotest/dutycycle_player.player (100%) rename {powerflow => module/powerflow}/autotest/feeder_schedules.glm (100%) rename {powerflow => module/powerflow}/autotest/flat.player (100%) rename {powerflow => module/powerflow}/autotest/fuse_assert_status_B.player (100%) rename {powerflow => module/powerflow}/autotest/fuse_assert_status_C.player (100%) rename {powerflow => module/powerflow}/autotest/fuse_load_B.player (100%) rename {powerflow => module/powerflow}/autotest/fuse_ph_A_status.player (100%) rename {powerflow => module/powerflow}/autotest/fuse_ph_B_status.player (100%) rename {powerflow => module/powerflow}/autotest/fuse_ph_C_status.player (100%) rename {powerflow => module/powerflow}/autotest/linearLoadIncrease.player (100%) rename {powerflow => module/powerflow}/autotest/load_tracker_setpoint.player (100%) rename {powerflow => module/powerflow}/autotest/loader_fastA.player (100%) rename {powerflow => module/powerflow}/autotest/loader_fastA_NR.player (100%) rename {powerflow => module/powerflow}/autotest/loader_fastA_induct.player (100%) rename {powerflow => module/powerflow}/autotest/loader_fastB.player (100%) rename {powerflow => module/powerflow}/autotest/loader_fastB_NR.player (100%) rename {powerflow => module/powerflow}/autotest/loader_fastB_induct.player (100%) rename {powerflow => module/powerflow}/autotest/loader_fastC.player (100%) rename {powerflow => module/powerflow}/autotest/loader_fastC_NR.player (100%) rename {powerflow => module/powerflow}/autotest/loader_fastC_induct.player (100%) rename {powerflow => module/powerflow}/autotest/meter_reactive_energy_delta.player (100%) rename {powerflow => module/powerflow}/autotest/meter_real_energy_delta.player (100%) rename {powerflow => module/powerflow}/autotest/regulator_load_phA.player (100%) rename {powerflow => module/powerflow}/autotest/regulator_load_phB.player (100%) rename {powerflow => module/powerflow}/autotest/regulator_load_phC.player (100%) rename {powerflow => module/powerflow}/autotest/regulator_manual_YY_assert_A.player (100%) rename {powerflow => module/powerflow}/autotest/regulator_manual_YY_assert_A_TypeB.player (100%) rename {powerflow => module/powerflow}/autotest/regulator_manual_YY_assert_B.player (100%) rename {powerflow => module/powerflow}/autotest/regulator_manual_YY_assert_B_TypeB.player (100%) rename {powerflow => module/powerflow}/autotest/regulator_manual_YY_assert_C.player (100%) rename {powerflow => module/powerflow}/autotest/regulator_manual_YY_assert_C_TypeB.player (100%) rename {powerflow => module/powerflow}/autotest/regulator_manual_YY_tap_A.player (100%) rename {powerflow => module/powerflow}/autotest/regulator_manual_YY_tap_B.player (100%) rename {powerflow => module/powerflow}/autotest/regulator_manual_YY_tap_C.player (100%) rename {powerflow => module/powerflow}/autotest/solver_ml.conf (100%) rename {powerflow => module/powerflow}/autotest/solver_ml_check.py (100%) rename {powerflow => module/powerflow}/autotest/solver_py.conf (100%) rename {powerflow => module/powerflow}/autotest/solver_py.py (100%) rename {powerflow => module/powerflow}/autotest/stub_bill_price.player (100%) rename {powerflow => module/powerflow}/autotest/stub_nofee_bill_value.player (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE-123_FBS.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE-13_FBS.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE123_zero_voltages_FBS.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE123_zero_voltages_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_13_FBS.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_13_FBS_AMI.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_13_FBS_AMI_24hr.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_13_FBS_AMI_24hr_Mod_Res.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_13_FBS_AMI_LinearLoadChange.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_13_FBS_AMI_LinearLoadChangeTrim.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_13_FBS_AMI_StepParameterChange.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_13_FBS_AMI_StepPropertyChange.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_13_FBS_AMI_StepPropertyChange2.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_13_ML.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_13_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_13_PY.glm (100%) rename {powerflow => module/powerflow}/autotest/test_IEEE_37node.glm (100%) rename {powerflow => module/powerflow}/autotest/test_NR_matrix_dump.glm (100%) rename {powerflow => module/powerflow}/autotest/test_SPIM_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_SPIM_triplex_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_Simple_Switch_Fault_InRush_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_ZIPLoad_ZeroBase_FBS.glm (100%) rename {powerflow => module/powerflow}/autotest/test_ZIPLoad_ZeroBase_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_D-D.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_D-D_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_D-grY.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_D-grY_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_D-grY_phA.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_D-grY_phAB.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_D-grY_phB.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_D-grY_phC.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_D_D_phA.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_D_D_phAB.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_D_D_phB.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_D_D_phC.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_grY-grY.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_grY-grY_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_grY-grY_phA.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_grY-grY_phAB.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_grY-grY_phB.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepdown_grY-grY_phC.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_D-D.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_D-D_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_D-D_phA.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_D-D_phAB.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_D-D_phB.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_D-D_phC.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_D-grY.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_D-grY_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_D-grY_phA.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_D-grY_phAB.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_D-grY_phB.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_D-grY_phC.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_grY-grY.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_grY-grY_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_grY-grY_phA.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_grY-grY_phAB.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_grY-grY_phB.glm (100%) rename {powerflow => module/powerflow}/autotest/test_balanced_stepup_grY-grY_phC.glm (100%) rename {powerflow => module/powerflow}/autotest/test_c_matrix_line_capacitance_balanced.glm (100%) rename {powerflow => module/powerflow}/autotest/test_c_matrix_line_capacitance_balanced_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_CURRENT_ABC_indiv.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_CURRENT_ABC_indiv_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_VAR_ABC_BANK_B.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_VAR_ABC_BANK_B_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_VAR_ABC_indiv.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_VAR_ABC_indiv_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_VAR_ABC_indiv_Y.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_VAR_ABC_indiv_Y_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_VAR_ABC_indiv_dwell.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_VAR_ABC_indiv_dwell_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_VAR_VOLT_ABC_indiv.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_VAR_VOLT_ABC_indiv_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_VAR_VOLT_ABC_indiv_dwell.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_VAR_VOLT_ABC_indiv_dwell_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_counters.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_ABC_bank_time_series.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_ABC_bank_time_series_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_ABC_time_series.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_ABC_time_series_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABBCD.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABBCD_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABBCD_Y.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABBCD_Y_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABBCD_service.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABCAD.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABCAD_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABCAD_Y.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABCAD_Y_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABD.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABD_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABD_Y.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABD_Y_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABN.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_ABN_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_AN.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_AN_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_All_D.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_All_D_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_All_D_Y.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_All_D_Y_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_All_N.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_All_N_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_BCCAD.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_BCCAD_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_BCCAD_Y.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_BCCAD_Y_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_BCD.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_BCD_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_BCD_Y.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_BCD_Y_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_BCN.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_BCN_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_BN.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_BN_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_CAD.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_CAD_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_CAD_Y.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_CAD_Y_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_CAN.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_CAN_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_CN.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_CN_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_allOff.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_manual_single_allOff_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_volt_ABC_BANK_A.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_volt_ABC_BANK_A_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_volt_ABC_indiv.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_volt_ABC_indiv_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_volt_ABC_indiv_Y.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_volt_ABC_indiv_Y_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_volt_ABC_indiv_dwell.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_volt_ABC_indiv_dwell_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_capacitor_volt_single_ABBCD_service.glm (100%) rename {powerflow => module/powerflow}/autotest/test_center_tapped_basic.glm (100%) rename {powerflow => module/powerflow}/autotest/test_center_tapped_basic_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_center_tapped_complex.glm (100%) rename {powerflow => module/powerflow}/autotest/test_center_tapped_complex_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_combination_loads_FBS.glm (100%) rename {powerflow => module/powerflow}/autotest/test_combination_loads_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_delta_IEEE_123node_cap_service_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_delta_IEEE_123node_test_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_different_load_parent_Delta_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_different_load_parent_Wye_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_disconnected_node.glm (100%) rename {powerflow => module/powerflow}/autotest/test_duplicate_NR_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_dutycycle.glm (100%) rename {powerflow => module/powerflow}/autotest/test_fuse.glm (100%) rename {powerflow => module/powerflow}/autotest/test_fuse_switched_out_of_service.glm (100%) rename {powerflow => module/powerflow}/autotest/test_line_sensor.glm (100%) rename {powerflow => module/powerflow}/autotest/test_link_same_from_and_to_FBS_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_link_same_from_and_to_NR_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_load_tracker.glm (100%) rename {powerflow => module/powerflow}/autotest/test_load_tracker_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_load_tracker_damped.glm (100%) rename {powerflow => module/powerflow}/autotest/test_load_tracker_damped_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_load_tracker_double.glm (100%) rename {powerflow => module/powerflow}/autotest/test_load_tracker_double_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_meter_delta.glm (100%) rename {powerflow => module/powerflow}/autotest/test_multi_island.glm (100%) rename {powerflow => module/powerflow}/autotest/test_multi_island_SWING_PQ.glm (100%) rename {powerflow => module/powerflow}/autotest/test_node_phaseS_check_FBS_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_node_phaseS_check_NR_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_nonzero_initial_meter_reading.glm (100%) rename {powerflow => module/powerflow}/autotest/test_opt_reg_linedropcomp2_YY_A_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_opt_reg_linedropcomp2_YY_A_NR_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_opt_reg_linedropcomp2_YY_B_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_opt_reg_linedropcomp2_YY_B_NR_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_opt_regulator_linedropcomp_YY_A_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_opt_regulator_linedropcomp_YY_A_NR_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_opt_regulator_linedropcomp_YY_B_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_opt_regulator_linedropcomp_YY_B_NR_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_pole.csv (100%) rename {powerflow => module/powerflow}/autotest/test_pole.glm (100%) rename {powerflow => module/powerflow}/autotest/test_pole_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_pole_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_NR_network.glm (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_exercise_4_1_3.glm (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_bank_rev_flow_control_current_pos_tap_pos.player (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_bank_rev_flow_control_neutral_tap_pos.player (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_bank_reverse_flow_control_current_pos.glm (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_bank_reverse_flow_control_neutral.glm (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_counters.glm (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_A.player (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_B.player (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_C.player (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_A.player (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_B.player (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_C.player (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_ind_reverse_flow_control_current_pos.glm (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_ind_reverse_flow_control_neutral.glm (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_A.player (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_B.player (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_C.player (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_transformer_thermal_model.glm (100%) rename {powerflow => module/powerflow}/autotest/test_powerflow_triplex_load.glm (100%) rename {powerflow => module/powerflow}/autotest/test_reg.player (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_linedropcomp2_YY_A.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_linedropcomp2_YY_A_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_linedropcomp2_YY_B.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_linedropcomp2_YY_B_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_linedropcomp_YY_A.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_linedropcomp_YY_A_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_linedropcomp_YY_B.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_linedropcomp_YY_B_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_manual_YY_A.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_manual_YY_A_1ph.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_manual_YY_A_1ph_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_manual_YY_A_2ph.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_manual_YY_A_2ph_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_manual_YY_A_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_manual_YY_B.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_manual_YY_B_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_outputvolt_YY_A.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_outputvolt_YY_A_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_outputvolt_YY_A_NR_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_outputvolt_YY_A_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_outputvolt_YY_B.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_outputvolt_YY_B_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_outputvolt_YY_B_NR_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_outputvolt_YY_B_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_remotesense_YY_A.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_remotesense_YY_A_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_remotesense_YY_A_NR_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_remotesense_YY_A_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_remotesense_YY_B.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_remotesense_YY_B_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_remotesense_YY_B_NR_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_regulator_remotesense_YY_B_ts.glm (100%) rename {powerflow => module/powerflow}/autotest/test_reversed_lines_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_substation_PSV_driven.glm (100%) rename {powerflow => module/powerflow}/autotest/test_substation_normal_node.glm (100%) rename {powerflow => module/powerflow}/autotest/test_substation_swing_node.glm (100%) rename {powerflow => module/powerflow}/autotest/test_switch_coordinator.glm (100%) rename {powerflow => module/powerflow}/autotest/test_switch_coordinator_method.glm (100%) rename {powerflow => module/powerflow}/autotest/test_transformer_losses_FBS.glm (100%) rename {powerflow => module/powerflow}/autotest/test_transformer_losses_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_triplex_billing_stub.glm (100%) rename {powerflow => module/powerflow}/autotest/test_triplex_billing_tiered_fee.glm (100%) rename {powerflow => module/powerflow}/autotest/test_triplex_billing_tiered_nofee.glm (100%) rename {powerflow => module/powerflow}/autotest/test_triplex_billing_uniform_fee.glm (100%) rename {powerflow => module/powerflow}/autotest/test_triplex_billing_uniform_nofee.glm (100%) rename {powerflow => module/powerflow}/autotest/test_triplex_invalid_conductor_FBS_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_triplex_invalid_conductor_NR_err.glm (100%) rename {powerflow => module/powerflow}/autotest/test_triplex_meter_parent_accum_FBS.glm (100%) rename {powerflow => module/powerflow}/autotest/test_triplex_meter_parent_accum_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_stepdown_D-D.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_stepdown_D-D_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_stepdown_D-grY.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_stepdown_D-grY_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_stepdown_grY-grY.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_stepdown_grY-grY_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_stepup_D-D.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_stepup_D-D_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_stepup_D-grY.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_stepup_D-grY_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_stepup_grY-grY.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_stepup_grY-grY_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_unity_grY-grY.glm (100%) rename {powerflow => module/powerflow}/autotest/test_unbalanced_unity_grY-grY_NR.glm (100%) rename {powerflow => module/powerflow}/autotest/test_underground_TapeShielded_cond.glm (100%) rename {powerflow => module/powerflow}/autotest/test_vfd_delta_opt.glm (100%) rename {powerflow => module/powerflow}/autotest/triplex_meter_reactive_energy_delta.player (100%) rename {powerflow => module/powerflow}/autotest/triplex_meter_real_energy_delta.player (100%) rename {powerflow => module/powerflow}/autotest/voltage.csv (100%) rename {powerflow => module/powerflow}/billdump.cpp (100%) rename {powerflow => module/powerflow}/billdump.h (100%) rename {powerflow => module/powerflow}/capacitor.cpp (100%) rename {powerflow => module/powerflow}/capacitor.h (100%) rename {powerflow => module/powerflow}/currdump.cpp (100%) rename {powerflow => module/powerflow}/currdump.h (100%) rename {powerflow => module/powerflow}/docs/pole_loading.pdf (100%) rename {powerflow => module/powerflow}/docs/pole_service_life.pdf (100%) rename {powerflow => module/powerflow}/docs/pole_top_degradation.pdf (100%) rename {powerflow => module/powerflow}/emissions.cpp (100%) rename {powerflow => module/powerflow}/emissions.h (100%) rename {powerflow => module/powerflow}/fault_check.cpp (100%) rename {powerflow => module/powerflow}/fault_check.h (100%) rename {powerflow => module/powerflow}/frequency_gen.cpp (100%) rename {powerflow => module/powerflow}/frequency_gen.h (100%) rename {powerflow => module/powerflow}/fuse.cpp (100%) rename {powerflow => module/powerflow}/fuse.h (100%) rename {powerflow => module/powerflow}/impedance_dump.cpp (100%) rename {powerflow => module/powerflow}/impedance_dump.h (100%) rename {powerflow => module/powerflow}/init.cpp (100%) rename {powerflow => module/powerflow}/line.cpp (100%) rename {powerflow => module/powerflow}/line.h (100%) rename {powerflow => module/powerflow}/line_configuration.cpp (100%) rename {powerflow => module/powerflow}/line_configuration.h (100%) rename {powerflow => module/powerflow}/line_sensor.cpp (100%) rename {powerflow => module/powerflow}/line_sensor.h (100%) rename {powerflow => module/powerflow}/line_spacing.cpp (100%) rename {powerflow => module/powerflow}/line_spacing.h (100%) rename {powerflow => module/powerflow}/link.cpp (100%) rename {powerflow => module/powerflow}/link.h (100%) rename {powerflow => module/powerflow}/load.cpp (100%) rename {powerflow => module/powerflow}/load.h (100%) rename {powerflow => module/powerflow}/load_tracker.cpp (100%) rename {powerflow => module/powerflow}/load_tracker.h (100%) rename {powerflow => module/powerflow}/main.cpp (100%) rename {powerflow => module/powerflow}/meter.cpp (100%) rename {powerflow => module/powerflow}/meter.h (100%) rename {powerflow => module/powerflow}/motor.cpp (100%) rename {powerflow => module/powerflow}/motor.h (100%) rename {powerflow => module/powerflow}/node.cpp (100%) rename {powerflow => module/powerflow}/node.h (100%) rename {powerflow => module/powerflow}/overhead_line.cpp (100%) rename {powerflow => module/powerflow}/overhead_line.h (100%) rename {powerflow => module/powerflow}/overhead_line_conductor.cpp (100%) rename {powerflow => module/powerflow}/overhead_line_conductor.h (100%) rename {powerflow => module/powerflow}/pole.cpp (100%) rename {powerflow => module/powerflow}/pole.h (100%) rename {powerflow => module/powerflow}/pole_configuration.cpp (100%) rename {powerflow => module/powerflow}/pole_configuration.h (100%) rename {powerflow => module/powerflow}/power_metrics.cpp (100%) rename {powerflow => module/powerflow}/power_metrics.h (100%) rename {powerflow => module/powerflow}/powerflow.cpp (100%) rename {powerflow => module/powerflow}/powerflow.h (100%) rename {powerflow => module/powerflow}/powerflow.vcproj (100%) rename {powerflow => module/powerflow}/powerflow_library.cpp (100%) rename {powerflow => module/powerflow}/powerflow_library.h (100%) rename {powerflow => module/powerflow}/powerflow_object.cpp (100%) rename {powerflow => module/powerflow}/powerflow_object.h (100%) rename {powerflow => module/powerflow}/pqload.cpp (100%) rename {powerflow => module/powerflow}/pqload.h (100%) rename {powerflow => module/powerflow}/recloser.cpp (100%) rename {powerflow => module/powerflow}/recloser.h (100%) rename {powerflow => module/powerflow}/regulator.cpp (100%) rename {powerflow => module/powerflow}/regulator.h (100%) rename {powerflow => module/powerflow}/regulator_configuration.cpp (100%) rename {powerflow => module/powerflow}/regulator_configuration.h (100%) rename {powerflow => module/powerflow}/restoration.cpp (100%) rename {powerflow => module/powerflow}/restoration.h (100%) rename {powerflow => module/powerflow}/sectionalizer.cpp (100%) rename {powerflow => module/powerflow}/sectionalizer.h (100%) rename {powerflow => module/powerflow}/series_reactor.cpp (100%) rename {powerflow => module/powerflow}/series_reactor.h (100%) rename {powerflow => module/powerflow}/solver_ml_branchdump.h (100%) rename {powerflow => module/powerflow}/solver_nr.cpp (100%) rename {powerflow => module/powerflow}/solver_nr.h (100%) rename {powerflow => module/powerflow}/solver_py.conf (100%) rename {powerflow => module/powerflow}/solver_py.cpp (100%) rename {powerflow => module/powerflow}/solver_py.h (100%) rename {powerflow => module/powerflow}/substation.cpp (100%) rename {powerflow => module/powerflow}/substation.h (100%) rename {powerflow => module/powerflow}/switch_coordinator.cpp (100%) rename {powerflow => module/powerflow}/switch_coordinator.h (100%) rename {powerflow => module/powerflow}/switch_object.cpp (100%) rename {powerflow => module/powerflow}/switch_object.h (100%) rename {powerflow => module/powerflow}/transformer.cpp (100%) rename {powerflow => module/powerflow}/transformer.h (100%) rename {powerflow => module/powerflow}/transformer_configuration.cpp (100%) rename {powerflow => module/powerflow}/transformer_configuration.h (100%) rename {powerflow => module/powerflow}/triplex_line.cpp (100%) rename {powerflow => module/powerflow}/triplex_line.h (100%) rename {powerflow => module/powerflow}/triplex_line_conductor.cpp (100%) rename {powerflow => module/powerflow}/triplex_line_conductor.h (100%) rename {powerflow => module/powerflow}/triplex_line_configuration.cpp (100%) rename {powerflow => module/powerflow}/triplex_line_configuration.h (100%) rename {powerflow => module/powerflow}/triplex_load.cpp (100%) rename {powerflow => module/powerflow}/triplex_load.h (100%) rename {powerflow => module/powerflow}/triplex_meter.cpp (100%) rename {powerflow => module/powerflow}/triplex_meter.h (100%) rename {powerflow => module/powerflow}/triplex_node.cpp (100%) rename {powerflow => module/powerflow}/triplex_node.h (100%) rename {powerflow => module/powerflow}/underground_line.cpp (100%) rename {powerflow => module/powerflow}/underground_line.h (100%) rename {powerflow => module/powerflow}/underground_line_conductor.cpp (100%) rename {powerflow => module/powerflow}/underground_line_conductor.h (100%) rename {powerflow => module/powerflow}/vfd.cpp (100%) rename {powerflow => module/powerflow}/vfd.h (100%) rename {powerflow => module/powerflow}/volt_var_control.cpp (100%) rename {powerflow => module/powerflow}/volt_var_control.h (100%) rename {powerflow => module/powerflow}/voltdump.cpp (100%) rename {powerflow => module/powerflow}/voltdump.h (100%) create mode 100644 module/powernet/Makefile.mk rename {powernet => module/powernet}/agent.cpp (100%) rename {powernet => module/powernet}/agent.h (100%) rename {powernet => module/powernet}/autotest/test_agent_method.glm (100%) rename {powernet => module/powernet}/house.cpp (100%) rename {powernet => module/powernet}/house.h (100%) rename {powernet => module/powernet}/main.cpp (100%) rename {powernet => module/powernet}/message.cpp (100%) rename {powernet => module/powernet}/message.h (100%) rename {powernet => module/powernet}/powernet.h (100%) rename {powernet => module/powernet}/validate.no (100%) create mode 100644 module/reliability/Makefile.mk rename {reliability => module/reliability}/autotest/data_deltamode_deterministic_eventgen.player (100%) rename {reliability => module/reliability}/autotest/data_deltamode_random_eventgen.player (100%) rename {reliability => module/reliability}/autotest/deterministic_CAIDI.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_CAIDI_int.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_MAIFI.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_MAIFI_int.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_SAIDI.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_SAIDI_int.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_SAIFI.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_SAIFI_int.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_minTS_CAIDI.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_minTS_CAIDI_int.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_minTS_MAIFI.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_minTS_MAIFI_int.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_minTS_SAIDI.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_minTS_SAIDI_int.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_minTS_SAIFI.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_minTS_SAIFI_int.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_minTS_measured_A.csv (100%) rename {reliability => module/reliability}/autotest/deterministic_powerA.csv (100%) rename {reliability => module/reliability}/autotest/fault_bus_A_within.player (100%) rename {reliability => module/reliability}/autotest/fault_bus_B_within.player (100%) rename {reliability => module/reliability}/autotest/fault_bus_C_within.player (100%) rename {reliability => module/reliability}/autotest/fault_bus_fault_current_A.player (100%) rename {reliability => module/reliability}/autotest/fault_bus_fault_current_B.player (100%) rename {reliability => module/reliability}/autotest/fault_bus_fault_current_C.player (100%) rename {reliability => module/reliability}/autotest/fuse_limit_manipulate.player (100%) rename {reliability => module/reliability}/autotest/random_CAIDI.csv (100%) rename {reliability => module/reliability}/autotest/random_CAIDI_int.csv (100%) rename {reliability => module/reliability}/autotest/random_MAIFI.csv (100%) rename {reliability => module/reliability}/autotest/random_MAIFI_int.csv (100%) rename {reliability => module/reliability}/autotest/random_SAIDI.csv (100%) rename {reliability => module/reliability}/autotest/random_SAIDI_int.csv (100%) rename {reliability => module/reliability}/autotest/random_SAIFI.csv (100%) rename {reliability => module/reliability}/autotest/random_SAIFI_int.csv (100%) rename {reliability => module/reliability}/autotest/random_minTS_CAIDI.csv (100%) rename {reliability => module/reliability}/autotest/random_minTS_CAIDI_int.csv (100%) rename {reliability => module/reliability}/autotest/random_minTS_MAIFI.csv (100%) rename {reliability => module/reliability}/autotest/random_minTS_MAIFI_Int.csv (100%) rename {reliability => module/reliability}/autotest/random_minTS_SAIDI.csv (100%) rename {reliability => module/reliability}/autotest/random_minTS_SAIDI_Int.csv (100%) rename {reliability => module/reliability}/autotest/random_minTS_SAIFI.csv (100%) rename {reliability => module/reliability}/autotest/random_minTS_SAIFI_Int.csv (100%) rename {reliability => module/reliability}/autotest/swing_bus_A_within.player (100%) rename {reliability => module/reliability}/autotest/swing_bus_B_within.player (100%) rename {reliability => module/reliability}/autotest/swing_bus_C_within.player (100%) rename {reliability => module/reliability}/autotest/swing_bus_fault_current_A.player (100%) rename {reliability => module/reliability}/autotest/swing_bus_fault_current_B.player (100%) rename {reliability => module/reliability}/autotest/swing_bus_fault_current_C.player (100%) rename {reliability => module/reliability}/autotest/test_cost.glm (100%) rename {reliability => module/reliability}/autotest/test_cost_outage.csv (100%) rename {reliability => module/reliability}/autotest/test_deltamode_deterministic_err.glm (100%) rename {reliability => module/reliability}/autotest/test_deltamode_eventgen_overrun_err.glm (100%) rename {reliability => module/reliability}/autotest/test_deltamode_random_err.glm (100%) rename {reliability => module/reliability}/autotest/test_deterministic.glm (100%) rename {reliability => module/reliability}/autotest/test_deterministic_minTS.glm (100%) rename {reliability => module/reliability}/autotest/test_eventgen_random.glm (100%) rename {reliability => module/reliability}/autotest/test_eventgen_random_minTS.glm (100%) rename {reliability => module/reliability}/autotest/test_fault_current_4_node.glm (100%) rename {reliability => module/reliability}/cost.cpp (100%) rename {reliability => module/reliability}/cost.h (100%) rename {reliability => module/reliability}/eventgen.cpp (100%) rename {reliability => module/reliability}/eventgen.h (100%) rename {reliability => module/reliability}/init.cpp (100%) rename {reliability => module/reliability}/main.cpp (100%) rename {reliability => module/reliability}/metrics.cpp (100%) rename {reliability => module/reliability}/metrics.h (100%) rename {reliability => module/reliability}/reliability.h (100%) rename {reliability => module/reliability}/reliability.vcproj (100%) create mode 100644 module/residential/Makefile.mk rename {residential => module/residential}/appliance.cpp (100%) rename {residential => module/residential}/appliance.h (100%) rename {residential => module/residential}/autotest/Dishwasher.glm (100%) rename {residential => module/residential}/autotest/Dryer.glm (100%) rename {residential => module/residential}/autotest/Range.glm (100%) rename {residential => module/residential}/autotest/Refrigerator.glm (100%) rename {residential => module/residential}/autotest/appliance_schedules.glm (100%) rename {residential => module/residential}/autotest/clotheswasher.glm (100%) rename {residential => module/residential}/autotest/clotheswasher_out.player (100%) rename {residential => module/residential}/autotest/clotheswasher_output.player (100%) rename {residential => module/residential}/autotest/data_EV_det_output_m1.player (100%) rename {residential => module/residential}/autotest/data_EV_det_output_m1_default.player (100%) rename {residential => module/residential}/autotest/data_Vtrigger_house.player (100%) rename {residential => module/residential}/autotest/data_min_new_EV_det_output_m1.player (100%) rename {residential => module/residential}/autotest/data_sample_NHTS.csv (100%) rename {residential => module/residential}/autotest/dishwasher_output.player (100%) rename {residential => module/residential}/autotest/dr_mode_normal.player (100%) rename {residential => module/residential}/autotest/dryer_output.player (100%) rename {residential => module/residential}/autotest/generic_demand.glt (100%) rename {residential => module/residential}/autotest/generic_fail_demand(range0-1).glt (100%) rename {residential => module/residential}/autotest/lights_power.m (100%) rename {residential => module/residential}/autotest/plot_paneldump.py (100%) rename {residential => module/residential}/autotest/plugload_demand_range_bounds.player (100%) rename {residential => module/residential}/autotest/plugload_enduse_load.player (100%) rename {residential => module/residential}/autotest/plugload_energy_meter.player (100%) rename {residential => module/residential}/autotest/plugload_internal_gains.player (100%) rename {residential => module/residential}/autotest/plugload_internal_gains_hf.player (100%) rename {residential => module/residential}/autotest/range_output.player (100%) rename {residential => module/residential}/autotest/refrigerator_out.player (100%) rename {residential => module/residential}/autotest/setpoint_schedule.glm (100%) rename {residential => module/residential}/autotest/test_HVAC_balance.glm (100%) rename {residential => module/residential}/autotest/test_HVAC_common_cool.glm (100%) rename {residential => module/residential}/autotest/test_HVAC_common_heat.glm (100%) rename {residential => module/residential}/autotest/test_HVAC_peak_cool.glm (100%) rename {residential => module/residential}/autotest/test_HVAC_peak_heat.glm (100%) rename {residential => module/residential}/autotest/test_Refrigerator_opt.glm (100%) rename {residential => module/residential}/autotest/test_appliance_opt.glm (100%) rename {residential => module/residential}/autotest/test_clotheswasher_explicit_energy_swd_opt.glm (100%) rename {residential => module/residential}/autotest/test_clotheswasher_explicit_energy_swy_opt.glm (100%) rename {residential => module/residential}/autotest/test_clotheswasher_explicit_energy_wwd_opt.glm (100%) rename {residential => module/residential}/autotest/test_clotheswasher_explicit_energy_wwy_opt.glm (100%) rename {residential => module/residential}/autotest/test_clotheswasher_implicit.glm (100%) rename {residential => module/residential}/autotest/test_clotheswasher_opt.glm (100%) rename {residential => module/residential}/autotest/test_deltamode_single_house.glm (100%) rename {residential => module/residential}/autotest/test_dishwasher.glm (100%) rename {residential => module/residential}/autotest/test_dishwasher_explicit_power1_opt.glm (100%) rename {residential => module/residential}/autotest/test_dishwasher_explicit_power2_opt.glm (100%) rename {residential => module/residential}/autotest/test_dishwasher_implicit.glm (100%) rename {residential => module/residential}/autotest/test_dryer.glm (100%) rename {residential => module/residential}/autotest/test_dryer_explicit_energy_swd_opt.glm (100%) rename {residential => module/residential}/autotest/test_dryer_explicit_energy_swy_opt.glm (100%) rename {residential => module/residential}/autotest/test_dryer_explicit_energy_wwd_opt.glm (100%) rename {residential => module/residential}/autotest/test_dryer_explicit_energy_wwy_opt.glm (100%) rename {residential => module/residential}/autotest/test_dryer_implicit.glm (100%) rename {residential => module/residential}/autotest/test_evcharger_det_m1.glm (100%) rename {residential => module/residential}/autotest/test_evcharger_det_m1_default.glm (100%) rename {residential => module/residential}/autotest/test_evcharger_det_m1_minTS.glm (100%) rename {residential => module/residential}/autotest/test_freezer_deadband_opt.glm (100%) rename {residential => module/residential}/autotest/test_freezer_implicit_opt.glm (100%) rename {residential => module/residential}/autotest/test_generic_limit_demand(range0-1).glt (100%) rename {residential => module/residential}/autotest/test_generic_limit_demand.player (100%) rename {residential => module/residential}/autotest/test_house_paneldump_energy.glm (100%) rename {residential => module/residential}/autotest/test_house_paneldump_power.glm (100%) rename {residential => module/residential}/autotest/test_implicit_eia2015_loads.glm (100%) rename {residential => module/residential}/autotest/test_implicit_gasenduses.glm (100%) rename {residential => module/residential}/autotest/test_lights_exp.glm (100%) rename {residential => module/residential}/autotest/test_lights_explicit_power1.glm (100%) rename {residential => module/residential}/autotest/test_lights_explicit_power1.player (100%) rename {residential => module/residential}/autotest/test_lights_explicit_power2.glm (100%) rename {residential => module/residential}/autotest/test_lights_explicit_power2.player (100%) rename {residential => module/residential}/autotest/test_lights_explicit_power3.glm (100%) rename {residential => module/residential}/autotest/test_lights_explicit_power3.player (100%) rename {residential => module/residential}/autotest/test_lights_explicit_power4.glm (100%) rename {residential => module/residential}/autotest/test_lights_explicit_power4.player (100%) rename {residential => module/residential}/autotest/test_lights_imp.glm (100%) rename {residential => module/residential}/autotest/test_lights_implicit_power1.glm (100%) rename {residential => module/residential}/autotest/test_lights_implicit_power2.glm (100%) rename {residential => module/residential}/autotest/test_lights_implicit_power3.glm (100%) rename {residential => module/residential}/autotest/test_lights_implicit_power4.glm (100%) rename {residential => module/residential}/autotest/test_lights_standalone.glm (100%) rename {residential => module/residential}/autotest/test_microwave_cycle_length_limits_err.glm (100%) rename {residential => module/residential}/autotest/test_microwave_demand_limits_opt.glm (100%) rename {residential => module/residential}/autotest/test_microwave_energy.glt (100%) rename {residential => module/residential}/autotest/test_microwave_energy.m (100%) rename {residential => module/residential}/autotest/test_microwave_energy.player (100%) rename {residential => module/residential}/autotest/test_microwave_energy_accumulation.glm (100%) rename {residential => module/residential}/autotest/test_microwave_energy_accumulation.m (100%) rename {residential => module/residential}/autotest/test_microwave_energy_accumulation.player (100%) rename {residential => module/residential}/autotest/test_microwave_energy_opt.glm (100%) rename {residential => module/residential}/autotest/test_microwave_explicit_swd_opt.glm (100%) rename {residential => module/residential}/autotest/test_microwave_explicit_swy_opt.glm (100%) rename {residential => module/residential}/autotest/test_microwave_explicit_wwd_opt.glm (100%) rename {residential => module/residential}/autotest/test_microwave_explicit_wwy_opt.glm (100%) rename {residential => module/residential}/autotest/test_microwave_implicit.glm (100%) rename {residential => module/residential}/autotest/test_microwave_implicit_swd_opt.glm (100%) rename {residential => module/residential}/autotest/test_microwave_implicit_swy_opt.glm (100%) rename {residential => module/residential}/autotest/test_microwave_implicit_wwd_opt.glm (100%) rename {residential => module/residential}/autotest/test_microwave_implicit_wwy_opt.glm (100%) rename {residential => module/residential}/autotest/test_microwave_internal_gains_0.player (100%) rename {residential => module/residential}/autotest/test_microwave_internal_gains_1.player (100%) rename {residential => module/residential}/autotest/test_microwave_internal_gains_opt.glm (100%) rename {residential => module/residential}/autotest/test_microwave_standby_power_limits.player (100%) rename {residential => module/residential}/autotest/test_microwave_standby_power_limits_opt.glm (100%) rename {residential => module/residential}/autotest/test_occupantload_enduse_load0.glm (100%) rename {residential => module/residential}/autotest/test_plugload_demand_range_bounds_opt.glm (100%) rename {residential => module/residential}/autotest/test_plugload_enduse_load.glm (100%) rename {residential => module/residential}/autotest/test_plugload_enduse_load_swd.player (100%) rename {residential => module/residential}/autotest/test_plugload_enduse_load_swy.player (100%) rename {residential => module/residential}/autotest/test_plugload_enduse_load_wwy.player (100%) rename {residential => module/residential}/autotest/test_plugload_energy_meter_opt.glm (100%) rename {residential => module/residential}/autotest/test_plugload_energy_swd.player (100%) rename {residential => module/residential}/autotest/test_plugload_energy_swy.player (100%) rename {residential => module/residential}/autotest/test_plugload_energy_wwd.player (100%) rename {residential => module/residential}/autotest/test_plugload_energy_wwy.player (100%) rename {residential => module/residential}/autotest/test_plugload_explicit_swd.glm (100%) rename {residential => module/residential}/autotest/test_plugload_explicit_swy.glm (100%) rename {residential => module/residential}/autotest/test_plugload_explicit_wwd_opt.glm (100%) rename {residential => module/residential}/autotest/test_plugload_explicit_wwy.glm (100%) rename {residential => module/residential}/autotest/test_plugload_heatgain_swd.player (100%) rename {residential => module/residential}/autotest/test_plugload_heatgain_swy.player (100%) rename {residential => module/residential}/autotest/test_plugload_heatgain_wwd.player (100%) rename {residential => module/residential}/autotest/test_plugload_heatgain_wwy.player (100%) rename {residential => module/residential}/autotest/test_plugload_implicit_swd_opt.glm (100%) rename {residential => module/residential}/autotest/test_plugload_implicit_swy_opt.glm (100%) rename {residential => module/residential}/autotest/test_plugload_implicit_wwd_opt.glm (100%) rename {residential => module/residential}/autotest/test_plugload_implicit_wwy_opt.glm (100%) rename {residential => module/residential}/autotest/test_plugload_internal_gains_hf.glm (100%) rename {residential => module/residential}/autotest/test_plugload_internal_gains_opt.glm (100%) rename {residential => module/residential}/autotest/test_range_explicit_energy1_opt.glm (100%) rename {residential => module/residential}/autotest/test_range_explicit_energy2_opt.glm (100%) rename {residential => module/residential}/autotest/test_range_explicit_energy3_opt.glm (100%) rename {residential => module/residential}/autotest/test_range_explicit_energy4_opt.glm (100%) rename {residential => module/residential}/autotest/test_range_implicit_opt.glm (100%) rename {residential => module/residential}/autotest/test_range_opt.glm (100%) rename {residential => module/residential}/autotest/test_range_power.player (100%) rename {residential => module/residential}/autotest/test_range_power_opt.glm (100%) rename {residential => module/residential}/autotest/test_refrigerator_implicit.glm (100%) rename {residential => module/residential}/autotest/test_residential_exercise_5_2_1.glm (100%) rename {residential => module/residential}/autotest/test_residentialenduse_standalone.glm (100%) rename {residential => module/residential}/autotest/test_residentialenduse_standalone_err.glm (100%) rename {residential => module/residential}/autotest/test_solargains.glm (100%) rename {residential => module/residential}/autotest/test_thermal_storage_SOC.player (100%) rename {residential => module/residential}/autotest/test_thermal_storage_autotest.glm (100%) rename {residential => module/residential}/autotest/test_thermal_storage_energy.player (100%) rename {residential => module/residential}/autotest/test_waterheater_explicit_1.glm (100%) rename {residential => module/residential}/autotest/test_waterheater_explicit_2.glm (100%) rename {residential => module/residential}/autotest/test_waterheater_implicit.glm (100%) rename {residential => module/residential}/autotest/test_wh_explicit_1_temperature.player (100%) rename {residential => module/residential}/autotest/test_wh_explicit_2_height.player (100%) rename {residential => module/residential}/autotest/test_wh_explicit_2_temperature.player (100%) rename {residential => module/residential}/autotest/test_zipload_pow_en_hg.glm (100%) rename {residential => module/residential}/autotest/water_schedule.glm (100%) rename {residential => module/residential}/autotest/waterheater_demand_waveform_sawtooth1.player (100%) rename {residential => module/residential}/autotest/waterheater_demand_waveform_sawtooth2.player (100%) rename {residential => module/residential}/autotest/waterheater_demand_waveform_sine.player (100%) rename {residential => module/residential}/autotest/waterheater_demand_waveform_square.player (100%) rename {residential => module/residential}/clotheswasher.cpp (100%) rename {residential => module/residential}/clotheswasher.h (100%) rename {residential => module/residential}/data/evcharger/home-work.csv (100%) rename {residential => module/residential}/data/evcharger/home-work.xls (100%) rename {residential => module/residential}/dishwasher.cpp (100%) rename {residential => module/residential}/dishwasher.h (100%) rename {residential => module/residential}/docs/evcharger.ppt (100%) rename {residential => module/residential}/docs/evcharger/Slide1.PNG (100%) rename {residential => module/residential}/docs/evcharger/Slide2.PNG (100%) rename {residential => module/residential}/dryer.cpp (100%) rename {residential => module/residential}/dryer.h (100%) rename {residential => module/residential}/eia2015.h (100%) rename {residential => module/residential}/elcap1990.h (100%) rename {residential => module/residential}/elcap2010.h (100%) rename {residential => module/residential}/evcharger.cpp (100%) rename {residential => module/residential}/evcharger.h (100%) rename {residential => module/residential}/evcharger_det.cpp (100%) rename {residential => module/residential}/evcharger_det.h (100%) rename {residential => module/residential}/freezer.cpp (100%) rename {residential => module/residential}/freezer.h (100%) rename {residential => module/residential}/house_e.cpp (100%) rename {residential => module/residential}/house_e.h (100%) rename {residential => module/residential}/init.cpp (100%) rename {residential => module/residential}/lights.cpp (100%) rename {residential => module/residential}/lights.h (100%) rename {residential => module/residential}/main.cpp (100%) rename {residential => module/residential}/microwave.cpp (100%) rename {residential => module/residential}/microwave.h (100%) rename {residential => module/residential}/occupantload.cpp (100%) rename {residential => module/residential}/occupantload.h (100%) rename {residential => module/residential}/plugload.cpp (100%) rename {residential => module/residential}/plugload.h (100%) rename {residential => module/residential}/range.cpp (100%) rename {residential => module/residential}/range.h (100%) rename {residential => module/residential}/rbsa.cpp (100%) rename {residential => module/residential}/rbsa.h (100%) rename {residential => module/residential}/rbsa2014.h (100%) rename {residential => module/residential}/rbsa2014_discrete.h (100%) rename {residential => module/residential}/refrigerator.cpp (100%) rename {residential => module/residential}/refrigerator.h (100%) rename {residential => module/residential}/residential.h (100%) rename {residential => module/residential}/residential.vcproj (100%) rename {residential => module/residential}/residential_enduse.cpp (100%) rename {residential => module/residential}/residential_enduse.h (100%) rename {residential => module/residential}/solvers.cpp (100%) rename {residential => module/residential}/solvers.h (100%) rename {residential => module/residential}/thermal_storage.cpp (100%) rename {residential => module/residential}/thermal_storage.h (100%) rename {residential => module/residential}/waterheater.cpp (100%) rename {residential => module/residential}/waterheater.h (100%) rename {residential => module/residential}/zipload.cpp (100%) rename {residential => module/residential}/zipload.h (100%) create mode 100644 module/revenue/Makefile.mk rename {revenue => module/revenue}/autotest/house.glm (100%) rename {revenue => module/revenue}/autotest/pgande_res_200301.glm (100%) rename {revenue => module/revenue}/autotest/test_billing.glm (100%) rename {revenue => module/revenue}/autotest/test_billing.py (100%) rename {revenue => module/revenue}/billing.cpp (100%) rename {revenue => module/revenue}/billing.h (100%) rename {revenue => module/revenue}/main.cpp (100%) rename {revenue => module/revenue}/revenue.h (100%) rename {revenue => module/revenue}/tariff.cpp (100%) rename {revenue => module/revenue}/tariff.h (100%) create mode 100644 module/tape/Makefile.mk rename {tape => module/tape}/autotest/data_configurations_delta_123node.glm (100%) rename {tape => module/tape}/autotest/data_delta_player_load_A.csv (100%) rename {tape => module/tape}/autotest/data_delta_player_load_A_check.csv (100%) rename {tape => module/tape}/autotest/data_loadchange.csv (100%) rename {tape => module/tape}/autotest/exercise_2_1_1.player (100%) rename {tape => module/tape}/autotest/recorder_flush_test2.csv (100%) rename {tape => module/tape}/autotest/test_collector_exercise_2_4_2.glm (100%) rename {tape => module/tape}/autotest/test_collector_multiple_properties.glm (100%) rename {tape => module/tape}/autotest/test_collector_triplex_meter.glm (100%) rename {tape => module/tape}/autotest/test_delta_player_first_delta_timestep_err.glm (100%) rename {tape => module/tape}/autotest/test_deltamode_player_endtime_err.glm (100%) rename {tape => module/tape}/autotest/test_histogram_basic.glm (100%) rename {tape => module/tape}/autotest/test_histogram_count_int.glm (100%) rename {tape => module/tape}/autotest/test_histogram_enum.glm (100%) rename {tape => module/tape}/autotest/test_histogram_set.glm (100%) rename {tape => module/tape}/autotest/test_multi_recorder_multiple_properties.glm (100%) rename {tape => module/tape}/autotest/test_multi_recorder_multiple_properties_long.glm (100%) rename {tape => module/tape}/autotest/test_multirecorder_global.glm (100%) rename {tape => module/tape}/autotest/test_player_buffer.glm (100%) rename {tape => module/tape}/autotest/test_player_buffer.player (100%) rename {tape => module/tape}/autotest/test_player_exercise_2_1_2.glm (100%) rename {tape => module/tape}/autotest/test_recorder_epoch.glm (100%) rename {tape => module/tape}/autotest/test_recorder_exercise_2_2_2.glm (100%) rename {tape => module/tape}/autotest/test_recorder_flush_0.glm (100%) rename {tape => module/tape}/autotest/test_recorder_flush_1_err.glm (100%) rename {tape => module/tape}/autotest/test_recorder_flush_300.glm (100%) rename {tape => module/tape}/autotest/test_recorder_flush_sync.py (100%) rename {tape => module/tape}/autotest/test_recorder_global.glm (100%) rename {tape => module/tape}/autotest/test_recorder_interval_err.glm (100%) rename {tape => module/tape}/autotest/test_recorder_multiple_properties.glm (100%) rename {tape => module/tape}/autotest/test_recorder_strftime_format.glm (100%) rename {tape => module/tape}/autotest/test_tape_whitespace.glm (100%) rename {tape => module/tape}/autotest/water_and_setpoint_schedule_v3.glm (100%) rename {tape => module/tape}/collector.cpp (100%) rename {tape => module/tape}/file.cpp (100%) rename {tape => module/tape}/file.h (100%) rename {tape => module/tape}/group_recorder.cpp (100%) rename {tape => module/tape}/group_recorder.h (100%) rename {tape => module/tape}/histogram.cpp (100%) rename {tape => module/tape}/histogram.h (100%) rename {tape => module/tape}/loadshape.cpp (100%) rename {tape => module/tape}/loadshape.h (100%) rename {tape => module/tape}/main.cpp (100%) rename {tape => module/tape}/memory.cpp (100%) rename {tape => module/tape}/memory.h (100%) rename {tape => module/tape}/metrics_collector.cpp (100%) rename {tape => module/tape}/metrics_collector.h (100%) rename {tape => module/tape}/metrics_collector_writer.cpp (100%) rename {tape => module/tape}/metrics_collector_writer.h (100%) rename {tape => module/tape}/multi_recorder.cpp (100%) rename {tape => module/tape}/odbc.cpp (100%) rename {tape => module/tape}/odbc.h (100%) rename {tape => module/tape}/player.cpp (100%) rename {tape => module/tape}/recorder.cpp (100%) rename {tape => module/tape}/schedule.cpp (100%) rename {tape => module/tape}/schedule.h (100%) rename {tape => module/tape}/shaper.cpp (100%) rename {tape => module/tape}/tape.cpp (100%) rename {tape => module/tape}/tape.h (100%) rename {tape => module/tape}/tape.vcproj (100%) rename {tape => module/tape}/violation_recorder.cpp (100%) rename {tape => module/tape}/violation_recorder.h (100%) create mode 100644 module/tape_file/Makefile.mk rename {tape_file => module/tape_file}/ReadMe.txt (100%) rename {tape_file => module/tape_file}/tape_file.cpp (99%) rename {tape_file => module/tape_file}/tape_file.h (100%) rename {tape_file => module/tape_file}/tape_file.vcproj (100%) rename {tape_memory => module/tape_memory}/tape_memory.cpp (100%) rename {tape_memory => module/tape_memory}/tape_memory.h (100%) rename {tape_memory => module/tape_memory}/tape_memory.vcproj (100%) create mode 100644 module/tape_plot/Makefile.mk rename {tape_plot => module/tape_plot}/ReadMe.txt (100%) rename {tape_plot => module/tape_plot}/tape_plot.cpp (99%) rename {tape_plot => module/tape_plot}/tape_plot.h (100%) rename {tape_plot => module/tape_plot}/tape_plot.vcproj (100%) create mode 100644 module/tariff/Makefile.mk rename {tariff => module/tariff}/autotest/Res_Inclu_TOU_Current.xlsx (100%) rename {tariff => module/tariff}/main.cpp (100%) create mode 100644 module/transactive/Makefile.mk rename {transactive => module/transactive}/agent.cpp (100%) rename {transactive => module/transactive}/agent.h (100%) rename {transactive => module/transactive}/autotest/test_agent_method.glm (100%) rename {transactive => module/transactive}/doc/transactive.tex (100%) rename {transactive => module/transactive}/house.cpp (100%) rename {transactive => module/transactive}/house.h (100%) rename {transactive => module/transactive}/main.cpp (100%) rename {transactive => module/transactive}/transactive.h (100%) rename {transactive => module/transactive}/validate.no (100%) delete mode 100644 mysql/Makefile.mk delete mode 100644 mysql/autotest/test_mysql_recorder.xml delete mode 100644 optimize/Makefile.mk delete mode 100644 powerflow/Makefile.mk delete mode 100644 powerflow/autotest/IEEE_13_node_impedance_dump.xml delete mode 100644 powernet/Makefile.mk delete mode 100644 reliability/Makefile.mk delete mode 100644 residential/.gitignore delete mode 100644 residential/Makefile.mk delete mode 100644 revenue/Makefile.mk delete mode 100644 tape/Makefile.mk delete mode 100644 tape_file/Makefile.mk delete mode 100644 tape_plot/Makefile.mk delete mode 100644 tariff/Makefile.mk delete mode 100644 transactive/Makefile.mk diff --git a/assert/Makefile.mk b/assert/Makefile.mk deleted file mode 100644 index a7b114431..000000000 --- a/assert/Makefile.mk +++ /dev/null @@ -1,23 +0,0 @@ -pkglib_LTLIBRARIES += assert/assert.la - -assert_assert_la_CPPFLAGS = -assert_assert_la_CPPFLAGS += $(AM_CPPFLAGS) - -assert_assert_la_LDFLAGS = -assert_assert_la_LDFLAGS += $(AM_LDFLAGS) - -assert_assert_la_LIBADD = - -assert_assert_la_SOURCES = -assert_assert_la_SOURCES += assert/assert.cpp -assert_assert_la_SOURCES += assert/assert.h -assert_assert_la_SOURCES += assert/complex_assert.cpp -assert_assert_la_SOURCES += assert/complex_assert.h -assert_assert_la_SOURCES += assert/double_assert.cpp -assert_assert_la_SOURCES += assert/double_assert.h -assert_assert_la_SOURCES += assert/enum_assert.cpp -assert_assert_la_SOURCES += assert/enum_assert.h -assert_assert_la_SOURCES += assert/int_assert.cpp -assert_assert_la_SOURCES += assert/int_assert.h -assert_assert_la_SOURCES += assert/init.cpp -assert_assert_la_SOURCES += assert/main.cpp diff --git a/climate/Makefile.mk b/climate/Makefile.mk deleted file mode 100644 index 72a4ce3e6..000000000 --- a/climate/Makefile.mk +++ /dev/null @@ -1,23 +0,0 @@ -pkglib_LTLIBRARIES += climate/climate.la - -climate_climate_la_CPPFLAGS = -climate_climate_la_CPPFLAGS += $(AM_CPPFLAGS) - -climate_climate_la_LDFLAGS = -climate_climate_la_LDFLAGS += $(AM_LDFLAGS) - -climate_climate_la_LIBADD = - -climate_climate_la_SOURCES = -climate_climate_la_SOURCES += climate/climate.cpp -climate_climate_la_SOURCES += climate/climate.h -climate_climate_la_SOURCES += climate/csv_reader.cpp -climate_climate_la_SOURCES += climate/csv_reader.h -climate_climate_la_SOURCES += climate/init.cpp -climate_climate_la_SOURCES += climate/main.cpp -climate_climate_la_SOURCES += climate/solar_angles.cpp -climate_climate_la_SOURCES += climate/solar_angles.h -climate_climate_la_SOURCES += climate/weather.cpp -climate_climate_la_SOURCES += climate/weather.h -climate_climate_la_SOURCES += climate/weather_reader.cpp -climate_climate_la_SOURCES += climate/weather_reader.h diff --git a/commercial/Makefile.mk b/commercial/Makefile.mk deleted file mode 100644 index a0d40e0ec..000000000 --- a/commercial/Makefile.mk +++ /dev/null @@ -1,19 +0,0 @@ -pkglib_LTLIBRARIES += commercial/commercial.la - -commercial_commercial_la_CPPFLAGS = -commercial_commercial_la_CPPFLAGS += $(AM_CPPFLAGS) - -commercial_commercial_la_LDFLAGS = -commercial_commercial_la_LDFLAGS += $(AM_LDFLAGS) - -commercial_commercial_la_LIBADD = - -commercial_commercial_la_SOURCES = commercial/commercial.h -commercial_commercial_la_SOURCES += commercial/init.cpp -commercial_commercial_la_SOURCES += commercial/main.cpp -commercial_commercial_la_SOURCES += commercial/ceus.h commercial/ceus.cpp -commercial_commercial_la_SOURCES += commercial/hvac.cpp commercial/hvac.h -commercial_commercial_la_SOURCES += commercial/multizone.cpp commercial/multizone.h -commercial_commercial_la_SOURCES += commercial/office.cpp commercial/office.h -commercial_commercial_la_SOURCES += commercial/solvers.cpp commercial/solvers.h -commercial_commercial_la_SOURCES += commercial/parking.cpp commercial/parking.h diff --git a/commercial/autotest/.gitignore b/commercial/autotest/.gitignore deleted file mode 100644 index 95f073100..000000000 --- a/commercial/autotest/.gitignore +++ /dev/null @@ -1 +0,0 @@ -test_ceus_*.csv diff --git a/connection/json_link/doc/Makefile b/connection/json_link/doc/Makefile deleted file mode 100644 index ece29ddf1..000000000 --- a/connection/json_link/doc/Makefile +++ /dev/null @@ -1,177 +0,0 @@ -# Makefile for Sphinx documentation -# - -# You can set these variables from the command line. -SPHINXOPTS = -SPHINXBUILD = /usr/local/bin/sphinx-build -PAPER = -BUILDDIR = . - -# User-friendly check for sphinx-build -ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1) -$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/) -endif - -# Internal variables. -PAPEROPT_a4 = -D latex_paper_size=a4 -PAPEROPT_letter = -D latex_paper_size=letter -ALLSPHINXOPTS = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source -# the i18n builder cannot share the environment and doctrees with the others -I18NSPHINXOPTS = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source - -.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext - -help: - @echo "Please use \`make ' where is one of" - @echo " html to make standalone HTML files" - @echo " dirhtml to make HTML files named index.html in directories" - @echo " singlehtml to make a single large HTML file" - @echo " pickle to make pickle files" - @echo " json to make JSON files" - @echo " htmlhelp to make HTML files and a HTML help project" - @echo " qthelp to make HTML files and a qthelp project" - @echo " devhelp to make HTML files and a Devhelp project" - @echo " epub to make an epub" - @echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter" - @echo " latexpdf to make LaTeX files and run them through pdflatex" - @echo " latexpdfja to make LaTeX files and run them through platex/dvipdfmx" - @echo " text to make text files" - @echo " man to make manual pages" - @echo " texinfo to make Texinfo files" - @echo " info to make Texinfo files and run them through makeinfo" - @echo " gettext to make PO message catalogs" - @echo " changes to make an overview of all changed/added/deprecated items" - @echo " xml to make Docutils-native XML files" - @echo " pseudoxml to make pseudoxml-XML files for display purposes" - @echo " linkcheck to check all external links for integrity" - @echo " doctest to run all doctests embedded in the documentation (if enabled)" - -clean: - rm -rf $(BUILDDIR)/html $(BUILDDIR)/doctrees $(BUILDDIR)/latex - -html: - $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/html." - -dirhtml: - $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml - @echo - @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml." - -singlehtml: - $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml - @echo - @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml." - -pickle: - $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle - @echo - @echo "Build finished; now you can process the pickle files." - -json: - $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json - @echo - @echo "Build finished; now you can process the JSON files." - -htmlhelp: - $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp - @echo - @echo "Build finished; now you can run HTML Help Workshop with the" \ - ".hhp project file in $(BUILDDIR)/htmlhelp." - -qthelp: - $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp - @echo - @echo "Build finished; now you can run "qcollectiongenerator" with the" \ - ".qhcp project file in $(BUILDDIR)/qthelp, like this:" - @echo "# qcollectiongenerator $(BUILDDIR)/qthelp/JSONLink.qhcp" - @echo "To view the help file:" - @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/JSONLink.qhc" - -devhelp: - $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp - @echo - @echo "Build finished." - @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/JSONLink" - @echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/JSONLink" - @echo "# devhelp" - -epub: - $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub - @echo - @echo "Build finished. The epub file is in $(BUILDDIR)/epub." - -latex: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo - @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex." - @echo "Run \`make' in that directory to run these through (pdf)latex" \ - "(use \`make latexpdf' here to do that automatically)." - -latexpdf: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through pdflatex..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -latexpdfja: - $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex - @echo "Running LaTeX files through platex and dvipdfmx..." - $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja - @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex." - -text: - $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text - @echo - @echo "Build finished. The text files are in $(BUILDDIR)/text." - -man: - $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man - @echo - @echo "Build finished. The manual pages are in $(BUILDDIR)/man." - -texinfo: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo - @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo." - @echo "Run \`make' in that directory to run these through makeinfo" \ - "(use \`make info' here to do that automatically)." - -info: - $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo - @echo "Running Texinfo files through makeinfo..." - make -C $(BUILDDIR)/texinfo info - @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo." - -gettext: - $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale - @echo - @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale." - -changes: - $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes - @echo - @echo "The overview file is in $(BUILDDIR)/changes." - -linkcheck: - $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck - @echo - @echo "Link check complete; look for any errors in the above output " \ - "or in $(BUILDDIR)/linkcheck/output.txt." - -doctest: - $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest - @echo "Testing of doctests in the sources finished, look at the " \ - "results in $(BUILDDIR)/doctest/output.txt." - -xml: - $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml - @echo - @echo "Build finished. The XML files are in $(BUILDDIR)/xml." - -pseudoxml: - $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml - @echo - @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml." diff --git a/connection/json_link/doc/html/.buildinfo b/connection/json_link/doc/html/.buildinfo deleted file mode 100644 index 9ce35ef31..000000000 --- a/connection/json_link/doc/html/.buildinfo +++ /dev/null @@ -1,4 +0,0 @@ -# Sphinx build info version 1 -# This file hashes the configuration used when building these files. When it is not found, a full rebuild will be done. -config: 679075f6143e94e86613be59c3d41cb5 -tags: a205e9ed8462ae86fdd2f73488852ba9 diff --git a/connection/json_link/faults/mast_raw_start_alive0.json b/connection/json_link/faults/mast_raw_start_alive0.json deleted file mode 100644 index b1f7cbd62..000000000 --- a/connection/json_link/faults/mast_raw_start_alive0.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 32 130 JSON 1.0 0 0 {\"data\": {\"x0\": 0.3224085133644463, \"x1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"method\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/mast_raw_start_bad_dlen.json b/connection/json_link/faults/mast_raw_start_bad_dlen.json deleted file mode 100644 index 7d197fdb2..000000000 --- a/connection/json_link/faults/mast_raw_start_bad_dlen.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 32 131 JSON 1.0 9 0 {\"data\": {\"x0\": 0.3224085133644463, \"x1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"method\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/mast_raw_start_bad_hlen.json b/connection/json_link/faults/mast_raw_start_bad_hlen.json deleted file mode 100644 index 42f4f3dde..000000000 --- a/connection/json_link/faults/mast_raw_start_bad_hlen.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 31 130 JSON 1.0 9 0 {\"data\": {\"x0\": 0.3224085133644463, \"x1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"method\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/mast_raw_start_bad_jver.json b/connection/json_link/faults/mast_raw_start_bad_jver.json deleted file mode 100644 index 66e708f35..000000000 --- a/connection/json_link/faults/mast_raw_start_bad_jver.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 32 130 JSON 1.1 9 0 {\"data\": {\"x0\": 0.3224085133644463, \"x1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"method\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/mast_raw_start_bad_rcode.json b/connection/json_link/faults/mast_raw_start_bad_rcode.json deleted file mode 100644 index 5ebf758f1..000000000 --- a/connection/json_link/faults/mast_raw_start_bad_rcode.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 32 130 JSON 1.0 9 200 {\"data\": {\"x0\": 0.3224085133644463, \"x1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"method\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/mast_raw_start_bad_type.json b/connection/json_link/faults/mast_raw_start_bad_type.json deleted file mode 100644 index c2c6fe1bf..000000000 --- a/connection/json_link/faults/mast_raw_start_bad_type.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 32 130 TEST 1.0 9 0 {\"data\": {\"x0\": 0.3224085133644463, \"x1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"method\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/mast_raw_start_bad_ver.json b/connection/json_link/faults/mast_raw_start_bad_ver.json deleted file mode 100644 index 9acaed2ea..000000000 --- a/connection/json_link/faults/mast_raw_start_bad_ver.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"1 32 130 JSON 1.0 9 0 {\"data\": {\"x0\": 0.3224085133644463, \"x1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"method\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/mast_raw_start_ok.json b/connection/json_link/faults/mast_raw_start_ok.json deleted file mode 100644 index 3bedf6a68..000000000 --- a/connection/json_link/faults/mast_raw_start_ok.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 32 130 JSON 1.0 9 0 {\"data\": {\"x0\": 0.3224085133644463, \"x1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"method\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/slv_raw_start_alive0.json b/connection/json_link/faults/slv_raw_start_alive0.json deleted file mode 100644 index 19263761a..000000000 --- a/connection/json_link/faults/slv_raw_start_alive0.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 32 130 JSON 1.0 0 200 {\"data\": {\"y0\": 0.3224085133644463, \"y1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"result\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/slv_raw_start_bad_dlen.json b/connection/json_link/faults/slv_raw_start_bad_dlen.json deleted file mode 100644 index 7d801bc54..000000000 --- a/connection/json_link/faults/slv_raw_start_bad_dlen.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 32 131 JSON 1.0 9 200 {\"data\": {\"y0\": 0.3224085133644463, \"y1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"result\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/slv_raw_start_bad_hlen.json b/connection/json_link/faults/slv_raw_start_bad_hlen.json deleted file mode 100644 index 11a00d56b..000000000 --- a/connection/json_link/faults/slv_raw_start_bad_hlen.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 31 130 JSON 1.0 9 200 {\"data\": {\"y0\": 0.3224085133644463, \"y1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"result\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/slv_raw_start_bad_jver.json b/connection/json_link/faults/slv_raw_start_bad_jver.json deleted file mode 100644 index 7e01ce4d6..000000000 --- a/connection/json_link/faults/slv_raw_start_bad_jver.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 32 130 JSON 1.1 9 200 {\"data\": {\"y0\": 0.3224085133644463, \"y1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"result\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/slv_raw_start_bad_rcode.json b/connection/json_link/faults/slv_raw_start_bad_rcode.json deleted file mode 100644 index 41d752d3a..000000000 --- a/connection/json_link/faults/slv_raw_start_bad_rcode.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 32 130 JSON 1.0 9 0 {\"data\": {\"y0\": 0.3224085133644463, \"y1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"result\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/slv_raw_start_bad_type.json b/connection/json_link/faults/slv_raw_start_bad_type.json deleted file mode 100644 index e718afbca..000000000 --- a/connection/json_link/faults/slv_raw_start_bad_type.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 32 130 TEST 1.0 9 200 {\"data\": {\"y0\": 0.3224085133644463, \"y1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"result\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/slv_raw_start_bad_ver.json b/connection/json_link/faults/slv_raw_start_bad_ver.json deleted file mode 100644 index c6872d5d7..000000000 --- a/connection/json_link/faults/slv_raw_start_bad_ver.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"1 32 130 JSON 1.0 9 200 {\"data\": {\"y0\": 0.3224085133644463, \"y1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"result\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/slv_raw_start_ok.json b/connection/json_link/faults/slv_raw_start_ok.json deleted file mode 100644 index 73cae1a28..000000000 --- a/connection/json_link/faults/slv_raw_start_ok.json +++ /dev/null @@ -1 +0,0 @@ -{"start":{"raw":"0 32 130 JSON 1.0 9 200 {\"data\": {\"y0\": 0.3224085133644463, \"y1\": 0.01922100194573617, \"clock\": \"2013-05-07 15:53:29.998553\"}, \"result\": \"start\", \"id\": 4}"}} \ No newline at end of file diff --git a/connection/json_link/faults/sync_bad-dict_c5.json b/connection/json_link/faults/sync_bad-dict_c5.json deleted file mode 100644 index 137ee9d7f..000000000 --- a/connection/json_link/faults/sync_bad-dict_c5.json +++ /dev/null @@ -1 +0,0 @@ -{"sync":{"count":5, "dict_str":{data:"bad_json_link_as_dict"}}} \ No newline at end of file diff --git a/connection/json_link/faults/sync_bad-json_c5.json b/connection/json_link/faults/sync_bad-json_c5.json deleted file mode 100644 index ec515aa09..000000000 --- a/connection/json_link/faults/sync_bad-json_c5.json +++ /dev/null @@ -1 +0,0 @@ -{"sync":{"count":5, "json":{"data":"bad_json_str"}}} \ No newline at end of file diff --git a/connection/json_link/faults/sync_drop_c[5,12,13].json b/connection/json_link/faults/sync_drop_c[5,12,13].json deleted file mode 100644 index 3760a4f2c..000000000 --- a/connection/json_link/faults/sync_drop_c[5,12,13].json +++ /dev/null @@ -1 +0,0 @@ -{"sync":{"count":[5,12,13], "drop":"True" }} \ No newline at end of file diff --git a/connection/json_link/faults/sync_drop_c[5,40].json b/connection/json_link/faults/sync_drop_c[5,40].json deleted file mode 100644 index 4c3d1eb53..000000000 --- a/connection/json_link/faults/sync_drop_c[5,40].json +++ /dev/null @@ -1 +0,0 @@ -{"sync":{"count":[5,40], "drop":"True" }} \ No newline at end of file diff --git a/connection/json_link/faults/sync_drop_count5.json b/connection/json_link/faults/sync_drop_count5.json deleted file mode 100644 index e427804c2..000000000 --- a/connection/json_link/faults/sync_drop_count5.json +++ /dev/null @@ -1 +0,0 @@ -{"sync":{"count":5, "drop":"True"}} \ No newline at end of file diff --git a/connection/json_link/faults/sync_drop_test.json b/connection/json_link/faults/sync_drop_test.json deleted file mode 100644 index 3760a4f2c..000000000 --- a/connection/json_link/faults/sync_drop_test.json +++ /dev/null @@ -1 +0,0 @@ -{"sync":{"count":[5,12,13], "drop":"True" }} \ No newline at end of file diff --git a/custom.mk b/custom.mk index fe6cb7e64..9eaa54d6c 100644 --- a/custom.mk +++ b/custom.mk @@ -1,4 +1,4 @@ -include mysql/Makefile.mk -#include gismo/Makefile.mk -#include transactive/Makefile.mk -#include powernet/Makefile.mk +include module/mysql/Makefile.mk +#include module/gismo/Makefile.mk +#include module/transactive/Makefile.mk +#include module/powernet/Makefile.mk diff --git a/customize b/customize index 03eaeb657..c66cec019 100755 --- a/customize +++ b/customize @@ -24,7 +24,7 @@ function help () function add () { - F="$1/Makefile.mk" + F="module/$1/Makefile.mk" if [ -z "$(grep $F $CUSTOMFILE)" ]; then if [ -f $F ]; then echo "include $F" >>$CUSTOMFILE @@ -39,7 +39,7 @@ function add () function delete () { - F="$1/Makefile.mk" + F="module/$1/Makefile.mk" if [ -z "$(grep $F $CUSTOMFILE)" ]; then if [ -f $F ]; then echo "module $1 is not listed in $CUSTOMFILE" @@ -54,7 +54,7 @@ function delete () function enable () { - F="$1/Makefile.mk" + F="module/$1/Makefile.mk" if [ -z "$(grep $F $CUSTOMFILE)" ]; then if [ -f $F ]; then echo "module $1 is not listed in $CUSTOMFILE" @@ -70,7 +70,7 @@ function enable () function disable () { - F="$1/Makefile.mk" + F="module/$1/Makefile.mk" if [ -z "$(grep $F $CUSTOMFILE)" ]; then if [ -f $F ]; then echo "module $1 is not listed in $CUSTOMFILE" diff --git a/generators/Makefile.mk b/generators/Makefile.mk deleted file mode 100644 index 182759ea4..000000000 --- a/generators/Makefile.mk +++ /dev/null @@ -1,39 +0,0 @@ -pkglib_LTLIBRARIES += generators/generators.la - -generators_generators_la_CPPFLAGS = -generators_generators_la_CPPFLAGS += $(AM_CPPFLAGS) -generators_generators_la_CPPFLAGS += -I$(top_srcdir)/powerflow - -generators_generators_la_LDFLAGS = -generators_generators_la_LDFLAGS += $(AM_LDFLAGS) - -generators_generators_la_LIBADD = - -generators_generators_la_SOURCES = -generators_generators_la_SOURCES += generators/battery.cpp -generators_generators_la_SOURCES += generators/battery.h -generators_generators_la_SOURCES += generators/central_dg_control.cpp -generators_generators_la_SOURCES += generators/central_dg_control.h -generators_generators_la_SOURCES += generators/dc_dc_converter.cpp -generators_generators_la_SOURCES += generators/dc_dc_converter.h -generators_generators_la_SOURCES += generators/diesel_dg.cpp -generators_generators_la_SOURCES += generators/diesel_dg.h -generators_generators_la_SOURCES += generators/energy_storage.cpp -generators_generators_la_SOURCES += generators/energy_storage.h -generators_generators_la_SOURCES += generators/generators.h -generators_generators_la_SOURCES += generators/init.cpp -generators_generators_la_SOURCES += generators/inverter.cpp -generators_generators_la_SOURCES += generators/inverter.h -generators_generators_la_SOURCES += generators/main.cpp -generators_generators_la_SOURCES += generators/microturbine.cpp -generators_generators_la_SOURCES += generators/microturbine.h -generators_generators_la_SOURCES += generators/power_electronics.cpp -generators_generators_la_SOURCES += generators/power_electronics.h -generators_generators_la_SOURCES += generators/rectifier.cpp -generators_generators_la_SOURCES += generators/rectifier.h -generators_generators_la_SOURCES += generators/solar.cpp -generators_generators_la_SOURCES += generators/solar.h -generators_generators_la_SOURCES += generators/windturb_dg.cpp -generators_generators_la_SOURCES += generators/windturb_dg.h -generators_generators_la_SOURCES += generators/controller_dg.cpp -generators_generators_la_SOURCES += generators/controller_dg.h diff --git a/industrial/Makefile.mk b/industrial/Makefile.mk deleted file mode 100644 index b4e7aa1bf..000000000 --- a/industrial/Makefile.mk +++ /dev/null @@ -1,14 +0,0 @@ -pkglib_LTLIBRARIES += industrial/industrial.la - -industrial_industrial_la_CPPFLAGS = -industrial_industrial_la_CPPFLAGS += $(AM_CPPFLAGS) - -industrial_industrial_la_LDFLAGS = -industrial_industrial_la_LDFLAGS += $(AM_LDFLAGS) - -industrial_industrial_la_LIBADD = - -industrial_industrial_la_SOURCES = industrial/init.cpp -industrial_industrial_la_SOURCES += industrial/industrial.h industrial/industrial.cpp - -dist_pkgdata_DATA += industrial/naics_data_file.csv diff --git a/influxdb/Makefile.mk b/influxdb/Makefile.mk deleted file mode 100644 index f076962fa..000000000 --- a/influxdb/Makefile.mk +++ /dev/null @@ -1,19 +0,0 @@ -pkglib_LTLIBRARIES += influxdb/influxdb.la - -influxdb_influxdb_la_CPPFLAGS = -influxdb_influxdb_la_CPPFLAGS += $(INFLUXDB_CPPFLAGS) -influxdb_influxdb_la_CPPFLAGS += $(AM_CPPFLAGS) - -influxdb_influxdb_la_LDFLAGS = -lpthread -lcurl -influxdb_influxdb_la_LDFLAGS += $(INFLUXDB_LDFLAGS) -influxdb_influxdb_la_LDFLAGS += $(AM_LDFLAGS) - -influxdb_influxdb_la_LIBADD = -influxdb_influxdb_la_LIBADD += $(INFLUXDB_LIBS) - -influxdb_influxdb_la_SOURCES = -influxdb_influxdb_la_SOURCES += influxdb/collector.cpp influxdb/collector.h -influxdb_influxdb_la_SOURCES += influxdb/database.cpp influxdb/database.h -influxdb_influxdb_la_SOURCES += influxdb/influxdb.cpp influxdb/influxdb.h influxdb/jsondata.h -influxdb_influxdb_la_SOURCES += influxdb/player.cpp influxdb/player.h -influxdb_influxdb_la_SOURCES += influxdb/recorder.cpp influxdb/recorder.h diff --git a/market/Makefile.mk b/market/Makefile.mk deleted file mode 100644 index a830b4d33..000000000 --- a/market/Makefile.mk +++ /dev/null @@ -1,36 +0,0 @@ -pkglib_LTLIBRARIES += market/market.la - -market_market_la_CPPFLAGS = -market_market_la_CPPFLAGS += $(AM_CPPFLAGS) - -market_market_la_LDFLAGS = -market_market_la_LDFLAGS += $(AM_LDFLAGS) - -market_market_la_LIBADD = - -market_market_la_SOURCES = -market_market_la_SOURCES += market/auction.cpp -market_market_la_SOURCES += market/auction.h -market_market_la_SOURCES += market/bid.cpp -market_market_la_SOURCES += market/bid.h -market_market_la_SOURCES += market/collect.cpp -market_market_la_SOURCES += market/collect.h -market_market_la_SOURCES += market/controller.cpp -market_market_la_SOURCES += market/controller.h -market_market_la_SOURCES += market/curve.cpp -market_market_la_SOURCES += market/curve.h -market_market_la_SOURCES += market/double_controller.cpp -market_market_la_SOURCES += market/double_controller.h -market_market_la_SOURCES += market/generator_controller.cpp -market_market_la_SOURCES += market/generator_controller.h -market_market_la_SOURCES += market/init.cpp -market_market_la_SOURCES += market/main.cpp -market_market_la_SOURCES += market/market.h -market_market_la_SOURCES += market/passive_controller.cpp -market_market_la_SOURCES += market/passive_controller.h -market_market_la_SOURCES += market/stub_bidder.cpp -market_market_la_SOURCES += market/stub_bidder.h -market_market_la_SOURCES += market/stubauction.cpp -market_market_la_SOURCES += market/stubauction.h -market_market_la_SOURCES += market/supervisory_control.cpp -market_market_la_SOURCES += market/supervisory_control.h diff --git a/module/assert/Makefile.mk b/module/assert/Makefile.mk new file mode 100644 index 000000000..9d1fe7688 --- /dev/null +++ b/module/assert/Makefile.mk @@ -0,0 +1,17 @@ +pkglib_LTLIBRARIES += module/assert/assert.la + +module_assert_assert_la_CPPFLAGS = +module_assert_assert_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_assert_assert_la_LDFLAGS = +module_assert_assert_la_LDFLAGS += $(AM_LDFLAGS) + +module_assert_assert_la_LIBADD = + +module_assert_assert_la_SOURCES = +module_assert_assert_la_SOURCES += module/assert/assert.cpp module/assert/assert.h +module_assert_assert_la_SOURCES += module/assert/complex_assert.cpp module/assert/complex_assert.h +module_assert_assert_la_SOURCES += module/assert/double_assert.cpp module/assert/double_assert.h +module_assert_assert_la_SOURCES += module/assert/enum_assert.cpp module/assert/enum_assert.h +module_assert_assert_la_SOURCES += module/assert/int_assert.cpp module/assert/int_assert.h +module_assert_assert_la_SOURCES += module/assert/init.cpp module/assert/main.cpp diff --git a/assert/assert.cpp b/module/assert/assert.cpp similarity index 100% rename from assert/assert.cpp rename to module/assert/assert.cpp diff --git a/assert/assert.h b/module/assert/assert.h similarity index 100% rename from assert/assert.h rename to module/assert/assert.h diff --git a/assert/assert.vcproj b/module/assert/assert.vcproj similarity index 100% rename from assert/assert.vcproj rename to module/assert/assert.vcproj diff --git a/assert/autotest/test_assert.glm b/module/assert/autotest/test_assert.glm similarity index 100% rename from assert/autotest/test_assert.glm rename to module/assert/autotest/test_assert.glm diff --git a/assert/autotest/test_assert_group.glm b/module/assert/autotest/test_assert_group.glm similarity index 100% rename from assert/autotest/test_assert_group.glm rename to module/assert/autotest/test_assert_group.glm diff --git a/assert/autotest/test_assert_hold.glm b/module/assert/autotest/test_assert_hold.glm similarity index 100% rename from assert/autotest/test_assert_hold.glm rename to module/assert/autotest/test_assert_hold.glm diff --git a/assert/autotest/test_assert_hold_err.glm b/module/assert/autotest/test_assert_hold_err.glm similarity index 100% rename from assert/autotest/test_assert_hold_err.glm rename to module/assert/autotest/test_assert_hold_err.glm diff --git a/assert/autotest/test_assert_start_err.glm b/module/assert/autotest/test_assert_start_err.glm similarity index 100% rename from assert/autotest/test_assert_start_err.glm rename to module/assert/autotest/test_assert_start_err.glm diff --git a/assert/autotest/test_complex_assert.glm b/module/assert/autotest/test_complex_assert.glm similarity index 100% rename from assert/autotest/test_complex_assert.glm rename to module/assert/autotest/test_complex_assert.glm diff --git a/assert/autotest/test_complex_assert_angle_err.glm b/module/assert/autotest/test_complex_assert_angle_err.glm similarity index 100% rename from assert/autotest/test_complex_assert_angle_err.glm rename to module/assert/autotest/test_complex_assert_angle_err.glm diff --git a/assert/autotest/test_complex_assert_imaginary_err.glm b/module/assert/autotest/test_complex_assert_imaginary_err.glm similarity index 100% rename from assert/autotest/test_complex_assert_imaginary_err.glm rename to module/assert/autotest/test_complex_assert_imaginary_err.glm diff --git a/assert/autotest/test_complex_assert_magnitude_err.glm b/module/assert/autotest/test_complex_assert_magnitude_err.glm similarity index 100% rename from assert/autotest/test_complex_assert_magnitude_err.glm rename to module/assert/autotest/test_complex_assert_magnitude_err.glm diff --git a/assert/autotest/test_complex_assert_real_err.glm b/module/assert/autotest/test_complex_assert_real_err.glm similarity index 100% rename from assert/autotest/test_complex_assert_real_err.glm rename to module/assert/autotest/test_complex_assert_real_err.glm diff --git a/assert/autotest/test_double_assert.glm b/module/assert/autotest/test_double_assert.glm similarity index 100% rename from assert/autotest/test_double_assert.glm rename to module/assert/autotest/test_double_assert.glm diff --git a/assert/autotest/test_double_assert_err.glm b/module/assert/autotest/test_double_assert_err.glm similarity index 100% rename from assert/autotest/test_double_assert_err.glm rename to module/assert/autotest/test_double_assert_err.glm diff --git a/assert/autotest/test_enum_assert.glm b/module/assert/autotest/test_enum_assert.glm similarity index 100% rename from assert/autotest/test_enum_assert.glm rename to module/assert/autotest/test_enum_assert.glm diff --git a/assert/autotest/test_enum_assert_err.glm b/module/assert/autotest/test_enum_assert_err.glm similarity index 100% rename from assert/autotest/test_enum_assert_err.glm rename to module/assert/autotest/test_enum_assert_err.glm diff --git a/assert/autotest/test_int_assert.glm b/module/assert/autotest/test_int_assert.glm similarity index 100% rename from assert/autotest/test_int_assert.glm rename to module/assert/autotest/test_int_assert.glm diff --git a/assert/complex_assert.cpp b/module/assert/complex_assert.cpp similarity index 100% rename from assert/complex_assert.cpp rename to module/assert/complex_assert.cpp diff --git a/assert/complex_assert.h b/module/assert/complex_assert.h similarity index 100% rename from assert/complex_assert.h rename to module/assert/complex_assert.h diff --git a/assert/double_assert.cpp b/module/assert/double_assert.cpp similarity index 100% rename from assert/double_assert.cpp rename to module/assert/double_assert.cpp diff --git a/assert/double_assert.h b/module/assert/double_assert.h similarity index 100% rename from assert/double_assert.h rename to module/assert/double_assert.h diff --git a/assert/enum_assert.cpp b/module/assert/enum_assert.cpp similarity index 100% rename from assert/enum_assert.cpp rename to module/assert/enum_assert.cpp diff --git a/assert/enum_assert.h b/module/assert/enum_assert.h similarity index 100% rename from assert/enum_assert.h rename to module/assert/enum_assert.h diff --git a/assert/init.cpp b/module/assert/init.cpp similarity index 100% rename from assert/init.cpp rename to module/assert/init.cpp diff --git a/assert/int_assert.cpp b/module/assert/int_assert.cpp similarity index 100% rename from assert/int_assert.cpp rename to module/assert/int_assert.cpp diff --git a/assert/int_assert.h b/module/assert/int_assert.h similarity index 100% rename from assert/int_assert.h rename to module/assert/int_assert.h diff --git a/assert/main.cpp b/module/assert/main.cpp similarity index 100% rename from assert/main.cpp rename to module/assert/main.cpp diff --git a/module/climate/Makefile.mk b/module/climate/Makefile.mk new file mode 100644 index 000000000..a78907ed3 --- /dev/null +++ b/module/climate/Makefile.mk @@ -0,0 +1,17 @@ +pkglib_LTLIBRARIES += module/climate/climate.la + +module_climate_climate_la_CPPFLAGS = +module_climate_climate_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_climate_climate_la_LDFLAGS = +module_climate_climate_la_LDFLAGS += $(AM_LDFLAGS) + +module_climate_climate_la_LIBADD = + +module_climate_climate_la_SOURCES = +module_climate_climate_la_SOURCES += module/climate/init.cpp module/climate/main.cpp +module_climate_climate_la_SOURCES += module/climate/climate.cpp module/climate/climate.h +module_climate_climate_la_SOURCES += module/climate/csv_reader.cpp module/climate/csv_reader.h +module_climate_climate_la_SOURCES += module/climate/solar_angles.cpp module/climate/solar_angles.h +module_climate_climate_la_SOURCES += module/climate/weather.cpp module/climate/weather.h +module_climate_climate_la_SOURCES += module/climate/weather_reader.cpp module/climate/weather_reader.h diff --git a/climate/autotest/cloud_insolation.player b/module/climate/autotest/cloud_insolation.player similarity index 100% rename from climate/autotest/cloud_insolation.player rename to module/climate/autotest/cloud_insolation.player diff --git a/climate/autotest/cloud_insolation_tmy3.player b/module/climate/autotest/cloud_insolation_tmy3.player similarity index 100% rename from climate/autotest/cloud_insolation_tmy3.player rename to module/climate/autotest/cloud_insolation_tmy3.player diff --git a/climate/autotest/test_WA-Yakima-tmy3.glm b/module/climate/autotest/test_WA-Yakima-tmy3.glm similarity index 100% rename from climate/autotest/test_WA-Yakima-tmy3.glm rename to module/climate/autotest/test_WA-Yakima-tmy3.glm diff --git a/climate/autotest/test_cloud_tmy3_opt.glm b/module/climate/autotest/test_cloud_tmy3_opt.glm similarity index 100% rename from climate/autotest/test_cloud_tmy3_opt.glm rename to module/climate/autotest/test_cloud_tmy3_opt.glm diff --git a/climate/autotest/test_csvreader_dst.glm b/module/climate/autotest/test_csvreader_dst.glm similarity index 100% rename from climate/autotest/test_csvreader_dst.glm rename to module/climate/autotest/test_csvreader_dst.glm diff --git a/climate/autotest/test_csvreader_exercise_5_1_2.glm b/module/climate/autotest/test_csvreader_exercise_5_1_2.glm similarity index 100% rename from climate/autotest/test_csvreader_exercise_5_1_2.glm rename to module/climate/autotest/test_csvreader_exercise_5_1_2.glm diff --git a/climate/autotest/test_singleHouseSolarInverter.glm b/module/climate/autotest/test_singleHouseSolarInverter.glm similarity index 100% rename from climate/autotest/test_singleHouseSolarInverter.glm rename to module/climate/autotest/test_singleHouseSolarInverter.glm diff --git a/climate/autotest/test_solar_opt.glm b/module/climate/autotest/test_solar_opt.glm similarity index 100% rename from climate/autotest/test_solar_opt.glm rename to module/climate/autotest/test_solar_opt.glm diff --git a/climate/autotest/weather.csv b/module/climate/autotest/weather.csv similarity index 100% rename from climate/autotest/weather.csv rename to module/climate/autotest/weather.csv diff --git a/climate/autotest/weather_dst.csv b/module/climate/autotest/weather_dst.csv similarity index 100% rename from climate/autotest/weather_dst.csv rename to module/climate/autotest/weather_dst.csv diff --git a/climate/climate.cpp b/module/climate/climate.cpp similarity index 100% rename from climate/climate.cpp rename to module/climate/climate.cpp diff --git a/climate/climate.h b/module/climate/climate.h similarity index 100% rename from climate/climate.h rename to module/climate/climate.h diff --git a/climate/climate.vcproj b/module/climate/climate.vcproj similarity index 100% rename from climate/climate.vcproj rename to module/climate/climate.vcproj diff --git a/climate/csv_reader.cpp b/module/climate/csv_reader.cpp similarity index 100% rename from climate/csv_reader.cpp rename to module/climate/csv_reader.cpp diff --git a/climate/csv_reader.h b/module/climate/csv_reader.h similarity index 100% rename from climate/csv_reader.h rename to module/climate/csv_reader.h diff --git a/climate/init.cpp b/module/climate/init.cpp similarity index 100% rename from climate/init.cpp rename to module/climate/init.cpp diff --git a/climate/main.cpp b/module/climate/main.cpp similarity index 100% rename from climate/main.cpp rename to module/climate/main.cpp diff --git a/climate/solar_angles.cpp b/module/climate/solar_angles.cpp similarity index 100% rename from climate/solar_angles.cpp rename to module/climate/solar_angles.cpp diff --git a/climate/solar_angles.h b/module/climate/solar_angles.h similarity index 100% rename from climate/solar_angles.h rename to module/climate/solar_angles.h diff --git a/climate/weather.cpp b/module/climate/weather.cpp similarity index 100% rename from climate/weather.cpp rename to module/climate/weather.cpp diff --git a/climate/weather.h b/module/climate/weather.h similarity index 100% rename from climate/weather.h rename to module/climate/weather.h diff --git a/climate/weather_reader.cpp b/module/climate/weather_reader.cpp similarity index 100% rename from climate/weather_reader.cpp rename to module/climate/weather_reader.cpp diff --git a/climate/weather_reader.h b/module/climate/weather_reader.h similarity index 100% rename from climate/weather_reader.h rename to module/climate/weather_reader.h diff --git a/module/commercial/Makefile.mk b/module/commercial/Makefile.mk new file mode 100644 index 000000000..428fba47f --- /dev/null +++ b/module/commercial/Makefile.mk @@ -0,0 +1,18 @@ +pkglib_LTLIBRARIES += module/commercial/commercial.la + +module_commercial_commercial_la_CPPFLAGS = +module_commercial_commercial_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_commercial_commercial_la_LDFLAGS = +module_commercial_commercial_la_LDFLAGS += $(AM_LDFLAGS) + +module_commercial_commercial_la_LIBADD = + +module_commercial_commercial_la_SOURCES = module/commercial/commercial.h +module_commercial_commercial_la_SOURCES += module/commercial/init.cpp module/commercial/main.cpp +module_commercial_commercial_la_SOURCES += module/commercial/ceus.h module/commercial/ceus.cpp +module_commercial_commercial_la_SOURCES += module/commercial/hvac.cpp module/commercial/hvac.h +module_commercial_commercial_la_SOURCES += module/commercial/multizone.cpp module/commercial/multizone.h +module_commercial_commercial_la_SOURCES += module/commercial/office.cpp module/commercial/office.h +module_commercial_commercial_la_SOURCES += module/commercial/solvers.cpp module/commercial/solvers.h +module_commercial_commercial_la_SOURCES += module/commercial/parking.cpp module/commercial/parking.h diff --git a/commercial/autotest/FCZ01_AOFF.csv b/module/commercial/autotest/FCZ01_AOFF.csv similarity index 100% rename from commercial/autotest/FCZ01_AOFF.csv rename to module/commercial/autotest/FCZ01_AOFF.csv diff --git a/commercial/autotest/FCZ01_AWHS.csv b/module/commercial/autotest/FCZ01_AWHS.csv similarity index 100% rename from commercial/autotest/FCZ01_AWHS.csv rename to module/commercial/autotest/FCZ01_AWHS.csv diff --git a/commercial/autotest/FCZ01_COLL.csv b/module/commercial/autotest/FCZ01_COLL.csv similarity index 100% rename from commercial/autotest/FCZ01_COLL.csv rename to module/commercial/autotest/FCZ01_COLL.csv diff --git a/commercial/autotest/FCZ01_GROC.csv b/module/commercial/autotest/FCZ01_GROC.csv similarity index 100% rename from commercial/autotest/FCZ01_GROC.csv rename to module/commercial/autotest/FCZ01_GROC.csv diff --git a/commercial/autotest/FCZ01_HLTH.csv b/module/commercial/autotest/FCZ01_HLTH.csv similarity index 100% rename from commercial/autotest/FCZ01_HLTH.csv rename to module/commercial/autotest/FCZ01_HLTH.csv diff --git a/commercial/autotest/FCZ01_LODG.csv b/module/commercial/autotest/FCZ01_LODG.csv similarity index 100% rename from commercial/autotest/FCZ01_LODG.csv rename to module/commercial/autotest/FCZ01_LODG.csv diff --git a/commercial/autotest/FCZ01_LOFF.csv b/module/commercial/autotest/FCZ01_LOFF.csv similarity index 100% rename from commercial/autotest/FCZ01_LOFF.csv rename to module/commercial/autotest/FCZ01_LOFF.csv diff --git a/commercial/autotest/FCZ01_MISC.csv b/module/commercial/autotest/FCZ01_MISC.csv similarity index 100% rename from commercial/autotest/FCZ01_MISC.csv rename to module/commercial/autotest/FCZ01_MISC.csv diff --git a/commercial/autotest/FCZ01_REFW.csv b/module/commercial/autotest/FCZ01_REFW.csv similarity index 100% rename from commercial/autotest/FCZ01_REFW.csv rename to module/commercial/autotest/FCZ01_REFW.csv diff --git a/commercial/autotest/FCZ01_REST.csv b/module/commercial/autotest/FCZ01_REST.csv similarity index 100% rename from commercial/autotest/FCZ01_REST.csv rename to module/commercial/autotest/FCZ01_REST.csv diff --git a/commercial/autotest/FCZ01_RETL.csv b/module/commercial/autotest/FCZ01_RETL.csv similarity index 100% rename from commercial/autotest/FCZ01_RETL.csv rename to module/commercial/autotest/FCZ01_RETL.csv diff --git a/commercial/autotest/FCZ01_SCHL.csv b/module/commercial/autotest/FCZ01_SCHL.csv similarity index 100% rename from commercial/autotest/FCZ01_SCHL.csv rename to module/commercial/autotest/FCZ01_SCHL.csv diff --git a/commercial/autotest/FCZ01_SOFF.csv b/module/commercial/autotest/FCZ01_SOFF.csv similarity index 100% rename from commercial/autotest/FCZ01_SOFF.csv rename to module/commercial/autotest/FCZ01_SOFF.csv diff --git a/commercial/autotest/energy_f.player b/module/commercial/autotest/energy_f.player similarity index 100% rename from commercial/autotest/energy_f.player rename to module/commercial/autotest/energy_f.player diff --git a/commercial/autotest/energy_pf.player b/module/commercial/autotest/energy_pf.player similarity index 100% rename from commercial/autotest/energy_pf.player rename to module/commercial/autotest/energy_pf.player diff --git a/commercial/autotest/generic_demand.glt b/module/commercial/autotest/generic_demand.glt similarity index 100% rename from commercial/autotest/generic_demand.glt rename to module/commercial/autotest/generic_demand.glt diff --git a/commercial/autotest/generic_demand_pf.glt b/module/commercial/autotest/generic_demand_pf.glt similarity index 100% rename from commercial/autotest/generic_demand_pf.glt rename to module/commercial/autotest/generic_demand_pf.glt diff --git a/commercial/autotest/load_f.player b/module/commercial/autotest/load_f.player similarity index 100% rename from commercial/autotest/load_f.player rename to module/commercial/autotest/load_f.player diff --git a/commercial/autotest/load_heatgain.player b/module/commercial/autotest/load_heatgain.player similarity index 100% rename from commercial/autotest/load_heatgain.player rename to module/commercial/autotest/load_heatgain.player diff --git a/commercial/autotest/load_pf.player b/module/commercial/autotest/load_pf.player similarity index 100% rename from commercial/autotest/load_pf.player rename to module/commercial/autotest/load_pf.player diff --git a/commercial/autotest/office_assert.player b/module/commercial/autotest/office_assert.player similarity index 100% rename from commercial/autotest/office_assert.player rename to module/commercial/autotest/office_assert.player diff --git a/commercial/autotest/office_energy.player b/module/commercial/autotest/office_energy.player similarity index 100% rename from commercial/autotest/office_energy.player rename to module/commercial/autotest/office_energy.player diff --git a/commercial/autotest/office_hvac_ECON_assert.player b/module/commercial/autotest/office_hvac_ECON_assert.player similarity index 100% rename from commercial/autotest/office_hvac_ECON_assert.player rename to module/commercial/autotest/office_hvac_ECON_assert.player diff --git a/commercial/autotest/office_hvac_energy.player b/module/commercial/autotest/office_hvac_energy.player similarity index 100% rename from commercial/autotest/office_hvac_energy.player rename to module/commercial/autotest/office_hvac_energy.player diff --git a/commercial/autotest/office_interior_temp.player b/module/commercial/autotest/office_interior_temp.player similarity index 100% rename from commercial/autotest/office_interior_temp.player rename to module/commercial/autotest/office_interior_temp.player diff --git a/commercial/autotest/test_ceus.glm b/module/commercial/autotest/test_ceus.glm similarity index 100% rename from commercial/autotest/test_ceus.glm rename to module/commercial/autotest/test_ceus.glm diff --git a/commercial/autotest/test_ceus_saveplots.py b/module/commercial/autotest/test_ceus_saveplots.py similarity index 100% rename from commercial/autotest/test_ceus_saveplots.py rename to module/commercial/autotest/test_ceus_saveplots.py diff --git a/commercial/autotest/test_commercial_HVAC_load_pf_opt.glm b/module/commercial/autotest/test_commercial_HVAC_load_pf_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_HVAC_load_pf_opt.glm rename to module/commercial/autotest/test_commercial_HVAC_load_pf_opt.glm diff --git a/commercial/autotest/test_commercial_Qi.glm b/module/commercial/autotest/test_commercial_Qi.glm similarity index 100% rename from commercial/autotest/test_commercial_Qi.glm rename to module/commercial/autotest/test_commercial_Qi.glm diff --git a/commercial/autotest/test_commercial_const_air_temp.glm b/module/commercial/autotest/test_commercial_const_air_temp.glm similarity index 100% rename from commercial/autotest/test_commercial_const_air_temp.glm rename to module/commercial/autotest/test_commercial_const_air_temp.glm diff --git a/commercial/autotest/test_commercial_cooling_cop_sanity_err.glm b/module/commercial/autotest/test_commercial_cooling_cop_sanity_err.glm similarity index 100% rename from commercial/autotest/test_commercial_cooling_cop_sanity_err.glm rename to module/commercial/autotest/test_commercial_cooling_cop_sanity_err.glm diff --git a/commercial/autotest/test_commercial_energy_opt.glm b/module/commercial/autotest/test_commercial_energy_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_energy_opt.glm rename to module/commercial/autotest/test_commercial_energy_opt.glm diff --git a/commercial/autotest/test_commercial_exterior_ua_sanity_err.glm b/module/commercial/autotest/test_commercial_exterior_ua_sanity_err.glm similarity index 100% rename from commercial/autotest/test_commercial_exterior_ua_sanity_err.glm rename to module/commercial/autotest/test_commercial_exterior_ua_sanity_err.glm diff --git a/commercial/autotest/test_commercial_floor_area_sanity_err.glm b/module/commercial/autotest/test_commercial_floor_area_sanity_err.glm similarity index 100% rename from commercial/autotest/test_commercial_floor_area_sanity_err.glm rename to module/commercial/autotest/test_commercial_floor_area_sanity_err.glm diff --git a/commercial/autotest/test_commercial_floor_height_sanity_err.glm b/module/commercial/autotest/test_commercial_floor_height_sanity_err.glm similarity index 100% rename from commercial/autotest/test_commercial_floor_height_sanity_err.glm rename to module/commercial/autotest/test_commercial_floor_height_sanity_err.glm diff --git a/commercial/autotest/test_commercial_heating_cop_sanity_err.glm b/module/commercial/autotest/test_commercial_heating_cop_sanity_err.glm similarity index 100% rename from commercial/autotest/test_commercial_heating_cop_sanity_err.glm rename to module/commercial/autotest/test_commercial_heating_cop_sanity_err.glm diff --git a/commercial/autotest/test_commercial_hvac_AUX_load_opt.glm b/module/commercial/autotest/test_commercial_hvac_AUX_load_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_hvac_AUX_load_opt.glm rename to module/commercial/autotest/test_commercial_hvac_AUX_load_opt.glm diff --git a/commercial/autotest/test_commercial_hvac_COOL_load_opt.glm b/module/commercial/autotest/test_commercial_hvac_COOL_load_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_hvac_COOL_load_opt.glm rename to module/commercial/autotest/test_commercial_hvac_COOL_load_opt.glm diff --git a/commercial/autotest/test_commercial_hvac_ECON_load_opt.glm b/module/commercial/autotest/test_commercial_hvac_ECON_load_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_hvac_ECON_load_opt.glm rename to module/commercial/autotest/test_commercial_hvac_ECON_load_opt.glm diff --git a/commercial/autotest/test_commercial_hvac_HEAT_load_opt.glm b/module/commercial/autotest/test_commercial_hvac_HEAT_load_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_hvac_HEAT_load_opt.glm rename to module/commercial/autotest/test_commercial_hvac_HEAT_load_opt.glm diff --git a/commercial/autotest/test_commercial_hvac_OFF_load_opt.glm b/module/commercial/autotest/test_commercial_hvac_OFF_load_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_hvac_OFF_load_opt.glm rename to module/commercial/autotest/test_commercial_hvac_OFF_load_opt.glm diff --git a/commercial/autotest/test_commercial_hvac_VENT_load_opt.glm b/module/commercial/autotest/test_commercial_hvac_VENT_load_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_hvac_VENT_load_opt.glm rename to module/commercial/autotest/test_commercial_hvac_VENT_load_opt.glm diff --git a/commercial/autotest/test_commercial_hvac_air_temp.glm b/module/commercial/autotest/test_commercial_hvac_air_temp.glm similarity index 100% rename from commercial/autotest/test_commercial_hvac_air_temp.glm rename to module/commercial/autotest/test_commercial_hvac_air_temp.glm diff --git a/commercial/autotest/test_commercial_hvac_air_temp2.glm b/module/commercial/autotest/test_commercial_hvac_air_temp2.glm similarity index 100% rename from commercial/autotest/test_commercial_hvac_air_temp2.glm rename to module/commercial/autotest/test_commercial_hvac_air_temp2.glm diff --git a/commercial/autotest/test_commercial_hvac_energy_opt.glm b/module/commercial/autotest/test_commercial_hvac_energy_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_hvac_energy_opt.glm rename to module/commercial/autotest/test_commercial_hvac_energy_opt.glm diff --git a/commercial/autotest/test_commercial_hvac_heat_cap_sanity_err.glm b/module/commercial/autotest/test_commercial_hvac_heat_cap_sanity_err.glm similarity index 100% rename from commercial/autotest/test_commercial_hvac_heat_cap_sanity_err.glm rename to module/commercial/autotest/test_commercial_hvac_heat_cap_sanity_err.glm diff --git a/commercial/autotest/test_commercial_interior_mass_sanity_err.glm b/module/commercial/autotest/test_commercial_interior_mass_sanity_err.glm similarity index 100% rename from commercial/autotest/test_commercial_interior_mass_sanity_err.glm rename to module/commercial/autotest/test_commercial_interior_mass_sanity_err.glm diff --git a/commercial/autotest/test_commercial_interior_ua_sanity_err.glm b/module/commercial/autotest/test_commercial_interior_ua_sanity_err.glm similarity index 100% rename from commercial/autotest/test_commercial_interior_ua_sanity_err.glm rename to module/commercial/autotest/test_commercial_interior_ua_sanity_err.glm diff --git a/commercial/autotest/test_commercial_lights_energy_f.glm b/module/commercial/autotest/test_commercial_lights_energy_f.glm similarity index 100% rename from commercial/autotest/test_commercial_lights_energy_f.glm rename to module/commercial/autotest/test_commercial_lights_energy_f.glm diff --git a/commercial/autotest/test_commercial_lights_energy_pf_opt.glm b/module/commercial/autotest/test_commercial_lights_energy_pf_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_lights_energy_pf_opt.glm rename to module/commercial/autotest/test_commercial_lights_energy_pf_opt.glm diff --git a/commercial/autotest/test_commercial_lights_heatgains_opt.glm b/module/commercial/autotest/test_commercial_lights_heatgains_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_lights_heatgains_opt.glm rename to module/commercial/autotest/test_commercial_lights_heatgains_opt.glm diff --git a/commercial/autotest/test_commercial_lights_load_f.glm b/module/commercial/autotest/test_commercial_lights_load_f.glm similarity index 100% rename from commercial/autotest/test_commercial_lights_load_f.glm rename to module/commercial/autotest/test_commercial_lights_load_f.glm diff --git a/commercial/autotest/test_commercial_lights_load_pf.glm b/module/commercial/autotest/test_commercial_lights_load_pf.glm similarity index 100% rename from commercial/autotest/test_commercial_lights_load_pf.glm rename to module/commercial/autotest/test_commercial_lights_load_pf.glm diff --git a/commercial/autotest/test_commercial_mass_temperature_opt.glm b/module/commercial/autotest/test_commercial_mass_temperature_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_mass_temperature_opt.glm rename to module/commercial/autotest/test_commercial_mass_temperature_opt.glm diff --git a/commercial/autotest/test_commercial_plugs_energy_f.glm b/module/commercial/autotest/test_commercial_plugs_energy_f.glm similarity index 100% rename from commercial/autotest/test_commercial_plugs_energy_f.glm rename to module/commercial/autotest/test_commercial_plugs_energy_f.glm diff --git a/commercial/autotest/test_commercial_plugs_energy_pf_opt.glm b/module/commercial/autotest/test_commercial_plugs_energy_pf_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_plugs_energy_pf_opt.glm rename to module/commercial/autotest/test_commercial_plugs_energy_pf_opt.glm diff --git a/commercial/autotest/test_commercial_plugs_heatgains.glm b/module/commercial/autotest/test_commercial_plugs_heatgains.glm similarity index 100% rename from commercial/autotest/test_commercial_plugs_heatgains.glm rename to module/commercial/autotest/test_commercial_plugs_heatgains.glm diff --git a/commercial/autotest/test_commercial_plugs_load_f.glm b/module/commercial/autotest/test_commercial_plugs_load_f.glm similarity index 100% rename from commercial/autotest/test_commercial_plugs_load_f.glm rename to module/commercial/autotest/test_commercial_plugs_load_f.glm diff --git a/commercial/autotest/test_commercial_plugs_load_pf.glm b/module/commercial/autotest/test_commercial_plugs_load_pf.glm similarity index 100% rename from commercial/autotest/test_commercial_plugs_load_pf.glm rename to module/commercial/autotest/test_commercial_plugs_load_pf.glm diff --git a/commercial/autotest/test_commercial_temp_deadband_sanity_err.glm b/module/commercial/autotest/test_commercial_temp_deadband_sanity_err.glm similarity index 100% rename from commercial/autotest/test_commercial_temp_deadband_sanity_err.glm rename to module/commercial/autotest/test_commercial_temp_deadband_sanity_err.glm diff --git a/commercial/autotest/test_commercial_temp_setpoints_sanity_err.glm b/module/commercial/autotest/test_commercial_temp_setpoints_sanity_err.glm similarity index 100% rename from commercial/autotest/test_commercial_temp_setpoints_sanity_err.glm rename to module/commercial/autotest/test_commercial_temp_setpoints_sanity_err.glm diff --git a/commercial/autotest/test_commercial_total_load_opt.glm b/module/commercial/autotest/test_commercial_total_load_opt.glm similarity index 100% rename from commercial/autotest/test_commercial_total_load_opt.glm rename to module/commercial/autotest/test_commercial_total_load_opt.glm diff --git a/commercial/autotest/test_parking.glm b/module/commercial/autotest/test_parking.glm similarity index 100% rename from commercial/autotest/test_parking.glm rename to module/commercial/autotest/test_parking.glm diff --git a/commercial/ceus.cpp b/module/commercial/ceus.cpp similarity index 100% rename from commercial/ceus.cpp rename to module/commercial/ceus.cpp diff --git a/commercial/ceus.h b/module/commercial/ceus.h similarity index 100% rename from commercial/ceus.h rename to module/commercial/ceus.h diff --git a/commercial/commercial.h b/module/commercial/commercial.h similarity index 100% rename from commercial/commercial.h rename to module/commercial/commercial.h diff --git a/commercial/commercial.vcproj b/module/commercial/commercial.vcproj similarity index 100% rename from commercial/commercial.vcproj rename to module/commercial/commercial.vcproj diff --git a/commercial/docs/Parking.ipynb b/module/commercial/docs/Parking.ipynb similarity index 100% rename from commercial/docs/Parking.ipynb rename to module/commercial/docs/Parking.ipynb diff --git a/commercial/hvac.cpp b/module/commercial/hvac.cpp similarity index 100% rename from commercial/hvac.cpp rename to module/commercial/hvac.cpp diff --git a/commercial/hvac.h b/module/commercial/hvac.h similarity index 100% rename from commercial/hvac.h rename to module/commercial/hvac.h diff --git a/commercial/init.cpp b/module/commercial/init.cpp similarity index 100% rename from commercial/init.cpp rename to module/commercial/init.cpp diff --git a/commercial/main.cpp b/module/commercial/main.cpp similarity index 100% rename from commercial/main.cpp rename to module/commercial/main.cpp diff --git a/commercial/multizone.cpp b/module/commercial/multizone.cpp similarity index 100% rename from commercial/multizone.cpp rename to module/commercial/multizone.cpp diff --git a/commercial/multizone.h b/module/commercial/multizone.h similarity index 100% rename from commercial/multizone.h rename to module/commercial/multizone.h diff --git a/commercial/office.cpp b/module/commercial/office.cpp similarity index 99% rename from commercial/office.cpp rename to module/commercial/office.cpp index 74aa4043c..705366b9d 100644 --- a/commercial/office.cpp +++ b/module/commercial/office.cpp @@ -67,7 +67,7 @@ **/ #include "commercial.h" -#include "../climate/climate.h" +#include "module/climate/climate.h" EXPORT_CREATE(office) EXPORT_INIT(office) diff --git a/commercial/office.h b/module/commercial/office.h similarity index 100% rename from commercial/office.h rename to module/commercial/office.h diff --git a/commercial/parking.cpp b/module/commercial/parking.cpp similarity index 100% rename from commercial/parking.cpp rename to module/commercial/parking.cpp diff --git a/commercial/parking.h b/module/commercial/parking.h similarity index 100% rename from commercial/parking.h rename to module/commercial/parking.h diff --git a/commercial/solvers.cpp b/module/commercial/solvers.cpp similarity index 100% rename from commercial/solvers.cpp rename to module/commercial/solvers.cpp diff --git a/commercial/solvers.h b/module/commercial/solvers.h similarity index 100% rename from commercial/solvers.h rename to module/commercial/solvers.h diff --git a/connection/Makefile.mk b/module/connection/Makefile.mk similarity index 100% rename from connection/Makefile.mk rename to module/connection/Makefile.mk diff --git a/connection/autotest/test_fncs_msg_client.glm b/module/connection/autotest/test_fncs_msg_client.glm similarity index 100% rename from connection/autotest/test_fncs_msg_client.glm rename to module/connection/autotest/test_fncs_msg_client.glm diff --git a/connection/autotest/test_json_client.glm b/module/connection/autotest/test_json_client.glm similarity index 100% rename from connection/autotest/test_json_client.glm rename to module/connection/autotest/test_json_client.glm diff --git a/connection/autotest/test_json_server.glm b/module/connection/autotest/test_json_server.glm similarity index 100% rename from connection/autotest/test_json_server.glm rename to module/connection/autotest/test_json_server.glm diff --git a/connection/autotest/test_native_client.glm b/module/connection/autotest/test_native_client.glm similarity index 100% rename from connection/autotest/test_native_client.glm rename to module/connection/autotest/test_native_client.glm diff --git a/connection/autotest/test_native_server.glm b/module/connection/autotest/test_native_server.glm similarity index 100% rename from connection/autotest/test_native_server.glm rename to module/connection/autotest/test_native_server.glm diff --git a/connection/autotest/test_xml_client.glm b/module/connection/autotest/test_xml_client.glm similarity index 100% rename from connection/autotest/test_xml_client.glm rename to module/connection/autotest/test_xml_client.glm diff --git a/connection/autotest/test_xml_server.glm b/module/connection/autotest/test_xml_server.glm similarity index 100% rename from connection/autotest/test_xml_server.glm rename to module/connection/autotest/test_xml_server.glm diff --git a/connection/cache.cpp b/module/connection/cache.cpp similarity index 100% rename from connection/cache.cpp rename to module/connection/cache.cpp diff --git a/connection/cache.h b/module/connection/cache.h similarity index 100% rename from connection/cache.h rename to module/connection/cache.h diff --git a/connection/client.cpp b/module/connection/client.cpp similarity index 100% rename from connection/client.cpp rename to module/connection/client.cpp diff --git a/connection/client.h b/module/connection/client.h similarity index 100% rename from connection/client.h rename to module/connection/client.h diff --git a/connection/connection.cpp b/module/connection/connection.cpp similarity index 100% rename from connection/connection.cpp rename to module/connection/connection.cpp diff --git a/connection/connection.h b/module/connection/connection.h similarity index 100% rename from connection/connection.h rename to module/connection/connection.h diff --git a/connection/connection.pptx b/module/connection/connection.pptx similarity index 100% rename from connection/connection.pptx rename to module/connection/connection.pptx diff --git a/connection/connection.vcproj b/module/connection/connection.vcproj similarity index 100% rename from connection/connection.vcproj rename to module/connection/connection.vcproj diff --git a/connection/connection.vcproj.PNL.fish334.user b/module/connection/connection.vcproj.PNL.fish334.user similarity index 100% rename from connection/connection.vcproj.PNL.fish334.user rename to module/connection/connection.vcproj.PNL.fish334.user diff --git a/connection/fncs_msg.cpp b/module/connection/fncs_msg.cpp similarity index 100% rename from connection/fncs_msg.cpp rename to module/connection/fncs_msg.cpp diff --git a/connection/fncs_msg.cpp.bak b/module/connection/fncs_msg.cpp.bak similarity index 100% rename from connection/fncs_msg.cpp.bak rename to module/connection/fncs_msg.cpp.bak diff --git a/connection/fncs_msg.h b/module/connection/fncs_msg.h similarity index 100% rename from connection/fncs_msg.h rename to module/connection/fncs_msg.h diff --git a/connection/fncs_msg.h.bak b/module/connection/fncs_msg.h.bak similarity index 100% rename from connection/fncs_msg.h.bak rename to module/connection/fncs_msg.h.bak diff --git a/connection/init.cpp b/module/connection/init.cpp similarity index 100% rename from connection/init.cpp rename to module/connection/init.cpp diff --git a/connection/jsmn.c b/module/connection/jsmn.c similarity index 100% rename from connection/jsmn.c rename to module/connection/jsmn.c diff --git a/connection/jsmn.h b/module/connection/jsmn.h similarity index 100% rename from connection/jsmn.h rename to module/connection/jsmn.h diff --git a/connection/json.cpp b/module/connection/json.cpp similarity index 100% rename from connection/json.cpp rename to module/connection/json.cpp diff --git a/connection/json.h b/module/connection/json.h similarity index 100% rename from connection/json.h rename to module/connection/json.h diff --git a/connection/json_link/__init__.py b/module/connection/json_link/__init__.py similarity index 100% rename from connection/json_link/__init__.py rename to module/connection/json_link/__init__.py diff --git a/connection/json_link/bin/__init__.py b/module/connection/json_link/bin/__init__.py similarity index 100% rename from connection/json_link/bin/__init__.py rename to module/connection/json_link/bin/__init__.py diff --git a/connection/json_link/bin/json_link_tester.py b/module/connection/json_link/bin/json_link_tester.py similarity index 100% rename from connection/json_link/bin/json_link_tester.py rename to module/connection/json_link/bin/json_link_tester.py diff --git a/connection/json_link/doc/html/_modules/index.html b/module/connection/json_link/doc/html/_modules/index.html similarity index 100% rename from connection/json_link/doc/html/_modules/index.html rename to module/connection/json_link/doc/html/_modules/index.html diff --git a/connection/json_link/doc/html/_modules/json_link/bin/json_link_tester.html b/module/connection/json_link/doc/html/_modules/json_link/bin/json_link_tester.html similarity index 100% rename from connection/json_link/doc/html/_modules/json_link/bin/json_link_tester.html rename to module/connection/json_link/doc/html/_modules/json_link/bin/json_link_tester.html diff --git a/connection/json_link/doc/html/_modules/json_link/faults/fault_inject.html b/module/connection/json_link/doc/html/_modules/json_link/faults/fault_inject.html similarity index 100% rename from connection/json_link/doc/html/_modules/json_link/faults/fault_inject.html rename to module/connection/json_link/doc/html/_modules/json_link/faults/fault_inject.html diff --git a/connection/json_link/doc/html/_modules/json_link/json_link.html b/module/connection/json_link/doc/html/_modules/json_link/json_link.html similarity index 100% rename from connection/json_link/doc/html/_modules/json_link/json_link.html rename to module/connection/json_link/doc/html/_modules/json_link/json_link.html diff --git a/connection/json_link/doc/html/_modules/json_link/json_link/json_link.html b/module/connection/json_link/doc/html/_modules/json_link/json_link/json_link.html similarity index 100% rename from connection/json_link/doc/html/_modules/json_link/json_link/json_link.html rename to module/connection/json_link/doc/html/_modules/json_link/json_link/json_link.html diff --git a/connection/json_link/doc/html/_modules/json_link/json_link/raw_xchg.html b/module/connection/json_link/doc/html/_modules/json_link/json_link/raw_xchg.html similarity index 100% rename from connection/json_link/doc/html/_modules/json_link/json_link/raw_xchg.html rename to module/connection/json_link/doc/html/_modules/json_link/json_link/raw_xchg.html diff --git a/connection/json_link/doc/html/_modules/json_link/test/fault_inject.html b/module/connection/json_link/doc/html/_modules/json_link/test/fault_inject.html similarity index 100% rename from connection/json_link/doc/html/_modules/json_link/test/fault_inject.html rename to module/connection/json_link/doc/html/_modules/json_link/test/fault_inject.html diff --git a/connection/json_link/doc/html/_modules/json_link/test/json_link_tester.html b/module/connection/json_link/doc/html/_modules/json_link/test/json_link_tester.html similarity index 100% rename from connection/json_link/doc/html/_modules/json_link/test/json_link_tester.html rename to module/connection/json_link/doc/html/_modules/json_link/test/json_link_tester.html diff --git a/connection/json_link/doc/html/_modules/json_link/xchg/raw_xchg.html b/module/connection/json_link/doc/html/_modules/json_link/xchg/raw_xchg.html similarity index 100% rename from connection/json_link/doc/html/_modules/json_link/xchg/raw_xchg.html rename to module/connection/json_link/doc/html/_modules/json_link/xchg/raw_xchg.html diff --git a/connection/json_link/doc/html/_sources/index.txt b/module/connection/json_link/doc/html/_sources/index.txt similarity index 100% rename from connection/json_link/doc/html/_sources/index.txt rename to module/connection/json_link/doc/html/_sources/index.txt diff --git a/connection/json_link/doc/html/_sources/json_link.bin.txt b/module/connection/json_link/doc/html/_sources/json_link.bin.txt similarity index 100% rename from connection/json_link/doc/html/_sources/json_link.bin.txt rename to module/connection/json_link/doc/html/_sources/json_link.bin.txt diff --git a/connection/json_link/doc/html/_sources/json_link.faults.txt b/module/connection/json_link/doc/html/_sources/json_link.faults.txt similarity index 100% rename from connection/json_link/doc/html/_sources/json_link.faults.txt rename to module/connection/json_link/doc/html/_sources/json_link.faults.txt diff --git a/connection/json_link/doc/html/_sources/json_link.json_link.txt b/module/connection/json_link/doc/html/_sources/json_link.json_link.txt similarity index 100% rename from connection/json_link/doc/html/_sources/json_link.json_link.txt rename to module/connection/json_link/doc/html/_sources/json_link.json_link.txt diff --git a/connection/json_link/doc/html/_sources/json_link.test.txt b/module/connection/json_link/doc/html/_sources/json_link.test.txt similarity index 100% rename from connection/json_link/doc/html/_sources/json_link.test.txt rename to module/connection/json_link/doc/html/_sources/json_link.test.txt diff --git a/connection/json_link/doc/html/_sources/json_link.txt b/module/connection/json_link/doc/html/_sources/json_link.txt similarity index 100% rename from connection/json_link/doc/html/_sources/json_link.txt rename to module/connection/json_link/doc/html/_sources/json_link.txt diff --git a/connection/json_link/doc/html/_sources/json_link.xchg.txt b/module/connection/json_link/doc/html/_sources/json_link.xchg.txt similarity index 100% rename from connection/json_link/doc/html/_sources/json_link.xchg.txt rename to module/connection/json_link/doc/html/_sources/json_link.xchg.txt diff --git a/connection/json_link/doc/html/_sources/modules.txt b/module/connection/json_link/doc/html/_sources/modules.txt similarity index 100% rename from connection/json_link/doc/html/_sources/modules.txt rename to module/connection/json_link/doc/html/_sources/modules.txt diff --git a/connection/json_link/doc/html/_static/ajax-loader.gif b/module/connection/json_link/doc/html/_static/ajax-loader.gif similarity index 100% rename from connection/json_link/doc/html/_static/ajax-loader.gif rename to module/connection/json_link/doc/html/_static/ajax-loader.gif diff --git a/connection/json_link/doc/html/_static/basic.css b/module/connection/json_link/doc/html/_static/basic.css similarity index 100% rename from connection/json_link/doc/html/_static/basic.css rename to module/connection/json_link/doc/html/_static/basic.css diff --git a/connection/json_link/doc/html/_static/comment-bright.png b/module/connection/json_link/doc/html/_static/comment-bright.png similarity index 100% rename from connection/json_link/doc/html/_static/comment-bright.png rename to module/connection/json_link/doc/html/_static/comment-bright.png diff --git a/connection/json_link/doc/html/_static/comment-close.png b/module/connection/json_link/doc/html/_static/comment-close.png similarity index 100% rename from connection/json_link/doc/html/_static/comment-close.png rename to module/connection/json_link/doc/html/_static/comment-close.png diff --git a/connection/json_link/doc/html/_static/comment.png b/module/connection/json_link/doc/html/_static/comment.png similarity index 100% rename from connection/json_link/doc/html/_static/comment.png rename to module/connection/json_link/doc/html/_static/comment.png diff --git a/connection/json_link/doc/html/_static/contents.png b/module/connection/json_link/doc/html/_static/contents.png similarity index 100% rename from connection/json_link/doc/html/_static/contents.png rename to module/connection/json_link/doc/html/_static/contents.png diff --git a/connection/json_link/doc/html/_static/default.css b/module/connection/json_link/doc/html/_static/default.css similarity index 100% rename from connection/json_link/doc/html/_static/default.css rename to module/connection/json_link/doc/html/_static/default.css diff --git a/connection/json_link/doc/html/_static/doctools.js b/module/connection/json_link/doc/html/_static/doctools.js similarity index 100% rename from connection/json_link/doc/html/_static/doctools.js rename to module/connection/json_link/doc/html/_static/doctools.js diff --git a/connection/json_link/doc/html/_static/down-pressed.png b/module/connection/json_link/doc/html/_static/down-pressed.png similarity index 100% rename from connection/json_link/doc/html/_static/down-pressed.png rename to module/connection/json_link/doc/html/_static/down-pressed.png diff --git a/connection/json_link/doc/html/_static/down.png b/module/connection/json_link/doc/html/_static/down.png similarity index 100% rename from connection/json_link/doc/html/_static/down.png rename to module/connection/json_link/doc/html/_static/down.png diff --git a/connection/json_link/doc/html/_static/file.png b/module/connection/json_link/doc/html/_static/file.png similarity index 100% rename from connection/json_link/doc/html/_static/file.png rename to module/connection/json_link/doc/html/_static/file.png diff --git a/connection/json_link/doc/html/_static/jquery.js b/module/connection/json_link/doc/html/_static/jquery.js similarity index 100% rename from connection/json_link/doc/html/_static/jquery.js rename to module/connection/json_link/doc/html/_static/jquery.js diff --git a/connection/json_link/doc/html/_static/minus.png b/module/connection/json_link/doc/html/_static/minus.png similarity index 100% rename from connection/json_link/doc/html/_static/minus.png rename to module/connection/json_link/doc/html/_static/minus.png diff --git a/connection/json_link/doc/html/_static/navigation.png b/module/connection/json_link/doc/html/_static/navigation.png similarity index 100% rename from connection/json_link/doc/html/_static/navigation.png rename to module/connection/json_link/doc/html/_static/navigation.png diff --git a/connection/json_link/doc/html/_static/plus.png b/module/connection/json_link/doc/html/_static/plus.png similarity index 100% rename from connection/json_link/doc/html/_static/plus.png rename to module/connection/json_link/doc/html/_static/plus.png diff --git a/connection/json_link/doc/html/_static/pygments.css b/module/connection/json_link/doc/html/_static/pygments.css similarity index 100% rename from connection/json_link/doc/html/_static/pygments.css rename to module/connection/json_link/doc/html/_static/pygments.css diff --git a/connection/json_link/doc/html/_static/searchtools.js b/module/connection/json_link/doc/html/_static/searchtools.js similarity index 100% rename from connection/json_link/doc/html/_static/searchtools.js rename to module/connection/json_link/doc/html/_static/searchtools.js diff --git a/connection/json_link/doc/html/_static/sidebar.js b/module/connection/json_link/doc/html/_static/sidebar.js similarity index 100% rename from connection/json_link/doc/html/_static/sidebar.js rename to module/connection/json_link/doc/html/_static/sidebar.js diff --git a/connection/json_link/doc/html/_static/sphinxdoc.css b/module/connection/json_link/doc/html/_static/sphinxdoc.css similarity index 100% rename from connection/json_link/doc/html/_static/sphinxdoc.css rename to module/connection/json_link/doc/html/_static/sphinxdoc.css diff --git a/connection/json_link/doc/html/_static/underscore.js b/module/connection/json_link/doc/html/_static/underscore.js similarity index 100% rename from connection/json_link/doc/html/_static/underscore.js rename to module/connection/json_link/doc/html/_static/underscore.js diff --git a/connection/json_link/doc/html/_static/up-pressed.png b/module/connection/json_link/doc/html/_static/up-pressed.png similarity index 100% rename from connection/json_link/doc/html/_static/up-pressed.png rename to module/connection/json_link/doc/html/_static/up-pressed.png diff --git a/connection/json_link/doc/html/_static/up.png b/module/connection/json_link/doc/html/_static/up.png similarity index 100% rename from connection/json_link/doc/html/_static/up.png rename to module/connection/json_link/doc/html/_static/up.png diff --git a/connection/json_link/doc/html/_static/websupport.js b/module/connection/json_link/doc/html/_static/websupport.js similarity index 100% rename from connection/json_link/doc/html/_static/websupport.js rename to module/connection/json_link/doc/html/_static/websupport.js diff --git a/connection/json_link/doc/html/genindex.html b/module/connection/json_link/doc/html/genindex.html similarity index 100% rename from connection/json_link/doc/html/genindex.html rename to module/connection/json_link/doc/html/genindex.html diff --git a/connection/json_link/doc/html/index.html b/module/connection/json_link/doc/html/index.html similarity index 100% rename from connection/json_link/doc/html/index.html rename to module/connection/json_link/doc/html/index.html diff --git a/connection/json_link/doc/html/json_link.bin.html b/module/connection/json_link/doc/html/json_link.bin.html similarity index 100% rename from connection/json_link/doc/html/json_link.bin.html rename to module/connection/json_link/doc/html/json_link.bin.html diff --git a/connection/json_link/doc/html/json_link.faults.html b/module/connection/json_link/doc/html/json_link.faults.html similarity index 100% rename from connection/json_link/doc/html/json_link.faults.html rename to module/connection/json_link/doc/html/json_link.faults.html diff --git a/connection/json_link/doc/html/json_link.html b/module/connection/json_link/doc/html/json_link.html similarity index 100% rename from connection/json_link/doc/html/json_link.html rename to module/connection/json_link/doc/html/json_link.html diff --git a/connection/json_link/doc/html/json_link.json_link.html b/module/connection/json_link/doc/html/json_link.json_link.html similarity index 100% rename from connection/json_link/doc/html/json_link.json_link.html rename to module/connection/json_link/doc/html/json_link.json_link.html diff --git a/connection/json_link/doc/html/json_link.test.html b/module/connection/json_link/doc/html/json_link.test.html similarity index 100% rename from connection/json_link/doc/html/json_link.test.html rename to module/connection/json_link/doc/html/json_link.test.html diff --git a/connection/json_link/doc/html/json_link.xchg.html b/module/connection/json_link/doc/html/json_link.xchg.html similarity index 100% rename from connection/json_link/doc/html/json_link.xchg.html rename to module/connection/json_link/doc/html/json_link.xchg.html diff --git a/connection/json_link/doc/html/modules.html b/module/connection/json_link/doc/html/modules.html similarity index 100% rename from connection/json_link/doc/html/modules.html rename to module/connection/json_link/doc/html/modules.html diff --git a/connection/json_link/doc/html/objects.inv b/module/connection/json_link/doc/html/objects.inv similarity index 100% rename from connection/json_link/doc/html/objects.inv rename to module/connection/json_link/doc/html/objects.inv diff --git a/connection/json_link/doc/html/py-modindex.html b/module/connection/json_link/doc/html/py-modindex.html similarity index 100% rename from connection/json_link/doc/html/py-modindex.html rename to module/connection/json_link/doc/html/py-modindex.html diff --git a/connection/json_link/doc/html/search.html b/module/connection/json_link/doc/html/search.html similarity index 100% rename from connection/json_link/doc/html/search.html rename to module/connection/json_link/doc/html/search.html diff --git a/connection/json_link/doc/html/searchindex.js b/module/connection/json_link/doc/html/searchindex.js similarity index 100% rename from connection/json_link/doc/html/searchindex.js rename to module/connection/json_link/doc/html/searchindex.js diff --git a/connection/json_link/doc/make.bat b/module/connection/json_link/doc/make.bat similarity index 100% rename from connection/json_link/doc/make.bat rename to module/connection/json_link/doc/make.bat diff --git a/connection/json_link/doc/source/conf.py b/module/connection/json_link/doc/source/conf.py similarity index 100% rename from connection/json_link/doc/source/conf.py rename to module/connection/json_link/doc/source/conf.py diff --git a/connection/json_link/doc/source/index.rst b/module/connection/json_link/doc/source/index.rst similarity index 100% rename from connection/json_link/doc/source/index.rst rename to module/connection/json_link/doc/source/index.rst diff --git a/connection/json_link/doc/source/json_link.bin.rst b/module/connection/json_link/doc/source/json_link.bin.rst similarity index 100% rename from connection/json_link/doc/source/json_link.bin.rst rename to module/connection/json_link/doc/source/json_link.bin.rst diff --git a/connection/json_link/doc/source/json_link.faults.rst b/module/connection/json_link/doc/source/json_link.faults.rst similarity index 100% rename from connection/json_link/doc/source/json_link.faults.rst rename to module/connection/json_link/doc/source/json_link.faults.rst diff --git a/connection/json_link/doc/source/json_link.rst b/module/connection/json_link/doc/source/json_link.rst similarity index 100% rename from connection/json_link/doc/source/json_link.rst rename to module/connection/json_link/doc/source/json_link.rst diff --git a/connection/json_link/doc/source/json_link.test.rst b/module/connection/json_link/doc/source/json_link.test.rst similarity index 100% rename from connection/json_link/doc/source/json_link.test.rst rename to module/connection/json_link/doc/source/json_link.test.rst diff --git a/connection/json_link/doc/source/json_link.xchg.rst b/module/connection/json_link/doc/source/json_link.xchg.rst similarity index 100% rename from connection/json_link/doc/source/json_link.xchg.rst rename to module/connection/json_link/doc/source/json_link.xchg.rst diff --git a/connection/json_link/faults/__init__.py b/module/connection/json_link/faults/__init__.py similarity index 100% rename from connection/json_link/faults/__init__.py rename to module/connection/json_link/faults/__init__.py diff --git a/connection/json_link/faults/fault_inject.py b/module/connection/json_link/faults/fault_inject.py similarity index 100% rename from connection/json_link/faults/fault_inject.py rename to module/connection/json_link/faults/fault_inject.py diff --git a/connection/json_link/json_link.py b/module/connection/json_link/json_link.py similarity index 100% rename from connection/json_link/json_link.py rename to module/connection/json_link/json_link.py diff --git a/connection/json_link/test/__init__.py b/module/connection/json_link/test/__init__.py similarity index 100% rename from connection/json_link/test/__init__.py rename to module/connection/json_link/test/__init__.py diff --git a/connection/json_link/test/test_json_link.py b/module/connection/json_link/test/test_json_link.py similarity index 100% rename from connection/json_link/test/test_json_link.py rename to module/connection/json_link/test/test_json_link.py diff --git a/connection/json_link/xchg/__init__.py b/module/connection/json_link/xchg/__init__.py similarity index 100% rename from connection/json_link/xchg/__init__.py rename to module/connection/json_link/xchg/__init__.py diff --git a/connection/json_link/xchg/raw_xchg.py b/module/connection/json_link/xchg/raw_xchg.py similarity index 100% rename from connection/json_link/xchg/raw_xchg.py rename to module/connection/json_link/xchg/raw_xchg.py diff --git a/connection/json_link_demo.py b/module/connection/json_link_demo.py similarity index 100% rename from connection/json_link_demo.py rename to module/connection/json_link_demo.py diff --git a/connection/main.cpp b/module/connection/main.cpp similarity index 100% rename from connection/main.cpp rename to module/connection/main.cpp diff --git a/connection/message.h b/module/connection/message.h similarity index 100% rename from connection/message.h rename to module/connection/message.h diff --git a/connection/native.cpp b/module/connection/native.cpp similarity index 100% rename from connection/native.cpp rename to module/connection/native.cpp diff --git a/connection/native.h b/module/connection/native.h similarity index 100% rename from connection/native.h rename to module/connection/native.h diff --git a/connection/server.cpp b/module/connection/server.cpp similarity index 100% rename from connection/server.cpp rename to module/connection/server.cpp diff --git a/connection/server.h b/module/connection/server.h similarity index 100% rename from connection/server.h rename to module/connection/server.h diff --git a/connection/socket.cpp b/module/connection/socket.cpp similarity index 100% rename from connection/socket.cpp rename to module/connection/socket.cpp diff --git a/connection/socket.h b/module/connection/socket.h similarity index 100% rename from connection/socket.h rename to module/connection/socket.h diff --git a/connection/tcp.cpp b/module/connection/tcp.cpp similarity index 100% rename from connection/tcp.cpp rename to module/connection/tcp.cpp diff --git a/connection/tcp.h b/module/connection/tcp.h similarity index 100% rename from connection/tcp.h rename to module/connection/tcp.h diff --git a/connection/transport.cpp b/module/connection/transport.cpp similarity index 100% rename from connection/transport.cpp rename to module/connection/transport.cpp diff --git a/connection/transport.h b/module/connection/transport.h similarity index 100% rename from connection/transport.h rename to module/connection/transport.h diff --git a/connection/udp.cpp b/module/connection/udp.cpp similarity index 100% rename from connection/udp.cpp rename to module/connection/udp.cpp diff --git a/connection/udp.h b/module/connection/udp.h similarity index 100% rename from connection/udp.h rename to module/connection/udp.h diff --git a/connection/validate.no b/module/connection/validate.no similarity index 100% rename from connection/validate.no rename to module/connection/validate.no diff --git a/connection/varmap.cpp b/module/connection/varmap.cpp similarity index 100% rename from connection/varmap.cpp rename to module/connection/varmap.cpp diff --git a/connection/varmap.h b/module/connection/varmap.h similarity index 100% rename from connection/varmap.h rename to module/connection/varmap.h diff --git a/connection/xml.cpp b/module/connection/xml.cpp similarity index 100% rename from connection/xml.cpp rename to module/connection/xml.cpp diff --git a/connection/xml.h b/module/connection/xml.h similarity index 100% rename from connection/xml.h rename to module/connection/xml.h diff --git a/module/generators/Makefile.mk b/module/generators/Makefile.mk new file mode 100644 index 000000000..79522f691 --- /dev/null +++ b/module/generators/Makefile.mk @@ -0,0 +1,39 @@ +pkglib_LTLIBRARIES += module/generators/generators.la + +module_generators_generators_la_CPPFLAGS = +module_generators_generators_la_CPPFLAGS += $(AM_CPPFLAGS) +module_generators_generators_la_CPPFLAGS += -I$(top_srcdir)/module/powerflow + +module_generators_generators_la_LDFLAGS = +module_generators_generators_la_LDFLAGS += $(AM_LDFLAGS) + +module_generators_generators_la_LIBADD = + +module_generators_generators_la_SOURCES = +module_generators_generators_la_SOURCES += module/generators/battery.cpp +module_generators_generators_la_SOURCES += module/generators/battery.h +module_generators_generators_la_SOURCES += module/generators/central_dg_control.cpp +module_generators_generators_la_SOURCES += module/generators/central_dg_control.h +module_generators_generators_la_SOURCES += module/generators/dc_dc_converter.cpp +module_generators_generators_la_SOURCES += module/generators/dc_dc_converter.h +module_generators_generators_la_SOURCES += module/generators/diesel_dg.cpp +module_generators_generators_la_SOURCES += module/generators/diesel_dg.h +module_generators_generators_la_SOURCES += module/generators/energy_storage.cpp +module_generators_generators_la_SOURCES += module/generators/energy_storage.h +module_generators_generators_la_SOURCES += module/generators/generators.h +module_generators_generators_la_SOURCES += module/generators/init.cpp +module_generators_generators_la_SOURCES += module/generators/inverter.cpp +module_generators_generators_la_SOURCES += module/generators/inverter.h +module_generators_generators_la_SOURCES += module/generators/main.cpp +module_generators_generators_la_SOURCES += module/generators/microturbine.cpp +module_generators_generators_la_SOURCES += module/generators/microturbine.h +module_generators_generators_la_SOURCES += module/generators/power_electronics.cpp +module_generators_generators_la_SOURCES += module/generators/power_electronics.h +module_generators_generators_la_SOURCES += module/generators/rectifier.cpp +module_generators_generators_la_SOURCES += module/generators/rectifier.h +module_generators_generators_la_SOURCES += module/generators/solar.cpp +module_generators_generators_la_SOURCES += module/generators/solar.h +module_generators_generators_la_SOURCES += module/generators/windturb_dg.cpp +module_generators_generators_la_SOURCES += module/generators/windturb_dg.h +module_generators_generators_la_SOURCES += module/generators/controller_dg.cpp +module_generators_generators_la_SOURCES += module/generators/controller_dg.h diff --git a/generators/autotest/CDGCLoad.player b/module/generators/autotest/CDGCLoad.player similarity index 100% rename from generators/autotest/CDGCLoad.player rename to module/generators/autotest/CDGCLoad.player diff --git a/generators/autotest/MPINV_OUT1.player b/module/generators/autotest/MPINV_OUT1.player similarity index 100% rename from generators/autotest/MPINV_OUT1.player rename to module/generators/autotest/MPINV_OUT1.player diff --git a/generators/autotest/Standard_Weather.csv b/module/generators/autotest/Standard_Weather.csv similarity index 100% rename from generators/autotest/Standard_Weather.csv rename to module/generators/autotest/Standard_Weather.csv diff --git a/generators/autotest/VSI_droop_VA.csv b/module/generators/autotest/VSI_droop_VA.csv similarity index 100% rename from generators/autotest/VSI_droop_VA.csv rename to module/generators/autotest/VSI_droop_VA.csv diff --git a/generators/autotest/VSI_droop_frequency.csv b/module/generators/autotest/VSI_droop_frequency.csv similarity index 100% rename from generators/autotest/VSI_droop_frequency.csv rename to module/generators/autotest/VSI_droop_frequency.csv diff --git a/generators/autotest/VSI_isochronous_VA.csv b/module/generators/autotest/VSI_isochronous_VA.csv similarity index 100% rename from generators/autotest/VSI_isochronous_VA.csv rename to module/generators/autotest/VSI_isochronous_VA.csv diff --git a/generators/autotest/VSI_isochronous_droop_VA.csv b/module/generators/autotest/VSI_isochronous_droop_VA.csv similarity index 100% rename from generators/autotest/VSI_isochronous_droop_VA.csv rename to module/generators/autotest/VSI_isochronous_droop_VA.csv diff --git a/generators/autotest/Yakima_Insolation.player b/module/generators/autotest/Yakima_Insolation.player similarity index 100% rename from generators/autotest/Yakima_Insolation.player rename to module/generators/autotest/Yakima_Insolation.player diff --git a/generators/autotest/Yakima_ambient_temperature.player b/module/generators/autotest/Yakima_ambient_temperature.player similarity index 100% rename from generators/autotest/Yakima_ambient_temperature.player rename to module/generators/autotest/Yakima_ambient_temperature.player diff --git a/generators/autotest/Yakima_wind_speed.player b/module/generators/autotest/Yakima_wind_speed.player similarity index 100% rename from generators/autotest/Yakima_wind_speed.player rename to module/generators/autotest/Yakima_wind_speed.player diff --git a/generators/autotest/cdgc_test_meter_power_assert.player b/module/generators/autotest/cdgc_test_meter_power_assert.player similarity index 100% rename from generators/autotest/cdgc_test_meter_power_assert.player rename to module/generators/autotest/cdgc_test_meter_power_assert.player diff --git a/generators/autotest/constantPFmeterPower_multi_efficiency.player b/module/generators/autotest/constantPFmeterPower_multi_efficiency.player similarity index 100% rename from generators/autotest/constantPFmeterPower_multi_efficiency.player rename to module/generators/autotest/constantPFmeterPower_multi_efficiency.player diff --git a/generators/autotest/constantPFmeterPower_static_efficiency.player b/module/generators/autotest/constantPFmeterPower_static_efficiency.player similarity index 100% rename from generators/autotest/constantPFmeterPower_static_efficiency.player rename to module/generators/autotest/constantPFmeterPower_static_efficiency.player diff --git a/generators/autotest/constantPQ_PV.csv b/module/generators/autotest/constantPQ_PV.csv similarity index 100% rename from generators/autotest/constantPQ_PV.csv rename to module/generators/autotest/constantPQ_PV.csv diff --git a/generators/autotest/constantPQ_PV_VA.csv b/module/generators/autotest/constantPQ_PV_VA.csv similarity index 100% rename from generators/autotest/constantPQ_PV_VA.csv rename to module/generators/autotest/constantPQ_PV_VA.csv diff --git a/generators/autotest/constantPQ_battery_VA.csv b/module/generators/autotest/constantPQ_battery_VA.csv similarity index 100% rename from generators/autotest/constantPQ_battery_VA.csv rename to module/generators/autotest/constantPQ_battery_VA.csv diff --git a/generators/autotest/constantPQ_diesel_dg.csv b/module/generators/autotest/constantPQ_diesel_dg.csv similarity index 100% rename from generators/autotest/constantPQ_diesel_dg.csv rename to module/generators/autotest/constantPQ_diesel_dg.csv diff --git a/generators/autotest/constantPQ_diesel_dg_speed.csv b/module/generators/autotest/constantPQ_diesel_dg_speed.csv similarity index 100% rename from generators/autotest/constantPQ_diesel_dg_speed.csv rename to module/generators/autotest/constantPQ_diesel_dg_speed.csv diff --git a/generators/autotest/constantPQmeterPower_multi_efficiency.player b/module/generators/autotest/constantPQmeterPower_multi_efficiency.player similarity index 100% rename from generators/autotest/constantPQmeterPower_multi_efficiency.player rename to module/generators/autotest/constantPQmeterPower_multi_efficiency.player diff --git a/generators/autotest/constantPQmeterPower_static_efficiency.player b/module/generators/autotest/constantPQmeterPower_static_efficiency.player similarity index 100% rename from generators/autotest/constantPQmeterPower_static_efficiency.player rename to module/generators/autotest/constantPQmeterPower_static_efficiency.player diff --git a/generators/autotest/constantP_PV_VA.csv b/module/generators/autotest/constantP_PV_VA.csv similarity index 100% rename from generators/autotest/constantP_PV_VA.csv rename to module/generators/autotest/constantP_PV_VA.csv diff --git a/generators/autotest/constantP_battery_VA.csv b/module/generators/autotest/constantP_battery_VA.csv similarity index 100% rename from generators/autotest/constantP_battery_VA.csv rename to module/generators/autotest/constantP_battery_VA.csv diff --git a/generators/autotest/constantP_diesel_dg_speed.csv b/module/generators/autotest/constantP_diesel_dg_speed.csv similarity index 100% rename from generators/autotest/constantP_diesel_dg_speed.csv rename to module/generators/autotest/constantP_diesel_dg_speed.csv diff --git a/generators/autotest/constantQ_PV.csv b/module/generators/autotest/constantQ_PV.csv similarity index 100% rename from generators/autotest/constantQ_PV.csv rename to module/generators/autotest/constantQ_PV.csv diff --git a/generators/autotest/constantQ_PV_VA.csv b/module/generators/autotest/constantQ_PV_VA.csv similarity index 100% rename from generators/autotest/constantQ_PV_VA.csv rename to module/generators/autotest/constantQ_PV_VA.csv diff --git a/generators/autotest/constantQ_battery_VA.csv b/module/generators/autotest/constantQ_battery_VA.csv similarity index 100% rename from generators/autotest/constantQ_battery_VA.csv rename to module/generators/autotest/constantQ_battery_VA.csv diff --git a/generators/autotest/constantQ_diesel_dg_speed.csv b/module/generators/autotest/constantQ_diesel_dg_speed.csv similarity index 100% rename from generators/autotest/constantQ_diesel_dg_speed.csv rename to module/generators/autotest/constantQ_diesel_dg_speed.csv diff --git a/generators/autotest/data_Bus1_voltageA.csv b/module/generators/autotest/data_Bus1_voltageA.csv similarity index 100% rename from generators/autotest/data_Bus1_voltageA.csv rename to module/generators/autotest/data_Bus1_voltageA.csv diff --git a/generators/autotest/data_G1SpeedAssert.csv b/module/generators/autotest/data_G1SpeedAssert.csv similarity index 100% rename from generators/autotest/data_G1SpeedAssert.csv rename to module/generators/autotest/data_G1SpeedAssert.csv diff --git a/generators/autotest/data_PID_inverter_current_A.csv b/module/generators/autotest/data_PID_inverter_current_A.csv similarity index 100% rename from generators/autotest/data_PID_inverter_current_A.csv rename to module/generators/autotest/data_PID_inverter_current_A.csv diff --git a/generators/autotest/data_PID_inverter_current_B.csv b/module/generators/autotest/data_PID_inverter_current_B.csv similarity index 100% rename from generators/autotest/data_PID_inverter_current_B.csv rename to module/generators/autotest/data_PID_inverter_current_B.csv diff --git a/generators/autotest/data_PID_inverter_current_C.csv b/module/generators/autotest/data_PID_inverter_current_C.csv similarity index 100% rename from generators/autotest/data_PID_inverter_current_C.csv rename to module/generators/autotest/data_PID_inverter_current_C.csv diff --git a/generators/autotest/data_PI_inverter_current_A.csv b/module/generators/autotest/data_PI_inverter_current_A.csv similarity index 100% rename from generators/autotest/data_PI_inverter_current_A.csv rename to module/generators/autotest/data_PI_inverter_current_A.csv diff --git a/generators/autotest/data_PI_inverter_current_B.csv b/module/generators/autotest/data_PI_inverter_current_B.csv similarity index 100% rename from generators/autotest/data_PI_inverter_current_B.csv rename to module/generators/autotest/data_PI_inverter_current_B.csv diff --git a/generators/autotest/data_PI_inverter_current_C.csv b/module/generators/autotest/data_PI_inverter_current_C.csv similarity index 100% rename from generators/autotest/data_PI_inverter_current_C.csv rename to module/generators/autotest/data_PI_inverter_current_C.csv diff --git a/generators/autotest/data_error_Bus1_voltageA.csv b/module/generators/autotest/data_error_Bus1_voltageA.csv similarity index 100% rename from generators/autotest/data_error_Bus1_voltageA.csv rename to module/generators/autotest/data_error_Bus1_voltageA.csv diff --git a/generators/autotest/data_error_G1SpeedAssert.csv b/module/generators/autotest/data_error_G1SpeedAssert.csv similarity index 100% rename from generators/autotest/data_error_G1SpeedAssert.csv rename to module/generators/autotest/data_error_G1SpeedAssert.csv diff --git a/generators/autotest/data_inv_voltage_player_A_test.csv b/module/generators/autotest/data_inv_voltage_player_A_test.csv similarity index 100% rename from generators/autotest/data_inv_voltage_player_A_test.csv rename to module/generators/autotest/data_inv_voltage_player_A_test.csv diff --git a/generators/autotest/data_inv_voltage_player_B_test.csv b/module/generators/autotest/data_inv_voltage_player_B_test.csv similarity index 100% rename from generators/autotest/data_inv_voltage_player_B_test.csv rename to module/generators/autotest/data_inv_voltage_player_B_test.csv diff --git a/generators/autotest/data_inv_voltage_player_C_test.csv b/module/generators/autotest/data_inv_voltage_player_C_test.csv similarity index 100% rename from generators/autotest/data_inv_voltage_player_C_test.csv rename to module/generators/autotest/data_inv_voltage_player_C_test.csv diff --git a/generators/autotest/default_solar_Insolation.player b/module/generators/autotest/default_solar_Insolation.player similarity index 100% rename from generators/autotest/default_solar_Insolation.player rename to module/generators/autotest/default_solar_Insolation.player diff --git a/generators/autotest/default_solar_VA_out.player b/module/generators/autotest/default_solar_VA_out.player similarity index 100% rename from generators/autotest/default_solar_VA_out.player rename to module/generators/autotest/default_solar_VA_out.player diff --git a/generators/autotest/diesel_brake_hp.player b/module/generators/autotest/diesel_brake_hp.player similarity index 100% rename from generators/autotest/diesel_brake_hp.player rename to module/generators/autotest/diesel_brake_hp.player diff --git a/generators/autotest/diesel_deltamode_load_player_A.csv b/module/generators/autotest/diesel_deltamode_load_player_A.csv similarity index 100% rename from generators/autotest/diesel_deltamode_load_player_A.csv rename to module/generators/autotest/diesel_deltamode_load_player_A.csv diff --git a/generators/autotest/diesel_deltamode_load_player_A_1Gen.player b/module/generators/autotest/diesel_deltamode_load_player_A_1Gen.player similarity index 100% rename from generators/autotest/diesel_deltamode_load_player_A_1Gen.player rename to module/generators/autotest/diesel_deltamode_load_player_A_1Gen.player diff --git a/generators/autotest/diesel_deltamode_load_player_A_1Gen_2.player b/module/generators/autotest/diesel_deltamode_load_player_A_1Gen_2.player similarity index 100% rename from generators/autotest/diesel_deltamode_load_player_A_1Gen_2.player rename to module/generators/autotest/diesel_deltamode_load_player_A_1Gen_2.player diff --git a/generators/autotest/diesel_deltamode_load_player_A_1Gen_3.player b/module/generators/autotest/diesel_deltamode_load_player_A_1Gen_3.player similarity index 100% rename from generators/autotest/diesel_deltamode_load_player_A_1Gen_3.player rename to module/generators/autotest/diesel_deltamode_load_player_A_1Gen_3.player diff --git a/generators/autotest/diesel_deltamode_load_player_B.csv b/module/generators/autotest/diesel_deltamode_load_player_B.csv similarity index 100% rename from generators/autotest/diesel_deltamode_load_player_B.csv rename to module/generators/autotest/diesel_deltamode_load_player_B.csv diff --git a/generators/autotest/diesel_deltamode_load_player_B_1Gen.player b/module/generators/autotest/diesel_deltamode_load_player_B_1Gen.player similarity index 100% rename from generators/autotest/diesel_deltamode_load_player_B_1Gen.player rename to module/generators/autotest/diesel_deltamode_load_player_B_1Gen.player diff --git a/generators/autotest/diesel_deltamode_load_player_B_1Gen_2.player b/module/generators/autotest/diesel_deltamode_load_player_B_1Gen_2.player similarity index 100% rename from generators/autotest/diesel_deltamode_load_player_B_1Gen_2.player rename to module/generators/autotest/diesel_deltamode_load_player_B_1Gen_2.player diff --git a/generators/autotest/diesel_deltamode_load_player_B_1Gen_3.player b/module/generators/autotest/diesel_deltamode_load_player_B_1Gen_3.player similarity index 100% rename from generators/autotest/diesel_deltamode_load_player_B_1Gen_3.player rename to module/generators/autotest/diesel_deltamode_load_player_B_1Gen_3.player diff --git a/generators/autotest/diesel_deltamode_load_player_C.csv b/module/generators/autotest/diesel_deltamode_load_player_C.csv similarity index 100% rename from generators/autotest/diesel_deltamode_load_player_C.csv rename to module/generators/autotest/diesel_deltamode_load_player_C.csv diff --git a/generators/autotest/diesel_deltamode_load_player_C_1Gen.player b/module/generators/autotest/diesel_deltamode_load_player_C_1Gen.player similarity index 100% rename from generators/autotest/diesel_deltamode_load_player_C_1Gen.player rename to module/generators/autotest/diesel_deltamode_load_player_C_1Gen.player diff --git a/generators/autotest/diesel_deltamode_load_player_C_1Gen_2.player b/module/generators/autotest/diesel_deltamode_load_player_C_1Gen_2.player similarity index 100% rename from generators/autotest/diesel_deltamode_load_player_C_1Gen_2.player rename to module/generators/autotest/diesel_deltamode_load_player_C_1Gen_2.player diff --git a/generators/autotest/diesel_deltamode_load_player_C_1Gen_3.player b/module/generators/autotest/diesel_deltamode_load_player_C_1Gen_3.player similarity index 100% rename from generators/autotest/diesel_deltamode_load_player_C_1Gen_3.player rename to module/generators/autotest/diesel_deltamode_load_player_C_1Gen_3.player diff --git a/generators/autotest/fixed_20_S_VA_out.player b/module/generators/autotest/fixed_20_S_VA_out.player similarity index 100% rename from generators/autotest/fixed_20_S_VA_out.player rename to module/generators/autotest/fixed_20_S_VA_out.player diff --git a/generators/autotest/fixed_45_E_VA_out.player b/module/generators/autotest/fixed_45_E_VA_out.player similarity index 100% rename from generators/autotest/fixed_45_E_VA_out.player rename to module/generators/autotest/fixed_45_E_VA_out.player diff --git a/generators/autotest/fixed_45_N_VA_out.player b/module/generators/autotest/fixed_45_N_VA_out.player similarity index 100% rename from generators/autotest/fixed_45_N_VA_out.player rename to module/generators/autotest/fixed_45_N_VA_out.player diff --git a/generators/autotest/fixed_45_S_Insolation.player b/module/generators/autotest/fixed_45_S_Insolation.player similarity index 100% rename from generators/autotest/fixed_45_S_Insolation.player rename to module/generators/autotest/fixed_45_S_Insolation.player diff --git a/generators/autotest/fixed_45_S_VA_out.player b/module/generators/autotest/fixed_45_S_VA_out.player similarity index 100% rename from generators/autotest/fixed_45_S_VA_out.player rename to module/generators/autotest/fixed_45_S_VA_out.player diff --git a/generators/autotest/fixed_45_S_shading_Insolation_15min.player b/module/generators/autotest/fixed_45_S_shading_Insolation_15min.player similarity index 100% rename from generators/autotest/fixed_45_S_shading_Insolation_15min.player rename to module/generators/autotest/fixed_45_S_shading_Insolation_15min.player diff --git a/generators/autotest/fixed_45_S_shading_VA_out_15min.player b/module/generators/autotest/fixed_45_S_shading_VA_out_15min.player similarity index 100% rename from generators/autotest/fixed_45_S_shading_VA_out_15min.player rename to module/generators/autotest/fixed_45_S_shading_VA_out_15min.player diff --git a/generators/autotest/fixed_45_W_VA_out.player b/module/generators/autotest/fixed_45_W_VA_out.player similarity index 100% rename from generators/autotest/fixed_45_W_VA_out.player rename to module/generators/autotest/fixed_45_W_VA_out.player diff --git a/generators/autotest/fixed_90_S_Insolation.player b/module/generators/autotest/fixed_90_S_Insolation.player similarity index 100% rename from generators/autotest/fixed_90_S_Insolation.player rename to module/generators/autotest/fixed_90_S_Insolation.player diff --git a/generators/autotest/fixed_90_S_VA_out.player b/module/generators/autotest/fixed_90_S_VA_out.player similarity index 100% rename from generators/autotest/fixed_90_S_VA_out.player rename to module/generators/autotest/fixed_90_S_VA_out.player diff --git a/generators/autotest/fqm_constant_pq_power.player b/module/generators/autotest/fqm_constant_pq_power.player similarity index 100% rename from generators/autotest/fqm_constant_pq_power.player rename to module/generators/autotest/fqm_constant_pq_power.player diff --git a/generators/autotest/fqm_constant_pq_soc.player b/module/generators/autotest/fqm_constant_pq_soc.player similarity index 100% rename from generators/autotest/fqm_constant_pq_soc.player rename to module/generators/autotest/fqm_constant_pq_soc.player diff --git a/generators/autotest/fqm_constant_pq_status.player b/module/generators/autotest/fqm_constant_pq_status.player similarity index 100% rename from generators/autotest/fqm_constant_pq_status.player rename to module/generators/autotest/fqm_constant_pq_status.player diff --git a/generators/autotest/fqm_group_lf_batt633_power.player b/module/generators/autotest/fqm_group_lf_batt633_power.player similarity index 100% rename from generators/autotest/fqm_group_lf_batt633_power.player rename to module/generators/autotest/fqm_group_lf_batt633_power.player diff --git a/generators/autotest/fqm_group_lf_batt684_power.player b/module/generators/autotest/fqm_group_lf_batt684_power.player similarity index 100% rename from generators/autotest/fqm_group_lf_batt684_power.player rename to module/generators/autotest/fqm_group_lf_batt684_power.player diff --git a/generators/autotest/fqm_group_lf_load.player b/module/generators/autotest/fqm_group_lf_load.player similarity index 100% rename from generators/autotest/fqm_group_lf_load.player rename to module/generators/autotest/fqm_group_lf_load.player diff --git a/generators/autotest/fqm_group_lf_status.player b/module/generators/autotest/fqm_group_lf_status.player similarity index 100% rename from generators/autotest/fqm_group_lf_status.player rename to module/generators/autotest/fqm_group_lf_status.player diff --git a/generators/autotest/fqm_pf_reg_load.player b/module/generators/autotest/fqm_pf_reg_load.player similarity index 100% rename from generators/autotest/fqm_pf_reg_load.player rename to module/generators/autotest/fqm_pf_reg_load.player diff --git a/generators/autotest/fqm_pf_reg_power.player b/module/generators/autotest/fqm_pf_reg_power.player similarity index 100% rename from generators/autotest/fqm_pf_reg_power.player rename to module/generators/autotest/fqm_pf_reg_power.player diff --git a/generators/autotest/fqm_pf_reg_status.player b/module/generators/autotest/fqm_pf_reg_status.player similarity index 100% rename from generators/autotest/fqm_pf_reg_status.player rename to module/generators/autotest/fqm_pf_reg_status.player diff --git a/generators/autotest/inv_loadflow_battery_soc_out.player b/module/generators/autotest/inv_loadflow_battery_soc_out.player similarity index 100% rename from generators/autotest/inv_loadflow_battery_soc_out.player rename to module/generators/autotest/inv_loadflow_battery_soc_out.player diff --git a/generators/autotest/inv_loadflow_meter_measured_power_imag.player b/module/generators/autotest/inv_loadflow_meter_measured_power_imag.player similarity index 100% rename from generators/autotest/inv_loadflow_meter_measured_power_imag.player rename to module/generators/autotest/inv_loadflow_meter_measured_power_imag.player diff --git a/generators/autotest/inv_loadflow_meter_measured_power_real.player b/module/generators/autotest/inv_loadflow_meter_measured_power_real.player similarity index 100% rename from generators/autotest/inv_loadflow_meter_measured_power_real.player rename to module/generators/autotest/inv_loadflow_meter_measured_power_real.player diff --git a/generators/autotest/inverter_VA_out_default_solar.player b/module/generators/autotest/inverter_VA_out_default_solar.player similarity index 100% rename from generators/autotest/inverter_VA_out_default_solar.player rename to module/generators/autotest/inverter_VA_out_default_solar.player diff --git a/generators/autotest/mltpt_efficiency_inverter_VA_out.player b/module/generators/autotest/mltpt_efficiency_inverter_VA_out.player similarity index 100% rename from generators/autotest/mltpt_efficiency_inverter_VA_out.player rename to module/generators/autotest/mltpt_efficiency_inverter_VA_out.player diff --git a/generators/autotest/solar_Vout.player b/module/generators/autotest/solar_Vout.player similarity index 100% rename from generators/autotest/solar_Vout.player rename to module/generators/autotest/solar_Vout.player diff --git a/generators/autotest/solar_playerval_VA_Out.player b/module/generators/autotest/solar_playerval_VA_Out.player similarity index 100% rename from generators/autotest/solar_playerval_VA_Out.player rename to module/generators/autotest/solar_playerval_VA_Out.player diff --git a/generators/autotest/substationSwitch_diesel_dg_speed.csv b/module/generators/autotest/substationSwitch_diesel_dg_speed.csv similarity index 100% rename from generators/autotest/substationSwitch_diesel_dg_speed.csv rename to module/generators/autotest/substationSwitch_diesel_dg_speed.csv diff --git a/generators/autotest/test_1_isochronous_VSI_1_droop_VSI_err.glm b/module/generators/autotest/test_1_isochronous_VSI_1_droop_VSI_err.glm similarity index 100% rename from generators/autotest/test_1_isochronous_VSI_1_droop_VSI_err.glm rename to module/generators/autotest/test_1_isochronous_VSI_1_droop_VSI_err.glm diff --git a/generators/autotest/test_1isochronous_VSI_err.glm b/module/generators/autotest/test_1isochronous_VSI_err.glm similarity index 100% rename from generators/autotest/test_1isochronous_VSI_err.glm rename to module/generators/autotest/test_1isochronous_VSI_err.glm diff --git a/generators/autotest/test_1isochronous_dg_1PQconstant_PV_err.glm b/module/generators/autotest/test_1isochronous_dg_1PQconstant_PV_err.glm similarity index 100% rename from generators/autotest/test_1isochronous_dg_1PQconstant_PV_err.glm rename to module/generators/autotest/test_1isochronous_dg_1PQconstant_PV_err.glm diff --git a/generators/autotest/test_1isochronous_dg_1PQconstant_battery_opt.glm b/module/generators/autotest/test_1isochronous_dg_1PQconstant_battery_opt.glm similarity index 100% rename from generators/autotest/test_1isochronous_dg_1PQconstant_battery_opt.glm rename to module/generators/autotest/test_1isochronous_dg_1PQconstant_battery_opt.glm diff --git a/generators/autotest/test_1isochronous_dg_1PQconstant_dg_err.glm b/module/generators/autotest/test_1isochronous_dg_1PQconstant_dg_err.glm similarity index 100% rename from generators/autotest/test_1isochronous_dg_1PQconstant_dg_err.glm rename to module/generators/autotest/test_1isochronous_dg_1PQconstant_dg_err.glm diff --git a/generators/autotest/test_1isochronous_dg_1Pconstant_Qdroop_PV_err.glm b/module/generators/autotest/test_1isochronous_dg_1Pconstant_Qdroop_PV_err.glm similarity index 100% rename from generators/autotest/test_1isochronous_dg_1Pconstant_Qdroop_PV_err.glm rename to module/generators/autotest/test_1isochronous_dg_1Pconstant_Qdroop_PV_err.glm diff --git a/generators/autotest/test_1isochronous_dg_1Pconstant_Qdroop_battery_opt.glm b/module/generators/autotest/test_1isochronous_dg_1Pconstant_Qdroop_battery_opt.glm similarity index 100% rename from generators/autotest/test_1isochronous_dg_1Pconstant_Qdroop_battery_opt.glm rename to module/generators/autotest/test_1isochronous_dg_1Pconstant_Qdroop_battery_opt.glm diff --git a/generators/autotest/test_1isochronous_dg_1Pconstant_Qdroop_dg_err.glm b/module/generators/autotest/test_1isochronous_dg_1Pconstant_Qdroop_dg_err.glm similarity index 100% rename from generators/autotest/test_1isochronous_dg_1Pconstant_Qdroop_dg_err.glm rename to module/generators/autotest/test_1isochronous_dg_1Pconstant_Qdroop_dg_err.glm diff --git a/generators/autotest/test_1isochronous_dg_1Pdroop_Qconstant_PV_opt.glm b/module/generators/autotest/test_1isochronous_dg_1Pdroop_Qconstant_PV_opt.glm similarity index 100% rename from generators/autotest/test_1isochronous_dg_1Pdroop_Qconstant_PV_opt.glm rename to module/generators/autotest/test_1isochronous_dg_1Pdroop_Qconstant_PV_opt.glm diff --git a/generators/autotest/test_1isochronous_dg_1Pdroop_Qconstant_battery_opt.glm b/module/generators/autotest/test_1isochronous_dg_1Pdroop_Qconstant_battery_opt.glm similarity index 100% rename from generators/autotest/test_1isochronous_dg_1Pdroop_Qconstant_battery_opt.glm rename to module/generators/autotest/test_1isochronous_dg_1Pdroop_Qconstant_battery_opt.glm diff --git a/generators/autotest/test_1isochronous_dg_1Pdroop_Qconstant_dg_opt.glm b/module/generators/autotest/test_1isochronous_dg_1Pdroop_Qconstant_dg_opt.glm similarity index 100% rename from generators/autotest/test_1isochronous_dg_1Pdroop_Qconstant_dg_opt.glm rename to module/generators/autotest/test_1isochronous_dg_1Pdroop_Qconstant_dg_opt.glm diff --git a/generators/autotest/test_2droop_VSI_err.glm b/module/generators/autotest/test_2droop_VSI_err.glm similarity index 100% rename from generators/autotest/test_2droop_VSI_err.glm rename to module/generators/autotest/test_2droop_VSI_err.glm diff --git a/generators/autotest/test_4quad_inv_modes_PF_PQ_default_efficiency.glm b/module/generators/autotest/test_4quad_inv_modes_PF_PQ_default_efficiency.glm similarity index 100% rename from generators/autotest/test_4quad_inv_modes_PF_PQ_default_efficiency.glm rename to module/generators/autotest/test_4quad_inv_modes_PF_PQ_default_efficiency.glm diff --git a/generators/autotest/test_4quad_inv_modes_PF_PQ_multipoint_efficiency.glm b/module/generators/autotest/test_4quad_inv_modes_PF_PQ_multipoint_efficiency.glm similarity index 100% rename from generators/autotest/test_4quad_inv_modes_PF_PQ_multipoint_efficiency.glm rename to module/generators/autotest/test_4quad_inv_modes_PF_PQ_multipoint_efficiency.glm diff --git a/generators/autotest/test_PMSG_windturb.glm b/module/generators/autotest/test_PMSG_windturb.glm similarity index 100% rename from generators/autotest/test_PMSG_windturb.glm rename to module/generators/autotest/test_PMSG_windturb.glm diff --git a/generators/autotest/test_Vout_PV.glm b/module/generators/autotest/test_Vout_PV.glm similarity index 100% rename from generators/autotest/test_Vout_PV.glm rename to module/generators/autotest/test_Vout_PV.glm diff --git a/generators/autotest/test_Vout_PV_solar_no_Parent.glm b/module/generators/autotest/test_Vout_PV_solar_no_Parent.glm similarity index 100% rename from generators/autotest/test_Vout_PV_solar_no_Parent.glm rename to module/generators/autotest/test_Vout_PV_solar_no_Parent.glm diff --git a/generators/autotest/test_central_dg_control.glm b/module/generators/autotest/test_central_dg_control.glm similarity index 100% rename from generators/autotest/test_central_dg_control.glm rename to module/generators/autotest/test_central_dg_control.glm diff --git a/generators/autotest/test_deltamode_diesel_dg_assert_err.glm b/module/generators/autotest/test_deltamode_diesel_dg_assert_err.glm similarity index 100% rename from generators/autotest/test_deltamode_diesel_dg_assert_err.glm rename to module/generators/autotest/test_deltamode_diesel_dg_assert_err.glm diff --git a/generators/autotest/test_deltamode_diesel_dg_assert_once_err.glm b/module/generators/autotest/test_deltamode_diesel_dg_assert_once_err.glm similarity index 100% rename from generators/autotest/test_deltamode_diesel_dg_assert_once_err.glm rename to module/generators/autotest/test_deltamode_diesel_dg_assert_once_err.glm diff --git a/generators/autotest/test_deltamode_diesel_dg_complex_err.glm b/module/generators/autotest/test_deltamode_diesel_dg_complex_err.glm similarity index 100% rename from generators/autotest/test_deltamode_diesel_dg_complex_err.glm rename to module/generators/autotest/test_deltamode_diesel_dg_complex_err.glm diff --git a/generators/autotest/test_deltamode_diesel_dg_double_err.glm b/module/generators/autotest/test_deltamode_diesel_dg_double_err.glm similarity index 100% rename from generators/autotest/test_deltamode_diesel_dg_double_err.glm rename to module/generators/autotest/test_deltamode_diesel_dg_double_err.glm diff --git a/generators/autotest/test_deltamode_diesel_dg_err.glm b/module/generators/autotest/test_deltamode_diesel_dg_err.glm similarity index 100% rename from generators/autotest/test_deltamode_diesel_dg_err.glm rename to module/generators/autotest/test_deltamode_diesel_dg_err.glm diff --git a/generators/autotest/test_deltamode_diesel_dg_pctests_err.glm b/module/generators/autotest/test_deltamode_diesel_dg_pctests_err.glm similarity index 100% rename from generators/autotest/test_deltamode_diesel_dg_pctests_err.glm rename to module/generators/autotest/test_deltamode_diesel_dg_pctests_err.glm diff --git a/generators/autotest/test_diesel_dg.glm b/module/generators/autotest/test_diesel_dg.glm similarity index 100% rename from generators/autotest/test_diesel_dg.glm rename to module/generators/autotest/test_diesel_dg.glm diff --git a/generators/autotest/test_fqm_constant_pq.glm b/module/generators/autotest/test_fqm_constant_pq.glm similarity index 100% rename from generators/autotest/test_fqm_constant_pq.glm rename to module/generators/autotest/test_fqm_constant_pq.glm diff --git a/generators/autotest/test_fqm_group_lf.glm b/module/generators/autotest/test_fqm_group_lf.glm similarity index 100% rename from generators/autotest/test_fqm_group_lf.glm rename to module/generators/autotest/test_fqm_group_lf.glm diff --git a/generators/autotest/test_fqm_pf_reg.glm b/module/generators/autotest/test_fqm_pf_reg.glm similarity index 100% rename from generators/autotest/test_fqm_pf_reg.glm rename to module/generators/autotest/test_fqm_pf_reg.glm diff --git a/generators/autotest/test_generators_inverter_volt_var.glm b/module/generators/autotest/test_generators_inverter_volt_var.glm similarity index 100% rename from generators/autotest/test_generators_inverter_volt_var.glm rename to module/generators/autotest/test_generators_inverter_volt_var.glm diff --git a/generators/autotest/test_generators_inverter_volt_var_voltageA.player b/module/generators/autotest/test_generators_inverter_volt_var_voltageA.player similarity index 100% rename from generators/autotest/test_generators_inverter_volt_var_voltageA.player rename to module/generators/autotest/test_generators_inverter_volt_var_voltageA.player diff --git a/generators/autotest/test_generators_inverter_volt_var_voltageB.player b/module/generators/autotest/test_generators_inverter_volt_var_voltageB.player similarity index 100% rename from generators/autotest/test_generators_inverter_volt_var_voltageB.player rename to module/generators/autotest/test_generators_inverter_volt_var_voltageB.player diff --git a/generators/autotest/test_generators_inverter_volt_var_voltageC.player b/module/generators/autotest/test_generators_inverter_volt_var_voltageC.player similarity index 100% rename from generators/autotest/test_generators_inverter_volt_var_voltageC.player rename to module/generators/autotest/test_generators_inverter_volt_var_voltageC.player diff --git a/generators/autotest/test_generators_inverter_vv_output_A.player b/module/generators/autotest/test_generators_inverter_vv_output_A.player similarity index 100% rename from generators/autotest/test_generators_inverter_vv_output_A.player rename to module/generators/autotest/test_generators_inverter_vv_output_A.player diff --git a/generators/autotest/test_generators_inverter_vv_output_B.player b/module/generators/autotest/test_generators_inverter_vv_output_B.player similarity index 100% rename from generators/autotest/test_generators_inverter_vv_output_B.player rename to module/generators/autotest/test_generators_inverter_vv_output_B.player diff --git a/generators/autotest/test_generators_inverter_vv_output_C.player b/module/generators/autotest/test_generators_inverter_vv_output_C.player similarity index 100% rename from generators/autotest/test_generators_inverter_vv_output_C.player rename to module/generators/autotest/test_generators_inverter_vv_output_C.player diff --git a/generators/autotest/test_inverter_PID_deltamode_err.glm b/module/generators/autotest/test_inverter_PID_deltamode_err.glm similarity index 100% rename from generators/autotest/test_inverter_PID_deltamode_err.glm rename to module/generators/autotest/test_inverter_PID_deltamode_err.glm diff --git a/generators/autotest/test_inverter_PI_deltamode_opt.glm b/module/generators/autotest/test_inverter_PI_deltamode_opt.glm similarity index 100% rename from generators/autotest/test_inverter_PI_deltamode_opt.glm rename to module/generators/autotest/test_inverter_PI_deltamode_opt.glm diff --git a/generators/autotest/test_inverter_loadfollow_FBS.glm b/module/generators/autotest/test_inverter_loadfollow_FBS.glm similarity index 100% rename from generators/autotest/test_inverter_loadfollow_FBS.glm rename to module/generators/autotest/test_inverter_loadfollow_FBS.glm diff --git a/generators/autotest/test_inverter_loadfollow_NR.glm b/module/generators/autotest/test_inverter_loadfollow_NR.glm similarity index 100% rename from generators/autotest/test_inverter_loadfollow_NR.glm rename to module/generators/autotest/test_inverter_loadfollow_NR.glm diff --git a/generators/autotest/test_multipoint_inverter.glm b/module/generators/autotest/test_multipoint_inverter.glm similarity index 100% rename from generators/autotest/test_multipoint_inverter.glm rename to module/generators/autotest/test_multipoint_inverter.glm diff --git a/generators/autotest/test_solar_climate_default_playerval.glm b/module/generators/autotest/test_solar_climate_default_playerval.glm similarity index 100% rename from generators/autotest/test_solar_climate_default_playerval.glm rename to module/generators/autotest/test_solar_climate_default_playerval.glm diff --git a/generators/autotest/test_solar_orientation.glm b/module/generators/autotest/test_solar_orientation.glm similarity index 100% rename from generators/autotest/test_solar_orientation.glm rename to module/generators/autotest/test_solar_orientation.glm diff --git a/generators/autotest/test_solar_output_efficiency.glm b/module/generators/autotest/test_solar_output_efficiency.glm similarity index 100% rename from generators/autotest/test_solar_output_efficiency.glm rename to module/generators/autotest/test_solar_output_efficiency.glm diff --git a/generators/autotest/test_solar_parent_err.glm b/module/generators/autotest/test_solar_parent_err.glm similarity index 100% rename from generators/autotest/test_solar_parent_err.glm rename to module/generators/autotest/test_solar_parent_err.glm diff --git a/generators/autotest/test_solar_shading.glm b/module/generators/autotest/test_solar_shading.glm similarity index 100% rename from generators/autotest/test_solar_shading.glm rename to module/generators/autotest/test_solar_shading.glm diff --git a/generators/autotest/test_solar_tilt.glm b/module/generators/autotest/test_solar_tilt.glm similarity index 100% rename from generators/autotest/test_solar_tilt.glm rename to module/generators/autotest/test_solar_tilt.glm diff --git a/generators/autotest/test_windturbine_FBS.glm b/module/generators/autotest/test_windturbine_FBS.glm similarity index 100% rename from generators/autotest/test_windturbine_FBS.glm rename to module/generators/autotest/test_windturbine_FBS.glm diff --git a/generators/autotest/test_windturbine_NR.glm b/module/generators/autotest/test_windturbine_NR.glm similarity index 100% rename from generators/autotest/test_windturbine_NR.glm rename to module/generators/autotest/test_windturbine_NR.glm diff --git a/generators/autotest/trigger.player b/module/generators/autotest/trigger.player similarity index 100% rename from generators/autotest/trigger.player rename to module/generators/autotest/trigger.player diff --git a/generators/autotest/windpower_assert.player b/module/generators/autotest/windpower_assert.player similarity index 100% rename from generators/autotest/windpower_assert.player rename to module/generators/autotest/windpower_assert.player diff --git a/generators/battery.cpp b/module/generators/battery.cpp similarity index 100% rename from generators/battery.cpp rename to module/generators/battery.cpp diff --git a/generators/battery.h b/module/generators/battery.h similarity index 100% rename from generators/battery.h rename to module/generators/battery.h diff --git a/generators/central_dg_control.cpp b/module/generators/central_dg_control.cpp similarity index 100% rename from generators/central_dg_control.cpp rename to module/generators/central_dg_control.cpp diff --git a/generators/central_dg_control.h b/module/generators/central_dg_control.h similarity index 100% rename from generators/central_dg_control.h rename to module/generators/central_dg_control.h diff --git a/generators/controller_dg.cpp b/module/generators/controller_dg.cpp similarity index 100% rename from generators/controller_dg.cpp rename to module/generators/controller_dg.cpp diff --git a/generators/controller_dg.h b/module/generators/controller_dg.h similarity index 100% rename from generators/controller_dg.h rename to module/generators/controller_dg.h diff --git a/generators/dc_dc_converter.cpp b/module/generators/dc_dc_converter.cpp similarity index 100% rename from generators/dc_dc_converter.cpp rename to module/generators/dc_dc_converter.cpp diff --git a/generators/dc_dc_converter.h b/module/generators/dc_dc_converter.h similarity index 100% rename from generators/dc_dc_converter.h rename to module/generators/dc_dc_converter.h diff --git a/generators/diesel_dg.cpp b/module/generators/diesel_dg.cpp similarity index 100% rename from generators/diesel_dg.cpp rename to module/generators/diesel_dg.cpp diff --git a/generators/diesel_dg.h b/module/generators/diesel_dg.h similarity index 100% rename from generators/diesel_dg.h rename to module/generators/diesel_dg.h diff --git a/generators/energy_storage.cpp b/module/generators/energy_storage.cpp similarity index 100% rename from generators/energy_storage.cpp rename to module/generators/energy_storage.cpp diff --git a/generators/energy_storage.h b/module/generators/energy_storage.h similarity index 100% rename from generators/energy_storage.h rename to module/generators/energy_storage.h diff --git a/generators/generators.h b/module/generators/generators.h similarity index 100% rename from generators/generators.h rename to module/generators/generators.h diff --git a/generators/generators.vcproj b/module/generators/generators.vcproj similarity index 100% rename from generators/generators.vcproj rename to module/generators/generators.vcproj diff --git a/generators/init.cpp b/module/generators/init.cpp similarity index 100% rename from generators/init.cpp rename to module/generators/init.cpp diff --git a/generators/inverter.cpp b/module/generators/inverter.cpp similarity index 100% rename from generators/inverter.cpp rename to module/generators/inverter.cpp diff --git a/generators/inverter.h b/module/generators/inverter.h similarity index 100% rename from generators/inverter.h rename to module/generators/inverter.h diff --git a/generators/main.cpp b/module/generators/main.cpp similarity index 100% rename from generators/main.cpp rename to module/generators/main.cpp diff --git a/generators/microturbine.cpp b/module/generators/microturbine.cpp similarity index 100% rename from generators/microturbine.cpp rename to module/generators/microturbine.cpp diff --git a/generators/microturbine.h b/module/generators/microturbine.h similarity index 100% rename from generators/microturbine.h rename to module/generators/microturbine.h diff --git a/generators/power_electronics.cpp b/module/generators/power_electronics.cpp similarity index 100% rename from generators/power_electronics.cpp rename to module/generators/power_electronics.cpp diff --git a/generators/power_electronics.h b/module/generators/power_electronics.h similarity index 100% rename from generators/power_electronics.h rename to module/generators/power_electronics.h diff --git a/generators/rectifier.cpp b/module/generators/rectifier.cpp similarity index 100% rename from generators/rectifier.cpp rename to module/generators/rectifier.cpp diff --git a/generators/rectifier.h b/module/generators/rectifier.h similarity index 100% rename from generators/rectifier.h rename to module/generators/rectifier.h diff --git a/generators/solar.cpp b/module/generators/solar.cpp similarity index 100% rename from generators/solar.cpp rename to module/generators/solar.cpp diff --git a/generators/solar.h b/module/generators/solar.h similarity index 100% rename from generators/solar.h rename to module/generators/solar.h diff --git a/generators/windturb_dg.cpp b/module/generators/windturb_dg.cpp similarity index 100% rename from generators/windturb_dg.cpp rename to module/generators/windturb_dg.cpp diff --git a/generators/windturb_dg.h b/module/generators/windturb_dg.h similarity index 100% rename from generators/windturb_dg.h rename to module/generators/windturb_dg.h diff --git a/module/industrial/Makefile.mk b/module/industrial/Makefile.mk new file mode 100644 index 000000000..e4d25c056 --- /dev/null +++ b/module/industrial/Makefile.mk @@ -0,0 +1,14 @@ +pkglib_LTLIBRARIES += module/industrial/industrial.la + +module_industrial_industrial_la_CPPFLAGS = +module_industrial_industrial_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_industrial_industrial_la_LDFLAGS = +module_industrial_industrial_la_LDFLAGS += $(AM_LDFLAGS) + +module_industrial_industrial_la_LIBADD = + +module_industrial_industrial_la_SOURCES = module/industrial/init.cpp +module_industrial_industrial_la_SOURCES += module/industrial/industrial.h module/industrial/industrial.cpp + +dist_pkgdata_DATA += module/industrial/naics_data_file.csv diff --git a/industrial/autotest/test_industrial.glm b/module/industrial/autotest/test_industrial.glm similarity index 100% rename from industrial/autotest/test_industrial.glm rename to module/industrial/autotest/test_industrial.glm diff --git a/industrial/autotest/test_industrial_variable.glm b/module/industrial/autotest/test_industrial_variable.glm similarity index 100% rename from industrial/autotest/test_industrial_variable.glm rename to module/industrial/autotest/test_industrial_variable.glm diff --git a/industrial/data/MECS2014_Table_11-1.xlsx b/module/industrial/data/MECS2014_Table_11-1.xlsx similarity index 100% rename from industrial/data/MECS2014_Table_11-1.xlsx rename to module/industrial/data/MECS2014_Table_11-1.xlsx diff --git a/industrial/data/MECS2014_Table_5-1.xlsx b/module/industrial/data/MECS2014_Table_5-1.xlsx similarity index 100% rename from industrial/data/MECS2014_Table_5-1.xlsx rename to module/industrial/data/MECS2014_Table_5-1.xlsx diff --git a/industrial/data/MECS2014_Table_9-1.xlsx b/module/industrial/data/MECS2014_Table_9-1.xlsx similarity index 100% rename from industrial/data/MECS2014_Table_9-1.xlsx rename to module/industrial/data/MECS2014_Table_9-1.xlsx diff --git a/industrial/data/config.py b/module/industrial/data/config.py similarity index 100% rename from industrial/data/config.py rename to module/industrial/data/config.py diff --git a/industrial/data/mecs.py b/module/industrial/data/mecs.py similarity index 100% rename from industrial/data/mecs.py rename to module/industrial/data/mecs.py diff --git a/industrial/data/mecs_data.csv b/module/industrial/data/mecs_data.csv similarity index 100% rename from industrial/data/mecs_data.csv rename to module/industrial/data/mecs_data.csv diff --git a/industrial/data/nerc_data.csv b/module/industrial/data/nerc_data.csv similarity index 100% rename from industrial/data/nerc_data.csv rename to module/industrial/data/nerc_data.csv diff --git a/industrial/industrial.cpp b/module/industrial/industrial.cpp similarity index 100% rename from industrial/industrial.cpp rename to module/industrial/industrial.cpp diff --git a/industrial/industrial.h b/module/industrial/industrial.h similarity index 100% rename from industrial/industrial.h rename to module/industrial/industrial.h diff --git a/industrial/init.cpp b/module/industrial/init.cpp similarity index 100% rename from industrial/init.cpp rename to module/industrial/init.cpp diff --git a/industrial/naics_data_file.csv b/module/industrial/naics_data_file.csv similarity index 100% rename from industrial/naics_data_file.csv rename to module/industrial/naics_data_file.csv diff --git a/module/influxdb/Makefile.mk b/module/influxdb/Makefile.mk new file mode 100644 index 000000000..8fc3d3ffa --- /dev/null +++ b/module/influxdb/Makefile.mk @@ -0,0 +1,20 @@ +pkglib_LTLIBRARIES += module/influxdb/influxdb.la + +module_influxdb_influxdb_la_CPPFLAGS = +module_influxdb_influxdb_la_CPPFLAGS += $(INFLUXDB_CPPFLAGS) +module_influxdb_influxdb_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_influxdb_influxdb_la_LDFLAGS = -lpthread -lcurl +module_influxdb_influxdb_la_LDFLAGS += $(INFLUXDB_LDFLAGS) +module_influxdb_influxdb_la_LDFLAGS += $(AM_LDFLAGS) + +module_influxdb_influxdb_la_LIBADD = +module_influxdb_influxdb_la_LIBADD += $(INFLUXDB_LIBS) + +module_influxdb_influxdb_la_SOURCES = +module_influxdb_influxdb_la_SOURCES += module/influxdb/collector.cpp module/influxdb/collector.h +module_influxdb_influxdb_la_SOURCES += module/influxdb/database.cpp module/influxdb/database.h +module_influxdb_influxdb_la_SOURCES += module/influxdb/influxdb.cpp module/influxdb/influxdb.h +module_influxdb_influxdb_la_SOURCES += module/influxdb/jsondata.h +module_influxdb_influxdb_la_SOURCES += module/influxdb/player.cpp module/influxdb/player.h +module_influxdb_influxdb_la_SOURCES += module/influxdb/recorder.cpp module/influxdb/recorder.h diff --git a/influxdb/autotest/test_local_database.glm b/module/influxdb/autotest/test_local_database.glm similarity index 100% rename from influxdb/autotest/test_local_database.glm rename to module/influxdb/autotest/test_local_database.glm diff --git a/influxdb/collector.cpp b/module/influxdb/collector.cpp similarity index 100% rename from influxdb/collector.cpp rename to module/influxdb/collector.cpp diff --git a/influxdb/collector.h b/module/influxdb/collector.h similarity index 100% rename from influxdb/collector.h rename to module/influxdb/collector.h diff --git a/influxdb/database.cpp b/module/influxdb/database.cpp similarity index 100% rename from influxdb/database.cpp rename to module/influxdb/database.cpp diff --git a/influxdb/database.h b/module/influxdb/database.h similarity index 100% rename from influxdb/database.h rename to module/influxdb/database.h diff --git a/influxdb/influxdb.cpp b/module/influxdb/influxdb.cpp similarity index 100% rename from influxdb/influxdb.cpp rename to module/influxdb/influxdb.cpp diff --git a/influxdb/influxdb.h b/module/influxdb/influxdb.h similarity index 100% rename from influxdb/influxdb.h rename to module/influxdb/influxdb.h diff --git a/influxdb/jsondata.h b/module/influxdb/jsondata.h similarity index 100% rename from influxdb/jsondata.h rename to module/influxdb/jsondata.h diff --git a/influxdb/player.cpp b/module/influxdb/player.cpp similarity index 100% rename from influxdb/player.cpp rename to module/influxdb/player.cpp diff --git a/influxdb/player.h b/module/influxdb/player.h similarity index 100% rename from influxdb/player.h rename to module/influxdb/player.h diff --git a/influxdb/recorder.cpp b/module/influxdb/recorder.cpp similarity index 100% rename from influxdb/recorder.cpp rename to module/influxdb/recorder.cpp diff --git a/influxdb/recorder.h b/module/influxdb/recorder.h similarity index 100% rename from influxdb/recorder.h rename to module/influxdb/recorder.h diff --git a/influxdb/validate.no b/module/influxdb/validate.no similarity index 100% rename from influxdb/validate.no rename to module/influxdb/validate.no diff --git a/module/market/Makefile.mk b/module/market/Makefile.mk new file mode 100644 index 000000000..4824f87b6 --- /dev/null +++ b/module/market/Makefile.mk @@ -0,0 +1,36 @@ +pkglib_LTLIBRARIES += module/market/market.la + +module_market_market_la_CPPFLAGS = +module_market_market_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_market_market_la_LDFLAGS = +module_market_market_la_LDFLAGS += $(AM_LDFLAGS) + +module_market_market_la_LIBADD = + +module_market_market_la_SOURCES = +module_market_market_la_SOURCES += module/market/auction.cpp +module_market_market_la_SOURCES += module/market/auction.h +module_market_market_la_SOURCES += module/market/bid.cpp +module_market_market_la_SOURCES += module/market/bid.h +module_market_market_la_SOURCES += module/market/collect.cpp +module_market_market_la_SOURCES += module/market/collect.h +module_market_market_la_SOURCES += module/market/controller.cpp +module_market_market_la_SOURCES += module/market/controller.h +module_market_market_la_SOURCES += module/market/curve.cpp +module_market_market_la_SOURCES += module/market/curve.h +module_market_market_la_SOURCES += module/market/double_controller.cpp +module_market_market_la_SOURCES += module/market/double_controller.h +module_market_market_la_SOURCES += module/market/generator_controller.cpp +module_market_market_la_SOURCES += module/market/generator_controller.h +module_market_market_la_SOURCES += module/market/init.cpp +module_market_market_la_SOURCES += module/market/main.cpp +module_market_market_la_SOURCES += module/market/market.h +module_market_market_la_SOURCES += module/market/passive_controller.cpp +module_market_market_la_SOURCES += module/market/passive_controller.h +module_market_market_la_SOURCES += module/market/stub_bidder.cpp +module_market_market_la_SOURCES += module/market/stub_bidder.h +module_market_market_la_SOURCES += module/market/stubauction.cpp +module_market_market_la_SOURCES += module/market/stubauction.h +module_market_market_la_SOURCES += module/market/supervisory_control.cpp +module_market_market_la_SOURCES += module/market/supervisory_control.h diff --git a/market/auction.cpp b/module/market/auction.cpp similarity index 100% rename from market/auction.cpp rename to module/market/auction.cpp diff --git a/market/auction.h b/module/market/auction.h similarity index 100% rename from market/auction.h rename to module/market/auction.h diff --git a/market/autotest/ColumbusWeather2009_Correct.csv b/module/market/autotest/ColumbusWeather2009_Correct.csv similarity index 100% rename from market/autotest/ColumbusWeather2009_Correct.csv rename to module/market/autotest/ColumbusWeather2009_Correct.csv diff --git a/market/autotest/Elasticity_Multiplier_Critical_With_Two_TierCPP.player b/module/market/autotest/Elasticity_Multiplier_Critical_With_Two_TierCPP.player similarity index 100% rename from market/autotest/Elasticity_Multiplier_Critical_With_Two_TierCPP.player rename to module/market/autotest/Elasticity_Multiplier_Critical_With_Two_TierCPP.player diff --git a/market/autotest/Elasticity_Multiplier_NonCritical_With_Three_TierCPP.player b/module/market/autotest/Elasticity_Multiplier_NonCritical_With_Three_TierCPP.player similarity index 100% rename from market/autotest/Elasticity_Multiplier_NonCritical_With_Three_TierCPP.player rename to module/market/autotest/Elasticity_Multiplier_NonCritical_With_Three_TierCPP.player diff --git a/market/autotest/Elasticity_Multiplier_NonCritical_With_Two_TierCPP.player b/module/market/autotest/Elasticity_Multiplier_NonCritical_With_Two_TierCPP.player similarity index 100% rename from market/autotest/Elasticity_Multiplier_NonCritical_With_Two_TierCPP.player rename to module/market/autotest/Elasticity_Multiplier_NonCritical_With_Two_TierCPP.player diff --git a/market/autotest/Elasticity_Multiplier_Three_Tier_Price.player b/module/market/autotest/Elasticity_Multiplier_Three_Tier_Price.player similarity index 100% rename from market/autotest/Elasticity_Multiplier_Three_Tier_Price.player rename to module/market/autotest/Elasticity_Multiplier_Three_Tier_Price.player diff --git a/market/autotest/Elasticity_Multiplier_Two_Tier_Price.player b/module/market/autotest/Elasticity_Multiplier_Two_Tier_Price.player similarity index 100% rename from market/autotest/Elasticity_Multiplier_Two_Tier_Price.player rename to module/market/autotest/Elasticity_Multiplier_Two_Tier_Price.player diff --git a/market/autotest/Price_Changing.player b/module/market/autotest/Price_Changing.player similarity index 100% rename from market/autotest/Price_Changing.player rename to module/market/autotest/Price_Changing.player diff --git a/market/autotest/Price_Static.player b/module/market/autotest/Price_Static.player similarity index 100% rename from market/autotest/Price_Static.player rename to module/market/autotest/Price_Static.player diff --git a/market/autotest/TOU_Pricing.player b/module/market/autotest/TOU_Pricing.player similarity index 100% rename from market/autotest/TOU_Pricing.player rename to module/market/autotest/TOU_Pricing.player diff --git a/market/autotest/TOU_Pricing_2Tier_OnlyCritical.glm b/module/market/autotest/TOU_Pricing_2Tier_OnlyCritical.glm similarity index 100% rename from market/autotest/TOU_Pricing_2Tier_OnlyCritical.glm rename to module/market/autotest/TOU_Pricing_2Tier_OnlyCritical.glm diff --git a/market/autotest/TOU_Pricing_2Tier_OnlyCritical.player b/module/market/autotest/TOU_Pricing_2Tier_OnlyCritical.player similarity index 100% rename from market/autotest/TOU_Pricing_2Tier_OnlyCritical.player rename to module/market/autotest/TOU_Pricing_2Tier_OnlyCritical.player diff --git a/market/autotest/TOU_Pricing_2Tier_OnlyHigh.player b/module/market/autotest/TOU_Pricing_2Tier_OnlyHigh.player similarity index 100% rename from market/autotest/TOU_Pricing_2Tier_OnlyHigh.player rename to module/market/autotest/TOU_Pricing_2Tier_OnlyHigh.player diff --git a/market/autotest/TOU_Pricing_3Tier.player b/module/market/autotest/TOU_Pricing_3Tier.player similarity index 100% rename from market/autotest/TOU_Pricing_3Tier.player rename to module/market/autotest/TOU_Pricing_3Tier.player diff --git a/market/autotest/appliance_schedules.glm b/module/market/autotest/appliance_schedules.glm similarity index 100% rename from market/autotest/appliance_schedules.glm rename to module/market/autotest/appliance_schedules.glm diff --git a/market/autotest/dutycycle_CPP_player.player b/module/market/autotest/dutycycle_CPP_player.player similarity index 100% rename from market/autotest/dutycycle_CPP_player.player rename to module/market/autotest/dutycycle_CPP_player.player diff --git a/market/autotest/dutycycle_TOU_player.player b/module/market/autotest/dutycycle_TOU_player.player similarity index 100% rename from market/autotest/dutycycle_TOU_player.player rename to module/market/autotest/dutycycle_TOU_player.player diff --git a/market/autotest/lastP_static.player b/module/market/autotest/lastP_static.player similarity index 100% rename from market/autotest/lastP_static.player rename to module/market/autotest/lastP_static.player diff --git a/market/autotest/negative_price_bids.player b/module/market/autotest/negative_price_bids.player similarity index 100% rename from market/autotest/negative_price_bids.player rename to module/market/autotest/negative_price_bids.player diff --git a/market/autotest/negative_quantity_bids.player b/module/market/autotest/negative_quantity_bids.player similarity index 100% rename from market/autotest/negative_quantity_bids.player rename to module/market/autotest/negative_quantity_bids.player diff --git a/market/autotest/repeated_bids.player b/module/market/autotest/repeated_bids.player similarity index 100% rename from market/autotest/repeated_bids.player rename to module/market/autotest/repeated_bids.player diff --git a/market/autotest/test_Zip_Load_Elasticity_Model_Critical_Three_Tier_Price.glm b/module/market/autotest/test_Zip_Load_Elasticity_Model_Critical_Three_Tier_Price.glm similarity index 100% rename from market/autotest/test_Zip_Load_Elasticity_Model_Critical_Three_Tier_Price.glm rename to module/market/autotest/test_Zip_Load_Elasticity_Model_Critical_Three_Tier_Price.glm diff --git a/market/autotest/test_Zip_Load_Elasticity_Model_Critical_Two_Tier_Price.glm b/module/market/autotest/test_Zip_Load_Elasticity_Model_Critical_Two_Tier_Price.glm similarity index 100% rename from market/autotest/test_Zip_Load_Elasticity_Model_Critical_Two_Tier_Price.glm rename to module/market/autotest/test_Zip_Load_Elasticity_Model_Critical_Two_Tier_Price.glm diff --git a/market/autotest/test_Zip_Load_Elasticity_Model_NonCritical_With_Three_TierCPP.glm b/module/market/autotest/test_Zip_Load_Elasticity_Model_NonCritical_With_Three_TierCPP.glm similarity index 100% rename from market/autotest/test_Zip_Load_Elasticity_Model_NonCritical_With_Three_TierCPP.glm rename to module/market/autotest/test_Zip_Load_Elasticity_Model_NonCritical_With_Three_TierCPP.glm diff --git a/market/autotest/test_Zip_Load_Elasticity_Model_NonCritical_With_Two_TierCPP.glm b/module/market/autotest/test_Zip_Load_Elasticity_Model_NonCritical_With_Two_TierCPP.glm similarity index 100% rename from market/autotest/test_Zip_Load_Elasticity_Model_NonCritical_With_Two_TierCPP.glm rename to module/market/autotest/test_Zip_Load_Elasticity_Model_NonCritical_With_Two_TierCPP.glm diff --git a/market/autotest/test_controller_override.glm b/module/market/autotest/test_controller_override.glm similarity index 100% rename from market/autotest/test_controller_override.glm rename to module/market/autotest/test_controller_override.glm diff --git a/market/autotest/test_controller_override_is_COOL_on.player b/module/market/autotest/test_controller_override_is_COOL_on.player similarity index 100% rename from market/autotest/test_controller_override_is_COOL_on.player rename to module/market/autotest/test_controller_override_is_COOL_on.player diff --git a/market/autotest/test_controller_override_value.player b/module/market/autotest/test_controller_override_value.player similarity index 100% rename from market/autotest/test_controller_override_value.player rename to module/market/autotest/test_controller_override_value.player diff --git a/market/autotest/test_dutycycle_CPP.glm b/module/market/autotest/test_dutycycle_CPP.glm similarity index 100% rename from market/autotest/test_dutycycle_CPP.glm rename to module/market/autotest/test_dutycycle_CPP.glm diff --git a/market/autotest/test_dutycycle_TOU.glm b/module/market/autotest/test_dutycycle_TOU.glm similarity index 100% rename from market/autotest/test_dutycycle_TOU.glm rename to module/market/autotest/test_dutycycle_TOU.glm diff --git a/market/autotest/test_market_auction_advanced_1.glm b/module/market/autotest/test_market_auction_advanced_1.glm similarity index 100% rename from market/autotest/test_market_auction_advanced_1.glm rename to module/market/autotest/test_market_auction_advanced_1.glm diff --git a/market/autotest/test_market_auction_clearing_3.glm b/module/market/autotest/test_market_auction_clearing_3.glm similarity index 100% rename from market/autotest/test_market_auction_clearing_3.glm rename to module/market/autotest/test_market_auction_clearing_3.glm diff --git a/market/autotest/test_market_auction_clearing_6_morebuyers.glm b/module/market/autotest/test_market_auction_clearing_6_morebuyers.glm similarity index 100% rename from market/autotest/test_market_auction_clearing_6_morebuyers.glm rename to module/market/autotest/test_market_auction_clearing_6_morebuyers.glm diff --git a/market/autotest/test_market_auction_clearing_6_moresellers.glm b/module/market/autotest/test_market_auction_clearing_6_moresellers.glm similarity index 100% rename from market/autotest/test_market_auction_clearing_6_moresellers.glm rename to module/market/autotest/test_market_auction_clearing_6_moresellers.glm diff --git a/market/autotest/test_market_auction_timing_1.glm b/module/market/autotest/test_market_auction_timing_1.glm similarity index 100% rename from market/autotest/test_market_auction_timing_1.glm rename to module/market/autotest/test_market_auction_timing_1.glm diff --git a/market/autotest/test_market_auction_timing_2.glm b/module/market/autotest/test_market_auction_timing_2.glm similarity index 100% rename from market/autotest/test_market_auction_timing_2.glm rename to module/market/autotest/test_market_auction_timing_2.glm diff --git a/market/autotest/test_market_auction_timing_4.glm b/module/market/autotest/test_market_auction_timing_4.glm similarity index 100% rename from market/autotest/test_market_auction_timing_4.glm rename to module/market/autotest/test_market_auction_timing_4.glm diff --git a/market/autotest/test_market_auction_timing_5.glm b/module/market/autotest/test_market_auction_timing_5.glm similarity index 100% rename from market/autotest/test_market_auction_timing_5.glm rename to module/market/autotest/test_market_auction_timing_5.glm diff --git a/market/autotest/test_market_exercise_4_4_1.glm b/module/market/autotest/test_market_exercise_4_4_1.glm similarity index 100% rename from market/autotest/test_market_exercise_4_4_1.glm rename to module/market/autotest/test_market_exercise_4_4_1.glm diff --git a/market/autotest/test_market_passive_controller_RAMP_mode_matching_period.glm b/module/market/autotest/test_market_passive_controller_RAMP_mode_matching_period.glm similarity index 100% rename from market/autotest/test_market_passive_controller_RAMP_mode_matching_period.glm rename to module/market/autotest/test_market_passive_controller_RAMP_mode_matching_period.glm diff --git a/market/autotest/test_market_passive_controller_RAMP_mode_nonmatching_period.glm b/module/market/autotest/test_market_passive_controller_RAMP_mode_nonmatching_period.glm similarity index 100% rename from market/autotest/test_market_passive_controller_RAMP_mode_nonmatching_period.glm rename to module/market/autotest/test_market_passive_controller_RAMP_mode_nonmatching_period.glm diff --git a/market/autotest/test_market_quantity_conversion.glm b/module/market/autotest/test_market_quantity_conversion.glm similarity index 100% rename from market/autotest/test_market_quantity_conversion.glm rename to module/market/autotest/test_market_quantity_conversion.glm diff --git a/market/autotest/test_markets_auction_buyer_rebid.glm b/module/market/autotest/test_markets_auction_buyer_rebid.glm similarity index 100% rename from market/autotest/test_markets_auction_buyer_rebid.glm rename to module/market/autotest/test_markets_auction_buyer_rebid.glm diff --git a/market/autotest/test_markets_auction_buyer_seller_alt.glm b/module/market/autotest/test_markets_auction_buyer_seller_alt.glm similarity index 100% rename from market/autotest/test_markets_auction_buyer_seller_alt.glm rename to module/market/autotest/test_markets_auction_buyer_seller_alt.glm diff --git a/market/autotest/test_markets_auction_buyers_first.glm b/module/market/autotest/test_markets_auction_buyers_first.glm similarity index 100% rename from market/autotest/test_markets_auction_buyers_first.glm rename to module/market/autotest/test_markets_auction_buyers_first.glm diff --git a/market/autotest/test_markets_auction_cases_4_and_5.glm b/module/market/autotest/test_markets_auction_cases_4_and_5.glm similarity index 100% rename from market/autotest/test_markets_auction_cases_4_and_5.glm rename to module/market/autotest/test_markets_auction_cases_4_and_5.glm diff --git a/market/autotest/test_markets_auction_large_balanced_exact.glm b/module/market/autotest/test_markets_auction_large_balanced_exact.glm similarity index 100% rename from market/autotest/test_markets_auction_large_balanced_exact.glm rename to module/market/autotest/test_markets_auction_large_balanced_exact.glm diff --git a/market/autotest/test_markets_auction_large_unbalanced_bid_resubmissions.glm b/module/market/autotest/test_markets_auction_large_unbalanced_bid_resubmissions.glm similarity index 100% rename from market/autotest/test_markets_auction_large_unbalanced_bid_resubmissions.glm rename to module/market/autotest/test_markets_auction_large_unbalanced_bid_resubmissions.glm diff --git a/market/autotest/test_markets_auction_large_unbalanced_exact.glm b/module/market/autotest/test_markets_auction_large_unbalanced_exact.glm similarity index 100% rename from market/autotest/test_markets_auction_large_unbalanced_exact.glm rename to module/market/autotest/test_markets_auction_large_unbalanced_exact.glm diff --git a/market/autotest/test_markets_auction_large_unbalanced_failure.glm b/module/market/autotest/test_markets_auction_large_unbalanced_failure.glm similarity index 100% rename from market/autotest/test_markets_auction_large_unbalanced_failure.glm rename to module/market/autotest/test_markets_auction_large_unbalanced_failure.glm diff --git a/market/autotest/test_markets_auction_large_unbalanced_marginal_buyer.glm b/module/market/autotest/test_markets_auction_large_unbalanced_marginal_buyer.glm similarity index 100% rename from market/autotest/test_markets_auction_large_unbalanced_marginal_buyer.glm rename to module/market/autotest/test_markets_auction_large_unbalanced_marginal_buyer.glm diff --git a/market/autotest/test_markets_auction_large_unbalanced_marginal_price.glm b/module/market/autotest/test_markets_auction_large_unbalanced_marginal_price.glm similarity index 100% rename from market/autotest/test_markets_auction_large_unbalanced_marginal_price.glm rename to module/market/autotest/test_markets_auction_large_unbalanced_marginal_price.glm diff --git a/market/autotest/test_markets_auction_large_unbalanced_marginal_seller.glm b/module/market/autotest/test_markets_auction_large_unbalanced_marginal_seller.glm similarity index 100% rename from market/autotest/test_markets_auction_large_unbalanced_marginal_seller.glm rename to module/market/autotest/test_markets_auction_large_unbalanced_marginal_seller.glm diff --git a/market/autotest/test_markets_auction_large_unbalanced_no_buyers_null.glm b/module/market/autotest/test_markets_auction_large_unbalanced_no_buyers_null.glm similarity index 100% rename from market/autotest/test_markets_auction_large_unbalanced_no_buyers_null.glm rename to module/market/autotest/test_markets_auction_large_unbalanced_no_buyers_null.glm diff --git a/market/autotest/test_markets_auction_large_unbalanced_no_sellers_null.glm b/module/market/autotest/test_markets_auction_large_unbalanced_no_sellers_null.glm similarity index 100% rename from market/autotest/test_markets_auction_large_unbalanced_no_sellers_null.glm rename to module/market/autotest/test_markets_auction_large_unbalanced_no_sellers_null.glm diff --git a/market/autotest/test_markets_auction_large_unbalanced_null.glm b/module/market/autotest/test_markets_auction_large_unbalanced_null.glm similarity index 100% rename from market/autotest/test_markets_auction_large_unbalanced_null.glm rename to module/market/autotest/test_markets_auction_large_unbalanced_null.glm diff --git a/market/autotest/test_markets_auction_negative_all_quantities.glm b/module/market/autotest/test_markets_auction_negative_all_quantities.glm similarity index 100% rename from market/autotest/test_markets_auction_negative_all_quantities.glm rename to module/market/autotest/test_markets_auction_negative_all_quantities.glm diff --git a/market/autotest/test_markets_auction_negative_buyer_and_seller_price.glm b/module/market/autotest/test_markets_auction_negative_buyer_and_seller_price.glm similarity index 100% rename from market/autotest/test_markets_auction_negative_buyer_and_seller_price.glm rename to module/market/autotest/test_markets_auction_negative_buyer_and_seller_price.glm diff --git a/market/autotest/test_markets_auction_negative_buyer_price.glm b/module/market/autotest/test_markets_auction_negative_buyer_price.glm similarity index 100% rename from market/autotest/test_markets_auction_negative_buyer_price.glm rename to module/market/autotest/test_markets_auction_negative_buyer_price.glm diff --git a/market/autotest/test_markets_auction_negative_buyer_quantity.glm b/module/market/autotest/test_markets_auction_negative_buyer_quantity.glm similarity index 100% rename from market/autotest/test_markets_auction_negative_buyer_quantity.glm rename to module/market/autotest/test_markets_auction_negative_buyer_quantity.glm diff --git a/market/autotest/test_markets_auction_negative_price_bids.glm b/module/market/autotest/test_markets_auction_negative_price_bids.glm similarity index 100% rename from market/autotest/test_markets_auction_negative_price_bids.glm rename to module/market/autotest/test_markets_auction_negative_price_bids.glm diff --git a/market/autotest/test_markets_auction_negative_quantity_bids.glm b/module/market/autotest/test_markets_auction_negative_quantity_bids.glm similarity index 100% rename from market/autotest/test_markets_auction_negative_quantity_bids.glm rename to module/market/autotest/test_markets_auction_negative_quantity_bids.glm diff --git a/market/autotest/test_markets_auction_negative_seller_price.glm b/module/market/autotest/test_markets_auction_negative_seller_price.glm similarity index 100% rename from market/autotest/test_markets_auction_negative_seller_price.glm rename to module/market/autotest/test_markets_auction_negative_seller_price.glm diff --git a/market/autotest/test_markets_auction_negative_seller_quantity.glm b/module/market/autotest/test_markets_auction_negative_seller_quantity.glm similarity index 100% rename from market/autotest/test_markets_auction_negative_seller_quantity.glm rename to module/market/autotest/test_markets_auction_negative_seller_quantity.glm diff --git a/market/autotest/test_markets_auction_no_buyers.glm b/module/market/autotest/test_markets_auction_no_buyers.glm similarity index 100% rename from market/autotest/test_markets_auction_no_buyers.glm rename to module/market/autotest/test_markets_auction_no_buyers.glm diff --git a/market/autotest/test_markets_auction_no_sellers.glm b/module/market/autotest/test_markets_auction_no_sellers.glm similarity index 100% rename from market/autotest/test_markets_auction_no_sellers.glm rename to module/market/autotest/test_markets_auction_no_sellers.glm diff --git a/market/autotest/test_markets_auction_null_market.glm b/module/market/autotest/test_markets_auction_null_market.glm similarity index 100% rename from market/autotest/test_markets_auction_null_market.glm rename to module/market/autotest/test_markets_auction_null_market.glm diff --git a/market/autotest/test_markets_auction_repeated_bids.glm b/module/market/autotest/test_markets_auction_repeated_bids.glm similarity index 100% rename from market/autotest/test_markets_auction_repeated_bids.glm rename to module/market/autotest/test_markets_auction_repeated_bids.glm diff --git a/market/autotest/test_markets_auction_seller_buyer_alt.glm b/module/market/autotest/test_markets_auction_seller_buyer_alt.glm similarity index 100% rename from market/autotest/test_markets_auction_seller_buyer_alt.glm rename to module/market/autotest/test_markets_auction_seller_buyer_alt.glm diff --git a/market/autotest/test_markets_auction_seller_rebid.glm b/module/market/autotest/test_markets_auction_seller_rebid.glm similarity index 100% rename from market/autotest/test_markets_auction_seller_rebid.glm rename to module/market/autotest/test_markets_auction_seller_rebid.glm diff --git a/market/autotest/test_markets_auction_sellers_first.glm b/module/market/autotest/test_markets_auction_sellers_first.glm similarity index 100% rename from market/autotest/test_markets_auction_sellers_first.glm rename to module/market/autotest/test_markets_auction_sellers_first.glm diff --git a/market/autotest/test_markets_auction_simultaneous.glm b/module/market/autotest/test_markets_auction_simultaneous.glm similarity index 100% rename from market/autotest/test_markets_auction_simultaneous.glm rename to module/market/autotest/test_markets_auction_simultaneous.glm diff --git a/market/autotest/test_markets_auction_unresponsive_buyer_failure.glm b/module/market/autotest/test_markets_auction_unresponsive_buyer_failure.glm similarity index 100% rename from market/autotest/test_markets_auction_unresponsive_buyer_failure.glm rename to module/market/autotest/test_markets_auction_unresponsive_buyer_failure.glm diff --git a/market/autotest/test_markets_controller_cooling_deadband_matching_period.glm b/module/market/autotest/test_markets_controller_cooling_deadband_matching_period.glm similarity index 100% rename from market/autotest/test_markets_controller_cooling_deadband_matching_period.glm rename to module/market/autotest/test_markets_controller_cooling_deadband_matching_period.glm diff --git a/market/autotest/test_markets_controller_cooling_inelastic_double.glm b/module/market/autotest/test_markets_controller_cooling_inelastic_double.glm similarity index 100% rename from market/autotest/test_markets_controller_cooling_inelastic_double.glm rename to module/market/autotest/test_markets_controller_cooling_inelastic_double.glm diff --git a/market/autotest/test_markets_controller_cooling_inelastic_matching_period.glm b/module/market/autotest/test_markets_controller_cooling_inelastic_matching_period.glm similarity index 100% rename from market/autotest/test_markets_controller_cooling_inelastic_matching_period.glm rename to module/market/autotest/test_markets_controller_cooling_inelastic_matching_period.glm diff --git a/market/autotest/test_markets_controller_cooling_inelastic_nonmatching_periods.glm b/module/market/autotest/test_markets_controller_cooling_inelastic_nonmatching_periods.glm similarity index 100% rename from market/autotest/test_markets_controller_cooling_inelastic_nonmatching_periods.glm rename to module/market/autotest/test_markets_controller_cooling_inelastic_nonmatching_periods.glm diff --git a/market/autotest/test_markets_controller_heating_deadband_matching_period.glm b/module/market/autotest/test_markets_controller_heating_deadband_matching_period.glm similarity index 100% rename from market/autotest/test_markets_controller_heating_deadband_matching_period.glm rename to module/market/autotest/test_markets_controller_heating_deadband_matching_period.glm diff --git a/market/autotest/test_markets_controller_heating_inelastic_double.glm b/module/market/autotest/test_markets_controller_heating_inelastic_double.glm similarity index 100% rename from market/autotest/test_markets_controller_heating_inelastic_double.glm rename to module/market/autotest/test_markets_controller_heating_inelastic_double.glm diff --git a/market/autotest/test_markets_controller_heating_inelastic_matching_period.glm b/module/market/autotest/test_markets_controller_heating_inelastic_matching_period.glm similarity index 100% rename from market/autotest/test_markets_controller_heating_inelastic_matching_period.glm rename to module/market/autotest/test_markets_controller_heating_inelastic_matching_period.glm diff --git a/market/autotest/test_markets_controller_heating_inelastic_nonmatching_period.glm b/module/market/autotest/test_markets_controller_heating_inelastic_nonmatching_period.glm similarity index 100% rename from market/autotest/test_markets_controller_heating_inelastic_nonmatching_period.glm rename to module/market/autotest/test_markets_controller_heating_inelastic_nonmatching_period.glm diff --git a/market/autotest/test_markets_stubauction_opt.glm b/module/market/autotest/test_markets_stubauction_opt.glm similarity index 100% rename from market/autotest/test_markets_stubauction_opt.glm rename to module/market/autotest/test_markets_stubauction_opt.glm diff --git a/market/autotest/test_opt_markets_auction_large_balanced_marginal_buyer.glm b/module/market/autotest/test_opt_markets_auction_large_balanced_marginal_buyer.glm similarity index 100% rename from market/autotest/test_opt_markets_auction_large_balanced_marginal_buyer.glm rename to module/market/autotest/test_opt_markets_auction_large_balanced_marginal_buyer.glm diff --git a/market/autotest/test_opt_markets_auction_large_balanced_marginal_price.glm b/module/market/autotest/test_opt_markets_auction_large_balanced_marginal_price.glm similarity index 100% rename from market/autotest/test_opt_markets_auction_large_balanced_marginal_price.glm rename to module/market/autotest/test_opt_markets_auction_large_balanced_marginal_price.glm diff --git a/market/autotest/test_opt_markets_auction_large_balanced_marginal_seller.glm b/module/market/autotest/test_opt_markets_auction_large_balanced_marginal_seller.glm similarity index 100% rename from market/autotest/test_opt_markets_auction_large_balanced_marginal_seller.glm rename to module/market/autotest/test_opt_markets_auction_large_balanced_marginal_seller.glm diff --git a/market/autotest/test_skew_DST_fall.glm b/module/market/autotest/test_skew_DST_fall.glm similarity index 100% rename from market/autotest/test_skew_DST_fall.glm rename to module/market/autotest/test_skew_DST_fall.glm diff --git a/market/autotest/test_skew_DST_spring.glm b/module/market/autotest/test_skew_DST_spring.glm similarity index 100% rename from market/autotest/test_skew_DST_spring.glm rename to module/market/autotest/test_skew_DST_spring.glm diff --git a/market/autotest/test_skew_leap_years.glm b/module/market/autotest/test_skew_leap_years.glm similarity index 100% rename from market/autotest/test_skew_leap_years.glm rename to module/market/autotest/test_skew_leap_years.glm diff --git a/market/autotest/test_skew_year_transitions.glm b/module/market/autotest/test_skew_year_transitions.glm similarity index 100% rename from market/autotest/test_skew_year_transitions.glm rename to module/market/autotest/test_skew_year_transitions.glm diff --git a/market/autotest/test_stubauction.glm b/module/market/autotest/test_stubauction.glm similarity index 100% rename from market/autotest/test_stubauction.glm rename to module/market/autotest/test_stubauction.glm diff --git a/market/autotest/test_unitless_bid_quantity_err.glm b/module/market/autotest/test_unitless_bid_quantity_err.glm similarity index 100% rename from market/autotest/test_unitless_bid_quantity_err.glm rename to module/market/autotest/test_unitless_bid_quantity_err.glm diff --git a/market/bid.cpp b/module/market/bid.cpp similarity index 100% rename from market/bid.cpp rename to module/market/bid.cpp diff --git a/market/bid.h b/module/market/bid.h similarity index 100% rename from market/bid.h rename to module/market/bid.h diff --git a/market/collect.cpp b/module/market/collect.cpp similarity index 100% rename from market/collect.cpp rename to module/market/collect.cpp diff --git a/market/collect.h b/module/market/collect.h similarity index 100% rename from market/collect.h rename to module/market/collect.h diff --git a/market/controller.cpp b/module/market/controller.cpp similarity index 100% rename from market/controller.cpp rename to module/market/controller.cpp diff --git a/market/controller.h b/module/market/controller.h similarity index 100% rename from market/controller.h rename to module/market/controller.h diff --git a/market/controller2.cpp b/module/market/controller2.cpp similarity index 100% rename from market/controller2.cpp rename to module/market/controller2.cpp diff --git a/market/controller2.h b/module/market/controller2.h similarity index 100% rename from market/controller2.h rename to module/market/controller2.h diff --git a/market/curve.cpp b/module/market/curve.cpp similarity index 100% rename from market/curve.cpp rename to module/market/curve.cpp diff --git a/market/curve.h b/module/market/curve.h similarity index 100% rename from market/curve.h rename to module/market/curve.h diff --git a/market/double_controller.cpp b/module/market/double_controller.cpp similarity index 100% rename from market/double_controller.cpp rename to module/market/double_controller.cpp diff --git a/market/double_controller.h b/module/market/double_controller.h similarity index 100% rename from market/double_controller.h rename to module/market/double_controller.h diff --git a/market/generator_controller.cpp b/module/market/generator_controller.cpp similarity index 100% rename from market/generator_controller.cpp rename to module/market/generator_controller.cpp diff --git a/market/generator_controller.h b/module/market/generator_controller.h similarity index 100% rename from market/generator_controller.h rename to module/market/generator_controller.h diff --git a/market/init.cpp b/module/market/init.cpp similarity index 100% rename from market/init.cpp rename to module/market/init.cpp diff --git a/market/main.cpp b/module/market/main.cpp similarity index 100% rename from market/main.cpp rename to module/market/main.cpp diff --git a/market/market.h b/module/market/market.h similarity index 100% rename from market/market.h rename to module/market/market.h diff --git a/market/market.vcproj b/module/market/market.vcproj similarity index 100% rename from market/market.vcproj rename to module/market/market.vcproj diff --git a/market/passive_controller.cpp b/module/market/passive_controller.cpp similarity index 100% rename from market/passive_controller.cpp rename to module/market/passive_controller.cpp diff --git a/market/passive_controller.h b/module/market/passive_controller.h similarity index 100% rename from market/passive_controller.h rename to module/market/passive_controller.h diff --git a/market/stub_bidder.cpp b/module/market/stub_bidder.cpp similarity index 100% rename from market/stub_bidder.cpp rename to module/market/stub_bidder.cpp diff --git a/market/stub_bidder.h b/module/market/stub_bidder.h similarity index 100% rename from market/stub_bidder.h rename to module/market/stub_bidder.h diff --git a/market/stubauction.cpp b/module/market/stubauction.cpp similarity index 100% rename from market/stubauction.cpp rename to module/market/stubauction.cpp diff --git a/market/stubauction.h b/module/market/stubauction.h similarity index 100% rename from market/stubauction.h rename to module/market/stubauction.h diff --git a/market/supervisory_control.cpp b/module/market/supervisory_control.cpp similarity index 100% rename from market/supervisory_control.cpp rename to module/market/supervisory_control.cpp diff --git a/market/supervisory_control.h b/module/market/supervisory_control.h similarity index 100% rename from market/supervisory_control.h rename to module/market/supervisory_control.h diff --git a/mysql/MYSQL_specific.vsprops b/module/mysql/MYSQL_specific.vsprops similarity index 100% rename from mysql/MYSQL_specific.vsprops rename to module/mysql/MYSQL_specific.vsprops diff --git a/module/mysql/Makefile.mk b/module/mysql/Makefile.mk new file mode 100644 index 000000000..1731eb57e --- /dev/null +++ b/module/mysql/Makefile.mk @@ -0,0 +1,24 @@ +pkglib_LTLIBRARIES += module/mysql/mysql.la + +module_mysql_mysql_la_CPPFLAGS = +module_mysql_mysql_la_CPPFLAGS += $(MYSQL_CPPFLAGS) +module_mysql_mysql_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_mysql_mysql_la_LDFLAGS = -lpthread +module_mysql_mysql_la_LDFLAGS += $(MYSQL_LDFLAGS) +module_mysql_mysql_la_LDFLAGS += $(AM_LDFLAGS) + +module_mysql_mysql_la_LIBADD = +module_mysql_mysql_la_LIBADD += $(MYSQL_LIBS) + +module_mysql_mysql_la_SOURCES = +module_mysql_mysql_la_SOURCES += module/mysql/collector.cpp +module_mysql_mysql_la_SOURCES += module/mysql/collector.h +module_mysql_mysql_la_SOURCES += module/mysql/database.cpp +module_mysql_mysql_la_SOURCES += module/mysql/database.h +module_mysql_mysql_la_SOURCES += module/mysql/init.cpp +module_mysql_mysql_la_SOURCES += module/mysql/main.cpp +module_mysql_mysql_la_SOURCES += module/mysql/player.cpp +module_mysql_mysql_la_SOURCES += module/mysql/player.h +module_mysql_mysql_la_SOURCES += module/mysql/recorder.cpp +module_mysql_mysql_la_SOURCES += module/mysql/recorder.h diff --git a/mysql/autotest/test_mysql_collector.glm b/module/mysql/autotest/test_mysql_collector.glm similarity index 100% rename from mysql/autotest/test_mysql_collector.glm rename to module/mysql/autotest/test_mysql_collector.glm diff --git a/mysql/autotest/test_mysql_player.csv b/module/mysql/autotest/test_mysql_player.csv similarity index 100% rename from mysql/autotest/test_mysql_player.csv rename to module/mysql/autotest/test_mysql_player.csv diff --git a/mysql/autotest/test_mysql_player.glm b/module/mysql/autotest/test_mysql_player.glm similarity index 100% rename from mysql/autotest/test_mysql_player.glm rename to module/mysql/autotest/test_mysql_player.glm diff --git a/mysql/autotest/test_mysql_player_init.sql b/module/mysql/autotest/test_mysql_player_init.sql similarity index 100% rename from mysql/autotest/test_mysql_player_init.sql rename to module/mysql/autotest/test_mysql_player_init.sql diff --git a/mysql/autotest/test_mysql_recorder.glm b/module/mysql/autotest/test_mysql_recorder.glm similarity index 100% rename from mysql/autotest/test_mysql_recorder.glm rename to module/mysql/autotest/test_mysql_recorder.glm diff --git a/mysql/autotest/test_mysql_recorder_init.sql b/module/mysql/autotest/test_mysql_recorder_init.sql similarity index 100% rename from mysql/autotest/test_mysql_recorder_init.sql rename to module/mysql/autotest/test_mysql_recorder_init.sql diff --git a/mysql/autotest/test_mysql_recorder_sync.sql b/module/mysql/autotest/test_mysql_recorder_sync.sql similarity index 100% rename from mysql/autotest/test_mysql_recorder_sync.sql rename to module/mysql/autotest/test_mysql_recorder_sync.sql diff --git a/mysql/autotest/test_mysql_recorder_term.sql b/module/mysql/autotest/test_mysql_recorder_term.sql similarity index 100% rename from mysql/autotest/test_mysql_recorder_term.sql rename to module/mysql/autotest/test_mysql_recorder_term.sql diff --git a/mysql/collector.cpp b/module/mysql/collector.cpp similarity index 100% rename from mysql/collector.cpp rename to module/mysql/collector.cpp diff --git a/mysql/collector.h b/module/mysql/collector.h similarity index 100% rename from mysql/collector.h rename to module/mysql/collector.h diff --git a/mysql/database.cpp b/module/mysql/database.cpp similarity index 100% rename from mysql/database.cpp rename to module/mysql/database.cpp diff --git a/mysql/database.h b/module/mysql/database.h similarity index 100% rename from mysql/database.h rename to module/mysql/database.h diff --git a/mysql/init.cpp b/module/mysql/init.cpp similarity index 100% rename from mysql/init.cpp rename to module/mysql/init.cpp diff --git a/mysql/main.cpp b/module/mysql/main.cpp similarity index 100% rename from mysql/main.cpp rename to module/mysql/main.cpp diff --git a/mysql/mysql.vcproj b/module/mysql/mysql.vcproj similarity index 100% rename from mysql/mysql.vcproj rename to module/mysql/mysql.vcproj diff --git a/mysql/player.cpp b/module/mysql/player.cpp similarity index 100% rename from mysql/player.cpp rename to module/mysql/player.cpp diff --git a/mysql/player.h b/module/mysql/player.h similarity index 100% rename from mysql/player.h rename to module/mysql/player.h diff --git a/mysql/recorder.cpp b/module/mysql/recorder.cpp similarity index 100% rename from mysql/recorder.cpp rename to module/mysql/recorder.cpp diff --git a/mysql/recorder.h b/module/mysql/recorder.h similarity index 100% rename from mysql/recorder.h rename to module/mysql/recorder.h diff --git a/mysql/validate.no b/module/mysql/validate.no similarity index 100% rename from mysql/validate.no rename to module/mysql/validate.no diff --git a/module/optimize/Makefile.mk b/module/optimize/Makefile.mk new file mode 100644 index 000000000..1baa9b44c --- /dev/null +++ b/module/optimize/Makefile.mk @@ -0,0 +1,13 @@ +pkglib_LTLIBRARIES += module/optimize/optimize.la + +module_optimize_optimize_la_CPPFLAGS = +module_optimize_optimize_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_optimize_optimize_la_LDFLAGS = +module_optimize_optimize_la_LDFLAGS += $(AM_LDFLAGS) + +module_optimize_optimize_la_LIBADD = + +module_optimize_optimize_la_SOURCES = +module_optimize_optimize_la_SOURCES += module/optimize/main.cpp module/optimize/optimize.h +module_optimize_optimize_la_SOURCES += module/optimize/simple.cpp module/optimize/simple.h diff --git a/optimize/autotest/test_extremum_opt.glm b/module/optimize/autotest/test_extremum_opt.glm similarity index 100% rename from optimize/autotest/test_extremum_opt.glm rename to module/optimize/autotest/test_extremum_opt.glm diff --git a/optimize/autotest/test_maximum_err.glm b/module/optimize/autotest/test_maximum_err.glm similarity index 100% rename from optimize/autotest/test_maximum_err.glm rename to module/optimize/autotest/test_maximum_err.glm diff --git a/optimize/autotest/test_minimum.glm b/module/optimize/autotest/test_minimum.glm similarity index 100% rename from optimize/autotest/test_minimum.glm rename to module/optimize/autotest/test_minimum.glm diff --git a/optimize/main.cpp b/module/optimize/main.cpp similarity index 100% rename from optimize/main.cpp rename to module/optimize/main.cpp diff --git a/optimize/optimize.h b/module/optimize/optimize.h similarity index 100% rename from optimize/optimize.h rename to module/optimize/optimize.h diff --git a/optimize/optimize.vcproj b/module/optimize/optimize.vcproj similarity index 100% rename from optimize/optimize.vcproj rename to module/optimize/optimize.vcproj diff --git a/optimize/particle_swarm_optimization.cpp b/module/optimize/particle_swarm_optimization.cpp similarity index 100% rename from optimize/particle_swarm_optimization.cpp rename to module/optimize/particle_swarm_optimization.cpp diff --git a/optimize/particle_swarm_optimization.h b/module/optimize/particle_swarm_optimization.h similarity index 100% rename from optimize/particle_swarm_optimization.h rename to module/optimize/particle_swarm_optimization.h diff --git a/optimize/simple.cpp b/module/optimize/simple.cpp similarity index 100% rename from optimize/simple.cpp rename to module/optimize/simple.cpp diff --git a/optimize/simple.h b/module/optimize/simple.h similarity index 100% rename from optimize/simple.h rename to module/optimize/simple.h diff --git a/module/powerflow/Makefile.mk b/module/powerflow/Makefile.mk new file mode 100644 index 000000000..916654f9f --- /dev/null +++ b/module/powerflow/Makefile.mk @@ -0,0 +1,80 @@ +pkglib_LTLIBRARIES += module/powerflow/powerflow.la + +module_powerflow_powerflow_la_CPPFLAGS = -DSOLVER_PY +module_powerflow_powerflow_la_CPPFLAGS += -I$(top_srcdir)/third_party/superLU_MT +module_powerflow_powerflow_la_CPPFLAGS += -I$(top_srcdir)/module/powerflow +module_powerflow_powerflow_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_powerflow_powerflow_la_LDFLAGS = +module_powerflow_powerflow_la_LDFLAGS += $(AM_LDFLAGS) +module_powerflow_powerflow_la_LDFLAGS += -ldl + +module_powerflow_powerflow_la_LIBADD = +module_powerflow_powerflow_la_LIBADD += third_party/superLU_MT/libsuperlu.la +module_powerflow_powerflow_la_LIBADD += $(PTHREAD_CFLAGS) +module_powerflow_powerflow_la_LIBADD += $(PTHREAD_LIBS) +module_powerflow_powerflow_la_LIBADD += -ldl + +module_powerflow_powerflow_la_SOURCES = module/powerflow/init.cpp module/powerflow/main.cpp + +module_powerflow_powerflow_la_SOURCES += module/powerflow/billdump.cpp module/powerflow/billdump.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/capacitor.cpp module/powerflow/capacitor.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/currdump.cpp module/powerflow/currdump.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/emissions.cpp module/powerflow/emissions.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/fault_check.cpp module/powerflow/fault_check.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/frequency_gen.cpp module/powerflow/frequency_gen.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/fuse.cpp module/powerflow/fuse.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/impedance_dump.cpp module/powerflow/impedance_dump.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/line_configuration.cpp +module_powerflow_powerflow_la_SOURCES += module/powerflow/line_configuration.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/line.cpp module/powerflow/line.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/line_sensor.cpp module/powerflow/line_sensor.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/line_spacing.cpp module/powerflow/line_spacing.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/link.cpp module/powerflow/link.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/load.cpp module/powerflow/load.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/load_tracker.cpp module/powerflow/load_tracker.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/meter.cpp module/powerflow/meter.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/motor.cpp module/powerflow/motor.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/node.cpp module/powerflow/node.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/overhead_line_conductor.cpp module/powerflow/overhead_line_conductor.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/overhead_line.cpp module/powerflow/overhead_line.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/pole.h module/powerflow/pole.cpp +module_powerflow_powerflow_la_SOURCES += module/powerflow/pole_configuration.h module/powerflow/pole_configuration.cpp +module_powerflow_powerflow_la_SOURCES += module/powerflow/powerflow.cpp module/powerflow/powerflow.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/powerflow_library.cpp module/powerflow/powerflow_library.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/powerflow_object.cpp module/powerflow/powerflow_object.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/power_metrics.cpp module/powerflow/power_metrics.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/pqload.cpp module/powerflow/pqload.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/recloser.cpp module/powerflow/recloser.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/regulator_configuration.cpp module/powerflow/regulator_configuration.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/regulator.cpp module/powerflow/regulator.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/restoration.cpp module/powerflow/restoration.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/sectionalizer.cpp module/powerflow/sectionalizer.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/series_reactor.cpp module/powerflow/series_reactor.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/solver_nr.cpp module/powerflow/solver_nr.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/solver_py.cpp module/powerflow/solver_py.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/substation.cpp module/powerflow/substation.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/switch_coordinator.cpp module/powerflow/switch_coordinate.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/switch_object.cpp module/powerflow/switch_object.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/transformer_configuration.cpp module/powerflow/transformer_configuration.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/transformer.cpp module/powerflow/transformer.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/triplex_line_conductor.cpp module/powerflow/triplex_line_conductor.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/triplex_line_configuration.cpp module/powerflow/triplex_line_configuration.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/triplex_line.cpp module/powerflow/triplex_line.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/triplex_load.h module/powerflow/triplex_load.cpp +module_powerflow_powerflow_la_SOURCES += module/powerflow/triplex_meter.cpp module/powerflow/triplex_meter.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/triplex_node.cpp module/powerflow/triplex_node.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/underground_line_conductor.cpp module/powerflow/underground_line_conductor.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/underground_line.cpp module/powerflow/underground_line.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/vfd.cpp module/powerflow/vfd.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/voltdump.cpp module/powerflow/voltdump.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/volt_var_control.cpp module/powerflow/volt_var_control.h + +module_powerflow_powerflow_la_SOURCES += module/powerflow/meter_test.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/overheadline_test.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/regulator_test.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/transformer_test.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/triplexline_test.h +module_powerflow_powerflow_la_SOURCES += module/powerflow/undergroundline_test.h + +dist_pkgdata_DATA += module/powerflow/solver_py.conf diff --git a/powerflow/OHLConductors.glm b/module/powerflow/OHLConductors.glm similarity index 100% rename from powerflow/OHLConductors.glm rename to module/powerflow/OHLConductors.glm diff --git a/powerflow/autotest/IEEE_13_node_impedance_dump.glm b/module/powerflow/autotest/IEEE_13_node_impedance_dump.glm similarity index 100% rename from powerflow/autotest/IEEE_13_node_impedance_dump.glm rename to module/powerflow/autotest/IEEE_13_node_impedance_dump.glm diff --git a/powerflow/autotest/PSV.player b/module/powerflow/autotest/PSV.player similarity index 100% rename from powerflow/autotest/PSV.player rename to module/powerflow/autotest/PSV.player diff --git a/powerflow/autotest/SPIM_frequency.player b/module/powerflow/autotest/SPIM_frequency.player similarity index 100% rename from powerflow/autotest/SPIM_frequency.player rename to module/powerflow/autotest/SPIM_frequency.player diff --git a/powerflow/autotest/SPIM_override.player b/module/powerflow/autotest/SPIM_override.player similarity index 100% rename from powerflow/autotest/SPIM_override.player rename to module/powerflow/autotest/SPIM_override.player diff --git a/powerflow/autotest/SPIM_power_assert.player b/module/powerflow/autotest/SPIM_power_assert.player similarity index 100% rename from powerflow/autotest/SPIM_power_assert.player rename to module/powerflow/autotest/SPIM_power_assert.player diff --git a/powerflow/autotest/SPIM_reconnect_assert.player b/module/powerflow/autotest/SPIM_reconnect_assert.player similarity index 100% rename from powerflow/autotest/SPIM_reconnect_assert.player rename to module/powerflow/autotest/SPIM_reconnect_assert.player diff --git a/powerflow/autotest/SPIM_status_assert.player b/module/powerflow/autotest/SPIM_status_assert.player similarity index 100% rename from powerflow/autotest/SPIM_status_assert.player rename to module/powerflow/autotest/SPIM_status_assert.player diff --git a/powerflow/autotest/SPIM_trip_assert.player b/module/powerflow/autotest/SPIM_trip_assert.player similarity index 100% rename from powerflow/autotest/SPIM_trip_assert.player rename to module/powerflow/autotest/SPIM_trip_assert.player diff --git a/powerflow/autotest/SPIM_voltage.player b/module/powerflow/autotest/SPIM_voltage.player similarity index 100% rename from powerflow/autotest/SPIM_voltage.player rename to module/powerflow/autotest/SPIM_voltage.player diff --git a/powerflow/autotest/SPIM_wr_assert.player b/module/powerflow/autotest/SPIM_wr_assert.player similarity index 100% rename from powerflow/autotest/SPIM_wr_assert.player rename to module/powerflow/autotest/SPIM_wr_assert.player diff --git a/powerflow/autotest/billing_power.player b/module/powerflow/autotest/billing_power.player similarity index 100% rename from powerflow/autotest/billing_power.player rename to module/powerflow/autotest/billing_power.player diff --git a/powerflow/autotest/cap_current_A_indiv_volt.player b/module/powerflow/autotest/cap_current_A_indiv_volt.player similarity index 100% rename from powerflow/autotest/cap_current_A_indiv_volt.player rename to module/powerflow/autotest/cap_current_A_indiv_volt.player diff --git a/powerflow/autotest/cap_current_B_indiv_volt.player b/module/powerflow/autotest/cap_current_B_indiv_volt.player similarity index 100% rename from powerflow/autotest/cap_current_B_indiv_volt.player rename to module/powerflow/autotest/cap_current_B_indiv_volt.player diff --git a/powerflow/autotest/cap_current_C_indiv_volt.player b/module/powerflow/autotest/cap_current_C_indiv_volt.player similarity index 100% rename from powerflow/autotest/cap_current_C_indiv_volt.player rename to module/powerflow/autotest/cap_current_C_indiv_volt.player diff --git a/powerflow/autotest/cap_manual_switch.player b/module/powerflow/autotest/cap_manual_switch.player similarity index 100% rename from powerflow/autotest/cap_manual_switch.player rename to module/powerflow/autotest/cap_manual_switch.player diff --git a/powerflow/autotest/cap_volt_A_BANK_VAR_dwell.player b/module/powerflow/autotest/cap_volt_A_BANK_VAR_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_A_BANK_VAR_dwell.player rename to module/powerflow/autotest/cap_volt_A_BANK_VAR_dwell.player diff --git a/powerflow/autotest/cap_volt_A_bank_dwell.player b/module/powerflow/autotest/cap_volt_A_bank_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_A_bank_dwell.player rename to module/powerflow/autotest/cap_volt_A_bank_dwell.player diff --git a/powerflow/autotest/cap_volt_A_indiv_VAR.player b/module/powerflow/autotest/cap_volt_A_indiv_VAR.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_VAR.player rename to module/powerflow/autotest/cap_volt_A_indiv_VAR.player diff --git a/powerflow/autotest/cap_volt_A_indiv_VAR_B_NR.player b/module/powerflow/autotest/cap_volt_A_indiv_VAR_B_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_VAR_B_NR.player rename to module/powerflow/autotest/cap_volt_A_indiv_VAR_B_NR.player diff --git a/powerflow/autotest/cap_volt_A_indiv_VAR_NR.player b/module/powerflow/autotest/cap_volt_A_indiv_VAR_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_VAR_NR.player rename to module/powerflow/autotest/cap_volt_A_indiv_VAR_NR.player diff --git a/powerflow/autotest/cap_volt_A_indiv_VAR_dwell.player b/module/powerflow/autotest/cap_volt_A_indiv_VAR_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_VAR_dwell.player rename to module/powerflow/autotest/cap_volt_A_indiv_VAR_dwell.player diff --git a/powerflow/autotest/cap_volt_A_indiv_VAR_dwell_NR.player b/module/powerflow/autotest/cap_volt_A_indiv_VAR_dwell_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_VAR_dwell_NR.player rename to module/powerflow/autotest/cap_volt_A_indiv_VAR_dwell_NR.player diff --git a/powerflow/autotest/cap_volt_A_indiv_VOLTVAR.player b/module/powerflow/autotest/cap_volt_A_indiv_VOLTVAR.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_VOLTVAR.player rename to module/powerflow/autotest/cap_volt_A_indiv_VOLTVAR.player diff --git a/powerflow/autotest/cap_volt_A_indiv_VOLTVAR_NR.player b/module/powerflow/autotest/cap_volt_A_indiv_VOLTVAR_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_VOLTVAR_NR.player rename to module/powerflow/autotest/cap_volt_A_indiv_VOLTVAR_NR.player diff --git a/powerflow/autotest/cap_volt_A_indiv_VOLTVAR_dwell.player b/module/powerflow/autotest/cap_volt_A_indiv_VOLTVAR_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_VOLTVAR_dwell.player rename to module/powerflow/autotest/cap_volt_A_indiv_VOLTVAR_dwell.player diff --git a/powerflow/autotest/cap_volt_A_indiv_dwell.player b/module/powerflow/autotest/cap_volt_A_indiv_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_dwell.player rename to module/powerflow/autotest/cap_volt_A_indiv_dwell.player diff --git a/powerflow/autotest/cap_volt_A_indiv_dwell_NR.player b/module/powerflow/autotest/cap_volt_A_indiv_dwell_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_dwell_NR.player rename to module/powerflow/autotest/cap_volt_A_indiv_dwell_NR.player diff --git a/powerflow/autotest/cap_volt_A_indiv_volt.player b/module/powerflow/autotest/cap_volt_A_indiv_volt.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_volt.player rename to module/powerflow/autotest/cap_volt_A_indiv_volt.player diff --git a/powerflow/autotest/cap_volt_A_indiv_volt_NR.player b/module/powerflow/autotest/cap_volt_A_indiv_volt_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_volt_NR.player rename to module/powerflow/autotest/cap_volt_A_indiv_volt_NR.player diff --git a/powerflow/autotest/cap_volt_A_indiv_volt_NR_Y.player b/module/powerflow/autotest/cap_volt_A_indiv_volt_NR_Y.player similarity index 100% rename from powerflow/autotest/cap_volt_A_indiv_volt_NR_Y.player rename to module/powerflow/autotest/cap_volt_A_indiv_volt_NR_Y.player diff --git a/powerflow/autotest/cap_volt_A_manual_ts.player b/module/powerflow/autotest/cap_volt_A_manual_ts.player similarity index 100% rename from powerflow/autotest/cap_volt_A_manual_ts.player rename to module/powerflow/autotest/cap_volt_A_manual_ts.player diff --git a/powerflow/autotest/cap_volt_B_BANK_VAR_dwell.player b/module/powerflow/autotest/cap_volt_B_BANK_VAR_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_B_BANK_VAR_dwell.player rename to module/powerflow/autotest/cap_volt_B_BANK_VAR_dwell.player diff --git a/powerflow/autotest/cap_volt_B_bank_dwell.player b/module/powerflow/autotest/cap_volt_B_bank_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_B_bank_dwell.player rename to module/powerflow/autotest/cap_volt_B_bank_dwell.player diff --git a/powerflow/autotest/cap_volt_B_indiv_VAR.player b/module/powerflow/autotest/cap_volt_B_indiv_VAR.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_VAR.player rename to module/powerflow/autotest/cap_volt_B_indiv_VAR.player diff --git a/powerflow/autotest/cap_volt_B_indiv_VAR_B_NR.player b/module/powerflow/autotest/cap_volt_B_indiv_VAR_B_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_VAR_B_NR.player rename to module/powerflow/autotest/cap_volt_B_indiv_VAR_B_NR.player diff --git a/powerflow/autotest/cap_volt_B_indiv_VAR_NR.player b/module/powerflow/autotest/cap_volt_B_indiv_VAR_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_VAR_NR.player rename to module/powerflow/autotest/cap_volt_B_indiv_VAR_NR.player diff --git a/powerflow/autotest/cap_volt_B_indiv_VAR_dwell.player b/module/powerflow/autotest/cap_volt_B_indiv_VAR_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_VAR_dwell.player rename to module/powerflow/autotest/cap_volt_B_indiv_VAR_dwell.player diff --git a/powerflow/autotest/cap_volt_B_indiv_VAR_dwell_NR.player b/module/powerflow/autotest/cap_volt_B_indiv_VAR_dwell_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_VAR_dwell_NR.player rename to module/powerflow/autotest/cap_volt_B_indiv_VAR_dwell_NR.player diff --git a/powerflow/autotest/cap_volt_B_indiv_VOLTVAR.player b/module/powerflow/autotest/cap_volt_B_indiv_VOLTVAR.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_VOLTVAR.player rename to module/powerflow/autotest/cap_volt_B_indiv_VOLTVAR.player diff --git a/powerflow/autotest/cap_volt_B_indiv_VOLTVAR_NR.player b/module/powerflow/autotest/cap_volt_B_indiv_VOLTVAR_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_VOLTVAR_NR.player rename to module/powerflow/autotest/cap_volt_B_indiv_VOLTVAR_NR.player diff --git a/powerflow/autotest/cap_volt_B_indiv_VOLTVAR_dwell.player b/module/powerflow/autotest/cap_volt_B_indiv_VOLTVAR_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_VOLTVAR_dwell.player rename to module/powerflow/autotest/cap_volt_B_indiv_VOLTVAR_dwell.player diff --git a/powerflow/autotest/cap_volt_B_indiv_dwell.player b/module/powerflow/autotest/cap_volt_B_indiv_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_dwell.player rename to module/powerflow/autotest/cap_volt_B_indiv_dwell.player diff --git a/powerflow/autotest/cap_volt_B_indiv_dwell_NR.player b/module/powerflow/autotest/cap_volt_B_indiv_dwell_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_dwell_NR.player rename to module/powerflow/autotest/cap_volt_B_indiv_dwell_NR.player diff --git a/powerflow/autotest/cap_volt_B_indiv_volt.player b/module/powerflow/autotest/cap_volt_B_indiv_volt.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_volt.player rename to module/powerflow/autotest/cap_volt_B_indiv_volt.player diff --git a/powerflow/autotest/cap_volt_B_indiv_volt_NR.player b/module/powerflow/autotest/cap_volt_B_indiv_volt_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_volt_NR.player rename to module/powerflow/autotest/cap_volt_B_indiv_volt_NR.player diff --git a/powerflow/autotest/cap_volt_B_indiv_volt_NR_Y.player b/module/powerflow/autotest/cap_volt_B_indiv_volt_NR_Y.player similarity index 100% rename from powerflow/autotest/cap_volt_B_indiv_volt_NR_Y.player rename to module/powerflow/autotest/cap_volt_B_indiv_volt_NR_Y.player diff --git a/powerflow/autotest/cap_volt_B_manual_ts.player b/module/powerflow/autotest/cap_volt_B_manual_ts.player similarity index 100% rename from powerflow/autotest/cap_volt_B_manual_ts.player rename to module/powerflow/autotest/cap_volt_B_manual_ts.player diff --git a/powerflow/autotest/cap_volt_C_BANK_VAR_dwell.player b/module/powerflow/autotest/cap_volt_C_BANK_VAR_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_C_BANK_VAR_dwell.player rename to module/powerflow/autotest/cap_volt_C_BANK_VAR_dwell.player diff --git a/powerflow/autotest/cap_volt_C_bank_dwell.player b/module/powerflow/autotest/cap_volt_C_bank_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_C_bank_dwell.player rename to module/powerflow/autotest/cap_volt_C_bank_dwell.player diff --git a/powerflow/autotest/cap_volt_C_indiv_VAR.player b/module/powerflow/autotest/cap_volt_C_indiv_VAR.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_VAR.player rename to module/powerflow/autotest/cap_volt_C_indiv_VAR.player diff --git a/powerflow/autotest/cap_volt_C_indiv_VAR_B_NR.player b/module/powerflow/autotest/cap_volt_C_indiv_VAR_B_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_VAR_B_NR.player rename to module/powerflow/autotest/cap_volt_C_indiv_VAR_B_NR.player diff --git a/powerflow/autotest/cap_volt_C_indiv_VAR_NR.player b/module/powerflow/autotest/cap_volt_C_indiv_VAR_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_VAR_NR.player rename to module/powerflow/autotest/cap_volt_C_indiv_VAR_NR.player diff --git a/powerflow/autotest/cap_volt_C_indiv_VAR_dwell.player b/module/powerflow/autotest/cap_volt_C_indiv_VAR_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_VAR_dwell.player rename to module/powerflow/autotest/cap_volt_C_indiv_VAR_dwell.player diff --git a/powerflow/autotest/cap_volt_C_indiv_VAR_dwell_NR.player b/module/powerflow/autotest/cap_volt_C_indiv_VAR_dwell_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_VAR_dwell_NR.player rename to module/powerflow/autotest/cap_volt_C_indiv_VAR_dwell_NR.player diff --git a/powerflow/autotest/cap_volt_C_indiv_VOLTVAR.player b/module/powerflow/autotest/cap_volt_C_indiv_VOLTVAR.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_VOLTVAR.player rename to module/powerflow/autotest/cap_volt_C_indiv_VOLTVAR.player diff --git a/powerflow/autotest/cap_volt_C_indiv_VOLTVAR_NR.player b/module/powerflow/autotest/cap_volt_C_indiv_VOLTVAR_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_VOLTVAR_NR.player rename to module/powerflow/autotest/cap_volt_C_indiv_VOLTVAR_NR.player diff --git a/powerflow/autotest/cap_volt_C_indiv_VOLTVAR_dwell.player b/module/powerflow/autotest/cap_volt_C_indiv_VOLTVAR_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_VOLTVAR_dwell.player rename to module/powerflow/autotest/cap_volt_C_indiv_VOLTVAR_dwell.player diff --git a/powerflow/autotest/cap_volt_C_indiv_dwell.player b/module/powerflow/autotest/cap_volt_C_indiv_dwell.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_dwell.player rename to module/powerflow/autotest/cap_volt_C_indiv_dwell.player diff --git a/powerflow/autotest/cap_volt_C_indiv_dwell_NR.player b/module/powerflow/autotest/cap_volt_C_indiv_dwell_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_dwell_NR.player rename to module/powerflow/autotest/cap_volt_C_indiv_dwell_NR.player diff --git a/powerflow/autotest/cap_volt_C_indiv_volt.player b/module/powerflow/autotest/cap_volt_C_indiv_volt.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_volt.player rename to module/powerflow/autotest/cap_volt_C_indiv_volt.player diff --git a/powerflow/autotest/cap_volt_C_indiv_volt_NR.player b/module/powerflow/autotest/cap_volt_C_indiv_volt_NR.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_volt_NR.player rename to module/powerflow/autotest/cap_volt_C_indiv_volt_NR.player diff --git a/powerflow/autotest/cap_volt_C_indiv_volt_NR_Y.player b/module/powerflow/autotest/cap_volt_C_indiv_volt_NR_Y.player similarity index 100% rename from powerflow/autotest/cap_volt_C_indiv_volt_NR_Y.player rename to module/powerflow/autotest/cap_volt_C_indiv_volt_NR_Y.player diff --git a/powerflow/autotest/cap_volt_C_manual_ts.player b/module/powerflow/autotest/cap_volt_C_manual_ts.player similarity index 100% rename from powerflow/autotest/cap_volt_C_manual_ts.player rename to module/powerflow/autotest/cap_volt_C_manual_ts.player diff --git a/powerflow/autotest/center_tapped_basic_energy.player b/module/powerflow/autotest/center_tapped_basic_energy.player similarity index 100% rename from powerflow/autotest/center_tapped_basic_energy.player rename to module/powerflow/autotest/center_tapped_basic_energy.player diff --git a/powerflow/autotest/center_tapped_complex_energy.player b/module/powerflow/autotest/center_tapped_complex_energy.player similarity index 100% rename from powerflow/autotest/center_tapped_complex_energy.player rename to module/powerflow/autotest/center_tapped_complex_energy.player diff --git a/powerflow/autotest/controller_1_armed.player b/module/powerflow/autotest/controller_1_armed.player similarity index 100% rename from powerflow/autotest/controller_1_armed.player rename to module/powerflow/autotest/controller_1_armed.player diff --git a/powerflow/autotest/controller_1_method.player b/module/powerflow/autotest/controller_1_method.player similarity index 100% rename from powerflow/autotest/controller_1_method.player rename to module/powerflow/autotest/controller_1_method.player diff --git a/powerflow/autotest/controller_1_status.player b/module/powerflow/autotest/controller_1_status.player similarity index 100% rename from powerflow/autotest/controller_1_status.player rename to module/powerflow/autotest/controller_1_status.player diff --git a/powerflow/autotest/data_SPIM_Vset.player b/module/powerflow/autotest/data_SPIM_Vset.player similarity index 100% rename from powerflow/autotest/data_SPIM_Vset.player rename to module/powerflow/autotest/data_SPIM_Vset.player diff --git a/powerflow/autotest/data_SPIM_triplex_measured_phaseA.csv b/module/powerflow/autotest/data_SPIM_triplex_measured_phaseA.csv similarity index 100% rename from powerflow/autotest/data_SPIM_triplex_measured_phaseA.csv rename to module/powerflow/autotest/data_SPIM_triplex_measured_phaseA.csv diff --git a/powerflow/autotest/data_SPIM_triplex_measured_phaseB.csv b/module/powerflow/autotest/data_SPIM_triplex_measured_phaseB.csv similarity index 100% rename from powerflow/autotest/data_SPIM_triplex_measured_phaseB.csv rename to module/powerflow/autotest/data_SPIM_triplex_measured_phaseB.csv diff --git a/powerflow/autotest/data_SPIM_triplex_measured_phaseC.csv b/module/powerflow/autotest/data_SPIM_triplex_measured_phaseC.csv similarity index 100% rename from powerflow/autotest/data_SPIM_triplex_measured_phaseC.csv rename to module/powerflow/autotest/data_SPIM_triplex_measured_phaseC.csv diff --git a/powerflow/autotest/data_SPIM_triplex_motor_A_speed.csv b/module/powerflow/autotest/data_SPIM_triplex_motor_A_speed.csv similarity index 100% rename from powerflow/autotest/data_SPIM_triplex_motor_A_speed.csv rename to module/powerflow/autotest/data_SPIM_triplex_motor_A_speed.csv diff --git a/powerflow/autotest/data_SPIM_triplex_motor_B_speed.csv b/module/powerflow/autotest/data_SPIM_triplex_motor_B_speed.csv similarity index 100% rename from powerflow/autotest/data_SPIM_triplex_motor_B_speed.csv rename to module/powerflow/autotest/data_SPIM_triplex_motor_B_speed.csv diff --git a/powerflow/autotest/data_SPIM_triplex_motor_C_speed.csv b/module/powerflow/autotest/data_SPIM_triplex_motor_C_speed.csv similarity index 100% rename from powerflow/autotest/data_SPIM_triplex_motor_C_speed.csv rename to module/powerflow/autotest/data_SPIM_triplex_motor_C_speed.csv diff --git a/powerflow/autotest/data_ZIP_test_base_power.csv b/module/powerflow/autotest/data_ZIP_test_base_power.csv similarity index 100% rename from powerflow/autotest/data_ZIP_test_base_power.csv rename to module/powerflow/autotest/data_ZIP_test_base_power.csv diff --git a/powerflow/autotest/data_assert_swing_pq_voltage_A.csv b/module/powerflow/autotest/data_assert_swing_pq_voltage_A.csv similarity index 100% rename from powerflow/autotest/data_assert_swing_pq_voltage_A.csv rename to module/powerflow/autotest/data_assert_swing_pq_voltage_A.csv diff --git a/powerflow/autotest/data_assert_swing_pq_voltage_B.csv b/module/powerflow/autotest/data_assert_swing_pq_voltage_B.csv similarity index 100% rename from powerflow/autotest/data_assert_swing_pq_voltage_B.csv rename to module/powerflow/autotest/data_assert_swing_pq_voltage_B.csv diff --git a/powerflow/autotest/data_assert_swing_pq_voltage_C.csv b/module/powerflow/autotest/data_assert_swing_pq_voltage_C.csv similarity index 100% rename from powerflow/autotest/data_assert_swing_pq_voltage_C.csv rename to module/powerflow/autotest/data_assert_swing_pq_voltage_C.csv diff --git a/powerflow/autotest/data_cap_service.csv b/module/powerflow/autotest/data_cap_service.csv similarity index 100% rename from powerflow/autotest/data_cap_service.csv rename to module/powerflow/autotest/data_cap_service.csv diff --git a/powerflow/autotest/data_cap_service_test_power_measure.csv b/module/powerflow/autotest/data_cap_service_test_power_measure.csv similarity index 100% rename from powerflow/autotest/data_cap_service_test_power_measure.csv rename to module/powerflow/autotest/data_cap_service_test_power_measure.csv diff --git a/powerflow/autotest/data_configurations_delta_123node.glm b/module/powerflow/autotest/data_configurations_delta_123node.glm similarity index 100% rename from powerflow/autotest/data_configurations_delta_123node.glm rename to module/powerflow/autotest/data_configurations_delta_123node.glm diff --git a/powerflow/autotest/data_delta_load_voltage_A.csv b/module/powerflow/autotest/data_delta_load_voltage_A.csv similarity index 100% rename from powerflow/autotest/data_delta_load_voltage_A.csv rename to module/powerflow/autotest/data_delta_load_voltage_A.csv diff --git a/powerflow/autotest/data_delta_load_voltage_B.csv b/module/powerflow/autotest/data_delta_load_voltage_B.csv similarity index 100% rename from powerflow/autotest/data_delta_load_voltage_B.csv rename to module/powerflow/autotest/data_delta_load_voltage_B.csv diff --git a/powerflow/autotest/data_delta_load_voltage_C.csv b/module/powerflow/autotest/data_delta_load_voltage_C.csv similarity index 100% rename from powerflow/autotest/data_delta_load_voltage_C.csv rename to module/powerflow/autotest/data_delta_load_voltage_C.csv diff --git a/powerflow/autotest/data_delta_player_load_A.csv b/module/powerflow/autotest/data_delta_player_load_A.csv similarity index 100% rename from powerflow/autotest/data_delta_player_load_A.csv rename to module/powerflow/autotest/data_delta_player_load_A.csv diff --git a/powerflow/autotest/data_delta_player_load_B.csv b/module/powerflow/autotest/data_delta_player_load_B.csv similarity index 100% rename from powerflow/autotest/data_delta_player_load_B.csv rename to module/powerflow/autotest/data_delta_player_load_B.csv diff --git a/powerflow/autotest/data_delta_player_load_C.csv b/module/powerflow/autotest/data_delta_player_load_C.csv similarity index 100% rename from powerflow/autotest/data_delta_player_load_C.csv rename to module/powerflow/autotest/data_delta_player_load_C.csv diff --git a/powerflow/autotest/data_delta_powermeas_assert.csv b/module/powerflow/autotest/data_delta_powermeas_assert.csv similarity index 100% rename from powerflow/autotest/data_delta_powermeas_assert.csv rename to module/powerflow/autotest/data_delta_powermeas_assert.csv diff --git a/powerflow/autotest/data_delta_triplex_load_power.csv b/module/powerflow/autotest/data_delta_triplex_load_power.csv similarity index 100% rename from powerflow/autotest/data_delta_triplex_load_power.csv rename to module/powerflow/autotest/data_delta_triplex_load_power.csv diff --git a/powerflow/autotest/data_delta_triplex_load_voltage_1.csv b/module/powerflow/autotest/data_delta_triplex_load_voltage_1.csv similarity index 100% rename from powerflow/autotest/data_delta_triplex_load_voltage_1.csv rename to module/powerflow/autotest/data_delta_triplex_load_voltage_1.csv diff --git a/powerflow/autotest/data_delta_triplex_load_voltage_12.csv b/module/powerflow/autotest/data_delta_triplex_load_voltage_12.csv similarity index 100% rename from powerflow/autotest/data_delta_triplex_load_voltage_12.csv rename to module/powerflow/autotest/data_delta_triplex_load_voltage_12.csv diff --git a/powerflow/autotest/data_delta_triplex_load_voltage_2.csv b/module/powerflow/autotest/data_delta_triplex_load_voltage_2.csv similarity index 100% rename from powerflow/autotest/data_delta_triplex_load_voltage_2.csv rename to module/powerflow/autotest/data_delta_triplex_load_voltage_2.csv diff --git a/powerflow/autotest/data_delta_triplex_player.csv b/module/powerflow/autotest/data_delta_triplex_player.csv similarity index 100% rename from powerflow/autotest/data_delta_triplex_player.csv rename to module/powerflow/autotest/data_delta_triplex_player.csv diff --git a/powerflow/autotest/data_inrush_LineFlowCurrentOut_A.csv b/module/powerflow/autotest/data_inrush_LineFlowCurrentOut_A.csv similarity index 100% rename from powerflow/autotest/data_inrush_LineFlowCurrentOut_A.csv rename to module/powerflow/autotest/data_inrush_LineFlowCurrentOut_A.csv diff --git a/powerflow/autotest/data_inrush_LineFlowCurrentOut_B.csv b/module/powerflow/autotest/data_inrush_LineFlowCurrentOut_B.csv similarity index 100% rename from powerflow/autotest/data_inrush_LineFlowCurrentOut_B.csv rename to module/powerflow/autotest/data_inrush_LineFlowCurrentOut_B.csv diff --git a/powerflow/autotest/data_inrush_LineFlowCurrentOut_C.csv b/module/powerflow/autotest/data_inrush_LineFlowCurrentOut_C.csv similarity index 100% rename from powerflow/autotest/data_inrush_LineFlowCurrentOut_C.csv rename to module/powerflow/autotest/data_inrush_LineFlowCurrentOut_C.csv diff --git a/powerflow/autotest/data_inrush_Voltage_node2_A.csv b/module/powerflow/autotest/data_inrush_Voltage_node2_A.csv similarity index 100% rename from powerflow/autotest/data_inrush_Voltage_node2_A.csv rename to module/powerflow/autotest/data_inrush_Voltage_node2_A.csv diff --git a/powerflow/autotest/data_inrush_Voltage_node2_B.csv b/module/powerflow/autotest/data_inrush_Voltage_node2_B.csv similarity index 100% rename from powerflow/autotest/data_inrush_Voltage_node2_B.csv rename to module/powerflow/autotest/data_inrush_Voltage_node2_B.csv diff --git a/powerflow/autotest/data_inrush_Voltage_node2_C.csv b/module/powerflow/autotest/data_inrush_Voltage_node2_C.csv similarity index 100% rename from powerflow/autotest/data_inrush_Voltage_node2_C.csv rename to module/powerflow/autotest/data_inrush_Voltage_node2_C.csv diff --git a/powerflow/autotest/data_multi_load4B_phaseA.csv b/module/powerflow/autotest/data_multi_load4B_phaseA.csv similarity index 100% rename from powerflow/autotest/data_multi_load4B_phaseA.csv rename to module/powerflow/autotest/data_multi_load4B_phaseA.csv diff --git a/powerflow/autotest/data_multi_load4B_phaseB.csv b/module/powerflow/autotest/data_multi_load4B_phaseB.csv similarity index 100% rename from powerflow/autotest/data_multi_load4B_phaseB.csv rename to module/powerflow/autotest/data_multi_load4B_phaseB.csv diff --git a/powerflow/autotest/data_multi_load4B_phaseC.csv b/module/powerflow/autotest/data_multi_load4B_phaseC.csv similarity index 100% rename from powerflow/autotest/data_multi_load4B_phaseC.csv rename to module/powerflow/autotest/data_multi_load4B_phaseC.csv diff --git a/powerflow/autotest/data_multi_load4C_phaseA.csv b/module/powerflow/autotest/data_multi_load4C_phaseA.csv similarity index 100% rename from powerflow/autotest/data_multi_load4C_phaseA.csv rename to module/powerflow/autotest/data_multi_load4C_phaseA.csv diff --git a/powerflow/autotest/data_multi_load4C_phaseB.csv b/module/powerflow/autotest/data_multi_load4C_phaseB.csv similarity index 100% rename from powerflow/autotest/data_multi_load4C_phaseB.csv rename to module/powerflow/autotest/data_multi_load4C_phaseB.csv diff --git a/powerflow/autotest/data_multi_load4C_phaseC.csv b/module/powerflow/autotest/data_multi_load4C_phaseC.csv similarity index 100% rename from powerflow/autotest/data_multi_load4C_phaseC.csv rename to module/powerflow/autotest/data_multi_load4C_phaseC.csv diff --git a/powerflow/autotest/data_multi_load4_phaseA.csv b/module/powerflow/autotest/data_multi_load4_phaseA.csv similarity index 100% rename from powerflow/autotest/data_multi_load4_phaseA.csv rename to module/powerflow/autotest/data_multi_load4_phaseA.csv diff --git a/powerflow/autotest/data_multi_load4_phaseB.csv b/module/powerflow/autotest/data_multi_load4_phaseB.csv similarity index 100% rename from powerflow/autotest/data_multi_load4_phaseB.csv rename to module/powerflow/autotest/data_multi_load4_phaseB.csv diff --git a/powerflow/autotest/data_multi_load4_phaseC.csv b/module/powerflow/autotest/data_multi_load4_phaseC.csv similarity index 100% rename from powerflow/autotest/data_multi_load4_phaseC.csv rename to module/powerflow/autotest/data_multi_load4_phaseC.csv diff --git a/powerflow/autotest/data_swing_pq_voltage_player_A.csv b/module/powerflow/autotest/data_swing_pq_voltage_player_A.csv similarity index 100% rename from powerflow/autotest/data_swing_pq_voltage_player_A.csv rename to module/powerflow/autotest/data_swing_pq_voltage_player_A.csv diff --git a/powerflow/autotest/data_swing_pq_voltage_player_B.csv b/module/powerflow/autotest/data_swing_pq_voltage_player_B.csv similarity index 100% rename from powerflow/autotest/data_swing_pq_voltage_player_B.csv rename to module/powerflow/autotest/data_swing_pq_voltage_player_B.csv diff --git a/powerflow/autotest/data_swing_pq_voltage_player_C.csv b/module/powerflow/autotest/data_swing_pq_voltage_player_C.csv similarity index 100% rename from powerflow/autotest/data_swing_pq_voltage_player_C.csv rename to module/powerflow/autotest/data_swing_pq_voltage_player_C.csv diff --git a/powerflow/autotest/data_triplex_parent_test_housebus.csv b/module/powerflow/autotest/data_triplex_parent_test_housebus.csv similarity index 100% rename from powerflow/autotest/data_triplex_parent_test_housebus.csv rename to module/powerflow/autotest/data_triplex_parent_test_housebus.csv diff --git a/powerflow/autotest/data_triplex_parent_test_parentbus.csv b/module/powerflow/autotest/data_triplex_parent_test_parentbus.csv similarity index 100% rename from powerflow/autotest/data_triplex_parent_test_parentbus.csv rename to module/powerflow/autotest/data_triplex_parent_test_parentbus.csv diff --git a/powerflow/autotest/data_triplex_parent_test_swingbus.csv b/module/powerflow/autotest/data_triplex_parent_test_swingbus.csv similarity index 100% rename from powerflow/autotest/data_triplex_parent_test_swingbus.csv rename to module/powerflow/autotest/data_triplex_parent_test_swingbus.csv diff --git a/powerflow/autotest/data_vfd_currRecorderA.csv b/module/powerflow/autotest/data_vfd_currRecorderA.csv similarity index 100% rename from powerflow/autotest/data_vfd_currRecorderA.csv rename to module/powerflow/autotest/data_vfd_currRecorderA.csv diff --git a/powerflow/autotest/data_vfd_currRecorderB.csv b/module/powerflow/autotest/data_vfd_currRecorderB.csv similarity index 100% rename from powerflow/autotest/data_vfd_currRecorderB.csv rename to module/powerflow/autotest/data_vfd_currRecorderB.csv diff --git a/powerflow/autotest/data_vfd_currRecorderC.csv b/module/powerflow/autotest/data_vfd_currRecorderC.csv similarity index 100% rename from powerflow/autotest/data_vfd_currRecorderC.csv rename to module/powerflow/autotest/data_vfd_currRecorderC.csv diff --git a/powerflow/autotest/data_vfd_in_rec_curr_A.csv b/module/powerflow/autotest/data_vfd_in_rec_curr_A.csv similarity index 100% rename from powerflow/autotest/data_vfd_in_rec_curr_A.csv rename to module/powerflow/autotest/data_vfd_in_rec_curr_A.csv diff --git a/powerflow/autotest/data_vfd_in_rec_curr_B.csv b/module/powerflow/autotest/data_vfd_in_rec_curr_B.csv similarity index 100% rename from powerflow/autotest/data_vfd_in_rec_curr_B.csv rename to module/powerflow/autotest/data_vfd_in_rec_curr_B.csv diff --git a/powerflow/autotest/data_vfd_in_rec_curr_C.csv b/module/powerflow/autotest/data_vfd_in_rec_curr_C.csv similarity index 100% rename from powerflow/autotest/data_vfd_in_rec_curr_C.csv rename to module/powerflow/autotest/data_vfd_in_rec_curr_C.csv diff --git a/powerflow/autotest/data_vfd_in_rec_pow_A.csv b/module/powerflow/autotest/data_vfd_in_rec_pow_A.csv similarity index 100% rename from powerflow/autotest/data_vfd_in_rec_pow_A.csv rename to module/powerflow/autotest/data_vfd_in_rec_pow_A.csv diff --git a/powerflow/autotest/data_vfd_in_rec_pow_B.csv b/module/powerflow/autotest/data_vfd_in_rec_pow_B.csv similarity index 100% rename from powerflow/autotest/data_vfd_in_rec_pow_B.csv rename to module/powerflow/autotest/data_vfd_in_rec_pow_B.csv diff --git a/powerflow/autotest/data_vfd_in_rec_pow_C.csv b/module/powerflow/autotest/data_vfd_in_rec_pow_C.csv similarity index 100% rename from powerflow/autotest/data_vfd_in_rec_pow_C.csv rename to module/powerflow/autotest/data_vfd_in_rec_pow_C.csv diff --git a/powerflow/autotest/data_vfd_load_volt_out_volt_A.csv b/module/powerflow/autotest/data_vfd_load_volt_out_volt_A.csv similarity index 100% rename from powerflow/autotest/data_vfd_load_volt_out_volt_A.csv rename to module/powerflow/autotest/data_vfd_load_volt_out_volt_A.csv diff --git a/powerflow/autotest/data_vfd_load_volt_out_volt_B.csv b/module/powerflow/autotest/data_vfd_load_volt_out_volt_B.csv similarity index 100% rename from powerflow/autotest/data_vfd_load_volt_out_volt_B.csv rename to module/powerflow/autotest/data_vfd_load_volt_out_volt_B.csv diff --git a/powerflow/autotest/data_vfd_load_volt_out_volt_C.csv b/module/powerflow/autotest/data_vfd_load_volt_out_volt_C.csv similarity index 100% rename from powerflow/autotest/data_vfd_load_volt_out_volt_C.csv rename to module/powerflow/autotest/data_vfd_load_volt_out_volt_C.csv diff --git a/powerflow/autotest/data_vfd_out_rec_curr_A.csv b/module/powerflow/autotest/data_vfd_out_rec_curr_A.csv similarity index 100% rename from powerflow/autotest/data_vfd_out_rec_curr_A.csv rename to module/powerflow/autotest/data_vfd_out_rec_curr_A.csv diff --git a/powerflow/autotest/data_vfd_out_rec_curr_B.csv b/module/powerflow/autotest/data_vfd_out_rec_curr_B.csv similarity index 100% rename from powerflow/autotest/data_vfd_out_rec_curr_B.csv rename to module/powerflow/autotest/data_vfd_out_rec_curr_B.csv diff --git a/powerflow/autotest/data_vfd_out_rec_curr_C.csv b/module/powerflow/autotest/data_vfd_out_rec_curr_C.csv similarity index 100% rename from powerflow/autotest/data_vfd_out_rec_curr_C.csv rename to module/powerflow/autotest/data_vfd_out_rec_curr_C.csv diff --git a/powerflow/autotest/data_vfd_out_rec_pow_A.csv b/module/powerflow/autotest/data_vfd_out_rec_pow_A.csv similarity index 100% rename from powerflow/autotest/data_vfd_out_rec_pow_A.csv rename to module/powerflow/autotest/data_vfd_out_rec_pow_A.csv diff --git a/powerflow/autotest/data_vfd_out_rec_pow_B.csv b/module/powerflow/autotest/data_vfd_out_rec_pow_B.csv similarity index 100% rename from powerflow/autotest/data_vfd_out_rec_pow_B.csv rename to module/powerflow/autotest/data_vfd_out_rec_pow_B.csv diff --git a/powerflow/autotest/data_vfd_out_rec_pow_C.csv b/module/powerflow/autotest/data_vfd_out_rec_pow_C.csv similarity index 100% rename from powerflow/autotest/data_vfd_out_rec_pow_C.csv rename to module/powerflow/autotest/data_vfd_out_rec_pow_C.csv diff --git a/powerflow/autotest/data_vfd_powRecorderA.csv b/module/powerflow/autotest/data_vfd_powRecorderA.csv similarity index 100% rename from powerflow/autotest/data_vfd_powRecorderA.csv rename to module/powerflow/autotest/data_vfd_powRecorderA.csv diff --git a/powerflow/autotest/data_vfd_powRecorderB.csv b/module/powerflow/autotest/data_vfd_powRecorderB.csv similarity index 100% rename from powerflow/autotest/data_vfd_powRecorderB.csv rename to module/powerflow/autotest/data_vfd_powRecorderB.csv diff --git a/powerflow/autotest/data_vfd_powRecorderC.csv b/module/powerflow/autotest/data_vfd_powRecorderC.csv similarity index 100% rename from powerflow/autotest/data_vfd_powRecorderC.csv rename to module/powerflow/autotest/data_vfd_powRecorderC.csv diff --git a/powerflow/autotest/data_vfd_speedPlayer_delta.player b/module/powerflow/autotest/data_vfd_speedPlayer_delta.player similarity index 100% rename from powerflow/autotest/data_vfd_speedPlayer_delta.player rename to module/powerflow/autotest/data_vfd_speedPlayer_delta.player diff --git a/powerflow/autotest/data_zip_measload_phaseA.csv b/module/powerflow/autotest/data_zip_measload_phaseA.csv similarity index 100% rename from powerflow/autotest/data_zip_measload_phaseA.csv rename to module/powerflow/autotest/data_zip_measload_phaseA.csv diff --git a/powerflow/autotest/data_zip_measload_phaseB.csv b/module/powerflow/autotest/data_zip_measload_phaseB.csv similarity index 100% rename from powerflow/autotest/data_zip_measload_phaseB.csv rename to module/powerflow/autotest/data_zip_measload_phaseB.csv diff --git a/powerflow/autotest/data_zip_measload_phaseC.csv b/module/powerflow/autotest/data_zip_measload_phaseC.csv similarity index 100% rename from powerflow/autotest/data_zip_measload_phaseC.csv rename to module/powerflow/autotest/data_zip_measload_phaseC.csv diff --git a/powerflow/autotest/dist_volt_A_Aref.player b/module/powerflow/autotest/dist_volt_A_Aref.player similarity index 100% rename from powerflow/autotest/dist_volt_A_Aref.player rename to module/powerflow/autotest/dist_volt_A_Aref.player diff --git a/powerflow/autotest/dist_volt_B_Aref.player b/module/powerflow/autotest/dist_volt_B_Aref.player similarity index 100% rename from powerflow/autotest/dist_volt_B_Aref.player rename to module/powerflow/autotest/dist_volt_B_Aref.player diff --git a/powerflow/autotest/dist_volt_C_Aref.player b/module/powerflow/autotest/dist_volt_C_Aref.player similarity index 100% rename from powerflow/autotest/dist_volt_C_Aref.player rename to module/powerflow/autotest/dist_volt_C_Aref.player diff --git a/powerflow/autotest/dutycycle_player.player b/module/powerflow/autotest/dutycycle_player.player similarity index 100% rename from powerflow/autotest/dutycycle_player.player rename to module/powerflow/autotest/dutycycle_player.player diff --git a/powerflow/autotest/feeder_schedules.glm b/module/powerflow/autotest/feeder_schedules.glm similarity index 100% rename from powerflow/autotest/feeder_schedules.glm rename to module/powerflow/autotest/feeder_schedules.glm diff --git a/powerflow/autotest/flat.player b/module/powerflow/autotest/flat.player similarity index 100% rename from powerflow/autotest/flat.player rename to module/powerflow/autotest/flat.player diff --git a/powerflow/autotest/fuse_assert_status_B.player b/module/powerflow/autotest/fuse_assert_status_B.player similarity index 100% rename from powerflow/autotest/fuse_assert_status_B.player rename to module/powerflow/autotest/fuse_assert_status_B.player diff --git a/powerflow/autotest/fuse_assert_status_C.player b/module/powerflow/autotest/fuse_assert_status_C.player similarity index 100% rename from powerflow/autotest/fuse_assert_status_C.player rename to module/powerflow/autotest/fuse_assert_status_C.player diff --git a/powerflow/autotest/fuse_load_B.player b/module/powerflow/autotest/fuse_load_B.player similarity index 100% rename from powerflow/autotest/fuse_load_B.player rename to module/powerflow/autotest/fuse_load_B.player diff --git a/powerflow/autotest/fuse_ph_A_status.player b/module/powerflow/autotest/fuse_ph_A_status.player similarity index 100% rename from powerflow/autotest/fuse_ph_A_status.player rename to module/powerflow/autotest/fuse_ph_A_status.player diff --git a/powerflow/autotest/fuse_ph_B_status.player b/module/powerflow/autotest/fuse_ph_B_status.player similarity index 100% rename from powerflow/autotest/fuse_ph_B_status.player rename to module/powerflow/autotest/fuse_ph_B_status.player diff --git a/powerflow/autotest/fuse_ph_C_status.player b/module/powerflow/autotest/fuse_ph_C_status.player similarity index 100% rename from powerflow/autotest/fuse_ph_C_status.player rename to module/powerflow/autotest/fuse_ph_C_status.player diff --git a/powerflow/autotest/linearLoadIncrease.player b/module/powerflow/autotest/linearLoadIncrease.player similarity index 100% rename from powerflow/autotest/linearLoadIncrease.player rename to module/powerflow/autotest/linearLoadIncrease.player diff --git a/powerflow/autotest/load_tracker_setpoint.player b/module/powerflow/autotest/load_tracker_setpoint.player similarity index 100% rename from powerflow/autotest/load_tracker_setpoint.player rename to module/powerflow/autotest/load_tracker_setpoint.player diff --git a/powerflow/autotest/loader_fastA.player b/module/powerflow/autotest/loader_fastA.player similarity index 100% rename from powerflow/autotest/loader_fastA.player rename to module/powerflow/autotest/loader_fastA.player diff --git a/powerflow/autotest/loader_fastA_NR.player b/module/powerflow/autotest/loader_fastA_NR.player similarity index 100% rename from powerflow/autotest/loader_fastA_NR.player rename to module/powerflow/autotest/loader_fastA_NR.player diff --git a/powerflow/autotest/loader_fastA_induct.player b/module/powerflow/autotest/loader_fastA_induct.player similarity index 100% rename from powerflow/autotest/loader_fastA_induct.player rename to module/powerflow/autotest/loader_fastA_induct.player diff --git a/powerflow/autotest/loader_fastB.player b/module/powerflow/autotest/loader_fastB.player similarity index 100% rename from powerflow/autotest/loader_fastB.player rename to module/powerflow/autotest/loader_fastB.player diff --git a/powerflow/autotest/loader_fastB_NR.player b/module/powerflow/autotest/loader_fastB_NR.player similarity index 100% rename from powerflow/autotest/loader_fastB_NR.player rename to module/powerflow/autotest/loader_fastB_NR.player diff --git a/powerflow/autotest/loader_fastB_induct.player b/module/powerflow/autotest/loader_fastB_induct.player similarity index 100% rename from powerflow/autotest/loader_fastB_induct.player rename to module/powerflow/autotest/loader_fastB_induct.player diff --git a/powerflow/autotest/loader_fastC.player b/module/powerflow/autotest/loader_fastC.player similarity index 100% rename from powerflow/autotest/loader_fastC.player rename to module/powerflow/autotest/loader_fastC.player diff --git a/powerflow/autotest/loader_fastC_NR.player b/module/powerflow/autotest/loader_fastC_NR.player similarity index 100% rename from powerflow/autotest/loader_fastC_NR.player rename to module/powerflow/autotest/loader_fastC_NR.player diff --git a/powerflow/autotest/loader_fastC_induct.player b/module/powerflow/autotest/loader_fastC_induct.player similarity index 100% rename from powerflow/autotest/loader_fastC_induct.player rename to module/powerflow/autotest/loader_fastC_induct.player diff --git a/powerflow/autotest/meter_reactive_energy_delta.player b/module/powerflow/autotest/meter_reactive_energy_delta.player similarity index 100% rename from powerflow/autotest/meter_reactive_energy_delta.player rename to module/powerflow/autotest/meter_reactive_energy_delta.player diff --git a/powerflow/autotest/meter_real_energy_delta.player b/module/powerflow/autotest/meter_real_energy_delta.player similarity index 100% rename from powerflow/autotest/meter_real_energy_delta.player rename to module/powerflow/autotest/meter_real_energy_delta.player diff --git a/powerflow/autotest/regulator_load_phA.player b/module/powerflow/autotest/regulator_load_phA.player similarity index 100% rename from powerflow/autotest/regulator_load_phA.player rename to module/powerflow/autotest/regulator_load_phA.player diff --git a/powerflow/autotest/regulator_load_phB.player b/module/powerflow/autotest/regulator_load_phB.player similarity index 100% rename from powerflow/autotest/regulator_load_phB.player rename to module/powerflow/autotest/regulator_load_phB.player diff --git a/powerflow/autotest/regulator_load_phC.player b/module/powerflow/autotest/regulator_load_phC.player similarity index 100% rename from powerflow/autotest/regulator_load_phC.player rename to module/powerflow/autotest/regulator_load_phC.player diff --git a/powerflow/autotest/regulator_manual_YY_assert_A.player b/module/powerflow/autotest/regulator_manual_YY_assert_A.player similarity index 100% rename from powerflow/autotest/regulator_manual_YY_assert_A.player rename to module/powerflow/autotest/regulator_manual_YY_assert_A.player diff --git a/powerflow/autotest/regulator_manual_YY_assert_A_TypeB.player b/module/powerflow/autotest/regulator_manual_YY_assert_A_TypeB.player similarity index 100% rename from powerflow/autotest/regulator_manual_YY_assert_A_TypeB.player rename to module/powerflow/autotest/regulator_manual_YY_assert_A_TypeB.player diff --git a/powerflow/autotest/regulator_manual_YY_assert_B.player b/module/powerflow/autotest/regulator_manual_YY_assert_B.player similarity index 100% rename from powerflow/autotest/regulator_manual_YY_assert_B.player rename to module/powerflow/autotest/regulator_manual_YY_assert_B.player diff --git a/powerflow/autotest/regulator_manual_YY_assert_B_TypeB.player b/module/powerflow/autotest/regulator_manual_YY_assert_B_TypeB.player similarity index 100% rename from powerflow/autotest/regulator_manual_YY_assert_B_TypeB.player rename to module/powerflow/autotest/regulator_manual_YY_assert_B_TypeB.player diff --git a/powerflow/autotest/regulator_manual_YY_assert_C.player b/module/powerflow/autotest/regulator_manual_YY_assert_C.player similarity index 100% rename from powerflow/autotest/regulator_manual_YY_assert_C.player rename to module/powerflow/autotest/regulator_manual_YY_assert_C.player diff --git a/powerflow/autotest/regulator_manual_YY_assert_C_TypeB.player b/module/powerflow/autotest/regulator_manual_YY_assert_C_TypeB.player similarity index 100% rename from powerflow/autotest/regulator_manual_YY_assert_C_TypeB.player rename to module/powerflow/autotest/regulator_manual_YY_assert_C_TypeB.player diff --git a/powerflow/autotest/regulator_manual_YY_tap_A.player b/module/powerflow/autotest/regulator_manual_YY_tap_A.player similarity index 100% rename from powerflow/autotest/regulator_manual_YY_tap_A.player rename to module/powerflow/autotest/regulator_manual_YY_tap_A.player diff --git a/powerflow/autotest/regulator_manual_YY_tap_B.player b/module/powerflow/autotest/regulator_manual_YY_tap_B.player similarity index 100% rename from powerflow/autotest/regulator_manual_YY_tap_B.player rename to module/powerflow/autotest/regulator_manual_YY_tap_B.player diff --git a/powerflow/autotest/regulator_manual_YY_tap_C.player b/module/powerflow/autotest/regulator_manual_YY_tap_C.player similarity index 100% rename from powerflow/autotest/regulator_manual_YY_tap_C.player rename to module/powerflow/autotest/regulator_manual_YY_tap_C.player diff --git a/powerflow/autotest/solver_ml.conf b/module/powerflow/autotest/solver_ml.conf similarity index 100% rename from powerflow/autotest/solver_ml.conf rename to module/powerflow/autotest/solver_ml.conf diff --git a/powerflow/autotest/solver_ml_check.py b/module/powerflow/autotest/solver_ml_check.py similarity index 100% rename from powerflow/autotest/solver_ml_check.py rename to module/powerflow/autotest/solver_ml_check.py diff --git a/powerflow/autotest/solver_py.conf b/module/powerflow/autotest/solver_py.conf similarity index 100% rename from powerflow/autotest/solver_py.conf rename to module/powerflow/autotest/solver_py.conf diff --git a/powerflow/autotest/solver_py.py b/module/powerflow/autotest/solver_py.py similarity index 100% rename from powerflow/autotest/solver_py.py rename to module/powerflow/autotest/solver_py.py diff --git a/powerflow/autotest/stub_bill_price.player b/module/powerflow/autotest/stub_bill_price.player similarity index 100% rename from powerflow/autotest/stub_bill_price.player rename to module/powerflow/autotest/stub_bill_price.player diff --git a/powerflow/autotest/stub_nofee_bill_value.player b/module/powerflow/autotest/stub_nofee_bill_value.player similarity index 100% rename from powerflow/autotest/stub_nofee_bill_value.player rename to module/powerflow/autotest/stub_nofee_bill_value.player diff --git a/powerflow/autotest/test_IEEE-123_FBS.glm b/module/powerflow/autotest/test_IEEE-123_FBS.glm similarity index 100% rename from powerflow/autotest/test_IEEE-123_FBS.glm rename to module/powerflow/autotest/test_IEEE-123_FBS.glm diff --git a/powerflow/autotest/test_IEEE-13_FBS.glm b/module/powerflow/autotest/test_IEEE-13_FBS.glm similarity index 100% rename from powerflow/autotest/test_IEEE-13_FBS.glm rename to module/powerflow/autotest/test_IEEE-13_FBS.glm diff --git a/powerflow/autotest/test_IEEE123_zero_voltages_FBS.glm b/module/powerflow/autotest/test_IEEE123_zero_voltages_FBS.glm similarity index 100% rename from powerflow/autotest/test_IEEE123_zero_voltages_FBS.glm rename to module/powerflow/autotest/test_IEEE123_zero_voltages_FBS.glm diff --git a/powerflow/autotest/test_IEEE123_zero_voltages_NR.glm b/module/powerflow/autotest/test_IEEE123_zero_voltages_NR.glm similarity index 100% rename from powerflow/autotest/test_IEEE123_zero_voltages_NR.glm rename to module/powerflow/autotest/test_IEEE123_zero_voltages_NR.glm diff --git a/powerflow/autotest/test_IEEE_13_FBS.glm b/module/powerflow/autotest/test_IEEE_13_FBS.glm similarity index 100% rename from powerflow/autotest/test_IEEE_13_FBS.glm rename to module/powerflow/autotest/test_IEEE_13_FBS.glm diff --git a/powerflow/autotest/test_IEEE_13_FBS_AMI.glm b/module/powerflow/autotest/test_IEEE_13_FBS_AMI.glm similarity index 100% rename from powerflow/autotest/test_IEEE_13_FBS_AMI.glm rename to module/powerflow/autotest/test_IEEE_13_FBS_AMI.glm diff --git a/powerflow/autotest/test_IEEE_13_FBS_AMI_24hr.glm b/module/powerflow/autotest/test_IEEE_13_FBS_AMI_24hr.glm similarity index 100% rename from powerflow/autotest/test_IEEE_13_FBS_AMI_24hr.glm rename to module/powerflow/autotest/test_IEEE_13_FBS_AMI_24hr.glm diff --git a/powerflow/autotest/test_IEEE_13_FBS_AMI_24hr_Mod_Res.glm b/module/powerflow/autotest/test_IEEE_13_FBS_AMI_24hr_Mod_Res.glm similarity index 100% rename from powerflow/autotest/test_IEEE_13_FBS_AMI_24hr_Mod_Res.glm rename to module/powerflow/autotest/test_IEEE_13_FBS_AMI_24hr_Mod_Res.glm diff --git a/powerflow/autotest/test_IEEE_13_FBS_AMI_LinearLoadChange.glm b/module/powerflow/autotest/test_IEEE_13_FBS_AMI_LinearLoadChange.glm similarity index 100% rename from powerflow/autotest/test_IEEE_13_FBS_AMI_LinearLoadChange.glm rename to module/powerflow/autotest/test_IEEE_13_FBS_AMI_LinearLoadChange.glm diff --git a/powerflow/autotest/test_IEEE_13_FBS_AMI_LinearLoadChangeTrim.glm b/module/powerflow/autotest/test_IEEE_13_FBS_AMI_LinearLoadChangeTrim.glm similarity index 100% rename from powerflow/autotest/test_IEEE_13_FBS_AMI_LinearLoadChangeTrim.glm rename to module/powerflow/autotest/test_IEEE_13_FBS_AMI_LinearLoadChangeTrim.glm diff --git a/powerflow/autotest/test_IEEE_13_FBS_AMI_StepParameterChange.glm b/module/powerflow/autotest/test_IEEE_13_FBS_AMI_StepParameterChange.glm similarity index 100% rename from powerflow/autotest/test_IEEE_13_FBS_AMI_StepParameterChange.glm rename to module/powerflow/autotest/test_IEEE_13_FBS_AMI_StepParameterChange.glm diff --git a/powerflow/autotest/test_IEEE_13_FBS_AMI_StepPropertyChange.glm b/module/powerflow/autotest/test_IEEE_13_FBS_AMI_StepPropertyChange.glm similarity index 100% rename from powerflow/autotest/test_IEEE_13_FBS_AMI_StepPropertyChange.glm rename to module/powerflow/autotest/test_IEEE_13_FBS_AMI_StepPropertyChange.glm diff --git a/powerflow/autotest/test_IEEE_13_FBS_AMI_StepPropertyChange2.glm b/module/powerflow/autotest/test_IEEE_13_FBS_AMI_StepPropertyChange2.glm similarity index 100% rename from powerflow/autotest/test_IEEE_13_FBS_AMI_StepPropertyChange2.glm rename to module/powerflow/autotest/test_IEEE_13_FBS_AMI_StepPropertyChange2.glm diff --git a/powerflow/autotest/test_IEEE_13_ML.glm b/module/powerflow/autotest/test_IEEE_13_ML.glm similarity index 100% rename from powerflow/autotest/test_IEEE_13_ML.glm rename to module/powerflow/autotest/test_IEEE_13_ML.glm diff --git a/powerflow/autotest/test_IEEE_13_NR.glm b/module/powerflow/autotest/test_IEEE_13_NR.glm similarity index 100% rename from powerflow/autotest/test_IEEE_13_NR.glm rename to module/powerflow/autotest/test_IEEE_13_NR.glm diff --git a/powerflow/autotest/test_IEEE_13_PY.glm b/module/powerflow/autotest/test_IEEE_13_PY.glm similarity index 100% rename from powerflow/autotest/test_IEEE_13_PY.glm rename to module/powerflow/autotest/test_IEEE_13_PY.glm diff --git a/powerflow/autotest/test_IEEE_37node.glm b/module/powerflow/autotest/test_IEEE_37node.glm similarity index 100% rename from powerflow/autotest/test_IEEE_37node.glm rename to module/powerflow/autotest/test_IEEE_37node.glm diff --git a/powerflow/autotest/test_NR_matrix_dump.glm b/module/powerflow/autotest/test_NR_matrix_dump.glm similarity index 100% rename from powerflow/autotest/test_NR_matrix_dump.glm rename to module/powerflow/autotest/test_NR_matrix_dump.glm diff --git a/powerflow/autotest/test_SPIM_err.glm b/module/powerflow/autotest/test_SPIM_err.glm similarity index 100% rename from powerflow/autotest/test_SPIM_err.glm rename to module/powerflow/autotest/test_SPIM_err.glm diff --git a/powerflow/autotest/test_SPIM_triplex_err.glm b/module/powerflow/autotest/test_SPIM_triplex_err.glm similarity index 100% rename from powerflow/autotest/test_SPIM_triplex_err.glm rename to module/powerflow/autotest/test_SPIM_triplex_err.glm diff --git a/powerflow/autotest/test_Simple_Switch_Fault_InRush_err.glm b/module/powerflow/autotest/test_Simple_Switch_Fault_InRush_err.glm similarity index 100% rename from powerflow/autotest/test_Simple_Switch_Fault_InRush_err.glm rename to module/powerflow/autotest/test_Simple_Switch_Fault_InRush_err.glm diff --git a/powerflow/autotest/test_ZIPLoad_ZeroBase_FBS.glm b/module/powerflow/autotest/test_ZIPLoad_ZeroBase_FBS.glm similarity index 100% rename from powerflow/autotest/test_ZIPLoad_ZeroBase_FBS.glm rename to module/powerflow/autotest/test_ZIPLoad_ZeroBase_FBS.glm diff --git a/powerflow/autotest/test_ZIPLoad_ZeroBase_NR.glm b/module/powerflow/autotest/test_ZIPLoad_ZeroBase_NR.glm similarity index 100% rename from powerflow/autotest/test_ZIPLoad_ZeroBase_NR.glm rename to module/powerflow/autotest/test_ZIPLoad_ZeroBase_NR.glm diff --git a/powerflow/autotest/test_balanced_stepdown_D-D.glm b/module/powerflow/autotest/test_balanced_stepdown_D-D.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_D-D.glm rename to module/powerflow/autotest/test_balanced_stepdown_D-D.glm diff --git a/powerflow/autotest/test_balanced_stepdown_D-D_NR.glm b/module/powerflow/autotest/test_balanced_stepdown_D-D_NR.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_D-D_NR.glm rename to module/powerflow/autotest/test_balanced_stepdown_D-D_NR.glm diff --git a/powerflow/autotest/test_balanced_stepdown_D-grY.glm b/module/powerflow/autotest/test_balanced_stepdown_D-grY.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_D-grY.glm rename to module/powerflow/autotest/test_balanced_stepdown_D-grY.glm diff --git a/powerflow/autotest/test_balanced_stepdown_D-grY_NR.glm b/module/powerflow/autotest/test_balanced_stepdown_D-grY_NR.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_D-grY_NR.glm rename to module/powerflow/autotest/test_balanced_stepdown_D-grY_NR.glm diff --git a/powerflow/autotest/test_balanced_stepdown_D-grY_phA.glm b/module/powerflow/autotest/test_balanced_stepdown_D-grY_phA.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_D-grY_phA.glm rename to module/powerflow/autotest/test_balanced_stepdown_D-grY_phA.glm diff --git a/powerflow/autotest/test_balanced_stepdown_D-grY_phAB.glm b/module/powerflow/autotest/test_balanced_stepdown_D-grY_phAB.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_D-grY_phAB.glm rename to module/powerflow/autotest/test_balanced_stepdown_D-grY_phAB.glm diff --git a/powerflow/autotest/test_balanced_stepdown_D-grY_phB.glm b/module/powerflow/autotest/test_balanced_stepdown_D-grY_phB.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_D-grY_phB.glm rename to module/powerflow/autotest/test_balanced_stepdown_D-grY_phB.glm diff --git a/powerflow/autotest/test_balanced_stepdown_D-grY_phC.glm b/module/powerflow/autotest/test_balanced_stepdown_D-grY_phC.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_D-grY_phC.glm rename to module/powerflow/autotest/test_balanced_stepdown_D-grY_phC.glm diff --git a/powerflow/autotest/test_balanced_stepdown_D_D_phA.glm b/module/powerflow/autotest/test_balanced_stepdown_D_D_phA.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_D_D_phA.glm rename to module/powerflow/autotest/test_balanced_stepdown_D_D_phA.glm diff --git a/powerflow/autotest/test_balanced_stepdown_D_D_phAB.glm b/module/powerflow/autotest/test_balanced_stepdown_D_D_phAB.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_D_D_phAB.glm rename to module/powerflow/autotest/test_balanced_stepdown_D_D_phAB.glm diff --git a/powerflow/autotest/test_balanced_stepdown_D_D_phB.glm b/module/powerflow/autotest/test_balanced_stepdown_D_D_phB.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_D_D_phB.glm rename to module/powerflow/autotest/test_balanced_stepdown_D_D_phB.glm diff --git a/powerflow/autotest/test_balanced_stepdown_D_D_phC.glm b/module/powerflow/autotest/test_balanced_stepdown_D_D_phC.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_D_D_phC.glm rename to module/powerflow/autotest/test_balanced_stepdown_D_D_phC.glm diff --git a/powerflow/autotest/test_balanced_stepdown_grY-grY.glm b/module/powerflow/autotest/test_balanced_stepdown_grY-grY.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_grY-grY.glm rename to module/powerflow/autotest/test_balanced_stepdown_grY-grY.glm diff --git a/powerflow/autotest/test_balanced_stepdown_grY-grY_NR.glm b/module/powerflow/autotest/test_balanced_stepdown_grY-grY_NR.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_grY-grY_NR.glm rename to module/powerflow/autotest/test_balanced_stepdown_grY-grY_NR.glm diff --git a/powerflow/autotest/test_balanced_stepdown_grY-grY_phA.glm b/module/powerflow/autotest/test_balanced_stepdown_grY-grY_phA.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_grY-grY_phA.glm rename to module/powerflow/autotest/test_balanced_stepdown_grY-grY_phA.glm diff --git a/powerflow/autotest/test_balanced_stepdown_grY-grY_phAB.glm b/module/powerflow/autotest/test_balanced_stepdown_grY-grY_phAB.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_grY-grY_phAB.glm rename to module/powerflow/autotest/test_balanced_stepdown_grY-grY_phAB.glm diff --git a/powerflow/autotest/test_balanced_stepdown_grY-grY_phB.glm b/module/powerflow/autotest/test_balanced_stepdown_grY-grY_phB.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_grY-grY_phB.glm rename to module/powerflow/autotest/test_balanced_stepdown_grY-grY_phB.glm diff --git a/powerflow/autotest/test_balanced_stepdown_grY-grY_phC.glm b/module/powerflow/autotest/test_balanced_stepdown_grY-grY_phC.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepdown_grY-grY_phC.glm rename to module/powerflow/autotest/test_balanced_stepdown_grY-grY_phC.glm diff --git a/powerflow/autotest/test_balanced_stepup_D-D.glm b/module/powerflow/autotest/test_balanced_stepup_D-D.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_D-D.glm rename to module/powerflow/autotest/test_balanced_stepup_D-D.glm diff --git a/powerflow/autotest/test_balanced_stepup_D-D_NR.glm b/module/powerflow/autotest/test_balanced_stepup_D-D_NR.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_D-D_NR.glm rename to module/powerflow/autotest/test_balanced_stepup_D-D_NR.glm diff --git a/powerflow/autotest/test_balanced_stepup_D-D_phA.glm b/module/powerflow/autotest/test_balanced_stepup_D-D_phA.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_D-D_phA.glm rename to module/powerflow/autotest/test_balanced_stepup_D-D_phA.glm diff --git a/powerflow/autotest/test_balanced_stepup_D-D_phAB.glm b/module/powerflow/autotest/test_balanced_stepup_D-D_phAB.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_D-D_phAB.glm rename to module/powerflow/autotest/test_balanced_stepup_D-D_phAB.glm diff --git a/powerflow/autotest/test_balanced_stepup_D-D_phB.glm b/module/powerflow/autotest/test_balanced_stepup_D-D_phB.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_D-D_phB.glm rename to module/powerflow/autotest/test_balanced_stepup_D-D_phB.glm diff --git a/powerflow/autotest/test_balanced_stepup_D-D_phC.glm b/module/powerflow/autotest/test_balanced_stepup_D-D_phC.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_D-D_phC.glm rename to module/powerflow/autotest/test_balanced_stepup_D-D_phC.glm diff --git a/powerflow/autotest/test_balanced_stepup_D-grY.glm b/module/powerflow/autotest/test_balanced_stepup_D-grY.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_D-grY.glm rename to module/powerflow/autotest/test_balanced_stepup_D-grY.glm diff --git a/powerflow/autotest/test_balanced_stepup_D-grY_NR.glm b/module/powerflow/autotest/test_balanced_stepup_D-grY_NR.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_D-grY_NR.glm rename to module/powerflow/autotest/test_balanced_stepup_D-grY_NR.glm diff --git a/powerflow/autotest/test_balanced_stepup_D-grY_phA.glm b/module/powerflow/autotest/test_balanced_stepup_D-grY_phA.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_D-grY_phA.glm rename to module/powerflow/autotest/test_balanced_stepup_D-grY_phA.glm diff --git a/powerflow/autotest/test_balanced_stepup_D-grY_phAB.glm b/module/powerflow/autotest/test_balanced_stepup_D-grY_phAB.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_D-grY_phAB.glm rename to module/powerflow/autotest/test_balanced_stepup_D-grY_phAB.glm diff --git a/powerflow/autotest/test_balanced_stepup_D-grY_phB.glm b/module/powerflow/autotest/test_balanced_stepup_D-grY_phB.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_D-grY_phB.glm rename to module/powerflow/autotest/test_balanced_stepup_D-grY_phB.glm diff --git a/powerflow/autotest/test_balanced_stepup_D-grY_phC.glm b/module/powerflow/autotest/test_balanced_stepup_D-grY_phC.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_D-grY_phC.glm rename to module/powerflow/autotest/test_balanced_stepup_D-grY_phC.glm diff --git a/powerflow/autotest/test_balanced_stepup_grY-grY.glm b/module/powerflow/autotest/test_balanced_stepup_grY-grY.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_grY-grY.glm rename to module/powerflow/autotest/test_balanced_stepup_grY-grY.glm diff --git a/powerflow/autotest/test_balanced_stepup_grY-grY_NR.glm b/module/powerflow/autotest/test_balanced_stepup_grY-grY_NR.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_grY-grY_NR.glm rename to module/powerflow/autotest/test_balanced_stepup_grY-grY_NR.glm diff --git a/powerflow/autotest/test_balanced_stepup_grY-grY_phA.glm b/module/powerflow/autotest/test_balanced_stepup_grY-grY_phA.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_grY-grY_phA.glm rename to module/powerflow/autotest/test_balanced_stepup_grY-grY_phA.glm diff --git a/powerflow/autotest/test_balanced_stepup_grY-grY_phAB.glm b/module/powerflow/autotest/test_balanced_stepup_grY-grY_phAB.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_grY-grY_phAB.glm rename to module/powerflow/autotest/test_balanced_stepup_grY-grY_phAB.glm diff --git a/powerflow/autotest/test_balanced_stepup_grY-grY_phB.glm b/module/powerflow/autotest/test_balanced_stepup_grY-grY_phB.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_grY-grY_phB.glm rename to module/powerflow/autotest/test_balanced_stepup_grY-grY_phB.glm diff --git a/powerflow/autotest/test_balanced_stepup_grY-grY_phC.glm b/module/powerflow/autotest/test_balanced_stepup_grY-grY_phC.glm similarity index 100% rename from powerflow/autotest/test_balanced_stepup_grY-grY_phC.glm rename to module/powerflow/autotest/test_balanced_stepup_grY-grY_phC.glm diff --git a/powerflow/autotest/test_c_matrix_line_capacitance_balanced.glm b/module/powerflow/autotest/test_c_matrix_line_capacitance_balanced.glm similarity index 100% rename from powerflow/autotest/test_c_matrix_line_capacitance_balanced.glm rename to module/powerflow/autotest/test_c_matrix_line_capacitance_balanced.glm diff --git a/powerflow/autotest/test_c_matrix_line_capacitance_balanced_NR.glm b/module/powerflow/autotest/test_c_matrix_line_capacitance_balanced_NR.glm similarity index 100% rename from powerflow/autotest/test_c_matrix_line_capacitance_balanced_NR.glm rename to module/powerflow/autotest/test_c_matrix_line_capacitance_balanced_NR.glm diff --git a/powerflow/autotest/test_capacitor_CURRENT_ABC_indiv.glm b/module/powerflow/autotest/test_capacitor_CURRENT_ABC_indiv.glm similarity index 100% rename from powerflow/autotest/test_capacitor_CURRENT_ABC_indiv.glm rename to module/powerflow/autotest/test_capacitor_CURRENT_ABC_indiv.glm diff --git a/powerflow/autotest/test_capacitor_CURRENT_ABC_indiv_NR.glm b/module/powerflow/autotest/test_capacitor_CURRENT_ABC_indiv_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_CURRENT_ABC_indiv_NR.glm rename to module/powerflow/autotest/test_capacitor_CURRENT_ABC_indiv_NR.glm diff --git a/powerflow/autotest/test_capacitor_VAR_ABC_BANK_B.glm b/module/powerflow/autotest/test_capacitor_VAR_ABC_BANK_B.glm similarity index 100% rename from powerflow/autotest/test_capacitor_VAR_ABC_BANK_B.glm rename to module/powerflow/autotest/test_capacitor_VAR_ABC_BANK_B.glm diff --git a/powerflow/autotest/test_capacitor_VAR_ABC_BANK_B_NR.glm b/module/powerflow/autotest/test_capacitor_VAR_ABC_BANK_B_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_VAR_ABC_BANK_B_NR.glm rename to module/powerflow/autotest/test_capacitor_VAR_ABC_BANK_B_NR.glm diff --git a/powerflow/autotest/test_capacitor_VAR_ABC_indiv.glm b/module/powerflow/autotest/test_capacitor_VAR_ABC_indiv.glm similarity index 100% rename from powerflow/autotest/test_capacitor_VAR_ABC_indiv.glm rename to module/powerflow/autotest/test_capacitor_VAR_ABC_indiv.glm diff --git a/powerflow/autotest/test_capacitor_VAR_ABC_indiv_NR.glm b/module/powerflow/autotest/test_capacitor_VAR_ABC_indiv_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_VAR_ABC_indiv_NR.glm rename to module/powerflow/autotest/test_capacitor_VAR_ABC_indiv_NR.glm diff --git a/powerflow/autotest/test_capacitor_VAR_ABC_indiv_Y.glm b/module/powerflow/autotest/test_capacitor_VAR_ABC_indiv_Y.glm similarity index 100% rename from powerflow/autotest/test_capacitor_VAR_ABC_indiv_Y.glm rename to module/powerflow/autotest/test_capacitor_VAR_ABC_indiv_Y.glm diff --git a/powerflow/autotest/test_capacitor_VAR_ABC_indiv_Y_NR.glm b/module/powerflow/autotest/test_capacitor_VAR_ABC_indiv_Y_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_VAR_ABC_indiv_Y_NR.glm rename to module/powerflow/autotest/test_capacitor_VAR_ABC_indiv_Y_NR.glm diff --git a/powerflow/autotest/test_capacitor_VAR_ABC_indiv_dwell.glm b/module/powerflow/autotest/test_capacitor_VAR_ABC_indiv_dwell.glm similarity index 100% rename from powerflow/autotest/test_capacitor_VAR_ABC_indiv_dwell.glm rename to module/powerflow/autotest/test_capacitor_VAR_ABC_indiv_dwell.glm diff --git a/powerflow/autotest/test_capacitor_VAR_ABC_indiv_dwell_NR.glm b/module/powerflow/autotest/test_capacitor_VAR_ABC_indiv_dwell_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_VAR_ABC_indiv_dwell_NR.glm rename to module/powerflow/autotest/test_capacitor_VAR_ABC_indiv_dwell_NR.glm diff --git a/powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv.glm b/module/powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv.glm similarity index 100% rename from powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv.glm rename to module/powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv.glm diff --git a/powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv_NR.glm b/module/powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv_NR.glm rename to module/powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv_NR.glm diff --git a/powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv_dwell.glm b/module/powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv_dwell.glm similarity index 100% rename from powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv_dwell.glm rename to module/powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv_dwell.glm diff --git a/powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv_dwell_NR.glm b/module/powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv_dwell_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv_dwell_NR.glm rename to module/powerflow/autotest/test_capacitor_VAR_VOLT_ABC_indiv_dwell_NR.glm diff --git a/powerflow/autotest/test_capacitor_counters.glm b/module/powerflow/autotest/test_capacitor_counters.glm similarity index 100% rename from powerflow/autotest/test_capacitor_counters.glm rename to module/powerflow/autotest/test_capacitor_counters.glm diff --git a/powerflow/autotest/test_capacitor_manual_ABC_bank_time_series.glm b/module/powerflow/autotest/test_capacitor_manual_ABC_bank_time_series.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_ABC_bank_time_series.glm rename to module/powerflow/autotest/test_capacitor_manual_ABC_bank_time_series.glm diff --git a/powerflow/autotest/test_capacitor_manual_ABC_bank_time_series_NR.glm b/module/powerflow/autotest/test_capacitor_manual_ABC_bank_time_series_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_ABC_bank_time_series_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_ABC_bank_time_series_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_ABC_time_series.glm b/module/powerflow/autotest/test_capacitor_manual_ABC_time_series.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_ABC_time_series.glm rename to module/powerflow/autotest/test_capacitor_manual_ABC_time_series.glm diff --git a/powerflow/autotest/test_capacitor_manual_ABC_time_series_NR.glm b/module/powerflow/autotest/test_capacitor_manual_ABC_time_series_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_ABC_time_series_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_ABC_time_series_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABBCD.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABBCD.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABBCD.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABBCD.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABBCD_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABBCD_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABBCD_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABBCD_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABBCD_Y.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABBCD_Y.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABBCD_Y.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABBCD_Y.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABBCD_Y_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABBCD_Y_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABBCD_Y_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABBCD_Y_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABBCD_service.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABBCD_service.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABBCD_service.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABBCD_service.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABCAD.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABCAD.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABCAD.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABCAD.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABCAD_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABCAD_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABCAD_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABCAD_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABCAD_Y.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABCAD_Y.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABCAD_Y.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABCAD_Y.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABCAD_Y_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABCAD_Y_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABCAD_Y_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABCAD_Y_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABD.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABD.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABD.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABD.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABD_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABD_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABD_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABD_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABD_Y.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABD_Y.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABD_Y.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABD_Y.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABD_Y_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABD_Y_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABD_Y_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABD_Y_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABN.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABN.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABN.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABN.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_ABN_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_ABN_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_ABN_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_ABN_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_AN.glm b/module/powerflow/autotest/test_capacitor_manual_single_AN.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_AN.glm rename to module/powerflow/autotest/test_capacitor_manual_single_AN.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_AN_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_AN_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_AN_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_AN_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_All_D.glm b/module/powerflow/autotest/test_capacitor_manual_single_All_D.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_All_D.glm rename to module/powerflow/autotest/test_capacitor_manual_single_All_D.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_All_D_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_All_D_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_All_D_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_All_D_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_All_D_Y.glm b/module/powerflow/autotest/test_capacitor_manual_single_All_D_Y.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_All_D_Y.glm rename to module/powerflow/autotest/test_capacitor_manual_single_All_D_Y.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_All_D_Y_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_All_D_Y_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_All_D_Y_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_All_D_Y_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_All_N.glm b/module/powerflow/autotest/test_capacitor_manual_single_All_N.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_All_N.glm rename to module/powerflow/autotest/test_capacitor_manual_single_All_N.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_All_N_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_All_N_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_All_N_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_All_N_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_BCCAD.glm b/module/powerflow/autotest/test_capacitor_manual_single_BCCAD.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_BCCAD.glm rename to module/powerflow/autotest/test_capacitor_manual_single_BCCAD.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_BCCAD_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_BCCAD_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_BCCAD_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_BCCAD_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_BCCAD_Y.glm b/module/powerflow/autotest/test_capacitor_manual_single_BCCAD_Y.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_BCCAD_Y.glm rename to module/powerflow/autotest/test_capacitor_manual_single_BCCAD_Y.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_BCCAD_Y_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_BCCAD_Y_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_BCCAD_Y_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_BCCAD_Y_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_BCD.glm b/module/powerflow/autotest/test_capacitor_manual_single_BCD.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_BCD.glm rename to module/powerflow/autotest/test_capacitor_manual_single_BCD.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_BCD_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_BCD_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_BCD_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_BCD_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_BCD_Y.glm b/module/powerflow/autotest/test_capacitor_manual_single_BCD_Y.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_BCD_Y.glm rename to module/powerflow/autotest/test_capacitor_manual_single_BCD_Y.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_BCD_Y_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_BCD_Y_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_BCD_Y_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_BCD_Y_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_BCN.glm b/module/powerflow/autotest/test_capacitor_manual_single_BCN.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_BCN.glm rename to module/powerflow/autotest/test_capacitor_manual_single_BCN.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_BCN_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_BCN_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_BCN_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_BCN_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_BN.glm b/module/powerflow/autotest/test_capacitor_manual_single_BN.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_BN.glm rename to module/powerflow/autotest/test_capacitor_manual_single_BN.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_BN_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_BN_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_BN_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_BN_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_CAD.glm b/module/powerflow/autotest/test_capacitor_manual_single_CAD.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_CAD.glm rename to module/powerflow/autotest/test_capacitor_manual_single_CAD.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_CAD_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_CAD_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_CAD_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_CAD_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_CAD_Y.glm b/module/powerflow/autotest/test_capacitor_manual_single_CAD_Y.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_CAD_Y.glm rename to module/powerflow/autotest/test_capacitor_manual_single_CAD_Y.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_CAD_Y_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_CAD_Y_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_CAD_Y_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_CAD_Y_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_CAN.glm b/module/powerflow/autotest/test_capacitor_manual_single_CAN.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_CAN.glm rename to module/powerflow/autotest/test_capacitor_manual_single_CAN.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_CAN_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_CAN_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_CAN_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_CAN_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_CN.glm b/module/powerflow/autotest/test_capacitor_manual_single_CN.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_CN.glm rename to module/powerflow/autotest/test_capacitor_manual_single_CN.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_CN_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_CN_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_CN_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_CN_NR.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_allOff.glm b/module/powerflow/autotest/test_capacitor_manual_single_allOff.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_allOff.glm rename to module/powerflow/autotest/test_capacitor_manual_single_allOff.glm diff --git a/powerflow/autotest/test_capacitor_manual_single_allOff_NR.glm b/module/powerflow/autotest/test_capacitor_manual_single_allOff_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_manual_single_allOff_NR.glm rename to module/powerflow/autotest/test_capacitor_manual_single_allOff_NR.glm diff --git a/powerflow/autotest/test_capacitor_volt_ABC_BANK_A.glm b/module/powerflow/autotest/test_capacitor_volt_ABC_BANK_A.glm similarity index 100% rename from powerflow/autotest/test_capacitor_volt_ABC_BANK_A.glm rename to module/powerflow/autotest/test_capacitor_volt_ABC_BANK_A.glm diff --git a/powerflow/autotest/test_capacitor_volt_ABC_BANK_A_NR.glm b/module/powerflow/autotest/test_capacitor_volt_ABC_BANK_A_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_volt_ABC_BANK_A_NR.glm rename to module/powerflow/autotest/test_capacitor_volt_ABC_BANK_A_NR.glm diff --git a/powerflow/autotest/test_capacitor_volt_ABC_indiv.glm b/module/powerflow/autotest/test_capacitor_volt_ABC_indiv.glm similarity index 100% rename from powerflow/autotest/test_capacitor_volt_ABC_indiv.glm rename to module/powerflow/autotest/test_capacitor_volt_ABC_indiv.glm diff --git a/powerflow/autotest/test_capacitor_volt_ABC_indiv_NR.glm b/module/powerflow/autotest/test_capacitor_volt_ABC_indiv_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_volt_ABC_indiv_NR.glm rename to module/powerflow/autotest/test_capacitor_volt_ABC_indiv_NR.glm diff --git a/powerflow/autotest/test_capacitor_volt_ABC_indiv_Y.glm b/module/powerflow/autotest/test_capacitor_volt_ABC_indiv_Y.glm similarity index 100% rename from powerflow/autotest/test_capacitor_volt_ABC_indiv_Y.glm rename to module/powerflow/autotest/test_capacitor_volt_ABC_indiv_Y.glm diff --git a/powerflow/autotest/test_capacitor_volt_ABC_indiv_Y_NR.glm b/module/powerflow/autotest/test_capacitor_volt_ABC_indiv_Y_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_volt_ABC_indiv_Y_NR.glm rename to module/powerflow/autotest/test_capacitor_volt_ABC_indiv_Y_NR.glm diff --git a/powerflow/autotest/test_capacitor_volt_ABC_indiv_dwell.glm b/module/powerflow/autotest/test_capacitor_volt_ABC_indiv_dwell.glm similarity index 100% rename from powerflow/autotest/test_capacitor_volt_ABC_indiv_dwell.glm rename to module/powerflow/autotest/test_capacitor_volt_ABC_indiv_dwell.glm diff --git a/powerflow/autotest/test_capacitor_volt_ABC_indiv_dwell_NR.glm b/module/powerflow/autotest/test_capacitor_volt_ABC_indiv_dwell_NR.glm similarity index 100% rename from powerflow/autotest/test_capacitor_volt_ABC_indiv_dwell_NR.glm rename to module/powerflow/autotest/test_capacitor_volt_ABC_indiv_dwell_NR.glm diff --git a/powerflow/autotest/test_capacitor_volt_single_ABBCD_service.glm b/module/powerflow/autotest/test_capacitor_volt_single_ABBCD_service.glm similarity index 100% rename from powerflow/autotest/test_capacitor_volt_single_ABBCD_service.glm rename to module/powerflow/autotest/test_capacitor_volt_single_ABBCD_service.glm diff --git a/powerflow/autotest/test_center_tapped_basic.glm b/module/powerflow/autotest/test_center_tapped_basic.glm similarity index 100% rename from powerflow/autotest/test_center_tapped_basic.glm rename to module/powerflow/autotest/test_center_tapped_basic.glm diff --git a/powerflow/autotest/test_center_tapped_basic_NR.glm b/module/powerflow/autotest/test_center_tapped_basic_NR.glm similarity index 100% rename from powerflow/autotest/test_center_tapped_basic_NR.glm rename to module/powerflow/autotest/test_center_tapped_basic_NR.glm diff --git a/powerflow/autotest/test_center_tapped_complex.glm b/module/powerflow/autotest/test_center_tapped_complex.glm similarity index 100% rename from powerflow/autotest/test_center_tapped_complex.glm rename to module/powerflow/autotest/test_center_tapped_complex.glm diff --git a/powerflow/autotest/test_center_tapped_complex_NR.glm b/module/powerflow/autotest/test_center_tapped_complex_NR.glm similarity index 100% rename from powerflow/autotest/test_center_tapped_complex_NR.glm rename to module/powerflow/autotest/test_center_tapped_complex_NR.glm diff --git a/powerflow/autotest/test_combination_loads_FBS.glm b/module/powerflow/autotest/test_combination_loads_FBS.glm similarity index 100% rename from powerflow/autotest/test_combination_loads_FBS.glm rename to module/powerflow/autotest/test_combination_loads_FBS.glm diff --git a/powerflow/autotest/test_combination_loads_NR.glm b/module/powerflow/autotest/test_combination_loads_NR.glm similarity index 100% rename from powerflow/autotest/test_combination_loads_NR.glm rename to module/powerflow/autotest/test_combination_loads_NR.glm diff --git a/powerflow/autotest/test_delta_IEEE_123node_cap_service_err.glm b/module/powerflow/autotest/test_delta_IEEE_123node_cap_service_err.glm similarity index 100% rename from powerflow/autotest/test_delta_IEEE_123node_cap_service_err.glm rename to module/powerflow/autotest/test_delta_IEEE_123node_cap_service_err.glm diff --git a/powerflow/autotest/test_delta_IEEE_123node_test_err.glm b/module/powerflow/autotest/test_delta_IEEE_123node_test_err.glm similarity index 100% rename from powerflow/autotest/test_delta_IEEE_123node_test_err.glm rename to module/powerflow/autotest/test_delta_IEEE_123node_test_err.glm diff --git a/powerflow/autotest/test_different_load_parent_Delta_NR.glm b/module/powerflow/autotest/test_different_load_parent_Delta_NR.glm similarity index 100% rename from powerflow/autotest/test_different_load_parent_Delta_NR.glm rename to module/powerflow/autotest/test_different_load_parent_Delta_NR.glm diff --git a/powerflow/autotest/test_different_load_parent_Wye_NR.glm b/module/powerflow/autotest/test_different_load_parent_Wye_NR.glm similarity index 100% rename from powerflow/autotest/test_different_load_parent_Wye_NR.glm rename to module/powerflow/autotest/test_different_load_parent_Wye_NR.glm diff --git a/powerflow/autotest/test_disconnected_node.glm b/module/powerflow/autotest/test_disconnected_node.glm similarity index 100% rename from powerflow/autotest/test_disconnected_node.glm rename to module/powerflow/autotest/test_disconnected_node.glm diff --git a/powerflow/autotest/test_duplicate_NR_err.glm b/module/powerflow/autotest/test_duplicate_NR_err.glm similarity index 100% rename from powerflow/autotest/test_duplicate_NR_err.glm rename to module/powerflow/autotest/test_duplicate_NR_err.glm diff --git a/powerflow/autotest/test_dutycycle.glm b/module/powerflow/autotest/test_dutycycle.glm similarity index 100% rename from powerflow/autotest/test_dutycycle.glm rename to module/powerflow/autotest/test_dutycycle.glm diff --git a/powerflow/autotest/test_fuse.glm b/module/powerflow/autotest/test_fuse.glm similarity index 100% rename from powerflow/autotest/test_fuse.glm rename to module/powerflow/autotest/test_fuse.glm diff --git a/powerflow/autotest/test_fuse_switched_out_of_service.glm b/module/powerflow/autotest/test_fuse_switched_out_of_service.glm similarity index 100% rename from powerflow/autotest/test_fuse_switched_out_of_service.glm rename to module/powerflow/autotest/test_fuse_switched_out_of_service.glm diff --git a/powerflow/autotest/test_line_sensor.glm b/module/powerflow/autotest/test_line_sensor.glm similarity index 100% rename from powerflow/autotest/test_line_sensor.glm rename to module/powerflow/autotest/test_line_sensor.glm diff --git a/powerflow/autotest/test_link_same_from_and_to_FBS_err.glm b/module/powerflow/autotest/test_link_same_from_and_to_FBS_err.glm similarity index 100% rename from powerflow/autotest/test_link_same_from_and_to_FBS_err.glm rename to module/powerflow/autotest/test_link_same_from_and_to_FBS_err.glm diff --git a/powerflow/autotest/test_link_same_from_and_to_NR_err.glm b/module/powerflow/autotest/test_link_same_from_and_to_NR_err.glm similarity index 100% rename from powerflow/autotest/test_link_same_from_and_to_NR_err.glm rename to module/powerflow/autotest/test_link_same_from_and_to_NR_err.glm diff --git a/powerflow/autotest/test_load_tracker.glm b/module/powerflow/autotest/test_load_tracker.glm similarity index 100% rename from powerflow/autotest/test_load_tracker.glm rename to module/powerflow/autotest/test_load_tracker.glm diff --git a/powerflow/autotest/test_load_tracker_NR.glm b/module/powerflow/autotest/test_load_tracker_NR.glm similarity index 100% rename from powerflow/autotest/test_load_tracker_NR.glm rename to module/powerflow/autotest/test_load_tracker_NR.glm diff --git a/powerflow/autotest/test_load_tracker_damped.glm b/module/powerflow/autotest/test_load_tracker_damped.glm similarity index 100% rename from powerflow/autotest/test_load_tracker_damped.glm rename to module/powerflow/autotest/test_load_tracker_damped.glm diff --git a/powerflow/autotest/test_load_tracker_damped_NR.glm b/module/powerflow/autotest/test_load_tracker_damped_NR.glm similarity index 100% rename from powerflow/autotest/test_load_tracker_damped_NR.glm rename to module/powerflow/autotest/test_load_tracker_damped_NR.glm diff --git a/powerflow/autotest/test_load_tracker_double.glm b/module/powerflow/autotest/test_load_tracker_double.glm similarity index 100% rename from powerflow/autotest/test_load_tracker_double.glm rename to module/powerflow/autotest/test_load_tracker_double.glm diff --git a/powerflow/autotest/test_load_tracker_double_NR.glm b/module/powerflow/autotest/test_load_tracker_double_NR.glm similarity index 100% rename from powerflow/autotest/test_load_tracker_double_NR.glm rename to module/powerflow/autotest/test_load_tracker_double_NR.glm diff --git a/powerflow/autotest/test_meter_delta.glm b/module/powerflow/autotest/test_meter_delta.glm similarity index 100% rename from powerflow/autotest/test_meter_delta.glm rename to module/powerflow/autotest/test_meter_delta.glm diff --git a/powerflow/autotest/test_multi_island.glm b/module/powerflow/autotest/test_multi_island.glm similarity index 100% rename from powerflow/autotest/test_multi_island.glm rename to module/powerflow/autotest/test_multi_island.glm diff --git a/powerflow/autotest/test_multi_island_SWING_PQ.glm b/module/powerflow/autotest/test_multi_island_SWING_PQ.glm similarity index 100% rename from powerflow/autotest/test_multi_island_SWING_PQ.glm rename to module/powerflow/autotest/test_multi_island_SWING_PQ.glm diff --git a/powerflow/autotest/test_node_phaseS_check_FBS_err.glm b/module/powerflow/autotest/test_node_phaseS_check_FBS_err.glm similarity index 100% rename from powerflow/autotest/test_node_phaseS_check_FBS_err.glm rename to module/powerflow/autotest/test_node_phaseS_check_FBS_err.glm diff --git a/powerflow/autotest/test_node_phaseS_check_NR_err.glm b/module/powerflow/autotest/test_node_phaseS_check_NR_err.glm similarity index 100% rename from powerflow/autotest/test_node_phaseS_check_NR_err.glm rename to module/powerflow/autotest/test_node_phaseS_check_NR_err.glm diff --git a/powerflow/autotest/test_nonzero_initial_meter_reading.glm b/module/powerflow/autotest/test_nonzero_initial_meter_reading.glm similarity index 100% rename from powerflow/autotest/test_nonzero_initial_meter_reading.glm rename to module/powerflow/autotest/test_nonzero_initial_meter_reading.glm diff --git a/powerflow/autotest/test_opt_reg_linedropcomp2_YY_A_NR.glm b/module/powerflow/autotest/test_opt_reg_linedropcomp2_YY_A_NR.glm similarity index 100% rename from powerflow/autotest/test_opt_reg_linedropcomp2_YY_A_NR.glm rename to module/powerflow/autotest/test_opt_reg_linedropcomp2_YY_A_NR.glm diff --git a/powerflow/autotest/test_opt_reg_linedropcomp2_YY_A_NR_ts.glm b/module/powerflow/autotest/test_opt_reg_linedropcomp2_YY_A_NR_ts.glm similarity index 100% rename from powerflow/autotest/test_opt_reg_linedropcomp2_YY_A_NR_ts.glm rename to module/powerflow/autotest/test_opt_reg_linedropcomp2_YY_A_NR_ts.glm diff --git a/powerflow/autotest/test_opt_reg_linedropcomp2_YY_B_NR.glm b/module/powerflow/autotest/test_opt_reg_linedropcomp2_YY_B_NR.glm similarity index 100% rename from powerflow/autotest/test_opt_reg_linedropcomp2_YY_B_NR.glm rename to module/powerflow/autotest/test_opt_reg_linedropcomp2_YY_B_NR.glm diff --git a/powerflow/autotest/test_opt_reg_linedropcomp2_YY_B_NR_ts.glm b/module/powerflow/autotest/test_opt_reg_linedropcomp2_YY_B_NR_ts.glm similarity index 100% rename from powerflow/autotest/test_opt_reg_linedropcomp2_YY_B_NR_ts.glm rename to module/powerflow/autotest/test_opt_reg_linedropcomp2_YY_B_NR_ts.glm diff --git a/powerflow/autotest/test_opt_regulator_linedropcomp_YY_A_NR.glm b/module/powerflow/autotest/test_opt_regulator_linedropcomp_YY_A_NR.glm similarity index 100% rename from powerflow/autotest/test_opt_regulator_linedropcomp_YY_A_NR.glm rename to module/powerflow/autotest/test_opt_regulator_linedropcomp_YY_A_NR.glm diff --git a/powerflow/autotest/test_opt_regulator_linedropcomp_YY_A_NR_ts.glm b/module/powerflow/autotest/test_opt_regulator_linedropcomp_YY_A_NR_ts.glm similarity index 100% rename from powerflow/autotest/test_opt_regulator_linedropcomp_YY_A_NR_ts.glm rename to module/powerflow/autotest/test_opt_regulator_linedropcomp_YY_A_NR_ts.glm diff --git a/powerflow/autotest/test_opt_regulator_linedropcomp_YY_B_NR.glm b/module/powerflow/autotest/test_opt_regulator_linedropcomp_YY_B_NR.glm similarity index 100% rename from powerflow/autotest/test_opt_regulator_linedropcomp_YY_B_NR.glm rename to module/powerflow/autotest/test_opt_regulator_linedropcomp_YY_B_NR.glm diff --git a/powerflow/autotest/test_opt_regulator_linedropcomp_YY_B_NR_ts.glm b/module/powerflow/autotest/test_opt_regulator_linedropcomp_YY_B_NR_ts.glm similarity index 100% rename from powerflow/autotest/test_opt_regulator_linedropcomp_YY_B_NR_ts.glm rename to module/powerflow/autotest/test_opt_regulator_linedropcomp_YY_B_NR_ts.glm diff --git a/powerflow/autotest/test_pole.csv b/module/powerflow/autotest/test_pole.csv similarity index 100% rename from powerflow/autotest/test_pole.csv rename to module/powerflow/autotest/test_pole.csv diff --git a/powerflow/autotest/test_pole.glm b/module/powerflow/autotest/test_pole.glm similarity index 100% rename from powerflow/autotest/test_pole.glm rename to module/powerflow/autotest/test_pole.glm diff --git a/powerflow/autotest/test_pole_NR.glm b/module/powerflow/autotest/test_pole_NR.glm similarity index 100% rename from powerflow/autotest/test_pole_NR.glm rename to module/powerflow/autotest/test_pole_NR.glm diff --git a/powerflow/autotest/test_pole_err.glm b/module/powerflow/autotest/test_pole_err.glm similarity index 100% rename from powerflow/autotest/test_pole_err.glm rename to module/powerflow/autotest/test_pole_err.glm diff --git a/powerflow/autotest/test_powerflow_NR_network.glm b/module/powerflow/autotest/test_powerflow_NR_network.glm similarity index 100% rename from powerflow/autotest/test_powerflow_NR_network.glm rename to module/powerflow/autotest/test_powerflow_NR_network.glm diff --git a/powerflow/autotest/test_powerflow_exercise_4_1_3.glm b/module/powerflow/autotest/test_powerflow_exercise_4_1_3.glm similarity index 100% rename from powerflow/autotest/test_powerflow_exercise_4_1_3.glm rename to module/powerflow/autotest/test_powerflow_exercise_4_1_3.glm diff --git a/powerflow/autotest/test_powerflow_reg_bank_rev_flow_control_current_pos_tap_pos.player b/module/powerflow/autotest/test_powerflow_reg_bank_rev_flow_control_current_pos_tap_pos.player similarity index 100% rename from powerflow/autotest/test_powerflow_reg_bank_rev_flow_control_current_pos_tap_pos.player rename to module/powerflow/autotest/test_powerflow_reg_bank_rev_flow_control_current_pos_tap_pos.player diff --git a/powerflow/autotest/test_powerflow_reg_bank_rev_flow_control_neutral_tap_pos.player b/module/powerflow/autotest/test_powerflow_reg_bank_rev_flow_control_neutral_tap_pos.player similarity index 100% rename from powerflow/autotest/test_powerflow_reg_bank_rev_flow_control_neutral_tap_pos.player rename to module/powerflow/autotest/test_powerflow_reg_bank_rev_flow_control_neutral_tap_pos.player diff --git a/powerflow/autotest/test_powerflow_reg_bank_reverse_flow_control_current_pos.glm b/module/powerflow/autotest/test_powerflow_reg_bank_reverse_flow_control_current_pos.glm similarity index 100% rename from powerflow/autotest/test_powerflow_reg_bank_reverse_flow_control_current_pos.glm rename to module/powerflow/autotest/test_powerflow_reg_bank_reverse_flow_control_current_pos.glm diff --git a/powerflow/autotest/test_powerflow_reg_bank_reverse_flow_control_neutral.glm b/module/powerflow/autotest/test_powerflow_reg_bank_reverse_flow_control_neutral.glm similarity index 100% rename from powerflow/autotest/test_powerflow_reg_bank_reverse_flow_control_neutral.glm rename to module/powerflow/autotest/test_powerflow_reg_bank_reverse_flow_control_neutral.glm diff --git a/powerflow/autotest/test_powerflow_reg_counters.glm b/module/powerflow/autotest/test_powerflow_reg_counters.glm similarity index 100% rename from powerflow/autotest/test_powerflow_reg_counters.glm rename to module/powerflow/autotest/test_powerflow_reg_counters.glm diff --git a/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_A.player b/module/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_A.player similarity index 100% rename from powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_A.player rename to module/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_A.player diff --git a/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_B.player b/module/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_B.player similarity index 100% rename from powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_B.player rename to module/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_B.player diff --git a/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_C.player b/module/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_C.player similarity index 100% rename from powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_C.player rename to module/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_current_pos_tap_pos_C.player diff --git a/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_A.player b/module/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_A.player similarity index 100% rename from powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_A.player rename to module/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_A.player diff --git a/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_B.player b/module/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_B.player similarity index 100% rename from powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_B.player rename to module/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_B.player diff --git a/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_C.player b/module/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_C.player similarity index 100% rename from powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_C.player rename to module/powerflow/autotest/test_powerflow_reg_ind_rev_flow_control_neutral_tap_pos_C.player diff --git a/powerflow/autotest/test_powerflow_reg_ind_reverse_flow_control_current_pos.glm b/module/powerflow/autotest/test_powerflow_reg_ind_reverse_flow_control_current_pos.glm similarity index 100% rename from powerflow/autotest/test_powerflow_reg_ind_reverse_flow_control_current_pos.glm rename to module/powerflow/autotest/test_powerflow_reg_ind_reverse_flow_control_current_pos.glm diff --git a/powerflow/autotest/test_powerflow_reg_ind_reverse_flow_control_neutral.glm b/module/powerflow/autotest/test_powerflow_reg_ind_reverse_flow_control_neutral.glm similarity index 100% rename from powerflow/autotest/test_powerflow_reg_ind_reverse_flow_control_neutral.glm rename to module/powerflow/autotest/test_powerflow_reg_ind_reverse_flow_control_neutral.glm diff --git a/powerflow/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_A.player b/module/powerflow/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_A.player similarity index 100% rename from powerflow/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_A.player rename to module/powerflow/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_A.player diff --git a/powerflow/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_B.player b/module/powerflow/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_B.player similarity index 100% rename from powerflow/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_B.player rename to module/powerflow/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_B.player diff --git a/powerflow/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_C.player b/module/powerflow/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_C.player similarity index 100% rename from powerflow/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_C.player rename to module/powerflow/autotest/test_powerflow_reg_rev_flow_control_neutral_ind_C.player diff --git a/powerflow/autotest/test_powerflow_transformer_thermal_model.glm b/module/powerflow/autotest/test_powerflow_transformer_thermal_model.glm similarity index 100% rename from powerflow/autotest/test_powerflow_transformer_thermal_model.glm rename to module/powerflow/autotest/test_powerflow_transformer_thermal_model.glm diff --git a/powerflow/autotest/test_powerflow_triplex_load.glm b/module/powerflow/autotest/test_powerflow_triplex_load.glm similarity index 100% rename from powerflow/autotest/test_powerflow_triplex_load.glm rename to module/powerflow/autotest/test_powerflow_triplex_load.glm diff --git a/powerflow/autotest/test_reg.player b/module/powerflow/autotest/test_reg.player similarity index 100% rename from powerflow/autotest/test_reg.player rename to module/powerflow/autotest/test_reg.player diff --git a/powerflow/autotest/test_regulator_linedropcomp2_YY_A.glm b/module/powerflow/autotest/test_regulator_linedropcomp2_YY_A.glm similarity index 100% rename from powerflow/autotest/test_regulator_linedropcomp2_YY_A.glm rename to module/powerflow/autotest/test_regulator_linedropcomp2_YY_A.glm diff --git a/powerflow/autotest/test_regulator_linedropcomp2_YY_A_ts.glm b/module/powerflow/autotest/test_regulator_linedropcomp2_YY_A_ts.glm similarity index 100% rename from powerflow/autotest/test_regulator_linedropcomp2_YY_A_ts.glm rename to module/powerflow/autotest/test_regulator_linedropcomp2_YY_A_ts.glm diff --git a/powerflow/autotest/test_regulator_linedropcomp2_YY_B.glm b/module/powerflow/autotest/test_regulator_linedropcomp2_YY_B.glm similarity index 100% rename from powerflow/autotest/test_regulator_linedropcomp2_YY_B.glm rename to module/powerflow/autotest/test_regulator_linedropcomp2_YY_B.glm diff --git a/powerflow/autotest/test_regulator_linedropcomp2_YY_B_ts.glm b/module/powerflow/autotest/test_regulator_linedropcomp2_YY_B_ts.glm similarity index 100% rename from powerflow/autotest/test_regulator_linedropcomp2_YY_B_ts.glm rename to module/powerflow/autotest/test_regulator_linedropcomp2_YY_B_ts.glm diff --git a/powerflow/autotest/test_regulator_linedropcomp_YY_A.glm b/module/powerflow/autotest/test_regulator_linedropcomp_YY_A.glm similarity index 100% rename from powerflow/autotest/test_regulator_linedropcomp_YY_A.glm rename to module/powerflow/autotest/test_regulator_linedropcomp_YY_A.glm diff --git a/powerflow/autotest/test_regulator_linedropcomp_YY_A_ts.glm b/module/powerflow/autotest/test_regulator_linedropcomp_YY_A_ts.glm similarity index 100% rename from powerflow/autotest/test_regulator_linedropcomp_YY_A_ts.glm rename to module/powerflow/autotest/test_regulator_linedropcomp_YY_A_ts.glm diff --git a/powerflow/autotest/test_regulator_linedropcomp_YY_B.glm b/module/powerflow/autotest/test_regulator_linedropcomp_YY_B.glm similarity index 100% rename from powerflow/autotest/test_regulator_linedropcomp_YY_B.glm rename to module/powerflow/autotest/test_regulator_linedropcomp_YY_B.glm diff --git a/powerflow/autotest/test_regulator_linedropcomp_YY_B_ts.glm b/module/powerflow/autotest/test_regulator_linedropcomp_YY_B_ts.glm similarity index 100% rename from powerflow/autotest/test_regulator_linedropcomp_YY_B_ts.glm rename to module/powerflow/autotest/test_regulator_linedropcomp_YY_B_ts.glm diff --git a/powerflow/autotest/test_regulator_manual_YY_A.glm b/module/powerflow/autotest/test_regulator_manual_YY_A.glm similarity index 100% rename from powerflow/autotest/test_regulator_manual_YY_A.glm rename to module/powerflow/autotest/test_regulator_manual_YY_A.glm diff --git a/powerflow/autotest/test_regulator_manual_YY_A_1ph.glm b/module/powerflow/autotest/test_regulator_manual_YY_A_1ph.glm similarity index 100% rename from powerflow/autotest/test_regulator_manual_YY_A_1ph.glm rename to module/powerflow/autotest/test_regulator_manual_YY_A_1ph.glm diff --git a/powerflow/autotest/test_regulator_manual_YY_A_1ph_NR.glm b/module/powerflow/autotest/test_regulator_manual_YY_A_1ph_NR.glm similarity index 100% rename from powerflow/autotest/test_regulator_manual_YY_A_1ph_NR.glm rename to module/powerflow/autotest/test_regulator_manual_YY_A_1ph_NR.glm diff --git a/powerflow/autotest/test_regulator_manual_YY_A_2ph.glm b/module/powerflow/autotest/test_regulator_manual_YY_A_2ph.glm similarity index 100% rename from powerflow/autotest/test_regulator_manual_YY_A_2ph.glm rename to module/powerflow/autotest/test_regulator_manual_YY_A_2ph.glm diff --git a/powerflow/autotest/test_regulator_manual_YY_A_2ph_NR.glm b/module/powerflow/autotest/test_regulator_manual_YY_A_2ph_NR.glm similarity index 100% rename from powerflow/autotest/test_regulator_manual_YY_A_2ph_NR.glm rename to module/powerflow/autotest/test_regulator_manual_YY_A_2ph_NR.glm diff --git a/powerflow/autotest/test_regulator_manual_YY_A_NR.glm b/module/powerflow/autotest/test_regulator_manual_YY_A_NR.glm similarity index 100% rename from powerflow/autotest/test_regulator_manual_YY_A_NR.glm rename to module/powerflow/autotest/test_regulator_manual_YY_A_NR.glm diff --git a/powerflow/autotest/test_regulator_manual_YY_B.glm b/module/powerflow/autotest/test_regulator_manual_YY_B.glm similarity index 100% rename from powerflow/autotest/test_regulator_manual_YY_B.glm rename to module/powerflow/autotest/test_regulator_manual_YY_B.glm diff --git a/powerflow/autotest/test_regulator_manual_YY_B_NR.glm b/module/powerflow/autotest/test_regulator_manual_YY_B_NR.glm similarity index 100% rename from powerflow/autotest/test_regulator_manual_YY_B_NR.glm rename to module/powerflow/autotest/test_regulator_manual_YY_B_NR.glm diff --git a/powerflow/autotest/test_regulator_outputvolt_YY_A.glm b/module/powerflow/autotest/test_regulator_outputvolt_YY_A.glm similarity index 100% rename from powerflow/autotest/test_regulator_outputvolt_YY_A.glm rename to module/powerflow/autotest/test_regulator_outputvolt_YY_A.glm diff --git a/powerflow/autotest/test_regulator_outputvolt_YY_A_NR.glm b/module/powerflow/autotest/test_regulator_outputvolt_YY_A_NR.glm similarity index 100% rename from powerflow/autotest/test_regulator_outputvolt_YY_A_NR.glm rename to module/powerflow/autotest/test_regulator_outputvolt_YY_A_NR.glm diff --git a/powerflow/autotest/test_regulator_outputvolt_YY_A_NR_ts.glm b/module/powerflow/autotest/test_regulator_outputvolt_YY_A_NR_ts.glm similarity index 100% rename from powerflow/autotest/test_regulator_outputvolt_YY_A_NR_ts.glm rename to module/powerflow/autotest/test_regulator_outputvolt_YY_A_NR_ts.glm diff --git a/powerflow/autotest/test_regulator_outputvolt_YY_A_ts.glm b/module/powerflow/autotest/test_regulator_outputvolt_YY_A_ts.glm similarity index 100% rename from powerflow/autotest/test_regulator_outputvolt_YY_A_ts.glm rename to module/powerflow/autotest/test_regulator_outputvolt_YY_A_ts.glm diff --git a/powerflow/autotest/test_regulator_outputvolt_YY_B.glm b/module/powerflow/autotest/test_regulator_outputvolt_YY_B.glm similarity index 100% rename from powerflow/autotest/test_regulator_outputvolt_YY_B.glm rename to module/powerflow/autotest/test_regulator_outputvolt_YY_B.glm diff --git a/powerflow/autotest/test_regulator_outputvolt_YY_B_NR.glm b/module/powerflow/autotest/test_regulator_outputvolt_YY_B_NR.glm similarity index 100% rename from powerflow/autotest/test_regulator_outputvolt_YY_B_NR.glm rename to module/powerflow/autotest/test_regulator_outputvolt_YY_B_NR.glm diff --git a/powerflow/autotest/test_regulator_outputvolt_YY_B_NR_ts.glm b/module/powerflow/autotest/test_regulator_outputvolt_YY_B_NR_ts.glm similarity index 100% rename from powerflow/autotest/test_regulator_outputvolt_YY_B_NR_ts.glm rename to module/powerflow/autotest/test_regulator_outputvolt_YY_B_NR_ts.glm diff --git a/powerflow/autotest/test_regulator_outputvolt_YY_B_ts.glm b/module/powerflow/autotest/test_regulator_outputvolt_YY_B_ts.glm similarity index 100% rename from powerflow/autotest/test_regulator_outputvolt_YY_B_ts.glm rename to module/powerflow/autotest/test_regulator_outputvolt_YY_B_ts.glm diff --git a/powerflow/autotest/test_regulator_remotesense_YY_A.glm b/module/powerflow/autotest/test_regulator_remotesense_YY_A.glm similarity index 100% rename from powerflow/autotest/test_regulator_remotesense_YY_A.glm rename to module/powerflow/autotest/test_regulator_remotesense_YY_A.glm diff --git a/powerflow/autotest/test_regulator_remotesense_YY_A_NR.glm b/module/powerflow/autotest/test_regulator_remotesense_YY_A_NR.glm similarity index 100% rename from powerflow/autotest/test_regulator_remotesense_YY_A_NR.glm rename to module/powerflow/autotest/test_regulator_remotesense_YY_A_NR.glm diff --git a/powerflow/autotest/test_regulator_remotesense_YY_A_NR_ts.glm b/module/powerflow/autotest/test_regulator_remotesense_YY_A_NR_ts.glm similarity index 100% rename from powerflow/autotest/test_regulator_remotesense_YY_A_NR_ts.glm rename to module/powerflow/autotest/test_regulator_remotesense_YY_A_NR_ts.glm diff --git a/powerflow/autotest/test_regulator_remotesense_YY_A_ts.glm b/module/powerflow/autotest/test_regulator_remotesense_YY_A_ts.glm similarity index 100% rename from powerflow/autotest/test_regulator_remotesense_YY_A_ts.glm rename to module/powerflow/autotest/test_regulator_remotesense_YY_A_ts.glm diff --git a/powerflow/autotest/test_regulator_remotesense_YY_B.glm b/module/powerflow/autotest/test_regulator_remotesense_YY_B.glm similarity index 100% rename from powerflow/autotest/test_regulator_remotesense_YY_B.glm rename to module/powerflow/autotest/test_regulator_remotesense_YY_B.glm diff --git a/powerflow/autotest/test_regulator_remotesense_YY_B_NR.glm b/module/powerflow/autotest/test_regulator_remotesense_YY_B_NR.glm similarity index 100% rename from powerflow/autotest/test_regulator_remotesense_YY_B_NR.glm rename to module/powerflow/autotest/test_regulator_remotesense_YY_B_NR.glm diff --git a/powerflow/autotest/test_regulator_remotesense_YY_B_NR_ts.glm b/module/powerflow/autotest/test_regulator_remotesense_YY_B_NR_ts.glm similarity index 100% rename from powerflow/autotest/test_regulator_remotesense_YY_B_NR_ts.glm rename to module/powerflow/autotest/test_regulator_remotesense_YY_B_NR_ts.glm diff --git a/powerflow/autotest/test_regulator_remotesense_YY_B_ts.glm b/module/powerflow/autotest/test_regulator_remotesense_YY_B_ts.glm similarity index 100% rename from powerflow/autotest/test_regulator_remotesense_YY_B_ts.glm rename to module/powerflow/autotest/test_regulator_remotesense_YY_B_ts.glm diff --git a/powerflow/autotest/test_reversed_lines_NR.glm b/module/powerflow/autotest/test_reversed_lines_NR.glm similarity index 100% rename from powerflow/autotest/test_reversed_lines_NR.glm rename to module/powerflow/autotest/test_reversed_lines_NR.glm diff --git a/powerflow/autotest/test_substation_PSV_driven.glm b/module/powerflow/autotest/test_substation_PSV_driven.glm similarity index 100% rename from powerflow/autotest/test_substation_PSV_driven.glm rename to module/powerflow/autotest/test_substation_PSV_driven.glm diff --git a/powerflow/autotest/test_substation_normal_node.glm b/module/powerflow/autotest/test_substation_normal_node.glm similarity index 100% rename from powerflow/autotest/test_substation_normal_node.glm rename to module/powerflow/autotest/test_substation_normal_node.glm diff --git a/powerflow/autotest/test_substation_swing_node.glm b/module/powerflow/autotest/test_substation_swing_node.glm similarity index 100% rename from powerflow/autotest/test_substation_swing_node.glm rename to module/powerflow/autotest/test_substation_swing_node.glm diff --git a/powerflow/autotest/test_switch_coordinator.glm b/module/powerflow/autotest/test_switch_coordinator.glm similarity index 100% rename from powerflow/autotest/test_switch_coordinator.glm rename to module/powerflow/autotest/test_switch_coordinator.glm diff --git a/powerflow/autotest/test_switch_coordinator_method.glm b/module/powerflow/autotest/test_switch_coordinator_method.glm similarity index 100% rename from powerflow/autotest/test_switch_coordinator_method.glm rename to module/powerflow/autotest/test_switch_coordinator_method.glm diff --git a/powerflow/autotest/test_transformer_losses_FBS.glm b/module/powerflow/autotest/test_transformer_losses_FBS.glm similarity index 100% rename from powerflow/autotest/test_transformer_losses_FBS.glm rename to module/powerflow/autotest/test_transformer_losses_FBS.glm diff --git a/powerflow/autotest/test_transformer_losses_NR.glm b/module/powerflow/autotest/test_transformer_losses_NR.glm similarity index 100% rename from powerflow/autotest/test_transformer_losses_NR.glm rename to module/powerflow/autotest/test_transformer_losses_NR.glm diff --git a/powerflow/autotest/test_triplex_billing_stub.glm b/module/powerflow/autotest/test_triplex_billing_stub.glm similarity index 100% rename from powerflow/autotest/test_triplex_billing_stub.glm rename to module/powerflow/autotest/test_triplex_billing_stub.glm diff --git a/powerflow/autotest/test_triplex_billing_tiered_fee.glm b/module/powerflow/autotest/test_triplex_billing_tiered_fee.glm similarity index 100% rename from powerflow/autotest/test_triplex_billing_tiered_fee.glm rename to module/powerflow/autotest/test_triplex_billing_tiered_fee.glm diff --git a/powerflow/autotest/test_triplex_billing_tiered_nofee.glm b/module/powerflow/autotest/test_triplex_billing_tiered_nofee.glm similarity index 100% rename from powerflow/autotest/test_triplex_billing_tiered_nofee.glm rename to module/powerflow/autotest/test_triplex_billing_tiered_nofee.glm diff --git a/powerflow/autotest/test_triplex_billing_uniform_fee.glm b/module/powerflow/autotest/test_triplex_billing_uniform_fee.glm similarity index 100% rename from powerflow/autotest/test_triplex_billing_uniform_fee.glm rename to module/powerflow/autotest/test_triplex_billing_uniform_fee.glm diff --git a/powerflow/autotest/test_triplex_billing_uniform_nofee.glm b/module/powerflow/autotest/test_triplex_billing_uniform_nofee.glm similarity index 100% rename from powerflow/autotest/test_triplex_billing_uniform_nofee.glm rename to module/powerflow/autotest/test_triplex_billing_uniform_nofee.glm diff --git a/powerflow/autotest/test_triplex_invalid_conductor_FBS_err.glm b/module/powerflow/autotest/test_triplex_invalid_conductor_FBS_err.glm similarity index 100% rename from powerflow/autotest/test_triplex_invalid_conductor_FBS_err.glm rename to module/powerflow/autotest/test_triplex_invalid_conductor_FBS_err.glm diff --git a/powerflow/autotest/test_triplex_invalid_conductor_NR_err.glm b/module/powerflow/autotest/test_triplex_invalid_conductor_NR_err.glm similarity index 100% rename from powerflow/autotest/test_triplex_invalid_conductor_NR_err.glm rename to module/powerflow/autotest/test_triplex_invalid_conductor_NR_err.glm diff --git a/powerflow/autotest/test_triplex_meter_parent_accum_FBS.glm b/module/powerflow/autotest/test_triplex_meter_parent_accum_FBS.glm similarity index 100% rename from powerflow/autotest/test_triplex_meter_parent_accum_FBS.glm rename to module/powerflow/autotest/test_triplex_meter_parent_accum_FBS.glm diff --git a/powerflow/autotest/test_triplex_meter_parent_accum_NR.glm b/module/powerflow/autotest/test_triplex_meter_parent_accum_NR.glm similarity index 100% rename from powerflow/autotest/test_triplex_meter_parent_accum_NR.glm rename to module/powerflow/autotest/test_triplex_meter_parent_accum_NR.glm diff --git a/powerflow/autotest/test_unbalanced_stepdown_D-D.glm b/module/powerflow/autotest/test_unbalanced_stepdown_D-D.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_stepdown_D-D.glm rename to module/powerflow/autotest/test_unbalanced_stepdown_D-D.glm diff --git a/powerflow/autotest/test_unbalanced_stepdown_D-D_NR.glm b/module/powerflow/autotest/test_unbalanced_stepdown_D-D_NR.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_stepdown_D-D_NR.glm rename to module/powerflow/autotest/test_unbalanced_stepdown_D-D_NR.glm diff --git a/powerflow/autotest/test_unbalanced_stepdown_D-grY.glm b/module/powerflow/autotest/test_unbalanced_stepdown_D-grY.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_stepdown_D-grY.glm rename to module/powerflow/autotest/test_unbalanced_stepdown_D-grY.glm diff --git a/powerflow/autotest/test_unbalanced_stepdown_D-grY_NR.glm b/module/powerflow/autotest/test_unbalanced_stepdown_D-grY_NR.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_stepdown_D-grY_NR.glm rename to module/powerflow/autotest/test_unbalanced_stepdown_D-grY_NR.glm diff --git a/powerflow/autotest/test_unbalanced_stepdown_grY-grY.glm b/module/powerflow/autotest/test_unbalanced_stepdown_grY-grY.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_stepdown_grY-grY.glm rename to module/powerflow/autotest/test_unbalanced_stepdown_grY-grY.glm diff --git a/powerflow/autotest/test_unbalanced_stepdown_grY-grY_NR.glm b/module/powerflow/autotest/test_unbalanced_stepdown_grY-grY_NR.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_stepdown_grY-grY_NR.glm rename to module/powerflow/autotest/test_unbalanced_stepdown_grY-grY_NR.glm diff --git a/powerflow/autotest/test_unbalanced_stepup_D-D.glm b/module/powerflow/autotest/test_unbalanced_stepup_D-D.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_stepup_D-D.glm rename to module/powerflow/autotest/test_unbalanced_stepup_D-D.glm diff --git a/powerflow/autotest/test_unbalanced_stepup_D-D_NR.glm b/module/powerflow/autotest/test_unbalanced_stepup_D-D_NR.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_stepup_D-D_NR.glm rename to module/powerflow/autotest/test_unbalanced_stepup_D-D_NR.glm diff --git a/powerflow/autotest/test_unbalanced_stepup_D-grY.glm b/module/powerflow/autotest/test_unbalanced_stepup_D-grY.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_stepup_D-grY.glm rename to module/powerflow/autotest/test_unbalanced_stepup_D-grY.glm diff --git a/powerflow/autotest/test_unbalanced_stepup_D-grY_NR.glm b/module/powerflow/autotest/test_unbalanced_stepup_D-grY_NR.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_stepup_D-grY_NR.glm rename to module/powerflow/autotest/test_unbalanced_stepup_D-grY_NR.glm diff --git a/powerflow/autotest/test_unbalanced_stepup_grY-grY.glm b/module/powerflow/autotest/test_unbalanced_stepup_grY-grY.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_stepup_grY-grY.glm rename to module/powerflow/autotest/test_unbalanced_stepup_grY-grY.glm diff --git a/powerflow/autotest/test_unbalanced_stepup_grY-grY_NR.glm b/module/powerflow/autotest/test_unbalanced_stepup_grY-grY_NR.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_stepup_grY-grY_NR.glm rename to module/powerflow/autotest/test_unbalanced_stepup_grY-grY_NR.glm diff --git a/powerflow/autotest/test_unbalanced_unity_grY-grY.glm b/module/powerflow/autotest/test_unbalanced_unity_grY-grY.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_unity_grY-grY.glm rename to module/powerflow/autotest/test_unbalanced_unity_grY-grY.glm diff --git a/powerflow/autotest/test_unbalanced_unity_grY-grY_NR.glm b/module/powerflow/autotest/test_unbalanced_unity_grY-grY_NR.glm similarity index 100% rename from powerflow/autotest/test_unbalanced_unity_grY-grY_NR.glm rename to module/powerflow/autotest/test_unbalanced_unity_grY-grY_NR.glm diff --git a/powerflow/autotest/test_underground_TapeShielded_cond.glm b/module/powerflow/autotest/test_underground_TapeShielded_cond.glm similarity index 100% rename from powerflow/autotest/test_underground_TapeShielded_cond.glm rename to module/powerflow/autotest/test_underground_TapeShielded_cond.glm diff --git a/powerflow/autotest/test_vfd_delta_opt.glm b/module/powerflow/autotest/test_vfd_delta_opt.glm similarity index 100% rename from powerflow/autotest/test_vfd_delta_opt.glm rename to module/powerflow/autotest/test_vfd_delta_opt.glm diff --git a/powerflow/autotest/triplex_meter_reactive_energy_delta.player b/module/powerflow/autotest/triplex_meter_reactive_energy_delta.player similarity index 100% rename from powerflow/autotest/triplex_meter_reactive_energy_delta.player rename to module/powerflow/autotest/triplex_meter_reactive_energy_delta.player diff --git a/powerflow/autotest/triplex_meter_real_energy_delta.player b/module/powerflow/autotest/triplex_meter_real_energy_delta.player similarity index 100% rename from powerflow/autotest/triplex_meter_real_energy_delta.player rename to module/powerflow/autotest/triplex_meter_real_energy_delta.player diff --git a/powerflow/autotest/voltage.csv b/module/powerflow/autotest/voltage.csv similarity index 100% rename from powerflow/autotest/voltage.csv rename to module/powerflow/autotest/voltage.csv diff --git a/powerflow/billdump.cpp b/module/powerflow/billdump.cpp similarity index 100% rename from powerflow/billdump.cpp rename to module/powerflow/billdump.cpp diff --git a/powerflow/billdump.h b/module/powerflow/billdump.h similarity index 100% rename from powerflow/billdump.h rename to module/powerflow/billdump.h diff --git a/powerflow/capacitor.cpp b/module/powerflow/capacitor.cpp similarity index 100% rename from powerflow/capacitor.cpp rename to module/powerflow/capacitor.cpp diff --git a/powerflow/capacitor.h b/module/powerflow/capacitor.h similarity index 100% rename from powerflow/capacitor.h rename to module/powerflow/capacitor.h diff --git a/powerflow/currdump.cpp b/module/powerflow/currdump.cpp similarity index 100% rename from powerflow/currdump.cpp rename to module/powerflow/currdump.cpp diff --git a/powerflow/currdump.h b/module/powerflow/currdump.h similarity index 100% rename from powerflow/currdump.h rename to module/powerflow/currdump.h diff --git a/powerflow/docs/pole_loading.pdf b/module/powerflow/docs/pole_loading.pdf similarity index 100% rename from powerflow/docs/pole_loading.pdf rename to module/powerflow/docs/pole_loading.pdf diff --git a/powerflow/docs/pole_service_life.pdf b/module/powerflow/docs/pole_service_life.pdf similarity index 100% rename from powerflow/docs/pole_service_life.pdf rename to module/powerflow/docs/pole_service_life.pdf diff --git a/powerflow/docs/pole_top_degradation.pdf b/module/powerflow/docs/pole_top_degradation.pdf similarity index 100% rename from powerflow/docs/pole_top_degradation.pdf rename to module/powerflow/docs/pole_top_degradation.pdf diff --git a/powerflow/emissions.cpp b/module/powerflow/emissions.cpp similarity index 100% rename from powerflow/emissions.cpp rename to module/powerflow/emissions.cpp diff --git a/powerflow/emissions.h b/module/powerflow/emissions.h similarity index 100% rename from powerflow/emissions.h rename to module/powerflow/emissions.h diff --git a/powerflow/fault_check.cpp b/module/powerflow/fault_check.cpp similarity index 100% rename from powerflow/fault_check.cpp rename to module/powerflow/fault_check.cpp diff --git a/powerflow/fault_check.h b/module/powerflow/fault_check.h similarity index 100% rename from powerflow/fault_check.h rename to module/powerflow/fault_check.h diff --git a/powerflow/frequency_gen.cpp b/module/powerflow/frequency_gen.cpp similarity index 100% rename from powerflow/frequency_gen.cpp rename to module/powerflow/frequency_gen.cpp diff --git a/powerflow/frequency_gen.h b/module/powerflow/frequency_gen.h similarity index 100% rename from powerflow/frequency_gen.h rename to module/powerflow/frequency_gen.h diff --git a/powerflow/fuse.cpp b/module/powerflow/fuse.cpp similarity index 100% rename from powerflow/fuse.cpp rename to module/powerflow/fuse.cpp diff --git a/powerflow/fuse.h b/module/powerflow/fuse.h similarity index 100% rename from powerflow/fuse.h rename to module/powerflow/fuse.h diff --git a/powerflow/impedance_dump.cpp b/module/powerflow/impedance_dump.cpp similarity index 100% rename from powerflow/impedance_dump.cpp rename to module/powerflow/impedance_dump.cpp diff --git a/powerflow/impedance_dump.h b/module/powerflow/impedance_dump.h similarity index 100% rename from powerflow/impedance_dump.h rename to module/powerflow/impedance_dump.h diff --git a/powerflow/init.cpp b/module/powerflow/init.cpp similarity index 100% rename from powerflow/init.cpp rename to module/powerflow/init.cpp diff --git a/powerflow/line.cpp b/module/powerflow/line.cpp similarity index 100% rename from powerflow/line.cpp rename to module/powerflow/line.cpp diff --git a/powerflow/line.h b/module/powerflow/line.h similarity index 100% rename from powerflow/line.h rename to module/powerflow/line.h diff --git a/powerflow/line_configuration.cpp b/module/powerflow/line_configuration.cpp similarity index 100% rename from powerflow/line_configuration.cpp rename to module/powerflow/line_configuration.cpp diff --git a/powerflow/line_configuration.h b/module/powerflow/line_configuration.h similarity index 100% rename from powerflow/line_configuration.h rename to module/powerflow/line_configuration.h diff --git a/powerflow/line_sensor.cpp b/module/powerflow/line_sensor.cpp similarity index 100% rename from powerflow/line_sensor.cpp rename to module/powerflow/line_sensor.cpp diff --git a/powerflow/line_sensor.h b/module/powerflow/line_sensor.h similarity index 100% rename from powerflow/line_sensor.h rename to module/powerflow/line_sensor.h diff --git a/powerflow/line_spacing.cpp b/module/powerflow/line_spacing.cpp similarity index 100% rename from powerflow/line_spacing.cpp rename to module/powerflow/line_spacing.cpp diff --git a/powerflow/line_spacing.h b/module/powerflow/line_spacing.h similarity index 100% rename from powerflow/line_spacing.h rename to module/powerflow/line_spacing.h diff --git a/powerflow/link.cpp b/module/powerflow/link.cpp similarity index 100% rename from powerflow/link.cpp rename to module/powerflow/link.cpp diff --git a/powerflow/link.h b/module/powerflow/link.h similarity index 100% rename from powerflow/link.h rename to module/powerflow/link.h diff --git a/powerflow/load.cpp b/module/powerflow/load.cpp similarity index 100% rename from powerflow/load.cpp rename to module/powerflow/load.cpp diff --git a/powerflow/load.h b/module/powerflow/load.h similarity index 100% rename from powerflow/load.h rename to module/powerflow/load.h diff --git a/powerflow/load_tracker.cpp b/module/powerflow/load_tracker.cpp similarity index 100% rename from powerflow/load_tracker.cpp rename to module/powerflow/load_tracker.cpp diff --git a/powerflow/load_tracker.h b/module/powerflow/load_tracker.h similarity index 100% rename from powerflow/load_tracker.h rename to module/powerflow/load_tracker.h diff --git a/powerflow/main.cpp b/module/powerflow/main.cpp similarity index 100% rename from powerflow/main.cpp rename to module/powerflow/main.cpp diff --git a/powerflow/meter.cpp b/module/powerflow/meter.cpp similarity index 100% rename from powerflow/meter.cpp rename to module/powerflow/meter.cpp diff --git a/powerflow/meter.h b/module/powerflow/meter.h similarity index 100% rename from powerflow/meter.h rename to module/powerflow/meter.h diff --git a/powerflow/motor.cpp b/module/powerflow/motor.cpp similarity index 100% rename from powerflow/motor.cpp rename to module/powerflow/motor.cpp diff --git a/powerflow/motor.h b/module/powerflow/motor.h similarity index 100% rename from powerflow/motor.h rename to module/powerflow/motor.h diff --git a/powerflow/node.cpp b/module/powerflow/node.cpp similarity index 100% rename from powerflow/node.cpp rename to module/powerflow/node.cpp diff --git a/powerflow/node.h b/module/powerflow/node.h similarity index 100% rename from powerflow/node.h rename to module/powerflow/node.h diff --git a/powerflow/overhead_line.cpp b/module/powerflow/overhead_line.cpp similarity index 100% rename from powerflow/overhead_line.cpp rename to module/powerflow/overhead_line.cpp diff --git a/powerflow/overhead_line.h b/module/powerflow/overhead_line.h similarity index 100% rename from powerflow/overhead_line.h rename to module/powerflow/overhead_line.h diff --git a/powerflow/overhead_line_conductor.cpp b/module/powerflow/overhead_line_conductor.cpp similarity index 100% rename from powerflow/overhead_line_conductor.cpp rename to module/powerflow/overhead_line_conductor.cpp diff --git a/powerflow/overhead_line_conductor.h b/module/powerflow/overhead_line_conductor.h similarity index 100% rename from powerflow/overhead_line_conductor.h rename to module/powerflow/overhead_line_conductor.h diff --git a/powerflow/pole.cpp b/module/powerflow/pole.cpp similarity index 100% rename from powerflow/pole.cpp rename to module/powerflow/pole.cpp diff --git a/powerflow/pole.h b/module/powerflow/pole.h similarity index 100% rename from powerflow/pole.h rename to module/powerflow/pole.h diff --git a/powerflow/pole_configuration.cpp b/module/powerflow/pole_configuration.cpp similarity index 100% rename from powerflow/pole_configuration.cpp rename to module/powerflow/pole_configuration.cpp diff --git a/powerflow/pole_configuration.h b/module/powerflow/pole_configuration.h similarity index 100% rename from powerflow/pole_configuration.h rename to module/powerflow/pole_configuration.h diff --git a/powerflow/power_metrics.cpp b/module/powerflow/power_metrics.cpp similarity index 100% rename from powerflow/power_metrics.cpp rename to module/powerflow/power_metrics.cpp diff --git a/powerflow/power_metrics.h b/module/powerflow/power_metrics.h similarity index 100% rename from powerflow/power_metrics.h rename to module/powerflow/power_metrics.h diff --git a/powerflow/powerflow.cpp b/module/powerflow/powerflow.cpp similarity index 100% rename from powerflow/powerflow.cpp rename to module/powerflow/powerflow.cpp diff --git a/powerflow/powerflow.h b/module/powerflow/powerflow.h similarity index 100% rename from powerflow/powerflow.h rename to module/powerflow/powerflow.h diff --git a/powerflow/powerflow.vcproj b/module/powerflow/powerflow.vcproj similarity index 100% rename from powerflow/powerflow.vcproj rename to module/powerflow/powerflow.vcproj diff --git a/powerflow/powerflow_library.cpp b/module/powerflow/powerflow_library.cpp similarity index 100% rename from powerflow/powerflow_library.cpp rename to module/powerflow/powerflow_library.cpp diff --git a/powerflow/powerflow_library.h b/module/powerflow/powerflow_library.h similarity index 100% rename from powerflow/powerflow_library.h rename to module/powerflow/powerflow_library.h diff --git a/powerflow/powerflow_object.cpp b/module/powerflow/powerflow_object.cpp similarity index 100% rename from powerflow/powerflow_object.cpp rename to module/powerflow/powerflow_object.cpp diff --git a/powerflow/powerflow_object.h b/module/powerflow/powerflow_object.h similarity index 100% rename from powerflow/powerflow_object.h rename to module/powerflow/powerflow_object.h diff --git a/powerflow/pqload.cpp b/module/powerflow/pqload.cpp similarity index 100% rename from powerflow/pqload.cpp rename to module/powerflow/pqload.cpp diff --git a/powerflow/pqload.h b/module/powerflow/pqload.h similarity index 100% rename from powerflow/pqload.h rename to module/powerflow/pqload.h diff --git a/powerflow/recloser.cpp b/module/powerflow/recloser.cpp similarity index 100% rename from powerflow/recloser.cpp rename to module/powerflow/recloser.cpp diff --git a/powerflow/recloser.h b/module/powerflow/recloser.h similarity index 100% rename from powerflow/recloser.h rename to module/powerflow/recloser.h diff --git a/powerflow/regulator.cpp b/module/powerflow/regulator.cpp similarity index 100% rename from powerflow/regulator.cpp rename to module/powerflow/regulator.cpp diff --git a/powerflow/regulator.h b/module/powerflow/regulator.h similarity index 100% rename from powerflow/regulator.h rename to module/powerflow/regulator.h diff --git a/powerflow/regulator_configuration.cpp b/module/powerflow/regulator_configuration.cpp similarity index 100% rename from powerflow/regulator_configuration.cpp rename to module/powerflow/regulator_configuration.cpp diff --git a/powerflow/regulator_configuration.h b/module/powerflow/regulator_configuration.h similarity index 100% rename from powerflow/regulator_configuration.h rename to module/powerflow/regulator_configuration.h diff --git a/powerflow/restoration.cpp b/module/powerflow/restoration.cpp similarity index 100% rename from powerflow/restoration.cpp rename to module/powerflow/restoration.cpp diff --git a/powerflow/restoration.h b/module/powerflow/restoration.h similarity index 100% rename from powerflow/restoration.h rename to module/powerflow/restoration.h diff --git a/powerflow/sectionalizer.cpp b/module/powerflow/sectionalizer.cpp similarity index 100% rename from powerflow/sectionalizer.cpp rename to module/powerflow/sectionalizer.cpp diff --git a/powerflow/sectionalizer.h b/module/powerflow/sectionalizer.h similarity index 100% rename from powerflow/sectionalizer.h rename to module/powerflow/sectionalizer.h diff --git a/powerflow/series_reactor.cpp b/module/powerflow/series_reactor.cpp similarity index 100% rename from powerflow/series_reactor.cpp rename to module/powerflow/series_reactor.cpp diff --git a/powerflow/series_reactor.h b/module/powerflow/series_reactor.h similarity index 100% rename from powerflow/series_reactor.h rename to module/powerflow/series_reactor.h diff --git a/powerflow/solver_ml_branchdump.h b/module/powerflow/solver_ml_branchdump.h similarity index 100% rename from powerflow/solver_ml_branchdump.h rename to module/powerflow/solver_ml_branchdump.h diff --git a/powerflow/solver_nr.cpp b/module/powerflow/solver_nr.cpp similarity index 100% rename from powerflow/solver_nr.cpp rename to module/powerflow/solver_nr.cpp diff --git a/powerflow/solver_nr.h b/module/powerflow/solver_nr.h similarity index 100% rename from powerflow/solver_nr.h rename to module/powerflow/solver_nr.h diff --git a/powerflow/solver_py.conf b/module/powerflow/solver_py.conf similarity index 100% rename from powerflow/solver_py.conf rename to module/powerflow/solver_py.conf diff --git a/powerflow/solver_py.cpp b/module/powerflow/solver_py.cpp similarity index 100% rename from powerflow/solver_py.cpp rename to module/powerflow/solver_py.cpp diff --git a/powerflow/solver_py.h b/module/powerflow/solver_py.h similarity index 100% rename from powerflow/solver_py.h rename to module/powerflow/solver_py.h diff --git a/powerflow/substation.cpp b/module/powerflow/substation.cpp similarity index 100% rename from powerflow/substation.cpp rename to module/powerflow/substation.cpp diff --git a/powerflow/substation.h b/module/powerflow/substation.h similarity index 100% rename from powerflow/substation.h rename to module/powerflow/substation.h diff --git a/powerflow/switch_coordinator.cpp b/module/powerflow/switch_coordinator.cpp similarity index 100% rename from powerflow/switch_coordinator.cpp rename to module/powerflow/switch_coordinator.cpp diff --git a/powerflow/switch_coordinator.h b/module/powerflow/switch_coordinator.h similarity index 100% rename from powerflow/switch_coordinator.h rename to module/powerflow/switch_coordinator.h diff --git a/powerflow/switch_object.cpp b/module/powerflow/switch_object.cpp similarity index 100% rename from powerflow/switch_object.cpp rename to module/powerflow/switch_object.cpp diff --git a/powerflow/switch_object.h b/module/powerflow/switch_object.h similarity index 100% rename from powerflow/switch_object.h rename to module/powerflow/switch_object.h diff --git a/powerflow/transformer.cpp b/module/powerflow/transformer.cpp similarity index 100% rename from powerflow/transformer.cpp rename to module/powerflow/transformer.cpp diff --git a/powerflow/transformer.h b/module/powerflow/transformer.h similarity index 100% rename from powerflow/transformer.h rename to module/powerflow/transformer.h diff --git a/powerflow/transformer_configuration.cpp b/module/powerflow/transformer_configuration.cpp similarity index 100% rename from powerflow/transformer_configuration.cpp rename to module/powerflow/transformer_configuration.cpp diff --git a/powerflow/transformer_configuration.h b/module/powerflow/transformer_configuration.h similarity index 100% rename from powerflow/transformer_configuration.h rename to module/powerflow/transformer_configuration.h diff --git a/powerflow/triplex_line.cpp b/module/powerflow/triplex_line.cpp similarity index 100% rename from powerflow/triplex_line.cpp rename to module/powerflow/triplex_line.cpp diff --git a/powerflow/triplex_line.h b/module/powerflow/triplex_line.h similarity index 100% rename from powerflow/triplex_line.h rename to module/powerflow/triplex_line.h diff --git a/powerflow/triplex_line_conductor.cpp b/module/powerflow/triplex_line_conductor.cpp similarity index 100% rename from powerflow/triplex_line_conductor.cpp rename to module/powerflow/triplex_line_conductor.cpp diff --git a/powerflow/triplex_line_conductor.h b/module/powerflow/triplex_line_conductor.h similarity index 100% rename from powerflow/triplex_line_conductor.h rename to module/powerflow/triplex_line_conductor.h diff --git a/powerflow/triplex_line_configuration.cpp b/module/powerflow/triplex_line_configuration.cpp similarity index 100% rename from powerflow/triplex_line_configuration.cpp rename to module/powerflow/triplex_line_configuration.cpp diff --git a/powerflow/triplex_line_configuration.h b/module/powerflow/triplex_line_configuration.h similarity index 100% rename from powerflow/triplex_line_configuration.h rename to module/powerflow/triplex_line_configuration.h diff --git a/powerflow/triplex_load.cpp b/module/powerflow/triplex_load.cpp similarity index 100% rename from powerflow/triplex_load.cpp rename to module/powerflow/triplex_load.cpp diff --git a/powerflow/triplex_load.h b/module/powerflow/triplex_load.h similarity index 100% rename from powerflow/triplex_load.h rename to module/powerflow/triplex_load.h diff --git a/powerflow/triplex_meter.cpp b/module/powerflow/triplex_meter.cpp similarity index 100% rename from powerflow/triplex_meter.cpp rename to module/powerflow/triplex_meter.cpp diff --git a/powerflow/triplex_meter.h b/module/powerflow/triplex_meter.h similarity index 100% rename from powerflow/triplex_meter.h rename to module/powerflow/triplex_meter.h diff --git a/powerflow/triplex_node.cpp b/module/powerflow/triplex_node.cpp similarity index 100% rename from powerflow/triplex_node.cpp rename to module/powerflow/triplex_node.cpp diff --git a/powerflow/triplex_node.h b/module/powerflow/triplex_node.h similarity index 100% rename from powerflow/triplex_node.h rename to module/powerflow/triplex_node.h diff --git a/powerflow/underground_line.cpp b/module/powerflow/underground_line.cpp similarity index 100% rename from powerflow/underground_line.cpp rename to module/powerflow/underground_line.cpp diff --git a/powerflow/underground_line.h b/module/powerflow/underground_line.h similarity index 100% rename from powerflow/underground_line.h rename to module/powerflow/underground_line.h diff --git a/powerflow/underground_line_conductor.cpp b/module/powerflow/underground_line_conductor.cpp similarity index 100% rename from powerflow/underground_line_conductor.cpp rename to module/powerflow/underground_line_conductor.cpp diff --git a/powerflow/underground_line_conductor.h b/module/powerflow/underground_line_conductor.h similarity index 100% rename from powerflow/underground_line_conductor.h rename to module/powerflow/underground_line_conductor.h diff --git a/powerflow/vfd.cpp b/module/powerflow/vfd.cpp similarity index 100% rename from powerflow/vfd.cpp rename to module/powerflow/vfd.cpp diff --git a/powerflow/vfd.h b/module/powerflow/vfd.h similarity index 100% rename from powerflow/vfd.h rename to module/powerflow/vfd.h diff --git a/powerflow/volt_var_control.cpp b/module/powerflow/volt_var_control.cpp similarity index 100% rename from powerflow/volt_var_control.cpp rename to module/powerflow/volt_var_control.cpp diff --git a/powerflow/volt_var_control.h b/module/powerflow/volt_var_control.h similarity index 100% rename from powerflow/volt_var_control.h rename to module/powerflow/volt_var_control.h diff --git a/powerflow/voltdump.cpp b/module/powerflow/voltdump.cpp similarity index 100% rename from powerflow/voltdump.cpp rename to module/powerflow/voltdump.cpp diff --git a/powerflow/voltdump.h b/module/powerflow/voltdump.h similarity index 100% rename from powerflow/voltdump.h rename to module/powerflow/voltdump.h diff --git a/module/powernet/Makefile.mk b/module/powernet/Makefile.mk new file mode 100644 index 000000000..6444896aa --- /dev/null +++ b/module/powernet/Makefile.mk @@ -0,0 +1,18 @@ +# powernet/Makefile.mk +# Copyright (C) 2016, Stanford University +# Author: dchassin@slac.stanford.edu + +pkglib_LTLIBRARIES += module/powernet/powernet.la + +module_powernet_powernet_la_CPPFLAGS = +module_powernet_powernet_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_powernet_powernet_la_LDFLAGS = +module_powernet_powernet_la_LDFLAGS += $(AM_LDFLAGS) + +module_powernet_powernet_la_LIBADD = + +module_powernet_powernet_la_SOURCES = module/powernet/main.cpp +module_powernet_powernet_la_SOURCES += module/powernet/agent.cpp module/powernet/agent.h +module_powernet_powernet_la_SOURCES += module/powernet/house.cpp module/powernet/house.h +module_powernet_powernet_la_SOURCES += module/powernet/message.cpp module/powernet/message.h diff --git a/powernet/agent.cpp b/module/powernet/agent.cpp similarity index 100% rename from powernet/agent.cpp rename to module/powernet/agent.cpp diff --git a/powernet/agent.h b/module/powernet/agent.h similarity index 100% rename from powernet/agent.h rename to module/powernet/agent.h diff --git a/powernet/autotest/test_agent_method.glm b/module/powernet/autotest/test_agent_method.glm similarity index 100% rename from powernet/autotest/test_agent_method.glm rename to module/powernet/autotest/test_agent_method.glm diff --git a/powernet/house.cpp b/module/powernet/house.cpp similarity index 100% rename from powernet/house.cpp rename to module/powernet/house.cpp diff --git a/powernet/house.h b/module/powernet/house.h similarity index 100% rename from powernet/house.h rename to module/powernet/house.h diff --git a/powernet/main.cpp b/module/powernet/main.cpp similarity index 100% rename from powernet/main.cpp rename to module/powernet/main.cpp diff --git a/powernet/message.cpp b/module/powernet/message.cpp similarity index 100% rename from powernet/message.cpp rename to module/powernet/message.cpp diff --git a/powernet/message.h b/module/powernet/message.h similarity index 100% rename from powernet/message.h rename to module/powernet/message.h diff --git a/powernet/powernet.h b/module/powernet/powernet.h similarity index 100% rename from powernet/powernet.h rename to module/powernet/powernet.h diff --git a/powernet/validate.no b/module/powernet/validate.no similarity index 100% rename from powernet/validate.no rename to module/powernet/validate.no diff --git a/module/reliability/Makefile.mk b/module/reliability/Makefile.mk new file mode 100644 index 000000000..f7af8cbff --- /dev/null +++ b/module/reliability/Makefile.mk @@ -0,0 +1,17 @@ +pkglib_LTLIBRARIES += module/reliability/reliability.la + +module_reliability_reliability_la_CPPFLAGS = +module_reliability_reliability_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_reliability_reliability_la_LDFLAGS = +module_reliability_reliability_la_LDFLAGS += $(AM_LDFLAGS) + +module_reliability_reliability_la_LIBADD = + +module_reliability_reliability_la_SOURCES = +module_reliability_reliability_la_SOURCES += module/reliability/reliability.h +module_reliability_reliability_la_SOURCES += module/reliability/init.cpp module/reliability/main.cpp +module_reliability_reliability_la_SOURCES += module/reliability/cost.cpp module/reliability/cost.h +module_reliability_reliability_la_SOURCES += module/reliability/eventgen.cpp module/reliability/eventgen.h +module_reliability_reliability_la_SOURCES += module/reliability/metrics.cpp module/reliability/metrics.h +module_reliability_reliability_la_SOURCES += third_party/jsonCpp/jsoncpp.cpp diff --git a/reliability/autotest/data_deltamode_deterministic_eventgen.player b/module/reliability/autotest/data_deltamode_deterministic_eventgen.player similarity index 100% rename from reliability/autotest/data_deltamode_deterministic_eventgen.player rename to module/reliability/autotest/data_deltamode_deterministic_eventgen.player diff --git a/reliability/autotest/data_deltamode_random_eventgen.player b/module/reliability/autotest/data_deltamode_random_eventgen.player similarity index 100% rename from reliability/autotest/data_deltamode_random_eventgen.player rename to module/reliability/autotest/data_deltamode_random_eventgen.player diff --git a/reliability/autotest/deterministic_CAIDI.csv b/module/reliability/autotest/deterministic_CAIDI.csv similarity index 100% rename from reliability/autotest/deterministic_CAIDI.csv rename to module/reliability/autotest/deterministic_CAIDI.csv diff --git a/reliability/autotest/deterministic_CAIDI_int.csv b/module/reliability/autotest/deterministic_CAIDI_int.csv similarity index 100% rename from reliability/autotest/deterministic_CAIDI_int.csv rename to module/reliability/autotest/deterministic_CAIDI_int.csv diff --git a/reliability/autotest/deterministic_MAIFI.csv b/module/reliability/autotest/deterministic_MAIFI.csv similarity index 100% rename from reliability/autotest/deterministic_MAIFI.csv rename to module/reliability/autotest/deterministic_MAIFI.csv diff --git a/reliability/autotest/deterministic_MAIFI_int.csv b/module/reliability/autotest/deterministic_MAIFI_int.csv similarity index 100% rename from reliability/autotest/deterministic_MAIFI_int.csv rename to module/reliability/autotest/deterministic_MAIFI_int.csv diff --git a/reliability/autotest/deterministic_SAIDI.csv b/module/reliability/autotest/deterministic_SAIDI.csv similarity index 100% rename from reliability/autotest/deterministic_SAIDI.csv rename to module/reliability/autotest/deterministic_SAIDI.csv diff --git a/reliability/autotest/deterministic_SAIDI_int.csv b/module/reliability/autotest/deterministic_SAIDI_int.csv similarity index 100% rename from reliability/autotest/deterministic_SAIDI_int.csv rename to module/reliability/autotest/deterministic_SAIDI_int.csv diff --git a/reliability/autotest/deterministic_SAIFI.csv b/module/reliability/autotest/deterministic_SAIFI.csv similarity index 100% rename from reliability/autotest/deterministic_SAIFI.csv rename to module/reliability/autotest/deterministic_SAIFI.csv diff --git a/reliability/autotest/deterministic_SAIFI_int.csv b/module/reliability/autotest/deterministic_SAIFI_int.csv similarity index 100% rename from reliability/autotest/deterministic_SAIFI_int.csv rename to module/reliability/autotest/deterministic_SAIFI_int.csv diff --git a/reliability/autotest/deterministic_minTS_CAIDI.csv b/module/reliability/autotest/deterministic_minTS_CAIDI.csv similarity index 100% rename from reliability/autotest/deterministic_minTS_CAIDI.csv rename to module/reliability/autotest/deterministic_minTS_CAIDI.csv diff --git a/reliability/autotest/deterministic_minTS_CAIDI_int.csv b/module/reliability/autotest/deterministic_minTS_CAIDI_int.csv similarity index 100% rename from reliability/autotest/deterministic_minTS_CAIDI_int.csv rename to module/reliability/autotest/deterministic_minTS_CAIDI_int.csv diff --git a/reliability/autotest/deterministic_minTS_MAIFI.csv b/module/reliability/autotest/deterministic_minTS_MAIFI.csv similarity index 100% rename from reliability/autotest/deterministic_minTS_MAIFI.csv rename to module/reliability/autotest/deterministic_minTS_MAIFI.csv diff --git a/reliability/autotest/deterministic_minTS_MAIFI_int.csv b/module/reliability/autotest/deterministic_minTS_MAIFI_int.csv similarity index 100% rename from reliability/autotest/deterministic_minTS_MAIFI_int.csv rename to module/reliability/autotest/deterministic_minTS_MAIFI_int.csv diff --git a/reliability/autotest/deterministic_minTS_SAIDI.csv b/module/reliability/autotest/deterministic_minTS_SAIDI.csv similarity index 100% rename from reliability/autotest/deterministic_minTS_SAIDI.csv rename to module/reliability/autotest/deterministic_minTS_SAIDI.csv diff --git a/reliability/autotest/deterministic_minTS_SAIDI_int.csv b/module/reliability/autotest/deterministic_minTS_SAIDI_int.csv similarity index 100% rename from reliability/autotest/deterministic_minTS_SAIDI_int.csv rename to module/reliability/autotest/deterministic_minTS_SAIDI_int.csv diff --git a/reliability/autotest/deterministic_minTS_SAIFI.csv b/module/reliability/autotest/deterministic_minTS_SAIFI.csv similarity index 100% rename from reliability/autotest/deterministic_minTS_SAIFI.csv rename to module/reliability/autotest/deterministic_minTS_SAIFI.csv diff --git a/reliability/autotest/deterministic_minTS_SAIFI_int.csv b/module/reliability/autotest/deterministic_minTS_SAIFI_int.csv similarity index 100% rename from reliability/autotest/deterministic_minTS_SAIFI_int.csv rename to module/reliability/autotest/deterministic_minTS_SAIFI_int.csv diff --git a/reliability/autotest/deterministic_minTS_measured_A.csv b/module/reliability/autotest/deterministic_minTS_measured_A.csv similarity index 100% rename from reliability/autotest/deterministic_minTS_measured_A.csv rename to module/reliability/autotest/deterministic_minTS_measured_A.csv diff --git a/reliability/autotest/deterministic_powerA.csv b/module/reliability/autotest/deterministic_powerA.csv similarity index 100% rename from reliability/autotest/deterministic_powerA.csv rename to module/reliability/autotest/deterministic_powerA.csv diff --git a/reliability/autotest/fault_bus_A_within.player b/module/reliability/autotest/fault_bus_A_within.player similarity index 100% rename from reliability/autotest/fault_bus_A_within.player rename to module/reliability/autotest/fault_bus_A_within.player diff --git a/reliability/autotest/fault_bus_B_within.player b/module/reliability/autotest/fault_bus_B_within.player similarity index 100% rename from reliability/autotest/fault_bus_B_within.player rename to module/reliability/autotest/fault_bus_B_within.player diff --git a/reliability/autotest/fault_bus_C_within.player b/module/reliability/autotest/fault_bus_C_within.player similarity index 100% rename from reliability/autotest/fault_bus_C_within.player rename to module/reliability/autotest/fault_bus_C_within.player diff --git a/reliability/autotest/fault_bus_fault_current_A.player b/module/reliability/autotest/fault_bus_fault_current_A.player similarity index 100% rename from reliability/autotest/fault_bus_fault_current_A.player rename to module/reliability/autotest/fault_bus_fault_current_A.player diff --git a/reliability/autotest/fault_bus_fault_current_B.player b/module/reliability/autotest/fault_bus_fault_current_B.player similarity index 100% rename from reliability/autotest/fault_bus_fault_current_B.player rename to module/reliability/autotest/fault_bus_fault_current_B.player diff --git a/reliability/autotest/fault_bus_fault_current_C.player b/module/reliability/autotest/fault_bus_fault_current_C.player similarity index 100% rename from reliability/autotest/fault_bus_fault_current_C.player rename to module/reliability/autotest/fault_bus_fault_current_C.player diff --git a/reliability/autotest/fuse_limit_manipulate.player b/module/reliability/autotest/fuse_limit_manipulate.player similarity index 100% rename from reliability/autotest/fuse_limit_manipulate.player rename to module/reliability/autotest/fuse_limit_manipulate.player diff --git a/reliability/autotest/random_CAIDI.csv b/module/reliability/autotest/random_CAIDI.csv similarity index 100% rename from reliability/autotest/random_CAIDI.csv rename to module/reliability/autotest/random_CAIDI.csv diff --git a/reliability/autotest/random_CAIDI_int.csv b/module/reliability/autotest/random_CAIDI_int.csv similarity index 100% rename from reliability/autotest/random_CAIDI_int.csv rename to module/reliability/autotest/random_CAIDI_int.csv diff --git a/reliability/autotest/random_MAIFI.csv b/module/reliability/autotest/random_MAIFI.csv similarity index 100% rename from reliability/autotest/random_MAIFI.csv rename to module/reliability/autotest/random_MAIFI.csv diff --git a/reliability/autotest/random_MAIFI_int.csv b/module/reliability/autotest/random_MAIFI_int.csv similarity index 100% rename from reliability/autotest/random_MAIFI_int.csv rename to module/reliability/autotest/random_MAIFI_int.csv diff --git a/reliability/autotest/random_SAIDI.csv b/module/reliability/autotest/random_SAIDI.csv similarity index 100% rename from reliability/autotest/random_SAIDI.csv rename to module/reliability/autotest/random_SAIDI.csv diff --git a/reliability/autotest/random_SAIDI_int.csv b/module/reliability/autotest/random_SAIDI_int.csv similarity index 100% rename from reliability/autotest/random_SAIDI_int.csv rename to module/reliability/autotest/random_SAIDI_int.csv diff --git a/reliability/autotest/random_SAIFI.csv b/module/reliability/autotest/random_SAIFI.csv similarity index 100% rename from reliability/autotest/random_SAIFI.csv rename to module/reliability/autotest/random_SAIFI.csv diff --git a/reliability/autotest/random_SAIFI_int.csv b/module/reliability/autotest/random_SAIFI_int.csv similarity index 100% rename from reliability/autotest/random_SAIFI_int.csv rename to module/reliability/autotest/random_SAIFI_int.csv diff --git a/reliability/autotest/random_minTS_CAIDI.csv b/module/reliability/autotest/random_minTS_CAIDI.csv similarity index 100% rename from reliability/autotest/random_minTS_CAIDI.csv rename to module/reliability/autotest/random_minTS_CAIDI.csv diff --git a/reliability/autotest/random_minTS_CAIDI_int.csv b/module/reliability/autotest/random_minTS_CAIDI_int.csv similarity index 100% rename from reliability/autotest/random_minTS_CAIDI_int.csv rename to module/reliability/autotest/random_minTS_CAIDI_int.csv diff --git a/reliability/autotest/random_minTS_MAIFI.csv b/module/reliability/autotest/random_minTS_MAIFI.csv similarity index 100% rename from reliability/autotest/random_minTS_MAIFI.csv rename to module/reliability/autotest/random_minTS_MAIFI.csv diff --git a/reliability/autotest/random_minTS_MAIFI_Int.csv b/module/reliability/autotest/random_minTS_MAIFI_Int.csv similarity index 100% rename from reliability/autotest/random_minTS_MAIFI_Int.csv rename to module/reliability/autotest/random_minTS_MAIFI_Int.csv diff --git a/reliability/autotest/random_minTS_SAIDI.csv b/module/reliability/autotest/random_minTS_SAIDI.csv similarity index 100% rename from reliability/autotest/random_minTS_SAIDI.csv rename to module/reliability/autotest/random_minTS_SAIDI.csv diff --git a/reliability/autotest/random_minTS_SAIDI_Int.csv b/module/reliability/autotest/random_minTS_SAIDI_Int.csv similarity index 100% rename from reliability/autotest/random_minTS_SAIDI_Int.csv rename to module/reliability/autotest/random_minTS_SAIDI_Int.csv diff --git a/reliability/autotest/random_minTS_SAIFI.csv b/module/reliability/autotest/random_minTS_SAIFI.csv similarity index 100% rename from reliability/autotest/random_minTS_SAIFI.csv rename to module/reliability/autotest/random_minTS_SAIFI.csv diff --git a/reliability/autotest/random_minTS_SAIFI_Int.csv b/module/reliability/autotest/random_minTS_SAIFI_Int.csv similarity index 100% rename from reliability/autotest/random_minTS_SAIFI_Int.csv rename to module/reliability/autotest/random_minTS_SAIFI_Int.csv diff --git a/reliability/autotest/swing_bus_A_within.player b/module/reliability/autotest/swing_bus_A_within.player similarity index 100% rename from reliability/autotest/swing_bus_A_within.player rename to module/reliability/autotest/swing_bus_A_within.player diff --git a/reliability/autotest/swing_bus_B_within.player b/module/reliability/autotest/swing_bus_B_within.player similarity index 100% rename from reliability/autotest/swing_bus_B_within.player rename to module/reliability/autotest/swing_bus_B_within.player diff --git a/reliability/autotest/swing_bus_C_within.player b/module/reliability/autotest/swing_bus_C_within.player similarity index 100% rename from reliability/autotest/swing_bus_C_within.player rename to module/reliability/autotest/swing_bus_C_within.player diff --git a/reliability/autotest/swing_bus_fault_current_A.player b/module/reliability/autotest/swing_bus_fault_current_A.player similarity index 100% rename from reliability/autotest/swing_bus_fault_current_A.player rename to module/reliability/autotest/swing_bus_fault_current_A.player diff --git a/reliability/autotest/swing_bus_fault_current_B.player b/module/reliability/autotest/swing_bus_fault_current_B.player similarity index 100% rename from reliability/autotest/swing_bus_fault_current_B.player rename to module/reliability/autotest/swing_bus_fault_current_B.player diff --git a/reliability/autotest/swing_bus_fault_current_C.player b/module/reliability/autotest/swing_bus_fault_current_C.player similarity index 100% rename from reliability/autotest/swing_bus_fault_current_C.player rename to module/reliability/autotest/swing_bus_fault_current_C.player diff --git a/reliability/autotest/test_cost.glm b/module/reliability/autotest/test_cost.glm similarity index 100% rename from reliability/autotest/test_cost.glm rename to module/reliability/autotest/test_cost.glm diff --git a/reliability/autotest/test_cost_outage.csv b/module/reliability/autotest/test_cost_outage.csv similarity index 100% rename from reliability/autotest/test_cost_outage.csv rename to module/reliability/autotest/test_cost_outage.csv diff --git a/reliability/autotest/test_deltamode_deterministic_err.glm b/module/reliability/autotest/test_deltamode_deterministic_err.glm similarity index 100% rename from reliability/autotest/test_deltamode_deterministic_err.glm rename to module/reliability/autotest/test_deltamode_deterministic_err.glm diff --git a/reliability/autotest/test_deltamode_eventgen_overrun_err.glm b/module/reliability/autotest/test_deltamode_eventgen_overrun_err.glm similarity index 100% rename from reliability/autotest/test_deltamode_eventgen_overrun_err.glm rename to module/reliability/autotest/test_deltamode_eventgen_overrun_err.glm diff --git a/reliability/autotest/test_deltamode_random_err.glm b/module/reliability/autotest/test_deltamode_random_err.glm similarity index 100% rename from reliability/autotest/test_deltamode_random_err.glm rename to module/reliability/autotest/test_deltamode_random_err.glm diff --git a/reliability/autotest/test_deterministic.glm b/module/reliability/autotest/test_deterministic.glm similarity index 100% rename from reliability/autotest/test_deterministic.glm rename to module/reliability/autotest/test_deterministic.glm diff --git a/reliability/autotest/test_deterministic_minTS.glm b/module/reliability/autotest/test_deterministic_minTS.glm similarity index 100% rename from reliability/autotest/test_deterministic_minTS.glm rename to module/reliability/autotest/test_deterministic_minTS.glm diff --git a/reliability/autotest/test_eventgen_random.glm b/module/reliability/autotest/test_eventgen_random.glm similarity index 100% rename from reliability/autotest/test_eventgen_random.glm rename to module/reliability/autotest/test_eventgen_random.glm diff --git a/reliability/autotest/test_eventgen_random_minTS.glm b/module/reliability/autotest/test_eventgen_random_minTS.glm similarity index 100% rename from reliability/autotest/test_eventgen_random_minTS.glm rename to module/reliability/autotest/test_eventgen_random_minTS.glm diff --git a/reliability/autotest/test_fault_current_4_node.glm b/module/reliability/autotest/test_fault_current_4_node.glm similarity index 100% rename from reliability/autotest/test_fault_current_4_node.glm rename to module/reliability/autotest/test_fault_current_4_node.glm diff --git a/reliability/cost.cpp b/module/reliability/cost.cpp similarity index 100% rename from reliability/cost.cpp rename to module/reliability/cost.cpp diff --git a/reliability/cost.h b/module/reliability/cost.h similarity index 100% rename from reliability/cost.h rename to module/reliability/cost.h diff --git a/reliability/eventgen.cpp b/module/reliability/eventgen.cpp similarity index 100% rename from reliability/eventgen.cpp rename to module/reliability/eventgen.cpp diff --git a/reliability/eventgen.h b/module/reliability/eventgen.h similarity index 100% rename from reliability/eventgen.h rename to module/reliability/eventgen.h diff --git a/reliability/init.cpp b/module/reliability/init.cpp similarity index 100% rename from reliability/init.cpp rename to module/reliability/init.cpp diff --git a/reliability/main.cpp b/module/reliability/main.cpp similarity index 100% rename from reliability/main.cpp rename to module/reliability/main.cpp diff --git a/reliability/metrics.cpp b/module/reliability/metrics.cpp similarity index 100% rename from reliability/metrics.cpp rename to module/reliability/metrics.cpp diff --git a/reliability/metrics.h b/module/reliability/metrics.h similarity index 100% rename from reliability/metrics.h rename to module/reliability/metrics.h diff --git a/reliability/reliability.h b/module/reliability/reliability.h similarity index 100% rename from reliability/reliability.h rename to module/reliability/reliability.h diff --git a/reliability/reliability.vcproj b/module/reliability/reliability.vcproj similarity index 100% rename from reliability/reliability.vcproj rename to module/reliability/reliability.vcproj diff --git a/module/residential/Makefile.mk b/module/residential/Makefile.mk new file mode 100644 index 000000000..1b327c6a7 --- /dev/null +++ b/module/residential/Makefile.mk @@ -0,0 +1,35 @@ +pkglib_LTLIBRARIES += module/residential/residential.la + +module_residential_residential_la_CPPFLAGS = +module_residential_residential_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_residential_residential_la_LDFLAGS = +module_residential_residential_la_LDFLAGS += $(AM_LDFLAGS) + +module_residential_residential_la_LIBADD = -ldl + +module_residential_residential_la_SOURCES = module/residential/init.cpp module/residential/main.cpp +module_residential_residential_la_SOURCES += module/residential/appliance.cpp module/residential/appliance.h +module_residential_residential_la_SOURCES += module/residential/clotheswasher.cpp module/residential/clotheswasher.h +module_residential_residential_la_SOURCES += module/residential/dishwasher.cpp module/residential/dishwasher.h +module_residential_residential_la_SOURCES += module/residential/dryer.cpp module/residential/dryer.h +module_residential_residential_la_SOURCES += module/residential/evcharger.cpp module/residential/evcharger_det.cpp +module_residential_residential_la_SOURCES += module/residential/evcharger_det.h module/residential/evcharger.h +module_residential_residential_la_SOURCES += module/residential/freezer.cpp module/residential/freezer.h +module_residential_residential_la_SOURCES += module/residential/house_e.cpp module/residential/house_e.h +module_residential_residential_la_SOURCES += module/residential/lights.cpp module/residential/lights.h +module_residential_residential_la_SOURCES += module/residential/microwave.cpp module/residential/microwave.h +module_residential_residential_la_SOURCES += module/residential/occupantload.cpp module/residential/occupantload.h +module_residential_residential_la_SOURCES += module/residential/plugload.cpp module/residential/plugload.h +module_residential_residential_la_SOURCES += module/residential/range.cpp module/residential/range.h +module_residential_residential_la_SOURCES += module/residential/rbsa.cpp module/residential/rbsa.h +module_residential_residential_la_SOURCES += module/residential/refrigerator.cpp module/residential/refrigerator.h +module_residential_residential_la_SOURCES += module/residential/residential_enduse.cpp module/residential/residential_enduse.h +module_residential_residential_la_SOURCES += module/residential/solvers.cpp module/residential/solvers.h +module_residential_residential_la_SOURCES += module/residential/thermal_storage.cpp module/residential/thermal_storage.h +module_residential_residential_la_SOURCES += module/residential/waterheater.cpp module/residential/waterheater.h +module_residential_residential_la_SOURCES += module/residential/zipload.cpp module/residential/zipload.h +module_residential_residential_la_SOURCES += module/residential/residential.h +module_residential_residential_la_SOURCES += module/residential/rbsa2014.h +module_residential_residential_la_SOURCES += module/residential/elcap1990.h +module_residential_residential_la_SOURCES += module/residential/elcap2010.h diff --git a/residential/appliance.cpp b/module/residential/appliance.cpp similarity index 100% rename from residential/appliance.cpp rename to module/residential/appliance.cpp diff --git a/residential/appliance.h b/module/residential/appliance.h similarity index 100% rename from residential/appliance.h rename to module/residential/appliance.h diff --git a/residential/autotest/Dishwasher.glm b/module/residential/autotest/Dishwasher.glm similarity index 100% rename from residential/autotest/Dishwasher.glm rename to module/residential/autotest/Dishwasher.glm diff --git a/residential/autotest/Dryer.glm b/module/residential/autotest/Dryer.glm similarity index 100% rename from residential/autotest/Dryer.glm rename to module/residential/autotest/Dryer.glm diff --git a/residential/autotest/Range.glm b/module/residential/autotest/Range.glm similarity index 100% rename from residential/autotest/Range.glm rename to module/residential/autotest/Range.glm diff --git a/residential/autotest/Refrigerator.glm b/module/residential/autotest/Refrigerator.glm similarity index 100% rename from residential/autotest/Refrigerator.glm rename to module/residential/autotest/Refrigerator.glm diff --git a/residential/autotest/appliance_schedules.glm b/module/residential/autotest/appliance_schedules.glm similarity index 100% rename from residential/autotest/appliance_schedules.glm rename to module/residential/autotest/appliance_schedules.glm diff --git a/residential/autotest/clotheswasher.glm b/module/residential/autotest/clotheswasher.glm similarity index 100% rename from residential/autotest/clotheswasher.glm rename to module/residential/autotest/clotheswasher.glm diff --git a/residential/autotest/clotheswasher_out.player b/module/residential/autotest/clotheswasher_out.player similarity index 100% rename from residential/autotest/clotheswasher_out.player rename to module/residential/autotest/clotheswasher_out.player diff --git a/residential/autotest/clotheswasher_output.player b/module/residential/autotest/clotheswasher_output.player similarity index 100% rename from residential/autotest/clotheswasher_output.player rename to module/residential/autotest/clotheswasher_output.player diff --git a/residential/autotest/data_EV_det_output_m1.player b/module/residential/autotest/data_EV_det_output_m1.player similarity index 100% rename from residential/autotest/data_EV_det_output_m1.player rename to module/residential/autotest/data_EV_det_output_m1.player diff --git a/residential/autotest/data_EV_det_output_m1_default.player b/module/residential/autotest/data_EV_det_output_m1_default.player similarity index 100% rename from residential/autotest/data_EV_det_output_m1_default.player rename to module/residential/autotest/data_EV_det_output_m1_default.player diff --git a/residential/autotest/data_Vtrigger_house.player b/module/residential/autotest/data_Vtrigger_house.player similarity index 100% rename from residential/autotest/data_Vtrigger_house.player rename to module/residential/autotest/data_Vtrigger_house.player diff --git a/residential/autotest/data_min_new_EV_det_output_m1.player b/module/residential/autotest/data_min_new_EV_det_output_m1.player similarity index 100% rename from residential/autotest/data_min_new_EV_det_output_m1.player rename to module/residential/autotest/data_min_new_EV_det_output_m1.player diff --git a/residential/autotest/data_sample_NHTS.csv b/module/residential/autotest/data_sample_NHTS.csv similarity index 100% rename from residential/autotest/data_sample_NHTS.csv rename to module/residential/autotest/data_sample_NHTS.csv diff --git a/residential/autotest/dishwasher_output.player b/module/residential/autotest/dishwasher_output.player similarity index 100% rename from residential/autotest/dishwasher_output.player rename to module/residential/autotest/dishwasher_output.player diff --git a/residential/autotest/dr_mode_normal.player b/module/residential/autotest/dr_mode_normal.player similarity index 100% rename from residential/autotest/dr_mode_normal.player rename to module/residential/autotest/dr_mode_normal.player diff --git a/residential/autotest/dryer_output.player b/module/residential/autotest/dryer_output.player similarity index 100% rename from residential/autotest/dryer_output.player rename to module/residential/autotest/dryer_output.player diff --git a/residential/autotest/generic_demand.glt b/module/residential/autotest/generic_demand.glt similarity index 100% rename from residential/autotest/generic_demand.glt rename to module/residential/autotest/generic_demand.glt diff --git a/residential/autotest/generic_fail_demand(range0-1).glt b/module/residential/autotest/generic_fail_demand(range0-1).glt similarity index 100% rename from residential/autotest/generic_fail_demand(range0-1).glt rename to module/residential/autotest/generic_fail_demand(range0-1).glt diff --git a/residential/autotest/lights_power.m b/module/residential/autotest/lights_power.m similarity index 100% rename from residential/autotest/lights_power.m rename to module/residential/autotest/lights_power.m diff --git a/residential/autotest/plot_paneldump.py b/module/residential/autotest/plot_paneldump.py similarity index 100% rename from residential/autotest/plot_paneldump.py rename to module/residential/autotest/plot_paneldump.py diff --git a/residential/autotest/plugload_demand_range_bounds.player b/module/residential/autotest/plugload_demand_range_bounds.player similarity index 100% rename from residential/autotest/plugload_demand_range_bounds.player rename to module/residential/autotest/plugload_demand_range_bounds.player diff --git a/residential/autotest/plugload_enduse_load.player b/module/residential/autotest/plugload_enduse_load.player similarity index 100% rename from residential/autotest/plugload_enduse_load.player rename to module/residential/autotest/plugload_enduse_load.player diff --git a/residential/autotest/plugload_energy_meter.player b/module/residential/autotest/plugload_energy_meter.player similarity index 100% rename from residential/autotest/plugload_energy_meter.player rename to module/residential/autotest/plugload_energy_meter.player diff --git a/residential/autotest/plugload_internal_gains.player b/module/residential/autotest/plugload_internal_gains.player similarity index 100% rename from residential/autotest/plugload_internal_gains.player rename to module/residential/autotest/plugload_internal_gains.player diff --git a/residential/autotest/plugload_internal_gains_hf.player b/module/residential/autotest/plugload_internal_gains_hf.player similarity index 100% rename from residential/autotest/plugload_internal_gains_hf.player rename to module/residential/autotest/plugload_internal_gains_hf.player diff --git a/residential/autotest/range_output.player b/module/residential/autotest/range_output.player similarity index 100% rename from residential/autotest/range_output.player rename to module/residential/autotest/range_output.player diff --git a/residential/autotest/refrigerator_out.player b/module/residential/autotest/refrigerator_out.player similarity index 100% rename from residential/autotest/refrigerator_out.player rename to module/residential/autotest/refrigerator_out.player diff --git a/residential/autotest/setpoint_schedule.glm b/module/residential/autotest/setpoint_schedule.glm similarity index 100% rename from residential/autotest/setpoint_schedule.glm rename to module/residential/autotest/setpoint_schedule.glm diff --git a/residential/autotest/test_HVAC_balance.glm b/module/residential/autotest/test_HVAC_balance.glm similarity index 100% rename from residential/autotest/test_HVAC_balance.glm rename to module/residential/autotest/test_HVAC_balance.glm diff --git a/residential/autotest/test_HVAC_common_cool.glm b/module/residential/autotest/test_HVAC_common_cool.glm similarity index 100% rename from residential/autotest/test_HVAC_common_cool.glm rename to module/residential/autotest/test_HVAC_common_cool.glm diff --git a/residential/autotest/test_HVAC_common_heat.glm b/module/residential/autotest/test_HVAC_common_heat.glm similarity index 100% rename from residential/autotest/test_HVAC_common_heat.glm rename to module/residential/autotest/test_HVAC_common_heat.glm diff --git a/residential/autotest/test_HVAC_peak_cool.glm b/module/residential/autotest/test_HVAC_peak_cool.glm similarity index 100% rename from residential/autotest/test_HVAC_peak_cool.glm rename to module/residential/autotest/test_HVAC_peak_cool.glm diff --git a/residential/autotest/test_HVAC_peak_heat.glm b/module/residential/autotest/test_HVAC_peak_heat.glm similarity index 100% rename from residential/autotest/test_HVAC_peak_heat.glm rename to module/residential/autotest/test_HVAC_peak_heat.glm diff --git a/residential/autotest/test_Refrigerator_opt.glm b/module/residential/autotest/test_Refrigerator_opt.glm similarity index 100% rename from residential/autotest/test_Refrigerator_opt.glm rename to module/residential/autotest/test_Refrigerator_opt.glm diff --git a/residential/autotest/test_appliance_opt.glm b/module/residential/autotest/test_appliance_opt.glm similarity index 100% rename from residential/autotest/test_appliance_opt.glm rename to module/residential/autotest/test_appliance_opt.glm diff --git a/residential/autotest/test_clotheswasher_explicit_energy_swd_opt.glm b/module/residential/autotest/test_clotheswasher_explicit_energy_swd_opt.glm similarity index 100% rename from residential/autotest/test_clotheswasher_explicit_energy_swd_opt.glm rename to module/residential/autotest/test_clotheswasher_explicit_energy_swd_opt.glm diff --git a/residential/autotest/test_clotheswasher_explicit_energy_swy_opt.glm b/module/residential/autotest/test_clotheswasher_explicit_energy_swy_opt.glm similarity index 100% rename from residential/autotest/test_clotheswasher_explicit_energy_swy_opt.glm rename to module/residential/autotest/test_clotheswasher_explicit_energy_swy_opt.glm diff --git a/residential/autotest/test_clotheswasher_explicit_energy_wwd_opt.glm b/module/residential/autotest/test_clotheswasher_explicit_energy_wwd_opt.glm similarity index 100% rename from residential/autotest/test_clotheswasher_explicit_energy_wwd_opt.glm rename to module/residential/autotest/test_clotheswasher_explicit_energy_wwd_opt.glm diff --git a/residential/autotest/test_clotheswasher_explicit_energy_wwy_opt.glm b/module/residential/autotest/test_clotheswasher_explicit_energy_wwy_opt.glm similarity index 100% rename from residential/autotest/test_clotheswasher_explicit_energy_wwy_opt.glm rename to module/residential/autotest/test_clotheswasher_explicit_energy_wwy_opt.glm diff --git a/residential/autotest/test_clotheswasher_implicit.glm b/module/residential/autotest/test_clotheswasher_implicit.glm similarity index 100% rename from residential/autotest/test_clotheswasher_implicit.glm rename to module/residential/autotest/test_clotheswasher_implicit.glm diff --git a/residential/autotest/test_clotheswasher_opt.glm b/module/residential/autotest/test_clotheswasher_opt.glm similarity index 100% rename from residential/autotest/test_clotheswasher_opt.glm rename to module/residential/autotest/test_clotheswasher_opt.glm diff --git a/residential/autotest/test_deltamode_single_house.glm b/module/residential/autotest/test_deltamode_single_house.glm similarity index 100% rename from residential/autotest/test_deltamode_single_house.glm rename to module/residential/autotest/test_deltamode_single_house.glm diff --git a/residential/autotest/test_dishwasher.glm b/module/residential/autotest/test_dishwasher.glm similarity index 100% rename from residential/autotest/test_dishwasher.glm rename to module/residential/autotest/test_dishwasher.glm diff --git a/residential/autotest/test_dishwasher_explicit_power1_opt.glm b/module/residential/autotest/test_dishwasher_explicit_power1_opt.glm similarity index 100% rename from residential/autotest/test_dishwasher_explicit_power1_opt.glm rename to module/residential/autotest/test_dishwasher_explicit_power1_opt.glm diff --git a/residential/autotest/test_dishwasher_explicit_power2_opt.glm b/module/residential/autotest/test_dishwasher_explicit_power2_opt.glm similarity index 100% rename from residential/autotest/test_dishwasher_explicit_power2_opt.glm rename to module/residential/autotest/test_dishwasher_explicit_power2_opt.glm diff --git a/residential/autotest/test_dishwasher_implicit.glm b/module/residential/autotest/test_dishwasher_implicit.glm similarity index 100% rename from residential/autotest/test_dishwasher_implicit.glm rename to module/residential/autotest/test_dishwasher_implicit.glm diff --git a/residential/autotest/test_dryer.glm b/module/residential/autotest/test_dryer.glm similarity index 100% rename from residential/autotest/test_dryer.glm rename to module/residential/autotest/test_dryer.glm diff --git a/residential/autotest/test_dryer_explicit_energy_swd_opt.glm b/module/residential/autotest/test_dryer_explicit_energy_swd_opt.glm similarity index 100% rename from residential/autotest/test_dryer_explicit_energy_swd_opt.glm rename to module/residential/autotest/test_dryer_explicit_energy_swd_opt.glm diff --git a/residential/autotest/test_dryer_explicit_energy_swy_opt.glm b/module/residential/autotest/test_dryer_explicit_energy_swy_opt.glm similarity index 100% rename from residential/autotest/test_dryer_explicit_energy_swy_opt.glm rename to module/residential/autotest/test_dryer_explicit_energy_swy_opt.glm diff --git a/residential/autotest/test_dryer_explicit_energy_wwd_opt.glm b/module/residential/autotest/test_dryer_explicit_energy_wwd_opt.glm similarity index 100% rename from residential/autotest/test_dryer_explicit_energy_wwd_opt.glm rename to module/residential/autotest/test_dryer_explicit_energy_wwd_opt.glm diff --git a/residential/autotest/test_dryer_explicit_energy_wwy_opt.glm b/module/residential/autotest/test_dryer_explicit_energy_wwy_opt.glm similarity index 100% rename from residential/autotest/test_dryer_explicit_energy_wwy_opt.glm rename to module/residential/autotest/test_dryer_explicit_energy_wwy_opt.glm diff --git a/residential/autotest/test_dryer_implicit.glm b/module/residential/autotest/test_dryer_implicit.glm similarity index 100% rename from residential/autotest/test_dryer_implicit.glm rename to module/residential/autotest/test_dryer_implicit.glm diff --git a/residential/autotest/test_evcharger_det_m1.glm b/module/residential/autotest/test_evcharger_det_m1.glm similarity index 100% rename from residential/autotest/test_evcharger_det_m1.glm rename to module/residential/autotest/test_evcharger_det_m1.glm diff --git a/residential/autotest/test_evcharger_det_m1_default.glm b/module/residential/autotest/test_evcharger_det_m1_default.glm similarity index 100% rename from residential/autotest/test_evcharger_det_m1_default.glm rename to module/residential/autotest/test_evcharger_det_m1_default.glm diff --git a/residential/autotest/test_evcharger_det_m1_minTS.glm b/module/residential/autotest/test_evcharger_det_m1_minTS.glm similarity index 100% rename from residential/autotest/test_evcharger_det_m1_minTS.glm rename to module/residential/autotest/test_evcharger_det_m1_minTS.glm diff --git a/residential/autotest/test_freezer_deadband_opt.glm b/module/residential/autotest/test_freezer_deadband_opt.glm similarity index 100% rename from residential/autotest/test_freezer_deadband_opt.glm rename to module/residential/autotest/test_freezer_deadband_opt.glm diff --git a/residential/autotest/test_freezer_implicit_opt.glm b/module/residential/autotest/test_freezer_implicit_opt.glm similarity index 100% rename from residential/autotest/test_freezer_implicit_opt.glm rename to module/residential/autotest/test_freezer_implicit_opt.glm diff --git a/residential/autotest/test_generic_limit_demand(range0-1).glt b/module/residential/autotest/test_generic_limit_demand(range0-1).glt similarity index 100% rename from residential/autotest/test_generic_limit_demand(range0-1).glt rename to module/residential/autotest/test_generic_limit_demand(range0-1).glt diff --git a/residential/autotest/test_generic_limit_demand.player b/module/residential/autotest/test_generic_limit_demand.player similarity index 100% rename from residential/autotest/test_generic_limit_demand.player rename to module/residential/autotest/test_generic_limit_demand.player diff --git a/residential/autotest/test_house_paneldump_energy.glm b/module/residential/autotest/test_house_paneldump_energy.glm similarity index 100% rename from residential/autotest/test_house_paneldump_energy.glm rename to module/residential/autotest/test_house_paneldump_energy.glm diff --git a/residential/autotest/test_house_paneldump_power.glm b/module/residential/autotest/test_house_paneldump_power.glm similarity index 100% rename from residential/autotest/test_house_paneldump_power.glm rename to module/residential/autotest/test_house_paneldump_power.glm diff --git a/residential/autotest/test_implicit_eia2015_loads.glm b/module/residential/autotest/test_implicit_eia2015_loads.glm similarity index 100% rename from residential/autotest/test_implicit_eia2015_loads.glm rename to module/residential/autotest/test_implicit_eia2015_loads.glm diff --git a/residential/autotest/test_implicit_gasenduses.glm b/module/residential/autotest/test_implicit_gasenduses.glm similarity index 100% rename from residential/autotest/test_implicit_gasenduses.glm rename to module/residential/autotest/test_implicit_gasenduses.glm diff --git a/residential/autotest/test_lights_exp.glm b/module/residential/autotest/test_lights_exp.glm similarity index 100% rename from residential/autotest/test_lights_exp.glm rename to module/residential/autotest/test_lights_exp.glm diff --git a/residential/autotest/test_lights_explicit_power1.glm b/module/residential/autotest/test_lights_explicit_power1.glm similarity index 100% rename from residential/autotest/test_lights_explicit_power1.glm rename to module/residential/autotest/test_lights_explicit_power1.glm diff --git a/residential/autotest/test_lights_explicit_power1.player b/module/residential/autotest/test_lights_explicit_power1.player similarity index 100% rename from residential/autotest/test_lights_explicit_power1.player rename to module/residential/autotest/test_lights_explicit_power1.player diff --git a/residential/autotest/test_lights_explicit_power2.glm b/module/residential/autotest/test_lights_explicit_power2.glm similarity index 100% rename from residential/autotest/test_lights_explicit_power2.glm rename to module/residential/autotest/test_lights_explicit_power2.glm diff --git a/residential/autotest/test_lights_explicit_power2.player b/module/residential/autotest/test_lights_explicit_power2.player similarity index 100% rename from residential/autotest/test_lights_explicit_power2.player rename to module/residential/autotest/test_lights_explicit_power2.player diff --git a/residential/autotest/test_lights_explicit_power3.glm b/module/residential/autotest/test_lights_explicit_power3.glm similarity index 100% rename from residential/autotest/test_lights_explicit_power3.glm rename to module/residential/autotest/test_lights_explicit_power3.glm diff --git a/residential/autotest/test_lights_explicit_power3.player b/module/residential/autotest/test_lights_explicit_power3.player similarity index 100% rename from residential/autotest/test_lights_explicit_power3.player rename to module/residential/autotest/test_lights_explicit_power3.player diff --git a/residential/autotest/test_lights_explicit_power4.glm b/module/residential/autotest/test_lights_explicit_power4.glm similarity index 100% rename from residential/autotest/test_lights_explicit_power4.glm rename to module/residential/autotest/test_lights_explicit_power4.glm diff --git a/residential/autotest/test_lights_explicit_power4.player b/module/residential/autotest/test_lights_explicit_power4.player similarity index 100% rename from residential/autotest/test_lights_explicit_power4.player rename to module/residential/autotest/test_lights_explicit_power4.player diff --git a/residential/autotest/test_lights_imp.glm b/module/residential/autotest/test_lights_imp.glm similarity index 100% rename from residential/autotest/test_lights_imp.glm rename to module/residential/autotest/test_lights_imp.glm diff --git a/residential/autotest/test_lights_implicit_power1.glm b/module/residential/autotest/test_lights_implicit_power1.glm similarity index 100% rename from residential/autotest/test_lights_implicit_power1.glm rename to module/residential/autotest/test_lights_implicit_power1.glm diff --git a/residential/autotest/test_lights_implicit_power2.glm b/module/residential/autotest/test_lights_implicit_power2.glm similarity index 100% rename from residential/autotest/test_lights_implicit_power2.glm rename to module/residential/autotest/test_lights_implicit_power2.glm diff --git a/residential/autotest/test_lights_implicit_power3.glm b/module/residential/autotest/test_lights_implicit_power3.glm similarity index 100% rename from residential/autotest/test_lights_implicit_power3.glm rename to module/residential/autotest/test_lights_implicit_power3.glm diff --git a/residential/autotest/test_lights_implicit_power4.glm b/module/residential/autotest/test_lights_implicit_power4.glm similarity index 100% rename from residential/autotest/test_lights_implicit_power4.glm rename to module/residential/autotest/test_lights_implicit_power4.glm diff --git a/residential/autotest/test_lights_standalone.glm b/module/residential/autotest/test_lights_standalone.glm similarity index 100% rename from residential/autotest/test_lights_standalone.glm rename to module/residential/autotest/test_lights_standalone.glm diff --git a/residential/autotest/test_microwave_cycle_length_limits_err.glm b/module/residential/autotest/test_microwave_cycle_length_limits_err.glm similarity index 100% rename from residential/autotest/test_microwave_cycle_length_limits_err.glm rename to module/residential/autotest/test_microwave_cycle_length_limits_err.glm diff --git a/residential/autotest/test_microwave_demand_limits_opt.glm b/module/residential/autotest/test_microwave_demand_limits_opt.glm similarity index 100% rename from residential/autotest/test_microwave_demand_limits_opt.glm rename to module/residential/autotest/test_microwave_demand_limits_opt.glm diff --git a/residential/autotest/test_microwave_energy.glt b/module/residential/autotest/test_microwave_energy.glt similarity index 100% rename from residential/autotest/test_microwave_energy.glt rename to module/residential/autotest/test_microwave_energy.glt diff --git a/residential/autotest/test_microwave_energy.m b/module/residential/autotest/test_microwave_energy.m similarity index 100% rename from residential/autotest/test_microwave_energy.m rename to module/residential/autotest/test_microwave_energy.m diff --git a/residential/autotest/test_microwave_energy.player b/module/residential/autotest/test_microwave_energy.player similarity index 100% rename from residential/autotest/test_microwave_energy.player rename to module/residential/autotest/test_microwave_energy.player diff --git a/residential/autotest/test_microwave_energy_accumulation.glm b/module/residential/autotest/test_microwave_energy_accumulation.glm similarity index 100% rename from residential/autotest/test_microwave_energy_accumulation.glm rename to module/residential/autotest/test_microwave_energy_accumulation.glm diff --git a/residential/autotest/test_microwave_energy_accumulation.m b/module/residential/autotest/test_microwave_energy_accumulation.m similarity index 100% rename from residential/autotest/test_microwave_energy_accumulation.m rename to module/residential/autotest/test_microwave_energy_accumulation.m diff --git a/residential/autotest/test_microwave_energy_accumulation.player b/module/residential/autotest/test_microwave_energy_accumulation.player similarity index 100% rename from residential/autotest/test_microwave_energy_accumulation.player rename to module/residential/autotest/test_microwave_energy_accumulation.player diff --git a/residential/autotest/test_microwave_energy_opt.glm b/module/residential/autotest/test_microwave_energy_opt.glm similarity index 100% rename from residential/autotest/test_microwave_energy_opt.glm rename to module/residential/autotest/test_microwave_energy_opt.glm diff --git a/residential/autotest/test_microwave_explicit_swd_opt.glm b/module/residential/autotest/test_microwave_explicit_swd_opt.glm similarity index 100% rename from residential/autotest/test_microwave_explicit_swd_opt.glm rename to module/residential/autotest/test_microwave_explicit_swd_opt.glm diff --git a/residential/autotest/test_microwave_explicit_swy_opt.glm b/module/residential/autotest/test_microwave_explicit_swy_opt.glm similarity index 100% rename from residential/autotest/test_microwave_explicit_swy_opt.glm rename to module/residential/autotest/test_microwave_explicit_swy_opt.glm diff --git a/residential/autotest/test_microwave_explicit_wwd_opt.glm b/module/residential/autotest/test_microwave_explicit_wwd_opt.glm similarity index 100% rename from residential/autotest/test_microwave_explicit_wwd_opt.glm rename to module/residential/autotest/test_microwave_explicit_wwd_opt.glm diff --git a/residential/autotest/test_microwave_explicit_wwy_opt.glm b/module/residential/autotest/test_microwave_explicit_wwy_opt.glm similarity index 100% rename from residential/autotest/test_microwave_explicit_wwy_opt.glm rename to module/residential/autotest/test_microwave_explicit_wwy_opt.glm diff --git a/residential/autotest/test_microwave_implicit.glm b/module/residential/autotest/test_microwave_implicit.glm similarity index 100% rename from residential/autotest/test_microwave_implicit.glm rename to module/residential/autotest/test_microwave_implicit.glm diff --git a/residential/autotest/test_microwave_implicit_swd_opt.glm b/module/residential/autotest/test_microwave_implicit_swd_opt.glm similarity index 100% rename from residential/autotest/test_microwave_implicit_swd_opt.glm rename to module/residential/autotest/test_microwave_implicit_swd_opt.glm diff --git a/residential/autotest/test_microwave_implicit_swy_opt.glm b/module/residential/autotest/test_microwave_implicit_swy_opt.glm similarity index 100% rename from residential/autotest/test_microwave_implicit_swy_opt.glm rename to module/residential/autotest/test_microwave_implicit_swy_opt.glm diff --git a/residential/autotest/test_microwave_implicit_wwd_opt.glm b/module/residential/autotest/test_microwave_implicit_wwd_opt.glm similarity index 100% rename from residential/autotest/test_microwave_implicit_wwd_opt.glm rename to module/residential/autotest/test_microwave_implicit_wwd_opt.glm diff --git a/residential/autotest/test_microwave_implicit_wwy_opt.glm b/module/residential/autotest/test_microwave_implicit_wwy_opt.glm similarity index 100% rename from residential/autotest/test_microwave_implicit_wwy_opt.glm rename to module/residential/autotest/test_microwave_implicit_wwy_opt.glm diff --git a/residential/autotest/test_microwave_internal_gains_0.player b/module/residential/autotest/test_microwave_internal_gains_0.player similarity index 100% rename from residential/autotest/test_microwave_internal_gains_0.player rename to module/residential/autotest/test_microwave_internal_gains_0.player diff --git a/residential/autotest/test_microwave_internal_gains_1.player b/module/residential/autotest/test_microwave_internal_gains_1.player similarity index 100% rename from residential/autotest/test_microwave_internal_gains_1.player rename to module/residential/autotest/test_microwave_internal_gains_1.player diff --git a/residential/autotest/test_microwave_internal_gains_opt.glm b/module/residential/autotest/test_microwave_internal_gains_opt.glm similarity index 100% rename from residential/autotest/test_microwave_internal_gains_opt.glm rename to module/residential/autotest/test_microwave_internal_gains_opt.glm diff --git a/residential/autotest/test_microwave_standby_power_limits.player b/module/residential/autotest/test_microwave_standby_power_limits.player similarity index 100% rename from residential/autotest/test_microwave_standby_power_limits.player rename to module/residential/autotest/test_microwave_standby_power_limits.player diff --git a/residential/autotest/test_microwave_standby_power_limits_opt.glm b/module/residential/autotest/test_microwave_standby_power_limits_opt.glm similarity index 100% rename from residential/autotest/test_microwave_standby_power_limits_opt.glm rename to module/residential/autotest/test_microwave_standby_power_limits_opt.glm diff --git a/residential/autotest/test_occupantload_enduse_load0.glm b/module/residential/autotest/test_occupantload_enduse_load0.glm similarity index 100% rename from residential/autotest/test_occupantload_enduse_load0.glm rename to module/residential/autotest/test_occupantload_enduse_load0.glm diff --git a/residential/autotest/test_plugload_demand_range_bounds_opt.glm b/module/residential/autotest/test_plugload_demand_range_bounds_opt.glm similarity index 100% rename from residential/autotest/test_plugload_demand_range_bounds_opt.glm rename to module/residential/autotest/test_plugload_demand_range_bounds_opt.glm diff --git a/residential/autotest/test_plugload_enduse_load.glm b/module/residential/autotest/test_plugload_enduse_load.glm similarity index 100% rename from residential/autotest/test_plugload_enduse_load.glm rename to module/residential/autotest/test_plugload_enduse_load.glm diff --git a/residential/autotest/test_plugload_enduse_load_swd.player b/module/residential/autotest/test_plugload_enduse_load_swd.player similarity index 100% rename from residential/autotest/test_plugload_enduse_load_swd.player rename to module/residential/autotest/test_plugload_enduse_load_swd.player diff --git a/residential/autotest/test_plugload_enduse_load_swy.player b/module/residential/autotest/test_plugload_enduse_load_swy.player similarity index 100% rename from residential/autotest/test_plugload_enduse_load_swy.player rename to module/residential/autotest/test_plugload_enduse_load_swy.player diff --git a/residential/autotest/test_plugload_enduse_load_wwy.player b/module/residential/autotest/test_plugload_enduse_load_wwy.player similarity index 100% rename from residential/autotest/test_plugload_enduse_load_wwy.player rename to module/residential/autotest/test_plugload_enduse_load_wwy.player diff --git a/residential/autotest/test_plugload_energy_meter_opt.glm b/module/residential/autotest/test_plugload_energy_meter_opt.glm similarity index 100% rename from residential/autotest/test_plugload_energy_meter_opt.glm rename to module/residential/autotest/test_plugload_energy_meter_opt.glm diff --git a/residential/autotest/test_plugload_energy_swd.player b/module/residential/autotest/test_plugload_energy_swd.player similarity index 100% rename from residential/autotest/test_plugload_energy_swd.player rename to module/residential/autotest/test_plugload_energy_swd.player diff --git a/residential/autotest/test_plugload_energy_swy.player b/module/residential/autotest/test_plugload_energy_swy.player similarity index 100% rename from residential/autotest/test_plugload_energy_swy.player rename to module/residential/autotest/test_plugload_energy_swy.player diff --git a/residential/autotest/test_plugload_energy_wwd.player b/module/residential/autotest/test_plugload_energy_wwd.player similarity index 100% rename from residential/autotest/test_plugload_energy_wwd.player rename to module/residential/autotest/test_plugload_energy_wwd.player diff --git a/residential/autotest/test_plugload_energy_wwy.player b/module/residential/autotest/test_plugload_energy_wwy.player similarity index 100% rename from residential/autotest/test_plugload_energy_wwy.player rename to module/residential/autotest/test_plugload_energy_wwy.player diff --git a/residential/autotest/test_plugload_explicit_swd.glm b/module/residential/autotest/test_plugload_explicit_swd.glm similarity index 100% rename from residential/autotest/test_plugload_explicit_swd.glm rename to module/residential/autotest/test_plugload_explicit_swd.glm diff --git a/residential/autotest/test_plugload_explicit_swy.glm b/module/residential/autotest/test_plugload_explicit_swy.glm similarity index 100% rename from residential/autotest/test_plugload_explicit_swy.glm rename to module/residential/autotest/test_plugload_explicit_swy.glm diff --git a/residential/autotest/test_plugload_explicit_wwd_opt.glm b/module/residential/autotest/test_plugload_explicit_wwd_opt.glm similarity index 100% rename from residential/autotest/test_plugload_explicit_wwd_opt.glm rename to module/residential/autotest/test_plugload_explicit_wwd_opt.glm diff --git a/residential/autotest/test_plugload_explicit_wwy.glm b/module/residential/autotest/test_plugload_explicit_wwy.glm similarity index 100% rename from residential/autotest/test_plugload_explicit_wwy.glm rename to module/residential/autotest/test_plugload_explicit_wwy.glm diff --git a/residential/autotest/test_plugload_heatgain_swd.player b/module/residential/autotest/test_plugload_heatgain_swd.player similarity index 100% rename from residential/autotest/test_plugload_heatgain_swd.player rename to module/residential/autotest/test_plugload_heatgain_swd.player diff --git a/residential/autotest/test_plugload_heatgain_swy.player b/module/residential/autotest/test_plugload_heatgain_swy.player similarity index 100% rename from residential/autotest/test_plugload_heatgain_swy.player rename to module/residential/autotest/test_plugload_heatgain_swy.player diff --git a/residential/autotest/test_plugload_heatgain_wwd.player b/module/residential/autotest/test_plugload_heatgain_wwd.player similarity index 100% rename from residential/autotest/test_plugload_heatgain_wwd.player rename to module/residential/autotest/test_plugload_heatgain_wwd.player diff --git a/residential/autotest/test_plugload_heatgain_wwy.player b/module/residential/autotest/test_plugload_heatgain_wwy.player similarity index 100% rename from residential/autotest/test_plugload_heatgain_wwy.player rename to module/residential/autotest/test_plugload_heatgain_wwy.player diff --git a/residential/autotest/test_plugload_implicit_swd_opt.glm b/module/residential/autotest/test_plugload_implicit_swd_opt.glm similarity index 100% rename from residential/autotest/test_plugload_implicit_swd_opt.glm rename to module/residential/autotest/test_plugload_implicit_swd_opt.glm diff --git a/residential/autotest/test_plugload_implicit_swy_opt.glm b/module/residential/autotest/test_plugload_implicit_swy_opt.glm similarity index 100% rename from residential/autotest/test_plugload_implicit_swy_opt.glm rename to module/residential/autotest/test_plugload_implicit_swy_opt.glm diff --git a/residential/autotest/test_plugload_implicit_wwd_opt.glm b/module/residential/autotest/test_plugload_implicit_wwd_opt.glm similarity index 100% rename from residential/autotest/test_plugload_implicit_wwd_opt.glm rename to module/residential/autotest/test_plugload_implicit_wwd_opt.glm diff --git a/residential/autotest/test_plugload_implicit_wwy_opt.glm b/module/residential/autotest/test_plugload_implicit_wwy_opt.glm similarity index 100% rename from residential/autotest/test_plugload_implicit_wwy_opt.glm rename to module/residential/autotest/test_plugload_implicit_wwy_opt.glm diff --git a/residential/autotest/test_plugload_internal_gains_hf.glm b/module/residential/autotest/test_plugload_internal_gains_hf.glm similarity index 100% rename from residential/autotest/test_plugload_internal_gains_hf.glm rename to module/residential/autotest/test_plugload_internal_gains_hf.glm diff --git a/residential/autotest/test_plugload_internal_gains_opt.glm b/module/residential/autotest/test_plugload_internal_gains_opt.glm similarity index 100% rename from residential/autotest/test_plugload_internal_gains_opt.glm rename to module/residential/autotest/test_plugload_internal_gains_opt.glm diff --git a/residential/autotest/test_range_explicit_energy1_opt.glm b/module/residential/autotest/test_range_explicit_energy1_opt.glm similarity index 100% rename from residential/autotest/test_range_explicit_energy1_opt.glm rename to module/residential/autotest/test_range_explicit_energy1_opt.glm diff --git a/residential/autotest/test_range_explicit_energy2_opt.glm b/module/residential/autotest/test_range_explicit_energy2_opt.glm similarity index 100% rename from residential/autotest/test_range_explicit_energy2_opt.glm rename to module/residential/autotest/test_range_explicit_energy2_opt.glm diff --git a/residential/autotest/test_range_explicit_energy3_opt.glm b/module/residential/autotest/test_range_explicit_energy3_opt.glm similarity index 100% rename from residential/autotest/test_range_explicit_energy3_opt.glm rename to module/residential/autotest/test_range_explicit_energy3_opt.glm diff --git a/residential/autotest/test_range_explicit_energy4_opt.glm b/module/residential/autotest/test_range_explicit_energy4_opt.glm similarity index 100% rename from residential/autotest/test_range_explicit_energy4_opt.glm rename to module/residential/autotest/test_range_explicit_energy4_opt.glm diff --git a/residential/autotest/test_range_implicit_opt.glm b/module/residential/autotest/test_range_implicit_opt.glm similarity index 100% rename from residential/autotest/test_range_implicit_opt.glm rename to module/residential/autotest/test_range_implicit_opt.glm diff --git a/residential/autotest/test_range_opt.glm b/module/residential/autotest/test_range_opt.glm similarity index 100% rename from residential/autotest/test_range_opt.glm rename to module/residential/autotest/test_range_opt.glm diff --git a/residential/autotest/test_range_power.player b/module/residential/autotest/test_range_power.player similarity index 100% rename from residential/autotest/test_range_power.player rename to module/residential/autotest/test_range_power.player diff --git a/residential/autotest/test_range_power_opt.glm b/module/residential/autotest/test_range_power_opt.glm similarity index 100% rename from residential/autotest/test_range_power_opt.glm rename to module/residential/autotest/test_range_power_opt.glm diff --git a/residential/autotest/test_refrigerator_implicit.glm b/module/residential/autotest/test_refrigerator_implicit.glm similarity index 100% rename from residential/autotest/test_refrigerator_implicit.glm rename to module/residential/autotest/test_refrigerator_implicit.glm diff --git a/residential/autotest/test_residential_exercise_5_2_1.glm b/module/residential/autotest/test_residential_exercise_5_2_1.glm similarity index 100% rename from residential/autotest/test_residential_exercise_5_2_1.glm rename to module/residential/autotest/test_residential_exercise_5_2_1.glm diff --git a/residential/autotest/test_residentialenduse_standalone.glm b/module/residential/autotest/test_residentialenduse_standalone.glm similarity index 100% rename from residential/autotest/test_residentialenduse_standalone.glm rename to module/residential/autotest/test_residentialenduse_standalone.glm diff --git a/residential/autotest/test_residentialenduse_standalone_err.glm b/module/residential/autotest/test_residentialenduse_standalone_err.glm similarity index 100% rename from residential/autotest/test_residentialenduse_standalone_err.glm rename to module/residential/autotest/test_residentialenduse_standalone_err.glm diff --git a/residential/autotest/test_solargains.glm b/module/residential/autotest/test_solargains.glm similarity index 100% rename from residential/autotest/test_solargains.glm rename to module/residential/autotest/test_solargains.glm diff --git a/residential/autotest/test_thermal_storage_SOC.player b/module/residential/autotest/test_thermal_storage_SOC.player similarity index 100% rename from residential/autotest/test_thermal_storage_SOC.player rename to module/residential/autotest/test_thermal_storage_SOC.player diff --git a/residential/autotest/test_thermal_storage_autotest.glm b/module/residential/autotest/test_thermal_storage_autotest.glm similarity index 100% rename from residential/autotest/test_thermal_storage_autotest.glm rename to module/residential/autotest/test_thermal_storage_autotest.glm diff --git a/residential/autotest/test_thermal_storage_energy.player b/module/residential/autotest/test_thermal_storage_energy.player similarity index 100% rename from residential/autotest/test_thermal_storage_energy.player rename to module/residential/autotest/test_thermal_storage_energy.player diff --git a/residential/autotest/test_waterheater_explicit_1.glm b/module/residential/autotest/test_waterheater_explicit_1.glm similarity index 100% rename from residential/autotest/test_waterheater_explicit_1.glm rename to module/residential/autotest/test_waterheater_explicit_1.glm diff --git a/residential/autotest/test_waterheater_explicit_2.glm b/module/residential/autotest/test_waterheater_explicit_2.glm similarity index 100% rename from residential/autotest/test_waterheater_explicit_2.glm rename to module/residential/autotest/test_waterheater_explicit_2.glm diff --git a/residential/autotest/test_waterheater_implicit.glm b/module/residential/autotest/test_waterheater_implicit.glm similarity index 100% rename from residential/autotest/test_waterheater_implicit.glm rename to module/residential/autotest/test_waterheater_implicit.glm diff --git a/residential/autotest/test_wh_explicit_1_temperature.player b/module/residential/autotest/test_wh_explicit_1_temperature.player similarity index 100% rename from residential/autotest/test_wh_explicit_1_temperature.player rename to module/residential/autotest/test_wh_explicit_1_temperature.player diff --git a/residential/autotest/test_wh_explicit_2_height.player b/module/residential/autotest/test_wh_explicit_2_height.player similarity index 100% rename from residential/autotest/test_wh_explicit_2_height.player rename to module/residential/autotest/test_wh_explicit_2_height.player diff --git a/residential/autotest/test_wh_explicit_2_temperature.player b/module/residential/autotest/test_wh_explicit_2_temperature.player similarity index 100% rename from residential/autotest/test_wh_explicit_2_temperature.player rename to module/residential/autotest/test_wh_explicit_2_temperature.player diff --git a/residential/autotest/test_zipload_pow_en_hg.glm b/module/residential/autotest/test_zipload_pow_en_hg.glm similarity index 100% rename from residential/autotest/test_zipload_pow_en_hg.glm rename to module/residential/autotest/test_zipload_pow_en_hg.glm diff --git a/residential/autotest/water_schedule.glm b/module/residential/autotest/water_schedule.glm similarity index 100% rename from residential/autotest/water_schedule.glm rename to module/residential/autotest/water_schedule.glm diff --git a/residential/autotest/waterheater_demand_waveform_sawtooth1.player b/module/residential/autotest/waterheater_demand_waveform_sawtooth1.player similarity index 100% rename from residential/autotest/waterheater_demand_waveform_sawtooth1.player rename to module/residential/autotest/waterheater_demand_waveform_sawtooth1.player diff --git a/residential/autotest/waterheater_demand_waveform_sawtooth2.player b/module/residential/autotest/waterheater_demand_waveform_sawtooth2.player similarity index 100% rename from residential/autotest/waterheater_demand_waveform_sawtooth2.player rename to module/residential/autotest/waterheater_demand_waveform_sawtooth2.player diff --git a/residential/autotest/waterheater_demand_waveform_sine.player b/module/residential/autotest/waterheater_demand_waveform_sine.player similarity index 100% rename from residential/autotest/waterheater_demand_waveform_sine.player rename to module/residential/autotest/waterheater_demand_waveform_sine.player diff --git a/residential/autotest/waterheater_demand_waveform_square.player b/module/residential/autotest/waterheater_demand_waveform_square.player similarity index 100% rename from residential/autotest/waterheater_demand_waveform_square.player rename to module/residential/autotest/waterheater_demand_waveform_square.player diff --git a/residential/clotheswasher.cpp b/module/residential/clotheswasher.cpp similarity index 100% rename from residential/clotheswasher.cpp rename to module/residential/clotheswasher.cpp diff --git a/residential/clotheswasher.h b/module/residential/clotheswasher.h similarity index 100% rename from residential/clotheswasher.h rename to module/residential/clotheswasher.h diff --git a/residential/data/evcharger/home-work.csv b/module/residential/data/evcharger/home-work.csv similarity index 100% rename from residential/data/evcharger/home-work.csv rename to module/residential/data/evcharger/home-work.csv diff --git a/residential/data/evcharger/home-work.xls b/module/residential/data/evcharger/home-work.xls similarity index 100% rename from residential/data/evcharger/home-work.xls rename to module/residential/data/evcharger/home-work.xls diff --git a/residential/dishwasher.cpp b/module/residential/dishwasher.cpp similarity index 100% rename from residential/dishwasher.cpp rename to module/residential/dishwasher.cpp diff --git a/residential/dishwasher.h b/module/residential/dishwasher.h similarity index 100% rename from residential/dishwasher.h rename to module/residential/dishwasher.h diff --git a/residential/docs/evcharger.ppt b/module/residential/docs/evcharger.ppt similarity index 100% rename from residential/docs/evcharger.ppt rename to module/residential/docs/evcharger.ppt diff --git a/residential/docs/evcharger/Slide1.PNG b/module/residential/docs/evcharger/Slide1.PNG similarity index 100% rename from residential/docs/evcharger/Slide1.PNG rename to module/residential/docs/evcharger/Slide1.PNG diff --git a/residential/docs/evcharger/Slide2.PNG b/module/residential/docs/evcharger/Slide2.PNG similarity index 100% rename from residential/docs/evcharger/Slide2.PNG rename to module/residential/docs/evcharger/Slide2.PNG diff --git a/residential/dryer.cpp b/module/residential/dryer.cpp similarity index 100% rename from residential/dryer.cpp rename to module/residential/dryer.cpp diff --git a/residential/dryer.h b/module/residential/dryer.h similarity index 100% rename from residential/dryer.h rename to module/residential/dryer.h diff --git a/residential/eia2015.h b/module/residential/eia2015.h similarity index 100% rename from residential/eia2015.h rename to module/residential/eia2015.h diff --git a/residential/elcap1990.h b/module/residential/elcap1990.h similarity index 100% rename from residential/elcap1990.h rename to module/residential/elcap1990.h diff --git a/residential/elcap2010.h b/module/residential/elcap2010.h similarity index 100% rename from residential/elcap2010.h rename to module/residential/elcap2010.h diff --git a/residential/evcharger.cpp b/module/residential/evcharger.cpp similarity index 100% rename from residential/evcharger.cpp rename to module/residential/evcharger.cpp diff --git a/residential/evcharger.h b/module/residential/evcharger.h similarity index 100% rename from residential/evcharger.h rename to module/residential/evcharger.h diff --git a/residential/evcharger_det.cpp b/module/residential/evcharger_det.cpp similarity index 100% rename from residential/evcharger_det.cpp rename to module/residential/evcharger_det.cpp diff --git a/residential/evcharger_det.h b/module/residential/evcharger_det.h similarity index 100% rename from residential/evcharger_det.h rename to module/residential/evcharger_det.h diff --git a/residential/freezer.cpp b/module/residential/freezer.cpp similarity index 100% rename from residential/freezer.cpp rename to module/residential/freezer.cpp diff --git a/residential/freezer.h b/module/residential/freezer.h similarity index 100% rename from residential/freezer.h rename to module/residential/freezer.h diff --git a/residential/house_e.cpp b/module/residential/house_e.cpp similarity index 100% rename from residential/house_e.cpp rename to module/residential/house_e.cpp diff --git a/residential/house_e.h b/module/residential/house_e.h similarity index 100% rename from residential/house_e.h rename to module/residential/house_e.h diff --git a/residential/init.cpp b/module/residential/init.cpp similarity index 100% rename from residential/init.cpp rename to module/residential/init.cpp diff --git a/residential/lights.cpp b/module/residential/lights.cpp similarity index 100% rename from residential/lights.cpp rename to module/residential/lights.cpp diff --git a/residential/lights.h b/module/residential/lights.h similarity index 100% rename from residential/lights.h rename to module/residential/lights.h diff --git a/residential/main.cpp b/module/residential/main.cpp similarity index 100% rename from residential/main.cpp rename to module/residential/main.cpp diff --git a/residential/microwave.cpp b/module/residential/microwave.cpp similarity index 100% rename from residential/microwave.cpp rename to module/residential/microwave.cpp diff --git a/residential/microwave.h b/module/residential/microwave.h similarity index 100% rename from residential/microwave.h rename to module/residential/microwave.h diff --git a/residential/occupantload.cpp b/module/residential/occupantload.cpp similarity index 100% rename from residential/occupantload.cpp rename to module/residential/occupantload.cpp diff --git a/residential/occupantload.h b/module/residential/occupantload.h similarity index 100% rename from residential/occupantload.h rename to module/residential/occupantload.h diff --git a/residential/plugload.cpp b/module/residential/plugload.cpp similarity index 100% rename from residential/plugload.cpp rename to module/residential/plugload.cpp diff --git a/residential/plugload.h b/module/residential/plugload.h similarity index 100% rename from residential/plugload.h rename to module/residential/plugload.h diff --git a/residential/range.cpp b/module/residential/range.cpp similarity index 100% rename from residential/range.cpp rename to module/residential/range.cpp diff --git a/residential/range.h b/module/residential/range.h similarity index 100% rename from residential/range.h rename to module/residential/range.h diff --git a/residential/rbsa.cpp b/module/residential/rbsa.cpp similarity index 100% rename from residential/rbsa.cpp rename to module/residential/rbsa.cpp diff --git a/residential/rbsa.h b/module/residential/rbsa.h similarity index 100% rename from residential/rbsa.h rename to module/residential/rbsa.h diff --git a/residential/rbsa2014.h b/module/residential/rbsa2014.h similarity index 100% rename from residential/rbsa2014.h rename to module/residential/rbsa2014.h diff --git a/residential/rbsa2014_discrete.h b/module/residential/rbsa2014_discrete.h similarity index 100% rename from residential/rbsa2014_discrete.h rename to module/residential/rbsa2014_discrete.h diff --git a/residential/refrigerator.cpp b/module/residential/refrigerator.cpp similarity index 100% rename from residential/refrigerator.cpp rename to module/residential/refrigerator.cpp diff --git a/residential/refrigerator.h b/module/residential/refrigerator.h similarity index 100% rename from residential/refrigerator.h rename to module/residential/refrigerator.h diff --git a/residential/residential.h b/module/residential/residential.h similarity index 100% rename from residential/residential.h rename to module/residential/residential.h diff --git a/residential/residential.vcproj b/module/residential/residential.vcproj similarity index 100% rename from residential/residential.vcproj rename to module/residential/residential.vcproj diff --git a/residential/residential_enduse.cpp b/module/residential/residential_enduse.cpp similarity index 100% rename from residential/residential_enduse.cpp rename to module/residential/residential_enduse.cpp diff --git a/residential/residential_enduse.h b/module/residential/residential_enduse.h similarity index 100% rename from residential/residential_enduse.h rename to module/residential/residential_enduse.h diff --git a/residential/solvers.cpp b/module/residential/solvers.cpp similarity index 100% rename from residential/solvers.cpp rename to module/residential/solvers.cpp diff --git a/residential/solvers.h b/module/residential/solvers.h similarity index 100% rename from residential/solvers.h rename to module/residential/solvers.h diff --git a/residential/thermal_storage.cpp b/module/residential/thermal_storage.cpp similarity index 100% rename from residential/thermal_storage.cpp rename to module/residential/thermal_storage.cpp diff --git a/residential/thermal_storage.h b/module/residential/thermal_storage.h similarity index 100% rename from residential/thermal_storage.h rename to module/residential/thermal_storage.h diff --git a/residential/waterheater.cpp b/module/residential/waterheater.cpp similarity index 100% rename from residential/waterheater.cpp rename to module/residential/waterheater.cpp diff --git a/residential/waterheater.h b/module/residential/waterheater.h similarity index 100% rename from residential/waterheater.h rename to module/residential/waterheater.h diff --git a/residential/zipload.cpp b/module/residential/zipload.cpp similarity index 100% rename from residential/zipload.cpp rename to module/residential/zipload.cpp diff --git a/residential/zipload.h b/module/residential/zipload.h similarity index 100% rename from residential/zipload.h rename to module/residential/zipload.h diff --git a/module/revenue/Makefile.mk b/module/revenue/Makefile.mk new file mode 100644 index 000000000..1ea716412 --- /dev/null +++ b/module/revenue/Makefile.mk @@ -0,0 +1,15 @@ +pkglib_LTLIBRARIES += module/revenue/revenue.la + +module_revenue_revenue_la_CPPFLAGS = +module_revenue_revenue_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_revenue_revenue_la_LDFLAGS = +module_revenue_revenue_la_LDFLAGS += $(AM_LDFLAGS) + +module_revenue_revenue_la_LIBADD = + +module_revenue_revenue_la_SOURCES = +module_revenue_revenue_la_SOURCES += module/revenue/main.cpp +module_revenue_revenue_la_SOURCES += module/revenue/revenue.h +module_revenue_revenue_la_SOURCES += module/revenue/billing.cpp module/revenue/billing.h +module_revenue_revenue_la_SOURCES += module/revenue/tariff.cpp module/revenue/tariff.h diff --git a/revenue/autotest/house.glm b/module/revenue/autotest/house.glm similarity index 100% rename from revenue/autotest/house.glm rename to module/revenue/autotest/house.glm diff --git a/revenue/autotest/pgande_res_200301.glm b/module/revenue/autotest/pgande_res_200301.glm similarity index 100% rename from revenue/autotest/pgande_res_200301.glm rename to module/revenue/autotest/pgande_res_200301.glm diff --git a/revenue/autotest/test_billing.glm b/module/revenue/autotest/test_billing.glm similarity index 100% rename from revenue/autotest/test_billing.glm rename to module/revenue/autotest/test_billing.glm diff --git a/revenue/autotest/test_billing.py b/module/revenue/autotest/test_billing.py similarity index 100% rename from revenue/autotest/test_billing.py rename to module/revenue/autotest/test_billing.py diff --git a/revenue/billing.cpp b/module/revenue/billing.cpp similarity index 100% rename from revenue/billing.cpp rename to module/revenue/billing.cpp diff --git a/revenue/billing.h b/module/revenue/billing.h similarity index 100% rename from revenue/billing.h rename to module/revenue/billing.h diff --git a/revenue/main.cpp b/module/revenue/main.cpp similarity index 100% rename from revenue/main.cpp rename to module/revenue/main.cpp diff --git a/revenue/revenue.h b/module/revenue/revenue.h similarity index 100% rename from revenue/revenue.h rename to module/revenue/revenue.h diff --git a/revenue/tariff.cpp b/module/revenue/tariff.cpp similarity index 100% rename from revenue/tariff.cpp rename to module/revenue/tariff.cpp diff --git a/revenue/tariff.h b/module/revenue/tariff.h similarity index 100% rename from revenue/tariff.h rename to module/revenue/tariff.h diff --git a/module/tape/Makefile.mk b/module/tape/Makefile.mk new file mode 100644 index 000000000..ecf63f0e2 --- /dev/null +++ b/module/tape/Makefile.mk @@ -0,0 +1,32 @@ +pkglib_LTLIBRARIES += module/tape/tape.la + +module_tape_tape_la_CPPFLAGS = +module_tape_tape_la_CPPFLAGS += -I$(top_srcdir)/third_party/jsonCpp +module_tape_tape_la_CPPFLAGS += -I$(top_srcdir)/module/powerflow +module_tape_tape_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_tape_tape_la_LDFLAGS = +module_tape_tape_la_LDFLAGS += $(AM_LDFLAGS) + +module_tape_tape_la_LIBADD = +module_tape_tape_la_LIBADD += third_party/jsonCpp/libjsoncpp.la +module_tape_tape_la_LIBADD += -ldl + +module_tape_tape_la_SOURCES = module/tape/main.cpp + +module_tape_tape_la_SOURCES += module/tape/file.cpp module/tape/file.h +module_tape_tape_la_SOURCES += module/tape/group_recorder.h module/tape/group_recorder.cpp +module_tape_tape_la_SOURCES += module/tape/metrics_collector.cpp module/tape/metrics_collector.h +module_tape_tape_la_SOURCES += module/tape/metrics_collector_writer.cpp module/tape/metrics_collector_writer.h +module_tape_tape_la_SOURCES += module/tape/violation_recorder.h module/tape/violation_recorder.cpp +module_tape_tape_la_SOURCES += module/tape/histogram.cpp module/tape/histogram.h +module_tape_tape_la_SOURCES += module/tape/loadshape.cpp module/tape/loadshape.h +module_tape_tape_la_SOURCES += module/tape/tape.cpp module/tape/tape.h +module_tape_tape_la_SOURCES += module/tape/memory.cpp module/tape/memory.h +module_tape_tape_la_SOURCES += module/tape/odbc.cpp module/tape/odbc.h + +module_tape_tape_la_SOURCES += module/tape/multi_recorder.cpp +module_tape_tape_la_SOURCES += module/tape/collector.cpp +module_tape_tape_la_SOURCES += module/tape/player.cpp +module_tape_tape_la_SOURCES += module/tape/recorder.cpp +module_tape_tape_la_SOURCES += module/tape/shaper.cpp diff --git a/tape/autotest/data_configurations_delta_123node.glm b/module/tape/autotest/data_configurations_delta_123node.glm similarity index 100% rename from tape/autotest/data_configurations_delta_123node.glm rename to module/tape/autotest/data_configurations_delta_123node.glm diff --git a/tape/autotest/data_delta_player_load_A.csv b/module/tape/autotest/data_delta_player_load_A.csv similarity index 100% rename from tape/autotest/data_delta_player_load_A.csv rename to module/tape/autotest/data_delta_player_load_A.csv diff --git a/tape/autotest/data_delta_player_load_A_check.csv b/module/tape/autotest/data_delta_player_load_A_check.csv similarity index 100% rename from tape/autotest/data_delta_player_load_A_check.csv rename to module/tape/autotest/data_delta_player_load_A_check.csv diff --git a/tape/autotest/data_loadchange.csv b/module/tape/autotest/data_loadchange.csv similarity index 100% rename from tape/autotest/data_loadchange.csv rename to module/tape/autotest/data_loadchange.csv diff --git a/tape/autotest/exercise_2_1_1.player b/module/tape/autotest/exercise_2_1_1.player similarity index 100% rename from tape/autotest/exercise_2_1_1.player rename to module/tape/autotest/exercise_2_1_1.player diff --git a/tape/autotest/recorder_flush_test2.csv b/module/tape/autotest/recorder_flush_test2.csv similarity index 100% rename from tape/autotest/recorder_flush_test2.csv rename to module/tape/autotest/recorder_flush_test2.csv diff --git a/tape/autotest/test_collector_exercise_2_4_2.glm b/module/tape/autotest/test_collector_exercise_2_4_2.glm similarity index 100% rename from tape/autotest/test_collector_exercise_2_4_2.glm rename to module/tape/autotest/test_collector_exercise_2_4_2.glm diff --git a/tape/autotest/test_collector_multiple_properties.glm b/module/tape/autotest/test_collector_multiple_properties.glm similarity index 100% rename from tape/autotest/test_collector_multiple_properties.glm rename to module/tape/autotest/test_collector_multiple_properties.glm diff --git a/tape/autotest/test_collector_triplex_meter.glm b/module/tape/autotest/test_collector_triplex_meter.glm similarity index 100% rename from tape/autotest/test_collector_triplex_meter.glm rename to module/tape/autotest/test_collector_triplex_meter.glm diff --git a/tape/autotest/test_delta_player_first_delta_timestep_err.glm b/module/tape/autotest/test_delta_player_first_delta_timestep_err.glm similarity index 100% rename from tape/autotest/test_delta_player_first_delta_timestep_err.glm rename to module/tape/autotest/test_delta_player_first_delta_timestep_err.glm diff --git a/tape/autotest/test_deltamode_player_endtime_err.glm b/module/tape/autotest/test_deltamode_player_endtime_err.glm similarity index 100% rename from tape/autotest/test_deltamode_player_endtime_err.glm rename to module/tape/autotest/test_deltamode_player_endtime_err.glm diff --git a/tape/autotest/test_histogram_basic.glm b/module/tape/autotest/test_histogram_basic.glm similarity index 100% rename from tape/autotest/test_histogram_basic.glm rename to module/tape/autotest/test_histogram_basic.glm diff --git a/tape/autotest/test_histogram_count_int.glm b/module/tape/autotest/test_histogram_count_int.glm similarity index 100% rename from tape/autotest/test_histogram_count_int.glm rename to module/tape/autotest/test_histogram_count_int.glm diff --git a/tape/autotest/test_histogram_enum.glm b/module/tape/autotest/test_histogram_enum.glm similarity index 100% rename from tape/autotest/test_histogram_enum.glm rename to module/tape/autotest/test_histogram_enum.glm diff --git a/tape/autotest/test_histogram_set.glm b/module/tape/autotest/test_histogram_set.glm similarity index 100% rename from tape/autotest/test_histogram_set.glm rename to module/tape/autotest/test_histogram_set.glm diff --git a/tape/autotest/test_multi_recorder_multiple_properties.glm b/module/tape/autotest/test_multi_recorder_multiple_properties.glm similarity index 100% rename from tape/autotest/test_multi_recorder_multiple_properties.glm rename to module/tape/autotest/test_multi_recorder_multiple_properties.glm diff --git a/tape/autotest/test_multi_recorder_multiple_properties_long.glm b/module/tape/autotest/test_multi_recorder_multiple_properties_long.glm similarity index 100% rename from tape/autotest/test_multi_recorder_multiple_properties_long.glm rename to module/tape/autotest/test_multi_recorder_multiple_properties_long.glm diff --git a/tape/autotest/test_multirecorder_global.glm b/module/tape/autotest/test_multirecorder_global.glm similarity index 100% rename from tape/autotest/test_multirecorder_global.glm rename to module/tape/autotest/test_multirecorder_global.glm diff --git a/tape/autotest/test_player_buffer.glm b/module/tape/autotest/test_player_buffer.glm similarity index 100% rename from tape/autotest/test_player_buffer.glm rename to module/tape/autotest/test_player_buffer.glm diff --git a/tape/autotest/test_player_buffer.player b/module/tape/autotest/test_player_buffer.player similarity index 100% rename from tape/autotest/test_player_buffer.player rename to module/tape/autotest/test_player_buffer.player diff --git a/tape/autotest/test_player_exercise_2_1_2.glm b/module/tape/autotest/test_player_exercise_2_1_2.glm similarity index 100% rename from tape/autotest/test_player_exercise_2_1_2.glm rename to module/tape/autotest/test_player_exercise_2_1_2.glm diff --git a/tape/autotest/test_recorder_epoch.glm b/module/tape/autotest/test_recorder_epoch.glm similarity index 100% rename from tape/autotest/test_recorder_epoch.glm rename to module/tape/autotest/test_recorder_epoch.glm diff --git a/tape/autotest/test_recorder_exercise_2_2_2.glm b/module/tape/autotest/test_recorder_exercise_2_2_2.glm similarity index 100% rename from tape/autotest/test_recorder_exercise_2_2_2.glm rename to module/tape/autotest/test_recorder_exercise_2_2_2.glm diff --git a/tape/autotest/test_recorder_flush_0.glm b/module/tape/autotest/test_recorder_flush_0.glm similarity index 100% rename from tape/autotest/test_recorder_flush_0.glm rename to module/tape/autotest/test_recorder_flush_0.glm diff --git a/tape/autotest/test_recorder_flush_1_err.glm b/module/tape/autotest/test_recorder_flush_1_err.glm similarity index 100% rename from tape/autotest/test_recorder_flush_1_err.glm rename to module/tape/autotest/test_recorder_flush_1_err.glm diff --git a/tape/autotest/test_recorder_flush_300.glm b/module/tape/autotest/test_recorder_flush_300.glm similarity index 100% rename from tape/autotest/test_recorder_flush_300.glm rename to module/tape/autotest/test_recorder_flush_300.glm diff --git a/tape/autotest/test_recorder_flush_sync.py b/module/tape/autotest/test_recorder_flush_sync.py similarity index 100% rename from tape/autotest/test_recorder_flush_sync.py rename to module/tape/autotest/test_recorder_flush_sync.py diff --git a/tape/autotest/test_recorder_global.glm b/module/tape/autotest/test_recorder_global.glm similarity index 100% rename from tape/autotest/test_recorder_global.glm rename to module/tape/autotest/test_recorder_global.glm diff --git a/tape/autotest/test_recorder_interval_err.glm b/module/tape/autotest/test_recorder_interval_err.glm similarity index 100% rename from tape/autotest/test_recorder_interval_err.glm rename to module/tape/autotest/test_recorder_interval_err.glm diff --git a/tape/autotest/test_recorder_multiple_properties.glm b/module/tape/autotest/test_recorder_multiple_properties.glm similarity index 100% rename from tape/autotest/test_recorder_multiple_properties.glm rename to module/tape/autotest/test_recorder_multiple_properties.glm diff --git a/tape/autotest/test_recorder_strftime_format.glm b/module/tape/autotest/test_recorder_strftime_format.glm similarity index 100% rename from tape/autotest/test_recorder_strftime_format.glm rename to module/tape/autotest/test_recorder_strftime_format.glm diff --git a/tape/autotest/test_tape_whitespace.glm b/module/tape/autotest/test_tape_whitespace.glm similarity index 100% rename from tape/autotest/test_tape_whitespace.glm rename to module/tape/autotest/test_tape_whitespace.glm diff --git a/tape/autotest/water_and_setpoint_schedule_v3.glm b/module/tape/autotest/water_and_setpoint_schedule_v3.glm similarity index 100% rename from tape/autotest/water_and_setpoint_schedule_v3.glm rename to module/tape/autotest/water_and_setpoint_schedule_v3.glm diff --git a/tape/collector.cpp b/module/tape/collector.cpp similarity index 100% rename from tape/collector.cpp rename to module/tape/collector.cpp diff --git a/tape/file.cpp b/module/tape/file.cpp similarity index 100% rename from tape/file.cpp rename to module/tape/file.cpp diff --git a/tape/file.h b/module/tape/file.h similarity index 100% rename from tape/file.h rename to module/tape/file.h diff --git a/tape/group_recorder.cpp b/module/tape/group_recorder.cpp similarity index 100% rename from tape/group_recorder.cpp rename to module/tape/group_recorder.cpp diff --git a/tape/group_recorder.h b/module/tape/group_recorder.h similarity index 100% rename from tape/group_recorder.h rename to module/tape/group_recorder.h diff --git a/tape/histogram.cpp b/module/tape/histogram.cpp similarity index 100% rename from tape/histogram.cpp rename to module/tape/histogram.cpp diff --git a/tape/histogram.h b/module/tape/histogram.h similarity index 100% rename from tape/histogram.h rename to module/tape/histogram.h diff --git a/tape/loadshape.cpp b/module/tape/loadshape.cpp similarity index 100% rename from tape/loadshape.cpp rename to module/tape/loadshape.cpp diff --git a/tape/loadshape.h b/module/tape/loadshape.h similarity index 100% rename from tape/loadshape.h rename to module/tape/loadshape.h diff --git a/tape/main.cpp b/module/tape/main.cpp similarity index 100% rename from tape/main.cpp rename to module/tape/main.cpp diff --git a/tape/memory.cpp b/module/tape/memory.cpp similarity index 100% rename from tape/memory.cpp rename to module/tape/memory.cpp diff --git a/tape/memory.h b/module/tape/memory.h similarity index 100% rename from tape/memory.h rename to module/tape/memory.h diff --git a/tape/metrics_collector.cpp b/module/tape/metrics_collector.cpp similarity index 100% rename from tape/metrics_collector.cpp rename to module/tape/metrics_collector.cpp diff --git a/tape/metrics_collector.h b/module/tape/metrics_collector.h similarity index 100% rename from tape/metrics_collector.h rename to module/tape/metrics_collector.h diff --git a/tape/metrics_collector_writer.cpp b/module/tape/metrics_collector_writer.cpp similarity index 100% rename from tape/metrics_collector_writer.cpp rename to module/tape/metrics_collector_writer.cpp diff --git a/tape/metrics_collector_writer.h b/module/tape/metrics_collector_writer.h similarity index 100% rename from tape/metrics_collector_writer.h rename to module/tape/metrics_collector_writer.h diff --git a/tape/multi_recorder.cpp b/module/tape/multi_recorder.cpp similarity index 100% rename from tape/multi_recorder.cpp rename to module/tape/multi_recorder.cpp diff --git a/tape/odbc.cpp b/module/tape/odbc.cpp similarity index 100% rename from tape/odbc.cpp rename to module/tape/odbc.cpp diff --git a/tape/odbc.h b/module/tape/odbc.h similarity index 100% rename from tape/odbc.h rename to module/tape/odbc.h diff --git a/tape/player.cpp b/module/tape/player.cpp similarity index 100% rename from tape/player.cpp rename to module/tape/player.cpp diff --git a/tape/recorder.cpp b/module/tape/recorder.cpp similarity index 100% rename from tape/recorder.cpp rename to module/tape/recorder.cpp diff --git a/tape/schedule.cpp b/module/tape/schedule.cpp similarity index 100% rename from tape/schedule.cpp rename to module/tape/schedule.cpp diff --git a/tape/schedule.h b/module/tape/schedule.h similarity index 100% rename from tape/schedule.h rename to module/tape/schedule.h diff --git a/tape/shaper.cpp b/module/tape/shaper.cpp similarity index 100% rename from tape/shaper.cpp rename to module/tape/shaper.cpp diff --git a/tape/tape.cpp b/module/tape/tape.cpp similarity index 100% rename from tape/tape.cpp rename to module/tape/tape.cpp diff --git a/tape/tape.h b/module/tape/tape.h similarity index 100% rename from tape/tape.h rename to module/tape/tape.h diff --git a/tape/tape.vcproj b/module/tape/tape.vcproj similarity index 100% rename from tape/tape.vcproj rename to module/tape/tape.vcproj diff --git a/tape/violation_recorder.cpp b/module/tape/violation_recorder.cpp similarity index 100% rename from tape/violation_recorder.cpp rename to module/tape/violation_recorder.cpp diff --git a/tape/violation_recorder.h b/module/tape/violation_recorder.h similarity index 100% rename from tape/violation_recorder.h rename to module/tape/violation_recorder.h diff --git a/module/tape_file/Makefile.mk b/module/tape_file/Makefile.mk new file mode 100644 index 000000000..aa179cbf2 --- /dev/null +++ b/module/tape_file/Makefile.mk @@ -0,0 +1,12 @@ +pkglib_LTLIBRARIES += module/tape_file/tape_file.la + +module_tape_file_tape_file_la_CPPFLAGS = +module_tape_file_tape_file_la_CPPFLAGS += $(AM_CPPFLAGS) +module_tape_file_tape_file_la_CPPFLAGS += -I$(top_srcdir)/module/tape + +module_tape_file_tape_file_la_LDFLAGS = +module_tape_file_tape_file_la_LDFLAGS += $(AM_LDFLAGS) + +module_tape_file_tape_file_la_LIBADD = + +module_tape_file_tape_file_la_SOURCES = module/tape_file/tape_file.cpp module/tape_file/tape_file.h diff --git a/tape_file/ReadMe.txt b/module/tape_file/ReadMe.txt similarity index 100% rename from tape_file/ReadMe.txt rename to module/tape_file/ReadMe.txt diff --git a/tape_file/tape_file.cpp b/module/tape_file/tape_file.cpp similarity index 99% rename from tape_file/tape_file.cpp rename to module/tape_file/tape_file.cpp index 0a601af61..3c63a90f7 100644 --- a/tape_file/tape_file.cpp +++ b/module/tape_file/tape_file.cpp @@ -19,8 +19,8 @@ #include #include "gridlabd.h" -#include "../tape/tape.h" -#include "../tape/histogram.h" +#include +#include "histogram.h" #include "tape_file.h" int csv_data_only = 0; /* enable this option to suppress addition of lines starting with # in CSV */ diff --git a/tape_file/tape_file.h b/module/tape_file/tape_file.h similarity index 100% rename from tape_file/tape_file.h rename to module/tape_file/tape_file.h diff --git a/tape_file/tape_file.vcproj b/module/tape_file/tape_file.vcproj similarity index 100% rename from tape_file/tape_file.vcproj rename to module/tape_file/tape_file.vcproj diff --git a/tape_memory/tape_memory.cpp b/module/tape_memory/tape_memory.cpp similarity index 100% rename from tape_memory/tape_memory.cpp rename to module/tape_memory/tape_memory.cpp diff --git a/tape_memory/tape_memory.h b/module/tape_memory/tape_memory.h similarity index 100% rename from tape_memory/tape_memory.h rename to module/tape_memory/tape_memory.h diff --git a/tape_memory/tape_memory.vcproj b/module/tape_memory/tape_memory.vcproj similarity index 100% rename from tape_memory/tape_memory.vcproj rename to module/tape_memory/tape_memory.vcproj diff --git a/module/tape_plot/Makefile.mk b/module/tape_plot/Makefile.mk new file mode 100644 index 000000000..d60a90f3b --- /dev/null +++ b/module/tape_plot/Makefile.mk @@ -0,0 +1,12 @@ +pkglib_LTLIBRARIES += module/tape_plot/tape_plot.la + +module_tape_plot_tape_plot_la_CPPFLAGS = +module_tape_plot_tape_plot_la_CPPFLAGS += $(AM_CPPFLAGS) +module_tape_plot_tape_plot_la_CPPFLAGS += -I$(top_srcdir)/module/tape + +module_tape_plot_tape_plot_la_LDFLAGS = +module_tape_plot_tape_plot_la_LDFLAGS += $(AM_LDFLAGS) + +module_tape_plot_tape_plot_la_LIBADD = + +module_tape_plot_tape_plot_la_SOURCES = module/tape_plot/tape_plot.cpp module/tape_plot/tape_plot.h diff --git a/tape_plot/ReadMe.txt b/module/tape_plot/ReadMe.txt similarity index 100% rename from tape_plot/ReadMe.txt rename to module/tape_plot/ReadMe.txt diff --git a/tape_plot/tape_plot.cpp b/module/tape_plot/tape_plot.cpp similarity index 99% rename from tape_plot/tape_plot.cpp rename to module/tape_plot/tape_plot.cpp index a57e01d69..a9c214777 100644 --- a/tape_plot/tape_plot.cpp +++ b/module/tape_plot/tape_plot.cpp @@ -19,7 +19,7 @@ #include #include "gridlabd.h" -#include "../tape/tape.h" +#include #include "tape_plot.h" #define MAXCOLUMNS 50 diff --git a/tape_plot/tape_plot.h b/module/tape_plot/tape_plot.h similarity index 100% rename from tape_plot/tape_plot.h rename to module/tape_plot/tape_plot.h diff --git a/tape_plot/tape_plot.vcproj b/module/tape_plot/tape_plot.vcproj similarity index 100% rename from tape_plot/tape_plot.vcproj rename to module/tape_plot/tape_plot.vcproj diff --git a/module/tariff/Makefile.mk b/module/tariff/Makefile.mk new file mode 100644 index 000000000..d347fcd1d --- /dev/null +++ b/module/tariff/Makefile.mk @@ -0,0 +1,13 @@ +pkglib_LTLIBRARIES += module/tariff/tariff.la + +module_tariff_tariff_la_CPPFLAGS = +module_tariff_tariff_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_tariff_tariff_la_LDFLAGS = +module_tariff_tariff_la_LDFLAGS += $(AM_LDFLAGS) + +module_tariff_tariff_la_LIBADD = + +module_tariff_tariff_la_SOURCES = +module_tariff_tariff_la_SOURCES += module/tariff/main.cpp +module_tariff_tariff_la_SOURCES += module/tariff/tariff.cpp module/tariff/tariff.h diff --git a/tariff/autotest/Res_Inclu_TOU_Current.xlsx b/module/tariff/autotest/Res_Inclu_TOU_Current.xlsx similarity index 100% rename from tariff/autotest/Res_Inclu_TOU_Current.xlsx rename to module/tariff/autotest/Res_Inclu_TOU_Current.xlsx diff --git a/tariff/main.cpp b/module/tariff/main.cpp similarity index 100% rename from tariff/main.cpp rename to module/tariff/main.cpp diff --git a/module/transactive/Makefile.mk b/module/transactive/Makefile.mk new file mode 100644 index 000000000..fdcae7b50 --- /dev/null +++ b/module/transactive/Makefile.mk @@ -0,0 +1,20 @@ +# transactive/Makefile.mk +# Copyright (C) 2016, Stanford University +# Author: dchassin@slac.stanford.edu + +pkglib_LTLIBRARIES += module/transactive/transactive.la + +module_transactive_transactive_la_CPPFLAGS = +module_transactive_transactive_la_CPPFLAGS += $(AM_CPPFLAGS) + +module_transactive_transactive_la_LDFLAGS = +module_transactive_transactive_la_LDFLAGS += $(AM_LDFLAGS) + +module_transactive_transactive_la_LIBADD = + +module_transactive_transactive_la_SOURCES = +module_transactive_transactive_la_SOURCES += module/transactive/house.cpp +module_transactive_transactive_la_SOURCES += module/transactive/house.h +module_transactive_transactive_la_SOURCES += module/transactive/agent.cpp +module_transactive_transactive_la_SOURCES += module/transactive/agent.h +module_transactive_transactive_la_SOURCES += module/transactive/main.cpp diff --git a/transactive/agent.cpp b/module/transactive/agent.cpp similarity index 100% rename from transactive/agent.cpp rename to module/transactive/agent.cpp diff --git a/transactive/agent.h b/module/transactive/agent.h similarity index 100% rename from transactive/agent.h rename to module/transactive/agent.h diff --git a/transactive/autotest/test_agent_method.glm b/module/transactive/autotest/test_agent_method.glm similarity index 100% rename from transactive/autotest/test_agent_method.glm rename to module/transactive/autotest/test_agent_method.glm diff --git a/transactive/doc/transactive.tex b/module/transactive/doc/transactive.tex similarity index 100% rename from transactive/doc/transactive.tex rename to module/transactive/doc/transactive.tex diff --git a/transactive/house.cpp b/module/transactive/house.cpp similarity index 100% rename from transactive/house.cpp rename to module/transactive/house.cpp diff --git a/transactive/house.h b/module/transactive/house.h similarity index 100% rename from transactive/house.h rename to module/transactive/house.h diff --git a/transactive/main.cpp b/module/transactive/main.cpp similarity index 100% rename from transactive/main.cpp rename to module/transactive/main.cpp diff --git a/transactive/transactive.h b/module/transactive/transactive.h similarity index 100% rename from transactive/transactive.h rename to module/transactive/transactive.h diff --git a/transactive/validate.no b/module/transactive/validate.no similarity index 100% rename from transactive/validate.no rename to module/transactive/validate.no diff --git a/modules.mk b/modules.mk index 87386546c..3abb5d839 100644 --- a/modules.mk +++ b/modules.mk @@ -1,21 +1,21 @@ # module.mk -- list of GridLAB-D modules that are considered part of this build -include assert/Makefile.mk -include climate/Makefile.mk -include commercial/Makefile.mk -include generators/Makefile.mk -include influxdb/Makefile.mk -include industrial/Makefile.mk -include market/Makefile.mk -include powerflow/Makefile.mk -include reliability/Makefile.mk -include residential/Makefile.mk -include revenue/Makefile.mk +include module/assert/Makefile.mk +include module/climate/Makefile.mk +include module/commercial/Makefile.mk +include module/generators/Makefile.mk +include module/industrial/Makefile.mk +include module/influxdb/Makefile.mk +include module/market/Makefile.mk +include module/optimize/Makefile.mk +include module/powerflow/Makefile.mk +include module/reliability/Makefile.mk +include module/residential/Makefile.mk +include module/revenue/Makefile.mk # TODO: deprecating these soon -include tape_file/Makefile.mk -include tape/Makefile.mk -include tape_plot/Makefile.mk +include module/tape/Makefile.mk +include module/tape_file/Makefile.mk +include module/tape_plot/Makefile.mk # TODO: removed until HiPAS upgrades are implemented #include connection/Makefile.mk -include optimize/Makefile.mk diff --git a/mysql/Makefile.mk b/mysql/Makefile.mk deleted file mode 100644 index 013b401cc..000000000 --- a/mysql/Makefile.mk +++ /dev/null @@ -1,24 +0,0 @@ -pkglib_LTLIBRARIES += mysql/mysql.la - -mysql_mysql_la_CPPFLAGS = -mysql_mysql_la_CPPFLAGS += $(MYSQL_CPPFLAGS) -mysql_mysql_la_CPPFLAGS += $(AM_CPPFLAGS) - -mysql_mysql_la_LDFLAGS = -lpthread -mysql_mysql_la_LDFLAGS += $(MYSQL_LDFLAGS) -mysql_mysql_la_LDFLAGS += $(AM_LDFLAGS) - -mysql_mysql_la_LIBADD = -mysql_mysql_la_LIBADD += $(MYSQL_LIBS) - -mysql_mysql_la_SOURCES = -mysql_mysql_la_SOURCES += mysql/collector.cpp -mysql_mysql_la_SOURCES += mysql/collector.h -mysql_mysql_la_SOURCES += mysql/database.cpp -mysql_mysql_la_SOURCES += mysql/database.h -mysql_mysql_la_SOURCES += mysql/init.cpp -mysql_mysql_la_SOURCES += mysql/main.cpp -mysql_mysql_la_SOURCES += mysql/player.cpp -mysql_mysql_la_SOURCES += mysql/player.h -mysql_mysql_la_SOURCES += mysql/recorder.cpp -mysql_mysql_la_SOURCES += mysql/recorder.h diff --git a/mysql/autotest/test_mysql_recorder.xml b/mysql/autotest/test_mysql_recorder.xml deleted file mode 100644 index a4084ccc4..000000000 --- a/mysql/autotest/test_mysql_recorder.xml +++ /dev/null @@ -1,143 +0,0 @@ - - - - 3 - 0 - 0 - 4548 - Hassayampa - "/usr/lib/gridlabd/gridlabd.bin test_mysql_recorder.glm -o test_mysql_recorder.xml" - batch - FALSE - TRUE - FALSE - FALSE - FALSE - FALSE - TRUE - 100 - /Users/d3g637/gridlabd_3.0/mysql/autotest - gridlabd.xml - test_mysql_recorder.xml - FALSE - FALSE - 1 - FALSE - FALSE - test.txt - 8 - INIT - 2012-07-25 13:40:25 UTC - NEVER - %+lg - %+lg%+lg%c - %s:%d - %[^:]:%d - FALSE - "" - test_mysql_recorder.glm - /usr/lib/gridlabd - TRUE - http://www.gridlabd.org/ - http://www.gridlabd.org/ - 1343223625 - "" - "" - FALSE - /Users/d3g637/.gridlabd/tmp - 0 - FALSE - FALSE - ISO - CREATION - 1 - MACOSX - TRUE - 1 - 60 - FALSE - TRUE - FALSE - FALSE - FALSE - safari - 6267 - FALSE - TRUE - PROTOTYPE - TRUE - NONE - "" - 0 - 0 - FALSE - FALSE - RNG3 - DONE - NEVER - http://sourceforge.net/apps/mediawiki/gridlab-d/index.php?title=Special:Search/ - localhost - 127.0.0.1 - TRUE - "" - 0 - STANDALONE - NONE - 5000 - 6267 - 0 - 0 - NONE - 64 - FALSE - 1048576 - UTC0 - - - pretopdown - - - bottomup - - - posttopdown - - - - 0 - 0 - - - 0 - 0 - NEVER - testdb - localhost - gld-e8635d27-22b7-5655-7836-8548543102af - gridlabd - "" - 3306 - /tmp/mysql.sock - - - - - 1 - 0 - NEVER - (recorder:1) - "" - "" - ""
- "" - 0 - +0 s - testdb - - - - - - - - diff --git a/optimize/Makefile.mk b/optimize/Makefile.mk deleted file mode 100644 index bf732e09d..000000000 --- a/optimize/Makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ -pkglib_LTLIBRARIES += optimize/optimize.la - -optimize_optimize_la_CPPFLAGS = -optimize_optimize_la_CPPFLAGS += $(AM_CPPFLAGS) - -optimize_optimize_la_LDFLAGS = -optimize_optimize_la_LDFLAGS += $(AM_LDFLAGS) - -optimize_optimize_la_LIBADD = - -optimize_optimize_la_SOURCES = -optimize_optimize_la_SOURCES += optimize/main.cpp optimize/optimize.h -optimize_optimize_la_SOURCES += optimize/simple.cpp optimize/simple.h diff --git a/powerflow/Makefile.mk b/powerflow/Makefile.mk deleted file mode 100644 index 247db918c..000000000 --- a/powerflow/Makefile.mk +++ /dev/null @@ -1,127 +0,0 @@ -pkglib_LTLIBRARIES += powerflow/powerflow.la - -powerflow_powerflow_la_CPPFLAGS = -DSOLVER_PY -powerflow_powerflow_la_CPPFLAGS += -I$(top_srcdir)/third_party/superLU_MT -powerflow_powerflow_la_CPPFLAGS += $(AM_CPPFLAGS) - -powerflow_powerflow_la_LDFLAGS = -powerflow_powerflow_la_LDFLAGS += $(AM_LDFLAGS) -powerflow_powerflow_la_LDFLAGS += -ldl - -powerflow_powerflow_la_LIBADD = -powerflow_powerflow_la_LIBADD += third_party/superLU_MT/libsuperlu.la -powerflow_powerflow_la_LIBADD += $(PTHREAD_CFLAGS) -powerflow_powerflow_la_LIBADD += $(PTHREAD_LIBS) -powerflow_powerflow_la_LIBADD += -ldl - -powerflow_powerflow_la_SOURCES = -powerflow_powerflow_la_SOURCES += powerflow/billdump.cpp -powerflow_powerflow_la_SOURCES += powerflow/billdump.h -powerflow_powerflow_la_SOURCES += powerflow/capacitor.cpp -powerflow_powerflow_la_SOURCES += powerflow/capacitor.h -powerflow_powerflow_la_SOURCES += powerflow/currdump.cpp -powerflow_powerflow_la_SOURCES += powerflow/currdump.h -powerflow_powerflow_la_SOURCES += powerflow/emissions.cpp -powerflow_powerflow_la_SOURCES += powerflow/emissions.h -powerflow_powerflow_la_SOURCES += powerflow/fault_check.cpp -powerflow_powerflow_la_SOURCES += powerflow/fault_check.h -powerflow_powerflow_la_SOURCES += powerflow/frequency_gen.cpp -powerflow_powerflow_la_SOURCES += powerflow/frequency_gen.h -powerflow_powerflow_la_SOURCES += powerflow/fuse.cpp -powerflow_powerflow_la_SOURCES += powerflow/fuse.h -powerflow_powerflow_la_SOURCES += powerflow/impedance_dump.cpp -powerflow_powerflow_la_SOURCES += powerflow/impedance_dump.h -powerflow_powerflow_la_SOURCES += powerflow/init.cpp -powerflow_powerflow_la_SOURCES += powerflow/line_configuration.cpp -powerflow_powerflow_la_SOURCES += powerflow/line_configuration.h -powerflow_powerflow_la_SOURCES += powerflow/line.cpp -powerflow_powerflow_la_SOURCES += powerflow/line.h -powerflow_powerflow_la_SOURCES += powerflow/line_sensor.cpp -powerflow_powerflow_la_SOURCES += powerflow/line_sensor.h -powerflow_powerflow_la_SOURCES += powerflow/line_spacing.cpp -powerflow_powerflow_la_SOURCES += powerflow/line_spacing.h -powerflow_powerflow_la_SOURCES += powerflow/link.cpp -powerflow_powerflow_la_SOURCES += powerflow/link.h -powerflow_powerflow_la_SOURCES += powerflow/load.cpp -powerflow_powerflow_la_SOURCES += powerflow/load.h -powerflow_powerflow_la_SOURCES += powerflow/load_tracker.cpp -powerflow_powerflow_la_SOURCES += powerflow/load_tracker.h -powerflow_powerflow_la_SOURCES += powerflow/main.cpp -powerflow_powerflow_la_SOURCES += powerflow/meter.cpp -powerflow_powerflow_la_SOURCES += powerflow/meter.h -powerflow_powerflow_la_SOURCES += powerflow/meter_test.h -powerflow_powerflow_la_SOURCES += powerflow/motor.cpp -powerflow_powerflow_la_SOURCES += powerflow/motor.h -powerflow_powerflow_la_SOURCES += powerflow/node.cpp -powerflow_powerflow_la_SOURCES += powerflow/node.h -powerflow_powerflow_la_SOURCES += powerflow/overhead_line_conductor.cpp -powerflow_powerflow_la_SOURCES += powerflow/overhead_line_conductor.h -powerflow_powerflow_la_SOURCES += powerflow/overhead_line.cpp -powerflow_powerflow_la_SOURCES += powerflow/overhead_line.h -powerflow_powerflow_la_SOURCES += powerflow/overheadline_test.h -powerflow_powerflow_la_SOURCES += powerflow/pole.h powerflow/pole.cpp -powerflow_powerflow_la_SOURCES += powerflow/pole_configuration.h powerflow/pole_configuration.cpp -powerflow_powerflow_la_SOURCES += powerflow/powerflow.cpp -powerflow_powerflow_la_SOURCES += powerflow/powerflow.h -powerflow_powerflow_la_SOURCES += powerflow/powerflow_library.cpp -powerflow_powerflow_la_SOURCES += powerflow/powerflow_library.h -powerflow_powerflow_la_SOURCES += powerflow/powerflow_object.cpp -powerflow_powerflow_la_SOURCES += powerflow/powerflow_object.h -powerflow_powerflow_la_SOURCES += powerflow/power_metrics.cpp -powerflow_powerflow_la_SOURCES += powerflow/power_metrics.h -powerflow_powerflow_la_SOURCES += powerflow/pqload.cpp -powerflow_powerflow_la_SOURCES += powerflow/pqload.h -powerflow_powerflow_la_SOURCES += powerflow/recloser.cpp -powerflow_powerflow_la_SOURCES += powerflow/recloser.h -powerflow_powerflow_la_SOURCES += powerflow/regulator_configuration.cpp -powerflow_powerflow_la_SOURCES += powerflow/regulator_configuration.h -powerflow_powerflow_la_SOURCES += powerflow/regulator.cpp -powerflow_powerflow_la_SOURCES += powerflow/regulator.h -powerflow_powerflow_la_SOURCES += powerflow/regulator_test.h -powerflow_powerflow_la_SOURCES += powerflow/restoration.cpp -powerflow_powerflow_la_SOURCES += powerflow/restoration.h -powerflow_powerflow_la_SOURCES += powerflow/sectionalizer.cpp -powerflow_powerflow_la_SOURCES += powerflow/sectionalizer.h -powerflow_powerflow_la_SOURCES += powerflow/series_reactor.cpp -powerflow_powerflow_la_SOURCES += powerflow/series_reactor.h -powerflow_powerflow_la_SOURCES += powerflow/solver_nr.cpp -powerflow_powerflow_la_SOURCES += powerflow/solver_nr.h -powerflow_powerflow_la_SOURCES += powerflow/solver_py.cpp -powerflow_powerflow_la_SOURCES += powerflow/solver_py.h -powerflow_powerflow_la_SOURCES += powerflow/substation.cpp -powerflow_powerflow_la_SOURCES += powerflow/substation.h -powerflow_powerflow_la_SOURCES += powerflow/switch_coordinator.cpp -powerflow_powerflow_la_SOURCES += powerflow/switch_coordinate.h -powerflow_powerflow_la_SOURCES += powerflow/switch_object.cpp -powerflow_powerflow_la_SOURCES += powerflow/switch_object.h -powerflow_powerflow_la_SOURCES += powerflow/transformer_configuration.cpp -powerflow_powerflow_la_SOURCES += powerflow/transformer_configuration.h -powerflow_powerflow_la_SOURCES += powerflow/transformer.cpp -powerflow_powerflow_la_SOURCES += powerflow/transformer.h -powerflow_powerflow_la_SOURCES += powerflow/transformer_test.h -powerflow_powerflow_la_SOURCES += powerflow/triplex_line_conductor.cpp -powerflow_powerflow_la_SOURCES += powerflow/triplex_line_conductor.h -powerflow_powerflow_la_SOURCES += powerflow/triplex_line_configuration.cpp -powerflow_powerflow_la_SOURCES += powerflow/triplex_line_configuration.h -powerflow_powerflow_la_SOURCES += powerflow/triplex_line.cpp -powerflow_powerflow_la_SOURCES += powerflow/triplex_line.h -powerflow_powerflow_la_SOURCES += powerflow/triplexline_test.h -powerflow_powerflow_la_SOURCES += powerflow/triplex_load.h -powerflow_powerflow_la_SOURCES += powerflow/triplex_load.cpp -powerflow_powerflow_la_SOURCES += powerflow/triplex_meter.cpp -powerflow_powerflow_la_SOURCES += powerflow/triplex_meter.h -powerflow_powerflow_la_SOURCES += powerflow/triplex_node.cpp -powerflow_powerflow_la_SOURCES += powerflow/triplex_node.h -powerflow_powerflow_la_SOURCES += powerflow/underground_line_conductor.cpp -powerflow_powerflow_la_SOURCES += powerflow/underground_line_conductor.h -powerflow_powerflow_la_SOURCES += powerflow/underground_line.cpp -powerflow_powerflow_la_SOURCES += powerflow/underground_line.h -powerflow_powerflow_la_SOURCES += powerflow/undergroundline_test.h -powerflow_powerflow_la_SOURCES += powerflow/vfd.cpp -powerflow_powerflow_la_SOURCES += powerflow/vfd.h -powerflow_powerflow_la_SOURCES += powerflow/voltdump.cpp -powerflow_powerflow_la_SOURCES += powerflow/voltdump.h -powerflow_powerflow_la_SOURCES += powerflow/volt_var_control.cpp -powerflow_powerflow_la_SOURCES += powerflow/volt_var_control.h - -dist_pkgdata_DATA += powerflow/solver_py.conf diff --git a/powerflow/autotest/IEEE_13_node_impedance_dump.xml b/powerflow/autotest/IEEE_13_node_impedance_dump.xml deleted file mode 100644 index e51109976..000000000 --- a/powerflow/autotest/IEEE_13_node_impedance_dump.xml +++ /dev/null @@ -1,992 +0,0 @@ - - - - - - line_632-645 - overhead_line:21 - node:n632 - node:n645 - 2535.849992 - 2520.707683 - BCN - 500.000000000 - - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.999999973+0.000000027j - -0.000000004-0.000000001j - +0.000000000+0.000000000j - -0.000000004-0.000000001j - +0.999999973+0.000000027j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.125891428+0.127564483j - +0.019561562+0.043479727j - +0.000000000+0.000000000j - +0.019561562+0.043479727j - +0.125359205+0.128496163j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - -0.000000000+0.000000446j - +0.000000000-0.000000085j - +0.000000000+0.000000000j - +0.000000000-0.000000085j - -0.000000000+0.000000442j - - - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.999999973+0.000000027j - -0.000000004-0.000000001j - +0.000000000+0.000000000j - -0.000000004-0.000000001j - +0.999999973+0.000000027j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000027-0.000000027j - +0.000000004+0.000000001j - +0.000000000+0.000000000j - +0.000000004+0.000000001j - +1.000000027-0.000000027j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.125891435+0.127564483j - +0.019561564+0.043479728j - +0.000000000+0.000000000j - +0.019561564+0.043479728j - +0.125359212+0.128496163j - - - - line_645-646 - overhead_line:22 - node:n645 - node:n646 - 2520.707683 - 2516.455940 - BCN - 300.000000000 - - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.999999990+0.000000010j - -0.000000002-0.000000000j - +0.000000000+0.000000000j - -0.000000002-0.000000000j - +0.999999990+0.000000010j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.075534857+0.076538690j - +0.011736937+0.026087836j - +0.000000000+0.000000000j - +0.011736937+0.026087836j - +0.075215523+0.077097698j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - -0.000000000+0.000000268j - +0.000000000-0.000000051j - +0.000000000+0.000000000j - +0.000000000-0.000000051j - -0.000000000+0.000000265j - - - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.999999990+0.000000010j - -0.000000002-0.000000000j - +0.000000000+0.000000000j - -0.000000002-0.000000000j - +0.999999990+0.000000010j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000010-0.000000010j - +0.000000002+0.000000000j - +0.000000000+0.000000000j - +0.000000002+0.000000000j - +1.000000010-0.000000010j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.075534858+0.076538690j - +0.011736938+0.026087837j - +0.000000000+0.000000000j - +0.011736938+0.026087837j - +0.075215524+0.077097698j - - - - line_630-632 - overhead_line:23 - meter:m630 - node:n632 - 2551.900000 - 2523.781901 - ABCN - 2000.000000000 - - +0.999999650+0.000000126j - -0.000000046+0.000000007j - -0.000000053+0.000000023j - -0.000000042+0.000000008j - +0.999999644+0.000000114j - -0.000000055+0.000000030j - -0.000000043+0.000000019j - -0.000000049+0.000000025j - +0.999999640+0.000000116j - - - +0.136601665+0.385591811j - +0.059072291+0.190030657j - +0.059851153+0.160475070j - +0.059072291+0.190030657j - +0.127822678+0.396906891j - +0.058138489+0.145810328j - +0.059851153+0.160475070j - +0.058138489+0.145810328j - +0.129308023+0.391991403j - - - -0.000000000+0.000002386j - +0.000000000-0.000000756j - +0.000000000-0.000000477j - +0.000000000-0.000000756j - -0.000000000+0.000002257j - -0.000000000-0.000000281j - +0.000000000-0.000000477j - -0.000000000-0.000000281j - -0.000000000+0.000002136j - - - +0.999999650+0.000000126j - -0.000000046+0.000000007j - -0.000000053+0.000000023j - -0.000000042+0.000000008j - +0.999999644+0.000000114j - -0.000000055+0.000000030j - -0.000000043+0.000000019j - -0.000000049+0.000000025j - +0.999999640+0.000000116j - - - +1.000000350-0.000000126j - +0.000000046-0.000000007j - +0.000000053-0.000000023j - +0.000000042-0.000000008j - +1.000000356-0.000000114j - +0.000000055-0.000000030j - +0.000000043-0.000000019j - +0.000000049-0.000000025j - +1.000000360-0.000000116j - - - +0.136601773+0.385591944j - +0.059072350+0.190030740j - +0.059851214+0.160475143j - +0.059072350+0.190030740j - +0.127822781+0.396907031j - +0.058138549+0.145810397j - +0.059851214+0.160475143j - +0.058138549+0.145810397j - +0.129308127+0.391991541j - - - - line_632-6321 - overhead_line:24 - node:n632 - node:n6321 - 2523.781901 - 2522.120085 - ABCN - 500.000000000 - - +0.999999978+0.000000008j - -0.000000003+0.000000001j - -0.000000003+0.000000002j - -0.000000003+0.000000001j - +0.999999978+0.000000007j - -0.000000003+0.000000002j - -0.000000003+0.000000001j - -0.000000003+0.000000002j - +0.999999978+0.000000007j - - - +0.032815189+0.096397953j - +0.014768073+0.047507664j - +0.014962788+0.040118768j - +0.014768073+0.047507664j - +0.031955670+0.099226723j - +0.014534622+0.036452582j - +0.014962788+0.040118768j - +0.014534622+0.036452582j - +0.032327006+0.097997851j - - - -0.000000000+0.000000597j - +0.000000000-0.000000189j - +0.000000000-0.000000119j - +0.000000000-0.000000189j - -0.000000000+0.000000564j - -0.000000000-0.000000070j - +0.000000000-0.000000119j - -0.000000000-0.000000070j - -0.000000000+0.000000534j - - - +0.999999978+0.000000008j - -0.000000003+0.000000001j - -0.000000003+0.000000002j - -0.000000003+0.000000001j - +0.999999978+0.000000007j - -0.000000003+0.000000002j - -0.000000003+0.000000001j - -0.000000003+0.000000002j - +0.999999978+0.000000007j - - - +1.000000022-0.000000008j - +0.000000003-0.000000001j - +0.000000003-0.000000002j - +0.000000003-0.000000001j - +1.000000022-0.000000007j - +0.000000003-0.000000002j - +0.000000003-0.000000001j - +0.000000003-0.000000002j - +1.000000022-0.000000007j - - - +0.032815191+0.096397955j - +0.014768074+0.047507666j - +0.014962789+0.040118769j - +0.014768074+0.047507666j - +0.031955671+0.099226725j - +0.014534623+0.036452583j - +0.014962789+0.040118769j - +0.014534623+0.036452583j - +0.032327007+0.097997853j - - - - line_6321-671 - overhead_line:25 - node:n6321 - node:n671 - 2522.120085 - 2516.627190 - ABCN - 1500.000000000 - - +0.999999803+0.000000068j - -0.000000026+0.000000005j - -0.000000030+0.000000014j - -0.000000024+0.000000005j - +0.999999800+0.000000064j - -0.000000031+0.000000017j - -0.000000024+0.000000010j - -0.000000027+0.000000014j - +0.999999798+0.000000065j - - - +0.098445567+0.289193858j - +0.044304218+0.142522993j - +0.044888365+0.120356303j - +0.044304218+0.142522993j - +0.095867009+0.297680168j - +0.043603867+0.109357746j - +0.044888365+0.120356303j - +0.043603867+0.109357746j - +0.096981017+0.293993553j - - - -0.000000000+0.000001790j - +0.000000000-0.000000567j - +0.000000000-0.000000358j - +0.000000000-0.000000567j - -0.000000000+0.000001693j - -0.000000000-0.000000211j - +0.000000000-0.000000358j - -0.000000000-0.000000211j - -0.000000000+0.000001602j - - - +0.999999803+0.000000068j - -0.000000026+0.000000005j - -0.000000030+0.000000014j - -0.000000024+0.000000005j - +0.999999800+0.000000064j - -0.000000031+0.000000017j - -0.000000024+0.000000010j - -0.000000027+0.000000014j - +0.999999798+0.000000065j - - - +1.000000197-0.000000068j - +0.000000026-0.000000005j - +0.000000030-0.000000014j - +0.000000024-0.000000005j - +1.000000200-0.000000064j - +0.000000031-0.000000017j - +0.000000024-0.000000010j - +0.000000027-0.000000014j - +1.000000202-0.000000065j - - - +0.098445611+0.289193915j - +0.044304243+0.142523028j - +0.044888390+0.120356333j - +0.044304243+0.142523028j - +0.095867052+0.297680227j - +0.043603892+0.109357775j - +0.044888390+0.120356333j - +0.043603892+0.109357775j - +0.096981061+0.293993611j - - - - line_671-680 - overhead_line:26 - node:n671 - node:n680 - 2516.627190 - 2516.627388 - ABCN - 1000.000000000 - - +0.999999913+0.000000030j - -0.000000012+0.000000002j - -0.000000013+0.000000006j - -0.000000010+0.000000002j - +0.999999911+0.000000028j - -0.000000014+0.000000008j - -0.000000011+0.000000005j - -0.000000012+0.000000006j - +0.999999910+0.000000029j - - - +0.065630378+0.192795905j - +0.029536145+0.095015329j - +0.029925577+0.080237535j - +0.029536145+0.095015329j - +0.063911339+0.198453445j - +0.029069244+0.072905164j - +0.029925577+0.080237535j - +0.029069244+0.072905164j - +0.064654011+0.195995702j - - - -0.000000000+0.000001193j - +0.000000000-0.000000378j - +0.000000000-0.000000239j - +0.000000000-0.000000378j - -0.000000000+0.000001129j - -0.000000000-0.000000141j - +0.000000000-0.000000239j - -0.000000000-0.000000141j - -0.000000000+0.000001068j - - - +0.999999913+0.000000030j - -0.000000012+0.000000002j - -0.000000013+0.000000006j - -0.000000010+0.000000002j - +0.999999911+0.000000028j - -0.000000014+0.000000008j - -0.000000011+0.000000005j - -0.000000012+0.000000006j - +0.999999910+0.000000029j - - - +1.000000087-0.000000030j - +0.000000012-0.000000002j - +0.000000013-0.000000006j - +0.000000010-0.000000002j - +1.000000089-0.000000028j - +0.000000014-0.000000008j - +0.000000011-0.000000005j - +0.000000012-0.000000006j - +1.000000090-0.000000029j - - - +0.065630391+0.192795922j - +0.029536153+0.095015339j - +0.029925584+0.080237544j - +0.029536153+0.095015339j - +0.063911352+0.198453463j - +0.029069252+0.072905173j - +0.029925584+0.080237544j - +0.029069252+0.072905173j - +0.064654024+0.195995719j - - - - line_671-684 - overhead_line:27 - node:n671 - node:n684 - 2516.627190 - 2516.556663 - ACN - 300.000000000 - - +0.999999990+0.000000010j - +0.000000000+0.000000000j - -0.000000002-0.000000000j - +0.000000000+0.000000000j - +1.000000000+0.000000000j - +0.000000000+0.000000000j - -0.000000002-0.000000000j - +0.000000000+0.000000000j - +0.999999990+0.000000010j - - - +0.075215523+0.077097698j - +0.000000000+0.000000000j - +0.011736937+0.026087836j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.011736937+0.026087836j - +0.000000000+0.000000000j - +0.075534857+0.076538690j - - - -0.000000000+0.000000265j - +0.000000000+0.000000000j - +0.000000000-0.000000051j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000-0.000000051j - +0.000000000+0.000000000j - -0.000000000+0.000000268j - - - +0.999999990+0.000000010j - +0.000000000+0.000000000j - -0.000000002-0.000000000j - +0.000000000+0.000000000j - +1.000000000+0.000000000j - +0.000000000+0.000000000j - -0.000000002-0.000000000j - +0.000000000+0.000000000j - +0.999999990+0.000000010j - - - +1.000000010-0.000000010j - +0.000000000+0.000000000j - +0.000000002+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000002+0.000000000j - +0.000000000+0.000000000j - +1.000000010-0.000000010j - - - +0.075215524+0.077097698j - +0.000000000+0.000000000j - +0.011736938+0.026087837j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.011736938+0.026087837j - +0.000000000+0.000000000j - +0.075534858+0.076538690j - - - - line_684-611 - overhead_line:28 - node:n684 - node:n611 - 2545.955539 - 2549.569994 - CN - 300.000000000 - - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.999999990+0.000000010j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.075534857+0.076538690j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - -0.000000000+0.000000258j - - - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.999999990+0.000000010j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000010-0.000000010j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.075534858+0.076538690j - - - - line_632-633 - overhead_line:31 - node:n632 - node:n633 - 2523.781901 - 2520.600320 - ABCN - 500.000000000 - - +0.999999976+0.000000017j - -0.000000003-0.000000000j - -0.000000002-0.000000002j - -0.000000002-0.000000001j - +0.999999975+0.000000016j - -0.000000003+0.000000000j - -0.000000002-0.000000002j - -0.000000003+0.000000001j - +0.999999975+0.000000016j - - - +0.071271628+0.111874000j - +0.014962788+0.040118768j - +0.014768073+0.047507664j - +0.014962788+0.040118768j - +0.070783445+0.113473898j - +0.014534622+0.036452582j - +0.014768073+0.047507664j - +0.014534622+0.036452582j - +0.070412109+0.114702770j - - - -0.000000000+0.000000539j - +0.000000000-0.000000102j - +0.000000000-0.000000160j - +0.000000000-0.000000102j - -0.000000000+0.000000490j - +0.000000000-0.000000062j - +0.000000000-0.000000160j - +0.000000000-0.000000062j - -0.000000000+0.000000513j - - - +0.999999976+0.000000017j - -0.000000003-0.000000000j - -0.000000002-0.000000002j - -0.000000002-0.000000001j - +0.999999975+0.000000016j - -0.000000003+0.000000000j - -0.000000002-0.000000002j - -0.000000003+0.000000001j - +0.999999975+0.000000016j - - - +1.000000024-0.000000017j - +0.000000003+0.000000000j - +0.000000002+0.000000002j - +0.000000002+0.000000001j - +1.000000025-0.000000016j - +0.000000003-0.000000000j - +0.000000002+0.000000002j - +0.000000003-0.000000001j - +1.000000025-0.000000016j - - - +0.071271632+0.111874002j - +0.014962789+0.040118769j - +0.014768074+0.047507666j - +0.014962789+0.040118769j - +0.070783449+0.113473900j - +0.014534623+0.036452583j - +0.014768074+0.047507666j - +0.014534623+0.036452583j - +0.070412113+0.114702772j - - - - line_633-634 - overhead_line:32 - node:n633 - node:n634 - 2520.600320 - 2519.964874 - ABCN - 100.000000000 - - +0.999999999+0.000000001j - -0.000000000-0.000000000j - -0.000000000-0.000000000j - -0.000000000-0.000000000j - +0.999999999+0.000000001j - -0.000000000+0.000000000j - -0.000000000-0.000000000j - -0.000000000+0.000000000j - +0.999999999+0.000000001j - - - +0.014254326+0.022374800j - +0.002992558+0.008023754j - +0.002953615+0.009501533j - +0.002992558+0.008023754j - +0.014156689+0.022694780j - +0.002906924+0.007290516j - +0.002953615+0.009501533j - +0.002906924+0.007290516j - +0.014082422+0.022940554j - - - -0.000000000+0.000000108j - +0.000000000-0.000000020j - +0.000000000-0.000000032j - +0.000000000-0.000000020j - -0.000000000+0.000000098j - +0.000000000-0.000000012j - +0.000000000-0.000000032j - +0.000000000-0.000000012j - -0.000000000+0.000000103j - - - +0.999999999+0.000000001j - -0.000000000-0.000000000j - -0.000000000-0.000000000j - -0.000000000-0.000000000j - +0.999999999+0.000000001j - -0.000000000+0.000000000j - -0.000000000-0.000000000j - -0.000000000+0.000000000j - +0.999999999+0.000000001j - - - +1.000000001-0.000000001j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000001-0.000000001j - +0.000000000-0.000000000j - +0.000000000+0.000000000j - +0.000000000-0.000000000j - +1.000000001-0.000000001j - - - +0.014254326+0.022374800j - +0.002992558+0.008023754j - +0.002953615+0.009501533j - +0.002992558+0.008023754j - +0.014156689+0.022694780j - +0.002906924+0.007290516j - +0.002953615+0.009501533j - +0.002906924+0.007290516j - +0.014082422+0.022940554j - - - - switch_671-692 - switch:80 - node:n671 - node:n692 - 2516.627190 - 2516.627190 - ABCN - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - - - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000000+0.000000000j - - - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000000+0.000000000j - - - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - - - - line_684-652 - underground_line:29 - node:n684 - node:n652 - 2516.556663 - 2516.556992 - AN - 800.000000 - - +0.999999869+0.000000870j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000000+0.000000000j - - - +0.171256940+0.025700817j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - - - -0.000000000+0.000010156j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - - - +0.999999869+0.000000870j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +1.000000000+0.000000000j - - - +1.000000131-0.000000870j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - - - +0.171256985+0.025700672j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - +0.000000000+0.000000000j - - - - line_692-675 - underground_line:30 - node:n692 - node:n675 - 2516.627190 - 2507.035540 - ABC - 500.000000 - - +0.999999807+0.000000346j - -0.000000014+0.000000138j - +0.000000006+0.000000123j - -0.000000014+0.000000138j - +0.999999825+0.000000342j - -0.000000014+0.000000138j - +0.000000006+0.000000123j - -0.000000014+0.000000138j - +0.999999807+0.000000346j - - - +0.075583360+0.042263888j - +0.030224357+0.003107653j - +0.026980444-0.001352916j - +0.030224357+0.003107653j - +0.074725312+0.038270205j - +0.030224357+0.003107653j - +0.026980444-0.001352916j - +0.030224357+0.003107653j - +0.075583360+0.042263888j - - - -0.000000000+0.000009148j - -0.000000000-0.000000000j - -0.000000000+0.000000000j - -0.000000000-0.000000000j - -0.000000000+0.000009148j - -0.000000000-0.000000000j - -0.000000000+0.000000000j - -0.000000000-0.000000000j - -0.000000000+0.000009148j - - - +0.999999807+0.000000346j - -0.000000014+0.000000138j - +0.000000006+0.000000123j - -0.000000014+0.000000138j - +0.999999825+0.000000342j - -0.000000014+0.000000138j - +0.000000006+0.000000123j - -0.000000014+0.000000138j - +0.999999807+0.000000346j - - - +1.000000193-0.000000346j - +0.000000014-0.000000138j - -0.000000006-0.000000123j - +0.000000014-0.000000138j - +1.000000175-0.000000342j - +0.000000014-0.000000138j - -0.000000006-0.000000123j - +0.000000014-0.000000138j - +1.000000193-0.000000346j - - - +0.075583389+0.042263862j - +0.030224370+0.003107630j - +0.026980454-0.001352939j - +0.030224370+0.003107630j - +0.074725340+0.038270178j - +0.030224370+0.003107630j - +0.026980454-0.001352939j - +0.030224370+0.003107630j - +0.075583389+0.042263862j - - - \ No newline at end of file diff --git a/powernet/Makefile.mk b/powernet/Makefile.mk deleted file mode 100644 index 0cfeca20d..000000000 --- a/powernet/Makefile.mk +++ /dev/null @@ -1,18 +0,0 @@ -# powernet/Makefile.mk -# Copyright (C) 2016, Stanford University -# Author: dchassin@slac.stanford.edu - -pkglib_LTLIBRARIES += powernet/powernet.la - -powernet_powernet_la_CPPFLAGS = -powernet_powernet_la_CPPFLAGS += $(AM_CPPFLAGS) - -powernet_powernet_la_LDFLAGS = -powernet_powernet_la_LDFLAGS += $(AM_LDFLAGS) - -powernet_powernet_la_LIBADD = - -powernet_powernet_la_SOURCES = powernet/main.cpp -powernet_powernet_la_SOURCES += powernet/agent.cpp powernet/agent.h -powernet_powernet_la_SOURCES += powernet/house.cpp powernet/house.h -powernet_powernet_la_SOURCES += powernet/message.cpp powernet/message.h diff --git a/reliability/Makefile.mk b/reliability/Makefile.mk deleted file mode 100644 index 18a2939c8..000000000 --- a/reliability/Makefile.mk +++ /dev/null @@ -1,17 +0,0 @@ -pkglib_LTLIBRARIES += reliability/reliability.la - -reliability_reliability_la_CPPFLAGS = -reliability_reliability_la_CPPFLAGS += $(AM_CPPFLAGS) - -reliability_reliability_la_LDFLAGS = -reliability_reliability_la_LDFLAGS += $(AM_LDFLAGS) - -reliability_reliability_la_LIBADD = - -reliability_reliability_la_SOURCES = -reliability_reliability_la_SOURCES += reliability/reliability.h -reliability_reliability_la_SOURCES += reliability/init.cpp reliability/main.cpp -reliability_reliability_la_SOURCES += reliability/cost.cpp reliability/cost.h -reliability_reliability_la_SOURCES += reliability/eventgen.cpp reliability/eventgen.h -reliability_reliability_la_SOURCES += reliability/metrics.cpp reliability/metrics.h -reliability_reliability_la_SOURCES += third_party/jsonCpp/jsoncpp.cpp diff --git a/residential/.gitignore b/residential/.gitignore deleted file mode 100644 index 9bb88d376..000000000 --- a/residential/.gitignore +++ /dev/null @@ -1 +0,0 @@ -/.DS_Store diff --git a/residential/Makefile.mk b/residential/Makefile.mk deleted file mode 100644 index b75c3767a..000000000 --- a/residential/Makefile.mk +++ /dev/null @@ -1,57 +0,0 @@ -pkglib_LTLIBRARIES += residential/residential.la - -residential_residential_la_CPPFLAGS = -residential_residential_la_CPPFLAGS += $(AM_CPPFLAGS) - -residential_residential_la_LDFLAGS = -residential_residential_la_LDFLAGS += $(AM_LDFLAGS) - -residential_residential_la_LIBADD = -ldl - -residential_residential_la_SOURCES = -residential_residential_la_SOURCES += residential/appliance.cpp -residential_residential_la_SOURCES += residential/appliance.h -residential_residential_la_SOURCES += residential/clotheswasher.cpp -residential_residential_la_SOURCES += residential/clotheswasher.h -residential_residential_la_SOURCES += residential/dishwasher.cpp -residential_residential_la_SOURCES += residential/dishwasher.h -residential_residential_la_SOURCES += residential/dryer.cpp -residential_residential_la_SOURCES += residential/dryer.h -residential_residential_la_SOURCES += residential/evcharger.cpp -residential_residential_la_SOURCES += residential/evcharger_det.cpp -residential_residential_la_SOURCES += residential/evcharger_det.h -residential_residential_la_SOURCES += residential/evcharger.h -residential_residential_la_SOURCES += residential/freezer.cpp -residential_residential_la_SOURCES += residential/freezer.h -residential_residential_la_SOURCES += residential/house_e.cpp -residential_residential_la_SOURCES += residential/house_e.h -residential_residential_la_SOURCES += residential/init.cpp -residential_residential_la_SOURCES += residential/lights.cpp -residential_residential_la_SOURCES += residential/lights.h -residential_residential_la_SOURCES += residential/main.cpp -residential_residential_la_SOURCES += residential/microwave.cpp -residential_residential_la_SOURCES += residential/microwave.h -residential_residential_la_SOURCES += residential/occupantload.cpp -residential_residential_la_SOURCES += residential/occupantload.h -residential_residential_la_SOURCES += residential/plugload.cpp -residential_residential_la_SOURCES += residential/plugload.h -residential_residential_la_SOURCES += residential/range.cpp -residential_residential_la_SOURCES += residential/range.h -residential_residential_la_SOURCES += residential/rbsa.cpp -residential_residential_la_SOURCES += residential/rbsa.h -residential_residential_la_SOURCES += residential/refrigerator.cpp -residential_residential_la_SOURCES += residential/refrigerator.h -residential_residential_la_SOURCES += residential/residential_enduse.cpp -residential_residential_la_SOURCES += residential/residential_enduse.h -residential_residential_la_SOURCES += residential/residential.h -residential_residential_la_SOURCES += residential/rbsa2014.h -residential_residential_la_SOURCES += residential/solvers.cpp -residential_residential_la_SOURCES += residential/solvers.h -residential_residential_la_SOURCES += residential/thermal_storage.cpp -residential_residential_la_SOURCES += residential/thermal_storage.h -residential_residential_la_SOURCES += residential/waterheater.cpp -residential_residential_la_SOURCES += residential/waterheater.h -residential_residential_la_SOURCES += residential/zipload.cpp -residential_residential_la_SOURCES += residential/zipload.h -residential_residential_la_SOURCES += residential/elcap1990.h -residential_residential_la_SOURCES += residential/elcap2010.h diff --git a/revenue/Makefile.mk b/revenue/Makefile.mk deleted file mode 100644 index 4e50a1840..000000000 --- a/revenue/Makefile.mk +++ /dev/null @@ -1,15 +0,0 @@ -pkglib_LTLIBRARIES += revenue/revenue.la - -revenue_revenue_la_CPPFLAGS = -revenue_revenue_la_CPPFLAGS += $(AM_CPPFLAGS) - -revenue_revenue_la_LDFLAGS = -revenue_revenue_la_LDFLAGS += $(AM_LDFLAGS) - -revenue_revenue_la_LIBADD = - -revenue_revenue_la_SOURCES = -revenue_revenue_la_SOURCES += revenue/main.cpp -revenue_revenue_la_SOURCES += revenue/revenue.h -revenue_revenue_la_SOURCES += revenue/billing.cpp revenue/billing.h -revenue_revenue_la_SOURCES += revenue/tariff.cpp revenue/tariff.h diff --git a/tape/Makefile.mk b/tape/Makefile.mk deleted file mode 100644 index cc7db78a0..000000000 --- a/tape/Makefile.mk +++ /dev/null @@ -1,41 +0,0 @@ -pkglib_LTLIBRARIES += tape/tape.la - -tape_tape_la_CPPFLAGS = -tape_tape_la_CPPFLAGS += -I$(top_srcdir)/third_party/jsonCpp -tape_tape_la_CPPFLAGS += -I$(top_srcdir)/powerflow -tape_tape_la_CPPFLAGS += $(AM_CPPFLAGS) - -tape_tape_la_LDFLAGS = -tape_tape_la_LDFLAGS += $(AM_LDFLAGS) - -tape_tape_la_LIBADD = -tape_tape_la_LIBADD += third_party/jsonCpp/libjsoncpp.la -tape_tape_la_LIBADD += -ldl - -tape_tape_la_SOURCES = -tape_tape_la_SOURCES += tape/collector.cpp -tape_tape_la_SOURCES += tape/file.cpp -tape_tape_la_SOURCES += tape/file.h -tape_tape_la_SOURCES += tape/group_recorder.h -tape_tape_la_SOURCES += tape/group_recorder.cpp -tape_tape_la_SOURCES += tape/metrics_collector.cpp -tape_tape_la_SOURCES += tape/metrics_collector.h -tape_tape_la_SOURCES += tape/metrics_collector_writer.cpp -tape_tape_la_SOURCES += tape/metrics_collector_writer.h -tape_tape_la_SOURCES += tape/violation_recorder.h -tape_tape_la_SOURCES += tape/violation_recorder.cpp -tape_tape_la_SOURCES += tape/histogram.cpp -tape_tape_la_SOURCES += tape/histogram.h -tape_tape_la_SOURCES += tape/loadshape.cpp -tape_tape_la_SOURCES += tape/loadshape.h -tape_tape_la_SOURCES += tape/main.cpp -tape_tape_la_SOURCES += tape/memory.cpp -tape_tape_la_SOURCES += tape/memory.h -tape_tape_la_SOURCES += tape/multi_recorder.cpp -tape_tape_la_SOURCES += tape/odbc.cpp -tape_tape_la_SOURCES += tape/odbc.h -tape_tape_la_SOURCES += tape/player.cpp -tape_tape_la_SOURCES += tape/recorder.cpp -tape_tape_la_SOURCES += tape/shaper.cpp -tape_tape_la_SOURCES += tape/tape.cpp -tape_tape_la_SOURCES += tape/tape.h diff --git a/tape_file/Makefile.mk b/tape_file/Makefile.mk deleted file mode 100644 index 9e68bbbc2..000000000 --- a/tape_file/Makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ -pkglib_LTLIBRARIES += tape_file/tape_file.la - -tape_file_tape_file_la_CPPFLAGS = -tape_file_tape_file_la_CPPFLAGS += $(AM_CPPFLAGS) - -tape_file_tape_file_la_LDFLAGS = -tape_file_tape_file_la_LDFLAGS += $(AM_LDFLAGS) - -tape_file_tape_file_la_LIBADD = - -tape_file_tape_file_la_SOURCES = -tape_file_tape_file_la_SOURCES += tape_file/tape_file.cpp -tape_file_tape_file_la_SOURCES += tape_file/tape_file.h diff --git a/tape_plot/Makefile.mk b/tape_plot/Makefile.mk deleted file mode 100644 index 61235c68e..000000000 --- a/tape_plot/Makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ -pkglib_LTLIBRARIES += tape_plot/tape_plot.la - -tape_plot_tape_plot_la_CPPFLAGS = -tape_plot_tape_plot_la_CPPFLAGS += $(AM_CPPFLAGS) - -tape_plot_tape_plot_la_LDFLAGS = -tape_plot_tape_plot_la_LDFLAGS += $(AM_LDFLAGS) - -tape_plot_tape_plot_la_LIBADD = - -tape_plot_tape_plot_la_SOURCES = -tape_plot_tape_plot_la_SOURCES += tape_plot/tape_plot.cpp -tape_plot_tape_plot_la_SOURCES += tape_plot/tape_plot.h diff --git a/tariff/Makefile.mk b/tariff/Makefile.mk deleted file mode 100644 index 49ce24e90..000000000 --- a/tariff/Makefile.mk +++ /dev/null @@ -1,13 +0,0 @@ -pkglib_LTLIBRARIES += tariff/tariff.la - -tariff_tariff_la_CPPFLAGS = -tariff_tariff_la_CPPFLAGS += $(AM_CPPFLAGS) - -tariff_tariff_la_LDFLAGS = -tariff_tariff_la_LDFLAGS += $(AM_LDFLAGS) - -tariff_tariff_la_LIBADD = - -tariff_tariff_la_SOURCES = -tariff_tariff_la_SOURCES += tariff/main.cpp -tariff_tariff_la_SOURCES += tariff/tariff.cpp tariff/tariff.h diff --git a/transactive/Makefile.mk b/transactive/Makefile.mk deleted file mode 100644 index 7e78dead7..000000000 --- a/transactive/Makefile.mk +++ /dev/null @@ -1,20 +0,0 @@ -# transactive/Makefile.mk -# Copyright (C) 2016, Stanford University -# Author: dchassin@slac.stanford.edu - -pkglib_LTLIBRARIES += transactive/transactive.la - -transactive_transactive_la_CPPFLAGS = -transactive_transactive_la_CPPFLAGS += $(AM_CPPFLAGS) - -transactive_transactive_la_LDFLAGS = -transactive_transactive_la_LDFLAGS += $(AM_LDFLAGS) - -transactive_transactive_la_LIBADD = - -transactive_transactive_la_SOURCES = -transactive_transactive_la_SOURCES += transactive/house.cpp -transactive_transactive_la_SOURCES += transactive/house.h -transactive_transactive_la_SOURCES += transactive/agent.cpp -transactive_transactive_la_SOURCES += transactive/agent.h -transactive_transactive_la_SOURCES += transactive/main.cpp From ffb2516206ba2d266619ddd72383e804d8d80938 Mon Sep 17 00:00:00 2001 From: Alyona Teyber Date: Mon, 19 Oct 2020 16:39:28 -0700 Subject: [PATCH 02/11] Update version.h --- gldcore/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gldcore/version.h b/gldcore/version.h index ec29f3776..26f776a09 100644 --- a/gldcore/version.h +++ b/gldcore/version.h @@ -11,7 +11,7 @@ #define REV_MAJOR 4 #define REV_MINOR 2 -#define REV_PATCH 13 +#define REV_PATCH 12 #ifdef HAVE_CONFIG_H #include "config.h" From af0101864080c20ca29974bf2f2337773656ff59 Mon Sep 17 00:00:00 2001 From: Alyona Teyber Date: Tue, 20 Oct 2020 08:38:31 -0700 Subject: [PATCH 03/11] Update version.h --- gldcore/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gldcore/version.h b/gldcore/version.h index 26f776a09..ec29f3776 100644 --- a/gldcore/version.h +++ b/gldcore/version.h @@ -11,7 +11,7 @@ #define REV_MAJOR 4 #define REV_MINOR 2 -#define REV_PATCH 12 +#define REV_PATCH 13 #ifdef HAVE_CONFIG_H #include "config.h" From b8d23cdbd975a27c35ac922d8c7096c369de0719 Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Thu, 22 Oct 2020 09:16:02 -0700 Subject: [PATCH 04/11] Update json2md.py (#779) * Update json2md.py * Create Markdown_docs.md * Update json2md.py * Update test_markdown.glm * Create test_markdown.md * Update Markdown_docs.md Co-authored-by: Alyona Teyber --- docs/Converters/Output/Markdown_docs.md | 41 + gldcore/converters/autotest/test_markdown.glm | 11 +- gldcore/converters/json2md.py | 242 +- test_markdown.md | 4225 +++++++++++++++++ 4 files changed, 4426 insertions(+), 93 deletions(-) create mode 100644 docs/Converters/Output/Markdown_docs.md create mode 100644 test_markdown.md diff --git a/docs/Converters/Output/Markdown_docs.md b/docs/Converters/Output/Markdown_docs.md new file mode 100644 index 000000000..b0c7ee0bd --- /dev/null +++ b/docs/Converters/Output/Markdown_docs.md @@ -0,0 +1,41 @@ +[[/Converters/Output/Mardown_docs]] -- Markdown documents + +# Synopsis + +~~~ +#output "filename.md" [--no_{classes,globals,modules,objects}|--with_{classes,contents,hyperlinks}] +~~~ + +# Description + +The markdown document output converter generates a markdown document that tabulates information in the GLM's corresponding JSON file. + +## Output options + +### `--{no,with}_classes` + +The markdown document excludes/includes class information. By default class information is included if available. If no objects are present in the file, all classes are included by default unless `--no_classes` is used. If objects are present, only referenced classes are included by default, unless `--no_classes` is used, in which case no class output is generated, or `--with_classes` is used in which case all class output is generated. + +### `--no_globals` + +The markdown document excludes global data information. + +### `--no_modules` + +The markdown document excludes module information. + +### `--no_objects` + +The markdown document excludes object information. + +### `--with_contents` + +The markdown document includes a table of contents. + +### `--with_hyperlinks` + +The markdown document includes hyperlinks to known entities. + +# See also + +* [[/GLM/Macro/Output]] diff --git a/gldcore/converters/autotest/test_markdown.glm b/gldcore/converters/autotest/test_markdown.glm index c59bb8f0f..2f6a78b48 100644 --- a/gldcore/converters/autotest/test_markdown.glm +++ b/gldcore/converters/autotest/test_markdown.glm @@ -14,6 +14,15 @@ module residential; module revenue; module tape; -#output "test_markdown.md" +class test { + double x[kW]; +} + +object test { + name "test_0"; + x 1.2345 MW; +} + +#output "test_markdown.md" --with_contents --with_hyperlinks // TODO: check markdown output somehow diff --git a/gldcore/converters/json2md.py b/gldcore/converters/json2md.py index 32b107605..dd5666afd 100644 --- a/gldcore/converters/json2md.py +++ b/gldcore/converters/json2md.py @@ -10,14 +10,33 @@ import sys, getopt import json -config = {"input":"json","output":"md","options":{}} +config = { + "input" : "json", + "output" : "md", + "options" : { + "--no_modules" : "Omit modules", + "--no_globals" : "Omit globals", + "--no_objects" : "Omit objects", + "--with_classes" : "Include classes", + "--no_classes" : "Omit classes", + "--with_contents" : "Include table of contents", + "--with_hyperlinks" : "Include hyperlinks", + } +} def help(): print('Syntax:') print(f'{config["input"]}2{config["output"]}.py -i|--ifile [,[,...]] -o|--ofile [options ...]') - print(f' -c|--config : [OPTIONAL] display converter configuration') - print(f' -i|--ifile : [REQUIRED] {config["input"]} input file name') - print(f' -o|--ofile : [REQUIRED] {config["output"]} output file name') + print(f' -c|--config : [OPTIONAL] display converter configuration') + print(f' -i|--ifile : [REQUIRED] {config["input"]} input file name') + print(f' -o|--ofile : [REQUIRED] {config["output"]} output file name') + print(f' --no_classes : [OPTIONAL] do not output classes') + print(f' --no_globals : [OPTIONAL] do not output globals') + print(f' --no_modules : [OPTIONAL] do not output modules') + print(f' --no_objects : [OPTIONAL] do not output objects') + print(f' --with_classes : [OPTIONAL] output all classes') + print(f' --with_contents : [OPTIONAL] output table of contents') + print(f' --with_hyperlinks : [OPTIONAL] add hyperlinks to known entities') def error(msg): print(f'ERROR [{config["input"]}2{config["output"]}]: {msg}') @@ -25,9 +44,17 @@ def error(msg): input_file = None output_file = None -options = {} - -opts, args = getopt.getopt(sys.argv[1:],"hci:o:",["help","config","ifile=","ofile="]) +options = { + "classes" : True, + "globals" : True, + "modules" : True, + "objects" : True, + "contents" : False, + "hyperlinks" : False, +} + +opts, args = getopt.getopt(sys.argv[1:],"hci:o:",["help","config","ifile=","ofile=", + "no_modules","no_globals","no_classes","no_objects","with_classes","with_contents","with_hyperlinks"]) if not opts : help() @@ -44,6 +71,15 @@ def error(msg): input_file = arg.strip() elif opt in ("-o", "--ofile"): output_file = arg.strip() + elif opt in ("--no_classes","--no_globals","--no_modules","--no_objects", + "--with_classes","--with_contents","--with_hyperlinks"): + spec = opt.split("_") + if spec[0] == "--no" and len(spec) > 1 and spec[1] in options.keys(): + options[spec[1]] = False + elif spec[0] == "--with" and len(spec) > 1 and spec[1] in options.keys(): + options[spec[1]] = True + else: + error(f"{opt} is not a valid option") else: error(f"{opt}={arg} is not a valid option"); @@ -74,9 +110,18 @@ def row(*args): md.write("| " + " | ".join(args) + " |") md.write("\n") + def line(text=""): + md.write(f"{text}\n") + def hdr(n,str): md.write(f"{'#'*n} {str}\n\n") + def link(n): + if options["hyperlinks"]: + return f"[{n}](#{n.replace(' ','-')}" + else: + return n + def get(x,n,y=None): if n in x: return x[n] else: return y @@ -87,8 +132,17 @@ def get(x,n,y=None): row(application,version) row() + # contents + if options["contents"]: + hdr(2,"Table of Contents") + if options["modules"]: line(f"- {link('Modules')})") + if options["classes"]: line(f"- {link('Classes')})") + if options["objects"]: line(f"- {link('Objects')})") + if options["globals"]: line(f"- {link('Global Data')})") + line() + # list modules - if modules: + if modules and options["modules"]: hdr(2,"Modules") row("Name","Version") row("----","-------") @@ -99,94 +153,98 @@ def get(x,n,y=None): row() # classes - if objects: - active_classes = [] - for object, properties in objects.items(): - oclass = properties["class"] + if options["classes"]: + if objects: + active_classes = [] + for object, properties in objects.items(): + oclass = properties["class"] + if oclass not in active_classes: + active_classes.append(oclass) + else: + active_classes = classes.keys() + if active_classes: + hdr(2,"Classes") + for oclass, properties in classes.items(): if oclass not in active_classes: - active_classes.append(oclass) - else: - active_classes = classes.keys() - if active_classes: - hdr(2,"Classes") - for oclass, properties in classes.items(): - if oclass not in active_classes: - continue - hdr(3,oclass) - row("Property","Type","Unit","Access","Flags","Keywords","Default","Description") - row("--------","----","----","------","-----","--------","-------","-----------") - for property, specs in properties.items(): - if not type(specs) is dict: continue + hdr(3,oclass) + row("Property","Type","Unit","Access","Flags","Keywords","Default","Description") + row("--------","----","----","------","-----","--------","-------","-----------") + for property, specs in properties.items(): + if not type(specs) is dict: + continue + ptype = get(specs,"type","(na)") + access = get(specs,"access","PUBLIC") + flags = get(specs,"flags","") + keywords = get(specs,"keywords","") + unit = get(specs,"unit","") + if type(keywords) is dict: + keywords = " ".join(keywords.keys()) + default = get(specs,"default","") + description = get(specs,"description","") + row(property,ptype,unit,access,flags,keywords,default,description) + row() + + # objects + if options["objects"] and objects: + hdr(2,"Objects") + for name, properties in objects.items(): + hdr(3,name) + row("Property","Value") + row("--------","-----") + for property, value in properties.items(): + row(property,value) + row() + + if options["globals"]: + hdr(2,"Global data") + + # header data + hdr(3,"Header data") + row("Name","Type","Access") + row("----","----","------") + for name, values in header.items(): + row(name,values["type"],values["access"]) + row() + + # list system data types + hdr(3,"Data Types") + row("Type","Format","Default","Size","Converters","Comparators") + row("----","-------","-------","----","----------","-----------") + for ptype, values in types.items(): + format = values["xsdtype"] + if "default" in values: + default = values["default"] + else: + default = "(na)" + if "strsize" in values: + size = values["strsize"] + else: + size = "(na)" + converters = [] + for key, item in values.items(): + if key[0:4] == "has_" and item: converters.append(key[4:]) + converters = " ".join(converters) + comparators = " ".join(values["compareops"].keys()) + row(ptype,format,default,size,converters,comparators) + row() + + # globals + hdr(3,"Global variables") + row("Name","Module","Type","Access","Keywords","Value") + row("----","------","----","------","--------","-----") + for name, specs in globals.items(): + if "::" in name: + name = name.split("::") + module = name[0] + name = name[1] ptype = get(specs,"type","(na)") - access = get(specs,"access","PUBLIC") - flags = get(specs,"flags","") + access = get(specs,"access","(na)") + value = get(specs,"value","(na)") keywords = get(specs,"keywords","") - unit = get(specs,"unit","") if type(keywords) is dict: keywords = " ".join(keywords.keys()) - default = get(specs,"default","") - description = get(specs,"description","") - row(property,ptype,unit,access,flags,keywords,default,description) + else: + module = "" + row(name,module,ptype,access,keywords,value) row() - - # objects - for name, properties in objects.items(): - hdr(3,name) - row("Property","Value") - row("--------","-----") - for property, value in properties.items(): - row(property,value) - row() - - hdr(2,"Global data") - - # header data - hdr(3,"Header data") - row("Name","Type","Access") - row("----","----","------") - for name, values in header.items(): - row(name,values["type"],values["access"]) - row() - - # list system data types - hdr(3,"Data Types") - row("Type","Format","Default","Size","Converters","Comparators") - row("----","-------","-------","----","----------","-----------") - for ptype, values in types.items(): - format = values["xsdtype"] - if "default" in values: - default = values["default"] - else: - default = "(na)" - if "strsize" in values: - size = values["strsize"] - else: - size = "(na)" - converters = [] - for key, item in values.items(): - if key[0:4] == "has_" and item: converters.append(key[4:]) - converters = " ".join(converters) - comparators = " ".join(values["compareops"].keys()) - row(ptype,format,default,size,converters,comparators) - row() - - # globals - hdr(3,"Global variables") - row("Name","Module","Type","Access","Keywords","Value") - row("----","------","----","------","--------","-----") - for name, specs in globals.items(): - if "::" in name: - name = name.split("::") - module = name[0] - name = name[1] - ptype = get(specs,"type","(na)") - access = get(specs,"access","(na)") - value = get(specs,"value","(na)") - keywords = get(specs,"keywords","") - if type(keywords) is dict: - keywords = " ".join(keywords.keys()) - else: - module = "" - row(name,module,ptype,access,keywords,value) - row() diff --git a/test_markdown.md b/test_markdown.md new file mode 100644 index 000000000..e6ba29007 --- /dev/null +++ b/test_markdown.md @@ -0,0 +1,4225 @@ +# Model documentation of gldcore/converters/autotest/test_markdown.json + +| Application | Version | +| ----------- | ------- | +| gridlabd | 4.2.13 | + +## Modules + +| Name | Version | +| ---- | ------- | +| assert | 4.2 | +| climate | 4.2 | +| commercial | 4.2 | +| generators | 4.2 | +| industrial | 4.2 | +| influxdb | 4.2 | +| market | 4.2 | +| optimize | 4.2 | +| powerflow | 4.2 | +| reliability | 4.2 | +| residential | 4.2 | +| revenue | 4.2 | +| tape | 4.2 | + +## Classes + +### assert + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| status | enumeration | | PUBLIC | | ERROR FALSE TRUE INIT NONE | TRUE | desired outcome of assert test | +| target | char1024 | | PUBLIC | REQUIRED | | | the target property to test | +| part | char32 | | PUBLIC | | | | the target property part to test | +| relation | enumeration | | PUBLIC | REQUIRED | outside inside != >= > <= < == | | the relation to use for the test | +| value | char1024 | | PUBLIC | REQUIRED | | | the value to compare with for binary tests | +| within | char1024 | | PUBLIC | | | | the bounds within which the value must bed compared | +| lower | char1024 | | PUBLIC | | | | the lower bound to compare with for interval tests | +| upper | char1024 | | PUBLIC | | | | the upper bound to compare with for interval tests | +| group | char1024 | | PUBLIC | | | | a target group specification to use instead of parent object | +| start | timestamp | | PUBLIC | | | INIT | time to start assertion | +| stop | timestamp | | PUBLIC | | | NEVER | time to stop assertion | +| hold | double | s | PUBLIC | | | | a duration over which the assertion must be violated before failing | + +### double_assert + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| status | enumeration | | PUBLIC | | ASSERT_NONE ASSERT_FALSE ASSERT_TRUE | ASSERT_TRUE | Conditions for the assert checks | +| once | enumeration | | PUBLIC | | ONCE_DONE ONCE_TRUE ONCE_FALSE | | Conditions for a single assert check | +| within_mode | enumeration | | PUBLIC | | WITHIN_RATIO WITHIN_VALUE | | Method of applying tolerance | +| value | double | | PUBLIC | | | | Value to assert | +| within | double | | PUBLIC | | | | Tolerance for a successful assert | +| target | char1024 | | PUBLIC | | | | Property to perform the assert upon | + +### complex_assert + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| status | enumeration | | PUBLIC | | ASSERT_NONE ASSERT_FALSE ASSERT_TRUE | ASSERT_TRUE | Conditions for the assert checks | +| once | enumeration | | PUBLIC | | ONCE_DONE ONCE_TRUE ONCE_FALSE | | Conditions for a single assert check | +| operation | enumeration | | PUBLIC | | ANGLE MAGNITUDE IMAGINARY REAL FULL | | Complex operation for the comparison | +| value | complex | | PUBLIC | | | | Value to assert | +| within | double | | PUBLIC | | | | Tolerance for a successful assert | +| target | char1024 | | PUBLIC | | | | Property to perform the assert upon | + +### enum_assert + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| status | enumeration | | PUBLIC | | ASSERT_NONE ASSERT_FALSE ASSERT_TRUE | ASSERT_TRUE | Conditions for the assert checks | +| value | int32 | | PUBLIC | | | | Value to assert | +| target | char1024 | | PUBLIC | | | | Property to perform the assert upon | + +### int_assert + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| status | enumeration | | PUBLIC | | ASSERT_NONE ASSERT_FALSE ASSERT_TRUE | ASSERT_TRUE | | +| once | enumeration | | PUBLIC | | ONCE_DONE ONCE_TRUE ONCE_FALSE | | | +| within_mode | enumeration | | PUBLIC | | WITHIN_RATIO WITHIN_VALUE | | | +| value | int32 | | PUBLIC | | | | | +| within | int32 | | PUBLIC | | | | | +| target | char1024 | | PUBLIC | | | | | + +### climate + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| solar_elevation | double | rad | PUBLIC | OUTPUT | | | solar elevation angle in radians | +| solar_azimuth | double | rad | PUBLIC | OUTPUT | | | solar azimuth angle in radians | +| solar_zenith | double | rad | PUBLIC | OUTPUT | | | solar zenith angle in radians | +| city | char32 | | PUBLIC | | | | weather data city name | +| tmyfile | char1024 | | PUBLIC | REQUIRED | | | weather data file name | +| temperature | double | degF | PUBLIC | OUTPUT | | 59.0 degF | current temperature | +| humidity | double | pu | PUBLIC | OUTPUT | | 75% | current humidity | +| solar_flux | double | W/sf | PUBLIC | OUTPUT | | | current solar irradiance (9 orientiations) | +| solar_direct | double | W/sf | PUBLIC | OUTPUT | | | solar direct irradiance | +| solar_diffuse | double | W/sf | PUBLIC | OUTPUT | | | solar diffuse irradiance | +| solar_global | double | W/sf | PUBLIC | OUTPUT | | | solar global flux irradiance | +| extraterrestrial_global_horizontal | double | W/sf | PUBLIC | OUTPUT | | | solar global extraterrestrial irradiance | +| extraterrestrial_direct_normal | double | W/sf | PUBLIC | OUTPUT | | 1367 W/m^2 | solar direct normal extraterrestrial irradiance | +| pressure | double | mbar | PUBLIC | OUTPUT | | 1013.25 mbar | current air pressure | +| wind_speed | double | m/s | PUBLIC | OUTPUT | | | current wind speed | +| wind_dir | double | rad | PUBLIC | OUTPUT | | | current direction in radians | +| wind_gust | double | m/s | PUBLIC | OUTPUT | | | current wind gusts | +| record.low | double | degF | PUBLIC | OUTPUT | | | record low temperature observed | +| record.low_day | int32 | | PUBLIC | OUTPUT | | | day of year for record low observation | +| record.high | double | degF | PUBLIC | OUTPUT | | | record high temperature observed | +| record.high_day | int32 | | PUBLIC | OUTPUT | | | day of year for record high observation | +| record.solar | double | W/sf | PUBLIC | OUTPUT | | | record high solar irradiance observed | +| rainfall | double | in/h | PUBLIC | OUTPUT | | | rainfall observed | +| snowdepth | double | in | PUBLIC | OUTPUT | | | snow depth observed | +| interpolate | enumeration | | PUBLIC | OUTPUT | QUADRATIC LINEAR NONE | NONE | the interpolation mode used on the climate data | +| solar_horiz | double | | PUBLIC | OUTPUT | | | solar flux on horizontal surface | +| solar_north | double | | PUBLIC | OUTPUT | | | solar flux on north surface | +| solar_northeast | double | | PUBLIC | OUTPUT | | | solar flux on northeast surface | +| solar_east | double | | PUBLIC | OUTPUT | | | solar flux on east surface | +| solar_southeast | double | | PUBLIC | OUTPUT | | | solar flux on southeast surface | +| solar_south | double | | PUBLIC | OUTPUT | | | solar flux on south surface | +| solar_southwest | double | | PUBLIC | OUTPUT | | | solar flux on southwest surface | +| solar_west | double | | PUBLIC | OUTPUT | | | solar flux on west surface | +| solar_northwest | double | | PUBLIC | OUTPUT | | | solar flux on northwest surface | +| solar_raw | double | W/sf | PUBLIC | OUTPUT | | | raw solar flux | +| ground_reflectivity | double | pu | PUBLIC | OUTPUT | | 0.3 pu | ground reflectivity observed | +| reader | object | | PUBLIC | | | | weather reader object | +| forecast | char1024 | | PUBLIC | | | | forecasting specifications | +| cloud_model | enumeration | | PUBLIC | OUTPUT | CUMULUS NONE | NONE | the cloud model to use | +| cloud_opacity | double | pu | PUBLIC | OUTPUT | | 1.0 pu | cloud opacity factor | +| opq_sky_cov | double | pu | PUBLIC | OUTPUT | | | cloud sky coverage factor | +| cloud_speed_factor | double | pu | PUBLIC | OUTPUT | | 1.0 pu | cloud speed factor | +| solar_cloud_direct | double | W/sf | PUBLIC | OUTPUT | | | cloud direct irradiance | +| solar_cloud_diffuse | double | W/sf | PUBLIC | OUTPUT | | | cloud diffuse irradiance | +| solar_cloud_global | double | W/sf | PUBLIC | OUTPUT | | | cloud global irradiance | +| cloud_alpha | double | pu | PUBLIC | OUTPUT | | 400 pu | cloud alpha | +| cloud_num_layers | double | pu | PUBLIC | OUTPUT | | 40 pu | number of cloud layers | +| cloud_aerosol_transmissivity | double | pu | PUBLIC | OUTPUT | | 0.95 pu | cloud aerosal transmissivity | +| heat_index | double | degF | PUBLIC | OUTPUT | | | heat index based on temperature and humidity | + +### weather + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| temperature | double | degF | PUBLIC | OUTPUT | | 0.0 degF | dry-bulb air temperature | +| humidity | double | % | PUBLIC | OUTPUT | | 0% | relative humidity | +| solar_dir | double | W/sf | PUBLIC | DEPRECATED|OUTPUT | | 0.0 W/sf | direct solar flux | +| solar_direct | double | W/sf | PUBLIC | | | 0.0 W/sf | direct solar flux | +| solar_diff | double | W/sf | PUBLIC | DEPRECATED|OUTPUT | | 0.0 W/sf | diffuse solar flux | +| solar_diffuse | double | W/sf | PUBLIC | OUTPUT | | 0.0 W/sf | diffuse solar flux | +| solar_global | double | W/sf | PUBLIC | OUTPUT | | 0.0 W/sf | global solar flux | +| global_horizontal_extra | double | W/sf | PUBLIC | OUTPUT | | 0.0 W/sf | horizontal surface solar flux | +| wind_speed | double | mph | PUBLIC | OUTPUT | | 0.0 mph | wind speed | +| wind_dir | double | deg | PUBLIC | OUTPUT | | 0.0 deg | wind direction | +| opq_sky_cov | double | pu | PUBLIC | OUTPUT | | 0.0 pu | opaque sky cover | +| tot_sky_cov | double | pu | PUBLIC | OUTPUT | | 0.0 pu | total sky cover | +| rainfall | double | in/h | PUBLIC | OUTPUT | | 0.0 in/h | rainfall rate | +| snowdepth | double | in | PUBLIC | OUTPUT | | 0.0 in | depth of snow on the ground | +| pressure | double | mbar | PUBLIC | OUTPUT | | 0.0 mbar | air pressure | +| month | int16 | | PUBLIC | OUTPUT | | | current month | +| day | int16 | | PUBLIC | OUTPUT | | | current day | +| hour | int16 | | PUBLIC | OUTPUT | | | current hour | +| minute | int16 | | PUBLIC | OUTPUT | | | current minute | +| second | int16 | | PUBLIC | OUTPUT | | | current second | + +### csv_reader + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| index | int32 | | REFERENCE | | | | reader line index | +| city_name | char32 | | PUBLIC | | | | name of city | +| state_name | char32 | | PUBLIC | | | | name of state/province | +| lat_deg | double | | PUBLIC | | | | latitude degrees | +| lat_min | double | | PUBLIC | | | | latitude minutes | +| long_deg | double | | PUBLIC | | | | longitude degrees | +| long_min | double | | PUBLIC | | | | longitude minutes | +| low_temp | double | | REFERENCE | | | | lowest temperature | +| high_temp | double | | REFERENCE | | | | highest temperature | +| peak_solar | double | | REFERENCE | | | | peak solar flux | +| elevation | int32 | | PUBLIC | | | | elevation | +| status | enumeration | | REFERENCE | | ERROR OPEN INIT | | reader status | +| timefmt | char32 | | PUBLIC | | | | time format | +| timezone | char32 | | PUBLIC | | | | timezone | +| timezone_offset | double | | PUBLIC | | | | timezone offset | +| columns | char256 | | PUBLIC | | | | column names | +| filename | char256 | | PUBLIC | | | | filename | + +### office + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| floor_area | double | sf | PUBLIC | | | | | +| floor_height | double | ft | PUBLIC | | | | | +| exterior_ua | double | Btu/degF/h | PUBLIC | | | | | +| interior_ua | double | Btu/degF/h | PUBLIC | | | | | +| interior_mass | double | Btu/degF | PUBLIC | | | | | +| glazing | double | sf | PUBLIC | | | | | +| glazing.north | double | sf | PUBLIC | | | | | +| glazing.northeast | double | sf | PUBLIC | | | | | +| glazing.east | double | sf | PUBLIC | | | | | +| glazing.southeast | double | sf | PUBLIC | | | | | +| glazing.south | double | sf | PUBLIC | | | | | +| glazing.southwest | double | sf | PUBLIC | | | | | +| glazing.west | double | sf | PUBLIC | | | | | +| glazing.northwest | double | sf | PUBLIC | | | | | +| glazing.horizontal | double | sf | PUBLIC | | | | | +| glazing.coefficient | double | pu | PUBLIC | | | | | +| occupancy | double | | PUBLIC | | | | | +| occupants | double | | PUBLIC | | | | | +| schedule | char256 | | PUBLIC | | | | | +| air_temperature | double | degF | PUBLIC | | | | | +| mass_temperature | double | degF | PUBLIC | | | | | +| temperature_change | double | degF/h | PUBLIC | | | | | +| outdoor_temperature | double | degF | PUBLIC | | | | | +| Qh | double | Btu/h | PUBLIC | | | | | +| Qs | double | Btu/h | PUBLIC | | | | | +| Qi | double | Btu/h | PUBLIC | | | | | +| Qz | double | Btu/h | PUBLIC | | | | | +| hvac_mode | enumeration | | PUBLIC | | OFF VENT ECON COOL AUX HEAT | | | +| hvac.cooling.balance_temperature | double | degF | PUBLIC | | | | | +| hvac.cooling.capacity | double | Btu/h | PUBLIC | | | | | +| hvac.cooling.capacity_perF | double | Btu/degF/h | PUBLIC | | | | | +| hvac.cooling.design_temperature | double | degF | PUBLIC | | | | | +| hvac.cooling.efficiency | double | pu | PUBLIC | | | | | +| hvac.cooling.cop | double | pu | PUBLIC | | | | | +| hvac.heating.balance_temperature | double | degF | PUBLIC | | | | | +| hvac.heating.capacity | double | Btu/h | PUBLIC | | | | | +| hvac.heating.capacity_perF | double | Btu/degF/h | PUBLIC | | | | | +| hvac.heating.design_temperature | double | degF | PUBLIC | | | | | +| hvac.heating.efficiency | double | pu | PUBLIC | | | | | +| hvac.heating.cop | double | pu | PUBLIC | | | | | +| lights.capacity | double | kW | PUBLIC | | | | | +| lights.fraction | double | pu | PUBLIC | | | | | +| plugs.capacity | double | kW | PUBLIC | | | | | +| plugs.fraction | double | pu | PUBLIC | | | | | +| demand | complex | kW | PUBLIC | | | | | +| total_load | complex | kW | PUBLIC | | | | | +| energy | complex | kWh | PUBLIC | | | | | +| power_factor | double | | PUBLIC | | | | | +| power | complex | kW | PUBLIC | | | | | +| current | complex | A | PUBLIC | | | | | +| admittance | complex | 1/Ohm | PUBLIC | | | | | +| hvac.demand | complex | kW | PUBLIC | | | | | +| hvac.load | complex | kW | PUBLIC | | | | | +| hvac.energy | complex | kWh | PUBLIC | | | | | +| hvac.power_factor | double | | PUBLIC | | | | | +| lights.demand | complex | kW | PUBLIC | | | | | +| lights.load | complex | kW | PUBLIC | | | | | +| lights.energy | complex | kWh | PUBLIC | | | | | +| lights.power_factor | double | | PUBLIC | | | | | +| lights.heatgain_fraction | double | | PUBLIC | | | | | +| lights.heatgain | double | kW | PUBLIC | | | | | +| plugs.demand | complex | kW | PUBLIC | | | | | +| plugs.load | complex | kW | PUBLIC | | | | | +| plugs.energy | complex | kWh | PUBLIC | | | | | +| plugs.power_factor | double | | PUBLIC | | | | | +| plugs.heatgain_fraction | double | | PUBLIC | | | | | +| plugs.heatgain | double | kW | PUBLIC | | | | | +| cooling_setpoint | double | degF | PUBLIC | | | | | +| heating_setpoint | double | degF | PUBLIC | | | | | +| thermostat_deadband | double | degF | PUBLIC | | | | | +| control.ventilation_fraction | double | | PUBLIC | | | | | +| control.lighting_fraction | double | | PUBLIC | | | | | +| ACH | double | | PUBLIC | | | | | + +### multizone + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| from | object | | PUBLIC | | | | | +| to | object | | PUBLIC | | | | | +| ua | double | | PUBLIC | | | | | + +### ceus + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| floor_area | double | sf | PUBLIC | REQUIRED | | | building floor area | +| filename | method | | PUBLIC | REQUIRED | | | CEUS data file | +| composition | method | | PUBLIC | REQUIRED | | | load composition specification | +| total_real_power | double | W | PUBLIC | OUTPUT | | | total real power | +| total_reactive_power | double | W | PUBLIC | OUTPUT | | | total reactive power | +| total_power_A | complex | W | PUBLIC | OUTPUT | | | total complex power on phase A | +| total_power_B | complex | W | PUBLIC | OUTPUT | | | total complex power on phase B | +| total_power_C | complex | W | PUBLIC | OUTPUT | | | total complex power on phase C | +| weather | object | | PUBLIC | | | | weather object for temperature and solar gain | +| tariff | object | | PUBLIC | | | | tariff object for energy price sensitivity | + +### parking + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| weather | object | | PUBLIC | | | | weather object for lighting data | +| lighting_nightonly | bool | | PUBLIC | | | TRUE | lighting is used only at night (requires weather) | +| lighting_capacity | complex | | PUBLIC | | | 0 | installed capacity for lighting | +| charger_installed | int16 | | PUBLIC | | | 0 | number of chargers installed | +| charger_active | double | | PUBLIC | | | 0 | number of chargers active | +| charger_unit_power | complex | | PUBLIC | | | 0 | power demand for a single charger | +| lighting_power | complex | | PUBLIC | | | 0 | power demand for lighting | +| ventilation_power | complex | | PUBLIC | | | 0 | power demand for ventilation | +| charger_power | complex | | PUBLIC | | | 0 | power demand for active chargers | +| total_power | complex | | PUBLIC | | | 0 | power total demand for parking structure | + +### diesel_dg + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| Gen_mode | enumeration | | PUBLIC | | CONSTANTP CONSTANTPQ CONSTANTE UNKNOWN | | | +| Gen_status | enumeration | | PUBLIC | | ONLINE OFFLINE UNKNOWN | | | +| Gen_type | enumeration | | PUBLIC | | DYN_SYNCHRONOUS SYNCHRONOUS INDUCTION | | Dynamics-capable implementation of synchronous diesel generator | +| pf | double | | PUBLIC | | | | desired power factor | +| GenElecEff | double | | PUBLIC | | | | calculated electrical efficiency of generator | +| TotalOutputPow | complex | VA | PUBLIC | | | | total complex power generated | +| TotalRealPow | double | W | PUBLIC | | | | total real power generated | +| TotalReacPow | double | VAr | PUBLIC | | | | total reactive power generated | +| speed | double | 1/min | PUBLIC | | | | speed of an engine | +| cylinders | double | | PUBLIC | | | | Total number of cylinders in a diesel engine | +| stroke | double | | PUBLIC | | | | category of internal combustion engines | +| torque | double | N | PUBLIC | | | | Net brake load | +| pressure | double | N/m^2 | PUBLIC | | | | | +| time_operation | double | min | PUBLIC | | | | | +| fuel | double | kg | PUBLIC | | | | fuel consumption | +| w_coolingwater | double | kg | PUBLIC | | | | weight of cooling water supplied per minute | +| inlet_temperature | double | degC | PUBLIC | | | | Inlet temperature of cooling water in degC | +| outlet_temperature | double | degC | PUBLIC | | | | outlet temperature of cooling water in degC | +| air_fuel | double | kg | PUBLIC | | | | Air used per kg fuel | +| room_temperature | double | degC | PUBLIC | | | | Room temperature in degC | +| exhaust_temperature | double | degC | PUBLIC | | | | exhaust gas temperature in degC | +| cylinder_length | double | m | PUBLIC | | | | length of the cylinder, used in efficiency calculations | +| cylinder_radius | double | m | PUBLIC | | | | inner radius of cylinder, used in efficiency calculations | +| brake_diameter | double | m | PUBLIC | | | | diameter of brake, used in efficiency calculations | +| calotific_fuel | double | kJ/kg | PUBLIC | | | | calorific value of fuel | +| steam_exhaust | double | kg | PUBLIC | | | | steam formed per kg of fuel in the exhaust | +| specific_heat_steam | double | kJ/kg/K | PUBLIC | | | | specific heat of steam in exhaust | +| specific_heat_dry | double | kJ/kg/K | PUBLIC | | | | specific heat of dry exhaust gases | +| indicated_hp | double | W | PUBLIC | | | | Indicated horse power is the power developed inside the cylinder | +| brake_hp | double | W | PUBLIC | | | | brake horse power is the output of the engine at the shaft measured by a dynamometer | +| thermal_efficiency | double | | PUBLIC | | | | thermal efficiency or mechanical efiiciency of the engine is efined as bp/ip | +| energy_supplied | double | kJ | PUBLIC | | | | energy supplied during the trail | +| heat_equivalent_ip | double | kJ | PUBLIC | | | | heat equivalent of IP in a given time of operation | +| energy_coolingwater | double | kJ | PUBLIC | | | | energy carried away by cooling water | +| mass_exhaustgas | double | kg | PUBLIC | | | | mass of dry exhaust gas | +| energy_exhaustgas | double | kJ | PUBLIC | | | | energy carried away by dry exhaust gases | +| energy_steam | double | kJ | PUBLIC | | | | energy carried away by steam | +| total_energy_exhaustgas | double | kJ | PUBLIC | | | | total energy carried away by dry exhaust gases is the sum of energy carried away bt steam and energy carried away by dry exhaust gases | +| unaccounted_energyloss | double | kJ | PUBLIC | | | | unaccounted for energy loss | +| Pconv | double | kW | PUBLIC | | | | Converted power = Mechanical input - (F & W loasses + Stray losses + Core losses) | +| Rated_V | double | V | PUBLIC | | | | nominal line-line voltage in Volts | +| Rated_VA | double | VA | PUBLIC | | | | nominal capacity in VA | +| power_out_A | complex | VA | PUBLIC | | | | Output power of phase A | +| power_out_B | complex | VA | PUBLIC | | | | Output power of phase B | +| power_out_C | complex | VA | PUBLIC | | | | Output power of phase C | +| Rs | double | | PUBLIC | | | | internal transient resistance in p.u. | +| Xs | double | | PUBLIC | | | | internal transient impedance in p.u. | +| Rg | double | | PUBLIC | | | | grounding resistance in p.u. | +| Xg | double | | PUBLIC | | | | grounding impedance in p.u. | +| voltage_A | complex | V | PUBLIC | | | | voltage at generator terminal, phase A | +| voltage_B | complex | V | PUBLIC | | | | voltage at generator terminal, phase B | +| voltage_C | complex | V | PUBLIC | | | | voltage at generator terminal, phase C | +| current_A | complex | A | PUBLIC | | | | current generated at generator terminal, phase A | +| current_B | complex | A | PUBLIC | | | | current generated at generator terminal, phase B | +| current_C | complex | A | PUBLIC | | | | current generated at generator terminal, phase C | +| EfA | complex | V | PUBLIC | | | | induced voltage on phase A | +| EfB | complex | V | PUBLIC | | | | induced voltage on phase B | +| EfC | complex | V | PUBLIC | | | | induced voltage on phase C | +| omega_ref | double | rad/s | PUBLIC | | | | Reference frequency of generator (rad/s) | +| inertia | double | | PUBLIC | | | | Inertial constant (H) of generator | +| damping | double | | PUBLIC | | | | Damping constant (D) of generator | +| number_poles | double | | PUBLIC | | | | Number of poles in the generator | +| Ra | double | pu | PUBLIC | | | | Stator resistance (p.u.) | +| Xd | double | pu | PUBLIC | | | | d-axis reactance (p.u.) | +| Xq | double | pu | PUBLIC | | | | q-axis reactance (p.u.) | +| Xdp | double | pu | PUBLIC | | | | d-axis transient reactance (p.u.) | +| Xqp | double | pu | PUBLIC | | | | q-axis transient reactance (p.u.) | +| Xdpp | double | pu | PUBLIC | | | | d-axis subtransient reactance (p.u.) | +| Xqpp | double | pu | PUBLIC | | | | q-axis subtransient reactance (p.u.) | +| Xl | double | pu | PUBLIC | | | | Leakage reactance (p.u.) | +| Tdp | double | s | PUBLIC | | | | d-axis short circuit time constant (s) | +| Tdop | double | s | PUBLIC | | | | d-axis open circuit time constant (s) | +| Tqop | double | s | PUBLIC | | | | q-axis open circuit time constant (s) | +| Tdopp | double | s | PUBLIC | | | | d-axis open circuit subtransient time constant (s) | +| Tqopp | double | s | PUBLIC | | | | q-axis open circuit subtransient time constant (s) | +| Ta | double | s | PUBLIC | | | | Armature short-circuit time constant (s) | +| X0 | complex | pu | PUBLIC | | | | Zero sequence impedance (p.u.) | +| X2 | complex | pu | PUBLIC | | | | Negative sequence impedance (p.u.) | +| rotor_speed_convergence | double | rad | PUBLIC | | | | Convergence criterion on rotor speed used to determine when to exit deltamode | +| voltage_convergence | double | V | PUBLIC | | | | Convergence criterion for voltage changes (if exciter present) to determine when to exit deltamode | +| rotor_speed_convergence_enabled | bool | | PUBLIC | | | | Uses rotor_speed_convergence to determine if an exit of deltamode is needed | +| voltage_magnitude_convergence_enabled | bool | | PUBLIC | | | | Uses voltage_convergence to determine if an exit of deltamode is needed - only works if an exciter is present | +| rotor_angle | double | rad | PUBLIC | | | | rotor angle state variable | +| rotor_speed | double | rad/s | PUBLIC | | | | machine speed state variable | +| field_voltage | double | pu | PUBLIC | | | | machine field voltage state variable | +| flux1d | double | pu | PUBLIC | | | | machine transient flux on d-axis state variable | +| flux2q | double | pu | PUBLIC | | | | machine subtransient flux on q-axis state variable | +| EpRotated | complex | pu | PUBLIC | | | | d-q rotated E-prime internal voltage state variable | +| VintRotated | complex | pu | PUBLIC | | | | d-q rotated Vint voltage state variable | +| Eint_A | complex | V | PUBLIC | | | | Unrotated, unsequenced phase A internal voltage | +| Eint_B | complex | V | PUBLIC | | | | Unrotated, unsequenced phase B internal voltage | +| Eint_C | complex | V | PUBLIC | | | | Unrotated, unsequenced phase C internal voltage | +| Irotated | complex | pu | PUBLIC | | | | d-q rotated sequence current state variable | +| pwr_electric | complex | VA | PUBLIC | | | | Current electrical output of machine | +| pwr_mech | double | W | PUBLIC | | | | Current mechanical output of machine | +| torque_mech | double | N*m | PUBLIC | | | | Current mechanical torque of machine | +| torque_elec | double | N*m | PUBLIC | | | | Current electrical torque output of machine | +| wref | double | pu | PUBLIC | | | | wref input to governor controls (per-unit) | +| vset | double | pu | PUBLIC | | | | vset input to AVR controls (per-unit) | +| Pref | double | pu | PUBLIC | | | | Pref input to governor controls (per-unit), if supported | +| Qref | double | pu | PUBLIC | | | | Qref input to govornor or AVR controls (per-unit), if supported | +| Exciter_type | enumeration | | PUBLIC | | SEXS NO_EXC | | Simplified Excitation System | +| KA | double | pu | PUBLIC | | | | Exciter gain (p.u.) | +| TA | double | s | PUBLIC | | | | Exciter time constant (seconds) | +| TB | double | s | PUBLIC | | | | Exciter transient gain reduction time constant (seconds) | +| TC | double | s | PUBLIC | | | | Exciter transient gain reduction time constant (seconds) | +| EMAX | double | pu | PUBLIC | | | | Exciter upper limit (p.u.) | +| EMIN | double | pu | PUBLIC | | | | Exciter lower limit (p.u.) | +| Vterm_max | double | pu | PUBLIC | | | | Upper voltage limit for super-second (p.u.) | +| Vterm_min | double | pu | PUBLIC | | | | Lower voltage limit for super-second (p.u.) | +| bias | double | | PUBLIC | | | | Exciter bias state variable | +| xe | double | | PUBLIC | | | | Exciter state variable | +| xb | double | | PUBLIC | | | | Exciter state variable | +| x_cvr1 | double | | PUBLIC | | | | Exciter state variable | +| x_cvr2 | double | | PUBLIC | | | | Exciter state variable | +| Vref | double | | PUBLIC | | | | Exciter CVR control voltage reference value | +| CVR_mode | enumeration | | PUBLIC | | Feedback HighOrder | | First order control mode with feedback loop | +| P_CONSTANT_ki | double | | PUBLIC | | | | parameter of the integration control for constant P mode | +| P_CONSTANT_kp | double | | PUBLIC | | | | parameter of the proportional control for constant P mode | +| Exciter_Q_constant_mode | bool | | PUBLIC | | | | True if the generator is operating under constant Q mode | +| Exciter_Q_constant_ki | double | | PUBLIC | | | | parameter of the integration control for constant Q mode | +| Exciter_Q_constant_kp | double | | PUBLIC | | | | parameter of the propotional control for constant Q mode | +| P_CONSTANT_Pref | double | pu | PUBLIC | | | | Pref input to governor controls (per-unit), if supported | +| Exciter_Q_constant_Qref | double | pu | PUBLIC | | | | Qref input to govornor or AVR controls (per-unit), if supported | +| CVR_enabled | bool | | PUBLIC | | | | True if the CVR control is enabled in the exciter | +| CVR_ki_cvr | double | | PUBLIC | | | | parameter of the integration control for CVR control | +| CVR_kp_cvr | double | | PUBLIC | | | | parameter of the proportional control for CVR control | +| CVR_kd_cvr | double | | PUBLIC | | | | parameter of the deviation control for CVR control | +| CVR_kt_cvr | double | | PUBLIC | | | | parameter of the gain in feedback loop for CVR control | +| CVR_kw_cvr | double | | PUBLIC | | | | parameter of the gain in feedback loop for CVR control | +| CVR_PI | bool | | PUBLIC | | | | True if the PI controller is implemented in CVR control | +| CVR_PID | bool | | PUBLIC | | | | True if the PID controller is implemented in CVR control | +| vset_EMAX | double | | PUBLIC | | | | Maximum Vset limit | +| vset_EMIN | double | | PUBLIC | | | | Minimum Vset limit | +| CVR_Kd1 | double | | PUBLIC | | | | parameter of the second order transfer function for CVR control | +| CVR_Kd2 | double | | PUBLIC | | | | parameter of the second order transfer function for CVR control | +| CVR_Kd3 | double | | PUBLIC | | | | parameter of the second order transfer function for CVR control | +| CVR_Kn1 | double | | PUBLIC | | | | parameter of the second order transfer function for CVR control | +| CVR_Kn2 | double | | PUBLIC | | | | parameter of the second order transfer function for CVR control | +| vset_delta_MAX | double | | PUBLIC | | | | Maximum delta Vset limit | +| vset_delta_MIN | double | | PUBLIC | | | | Minimum delta Vset limit | +| vadd | double | | PUBLIC | | | | Delta Vset | +| vadd_a | double | | PUBLIC | | | | Delta Vset before going into bound check | +| Governor_type | enumeration | | PUBLIC | | P_CONSTANT GGOV1 GGOV1_OLD GAST DEGOV1 NO_GOV | | P_CONSTANT mode Governor Model | +| DEGOV1_R | double | pu | PUBLIC | | | | Governor droop constant (p.u.) | +| DEGOV1_T1 | double | s | PUBLIC | | | | Governor electric control box time constant (s) | +| DEGOV1_T2 | double | s | PUBLIC | | | | Governor electric control box time constant (s) | +| DEGOV1_T3 | double | s | PUBLIC | | | | Governor electric control box time constant (s) | +| DEGOV1_T4 | double | s | PUBLIC | | | | Governor actuator time constant (s) | +| DEGOV1_T5 | double | s | PUBLIC | | | | Governor actuator time constant (s) | +| DEGOV1_T6 | double | s | PUBLIC | | | | Governor actuator time constant (s) | +| DEGOV1_K | double | pu | PUBLIC | | | | Governor actuator gain | +| DEGOV1_TMAX | double | pu | PUBLIC | | | | Governor actuator upper limit (p.u.) | +| DEGOV1_TMIN | double | pu | PUBLIC | | | | Governor actuator lower limit (p.u.) | +| DEGOV1_TD | double | s | PUBLIC | | | | Governor combustion delay (s) | +| DEGOV1_x1 | double | | PUBLIC | | | | Governor electric box state variable | +| DEGOV1_x2 | double | | PUBLIC | | | | Governor electric box state variable | +| DEGOV1_x4 | double | | PUBLIC | | | | Governor electric box state variable | +| DEGOV1_x5 | double | | PUBLIC | | | | Governor electric box state variable | +| DEGOV1_x6 | double | | PUBLIC | | | | Governor electric box state variable | +| DEGOV1_throttle | double | | PUBLIC | | | | Governor electric box state variable | +| GAST_R | double | pu | PUBLIC | | | | Governor droop constant (p.u.) | +| GAST_T1 | double | s | PUBLIC | | | | Governor electric control box time constant (s) | +| GAST_T2 | double | s | PUBLIC | | | | Governor electric control box time constant (s) | +| GAST_T3 | double | s | PUBLIC | | | | Governor temperature limiter time constant (s) | +| GAST_AT | double | s | PUBLIC | | | | Governor Ambient Temperature load limit (units) | +| GAST_KT | double | pu | PUBLIC | | | | Governor temperature control loop gain | +| GAST_VMAX | double | pu | PUBLIC | | | | Governor actuator upper limit (p.u.) | +| GAST_VMIN | double | pu | PUBLIC | | | | Governor actuator lower limit (p.u.) | +| GAST_x1 | double | | PUBLIC | | | | Governor electric box state variable | +| GAST_x2 | double | | PUBLIC | | | | Governor electric box state variable | +| GAST_x3 | double | | PUBLIC | | | | Governor electric box state variable | +| GAST_throttle | double | | PUBLIC | | | | Governor electric box state variable | +| GGOV1_R | double | pu | PUBLIC | | | | Permanent droop, p.u. | +| GGOV1_Rselect | int32 | | PUBLIC | | | | Feedback signal for droop, = 1 selected electrical power, = 0 none (isochronous governor), = -1 fuel valve stroke ( true stroke),= -2 governor output ( requested stroke) | +| GGOV1_Tpelec | double | s | PUBLIC | | | | Electrical power transducer time constant, sec. (>0.) | +| GGOV1_maxerr | double | | PUBLIC | | | | Maximum value for speed error signal | +| GGOV1_minerr | double | | PUBLIC | | | | Minimum value for speed error signal | +| GGOV1_Kpgov | double | | PUBLIC | | | | Governor proportional gain | +| GGOV1_Kigov | double | | PUBLIC | | | | Governor integral gain | +| GGOV1_Kdgov | double | | PUBLIC | | | | Governor derivative gain | +| GGOV1_Tdgov | double | s | PUBLIC | | | | Governor derivative controller time constant, sec. | +| GGOV1_vmax | double | | PUBLIC | | | | Maximum valve position limit | +| GGOV1_vmin | double | | PUBLIC | | | | Minimum valve position limit | +| GGOV1_Tact | double | | PUBLIC | | | | Actuator time constant | +| GGOV1_Kturb | double | | PUBLIC | | | | Turbine gain (>0.) | +| GGOV1_wfnl | double | pu | PUBLIC | | | | No load fuel flow, p.u | +| GGOV1_Tb | double | s | PUBLIC | | | | Turbine lag time constant, sec. (>0.) | +| GGOV1_Tc | double | s | PUBLIC | | | | Turbine lead time constant, sec. | +| GGOV1_Fuel_lag | int32 | | PUBLIC | | | | Switch for fuel source characteristic, = 0 for fuel flow independent of speed, = 1 fuel flow proportional to speed | +| GGOV1_Teng | double | | PUBLIC | | | | Transport lag time constant for diesel engine | +| GGOV1_Tfload | double | | PUBLIC | | | | Load Limiter time constant, sec. (>0.) | +| GGOV1_Kpload | double | | PUBLIC | | | | Load limiter proportional gain for PI controller | +| GGOV1_Kiload | double | | PUBLIC | | | | Load limiter integral gain for PI controller | +| GGOV1_Ldref | double | pu | PUBLIC | | | | Load limiter reference value p.u. | +| GGOV1_Dm | double | pu | PUBLIC | | | | Speed sensitivity coefficient, p.u. | +| GGOV1_ropen | double | pu/s | PUBLIC | | | | Maximum valve opening rate, p.u./sec. | +| GGOV1_rclose | double | pu/s | PUBLIC | | | | Minimum valve closing rate, p.u./sec. | +| GGOV1_Kimw | double | | PUBLIC | | | | Power controller (reset) gain | +| GGOV1_Pmwset | double | MW | PUBLIC | | | | Power controller setpoint, MW | +| GGOV1_aset | double | pu/s | PUBLIC | | | | Acceleration limiter setpoint, p.u. / sec. | +| GGOV1_Ka | double | | PUBLIC | | | | Acceleration limiter Gain | +| GGOV1_Ta | double | s | PUBLIC | | | | Acceleration limiter time constant, sec. (>0.) | +| GGOV1_db | double | | PUBLIC | | | | Speed governor dead band | +| GGOV1_Tsa | double | s | PUBLIC | | | | Temperature detection lead time constant, sec. | +| GGOV1_Tsb | double | s | PUBLIC | | | | Temperature detection lag time constant, sec. | +| GGOV1_Load_Limit_enable | bool | | PUBLIC | | | | Enables/disables load limiter (fsrt) of low-value-select | +| GGOV1_Acceleration_Limit_enable | bool | | PUBLIC | | | | Enables/disables acceleration limiter (fsra) of low-value-select | +| GGOV1_PID_enable | bool | | PUBLIC | | | | Enables/disables PID controller (fsrn) of low-value-select | +| GGOV1_fsrt | double | | PUBLIC | | | | Load limiter block input to low-value-select | +| GGOV1_fsra | double | | PUBLIC | | | | Acceleration limiter block input to low-value-select | +| GGOV1_fsrn | double | | PUBLIC | | | | PID block input to low-value-select | +| GGOV1_speed_error | double | pu | PUBLIC | | | | Speed difference in per-unit for input to PID controller | +| GGOV1_x1 | double | | PUBLIC | | | | | +| GGOV1_x2 | double | | PUBLIC | | | | | +| GGOV1_x2a | double | | PUBLIC | | | | | +| GGOV1_x3 | double | | PUBLIC | | | | | +| GGOV1_x3a | double | | PUBLIC | | | | | +| GGOV1_x4 | double | | PUBLIC | | | | | +| GGOV1_x4a | double | | PUBLIC | | | | | +| GGOV1_x4b | double | | PUBLIC | | | | | +| GGOV1_x5 | double | | PUBLIC | | | | | +| GGOV1_x5a | double | | PUBLIC | | | | | +| GGOV1_x5b | double | | PUBLIC | | | | | +| GGOV1_x6 | double | | PUBLIC | | | | | +| GGOV1_x7 | double | | PUBLIC | | | | | +| GGOV1_x7a | double | | PUBLIC | | | | | +| GGOV1_x8 | double | | PUBLIC | | | | | +| GGOV1_x8a | double | | PUBLIC | | | | | +| GGOV1_x9 | double | | PUBLIC | | | | | +| GGOV1_x9a | double | | PUBLIC | | | | | +| GGOV1_x10 | double | | PUBLIC | | | | | +| GGOV1_x10a | double | | PUBLIC | | | | | +| GGOV1_x10b | double | | PUBLIC | | | | | +| GGOV1_ValveStroke | double | | PUBLIC | | | | | +| GGOV1_FuelFlow | double | | PUBLIC | | | | | +| GGOV1_GovOutPut | double | | PUBLIC | | | | | +| GGOV1_RselectValue | double | | PUBLIC | | | | | +| GGOV1_fsrtNoLim | double | | PUBLIC | | | | | +| GGOV1_err2 | double | | PUBLIC | | | | | +| GGOV1_err2a | double | | PUBLIC | | | | | +| GGOV1_err3 | double | | PUBLIC | | | | | +| GGOV1_err4 | double | | PUBLIC | | | | | +| GGOV1_err7 | double | | PUBLIC | | | | | +| GGOV1_LowValSelect1 | double | | PUBLIC | | | | | +| GGOV1_LowValSelect | double | | PUBLIC | | | | | +| P_CONSTANT_Tpelec | double | s | PUBLIC | | | | Electrical power transducer time constant, sec. (>0.) | +| P_CONSTANT_Tact | double | | PUBLIC | | | | Actuator time constant | +| P_CONSTANT_Kturb | double | | PUBLIC | | | | Turbine gain (>0.) | +| P_CONSTANT_wfnl | double | pu | PUBLIC | | | | No load fuel flow, p.u | +| P_CONSTANT_Tb | double | s | PUBLIC | | | | Turbine lag time constant, sec. (>0.) | +| P_CONSTANT_Tc | double | s | PUBLIC | | | | Turbine lead time constant, sec. | +| P_CONSTANT_Teng | double | | PUBLIC | | | | Transport lag time constant for diesel engine | +| P_CONSTANT_ropen | double | pu/s | PUBLIC | | | | Maximum valve opening rate, p.u./sec. | +| P_CONSTANT_rclose | double | pu/s | PUBLIC | | | | Minimum valve closing rate, p.u./sec. | +| P_CONSTANT_Kimw | double | | PUBLIC | | | | Power controller (reset) gain | +| P_CONSTANT_x1 | double | | PUBLIC | | | | | +| P_CONSTANT_x4 | double | | PUBLIC | | | | | +| P_CONSTANT_x4a | double | | PUBLIC | | | | | +| P_CONSTANT_x4b | double | | PUBLIC | | | | | +| P_CONSTANT_x5 | double | | PUBLIC | | | | | +| P_CONSTANT_x5a | double | | PUBLIC | | | | | +| P_CONSTANT_x5b | double | | PUBLIC | | | | | +| P_CONSTANT_x_Pconstant | double | | PUBLIC | | | | | +| P_CONSTANT_err4 | double | | PUBLIC | | | | | +| P_CONSTANT_ValveStroke | double | | PUBLIC | | | | | +| P_CONSTANT_FuelFlow | double | | PUBLIC | | | | | +| P_CONSTANT_GovOutPut | double | | PUBLIC | | | | | +| fuelEmissionCal | bool | | PUBLIC | | | | Boolean value indicating whether fuel and emission calculations are used or not | +| outputEnergy | double | | PUBLIC | | | | Total energy(kWh) output from the generator | +| FuelUse | double | | PUBLIC | | | | Total fuel usage (gal) based on kW power output | +| efficiency | double | | PUBLIC | | | | Total energy output per fuel usage (kWh/gal) | +| CO2_emission | double | | PUBLIC | | | | Total CO2 emissions (lbs) based on fule usage | +| SOx_emission | double | | PUBLIC | | | | Total SOx emissions (lbs) based on fule usage | +| NOx_emission | double | | PUBLIC | | | | Total NOx emissions (lbs) based on fule usage | +| PM10_emission | double | | PUBLIC | | | | Total PM-10 emissions (lbs) based on fule usage | +| frequency_deviation | double | | PUBLIC | | | | Frequency deviation of diesel_dg | +| frequency_deviation_energy | double | | PUBLIC | | | | Frequency deviation accumulation of diesel_dg | +| frequency_deviation_max | double | | PUBLIC | | | | Frequency deviation of diesel_dg | +| realPowerChange | double | | PUBLIC | | | | Real power output change of diesel_dg | +| ratio_f_p | double | | PUBLIC | | | | Ratio of frequency deviation to real power output change of diesel_dg | +| phases | set | | PUBLIC | CHARSET | S N C B A | | Specifies which phases to connect to - currently not supported and assumes three-phase connection | + +### windturb_dg + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| Gen_status | enumeration | | PUBLIC | | ONLINE OFFLINE | | Generator is currently available to supply power | +| Gen_type | enumeration | | PUBLIC | | SYNCHRONOUS INDUCTION | | Standard synchronous generator; is also used to 'fake' a doubly-fed induction generator for now | +| Gen_mode | enumeration | | PUBLIC | | CONSTANTPQ CONSTANTP CONSTANTE | | Maintains the real and reactive output at the terminals - currently unsupported | +| Turbine_Model | enumeration | | PUBLIC | | BERGEY_10kW GE_25MW VESTAS_V82 USER_DEFINED GENERIC_IND_LARGE GENERIC_IND_MID GENERIC_IND_SMALL GENERIC_SYNCH_LARGE GENERIC_SYNCH_MID GENERIC_SYNCH_SMALL | | Sets all defaults to represent the power output of a Bergey 10kW turbine | +| turbine_height | double | m | PUBLIC | | | | Describes the height of the wind turbine hub above the ground | +| roughness_length_factor | double | | PUBLIC | | | | European Wind Atlas unitless correction factor for adjusting wind speed at various heights above ground and terrain types, default=0.055 | +| blade_diam | double | m | PUBLIC | | | | Diameter of blades | +| blade_diameter | double | m | PUBLIC | | | | Diameter of blades | +| cut_in_ws | double | m/s | PUBLIC | | | | Minimum wind speed for generator operation | +| cut_out_ws | double | m/s | PUBLIC | | | | Maximum wind speed for generator operation | +| ws_rated | double | m/s | PUBLIC | | | | Rated wind speed for generator operation | +| ws_maxcp | double | m/s | PUBLIC | | | | Wind speed at which generator reaches maximum Cp | +| Cp_max | double | pu | PUBLIC | | | | Maximum coefficient of performance | +| Cp_rated | double | pu | PUBLIC | | | | Rated coefficient of performance | +| Cp | double | pu | PUBLIC | | | | Calculated coefficient of performance | +| Rated_VA | double | VA | PUBLIC | | | | Rated generator power output | +| Rated_V | double | V | PUBLIC | | | | Rated generator terminal voltage | +| Pconv | double | W | PUBLIC | | | | Amount of electrical power converted from mechanical power delivered | +| P_converted | double | W | PUBLIC | | | | Amount of electrical power converted from mechanical power delivered | +| GenElecEff | double | % | PUBLIC | | | | Calculated generator electrical efficiency | +| generator_efficiency | double | % | PUBLIC | | | | Calculated generator electrical efficiency | +| TotalRealPow | double | W | PUBLIC | | | | Total real power output | +| total_real_power | double | W | PUBLIC | | | | Total real power output | +| TotalReacPow | double | VA | PUBLIC | | | | Total reactive power output | +| total_reactive_power | double | VA | PUBLIC | | | | Total reactive power output | +| power_A | complex | VA | PUBLIC | | | | Total complex power injected on phase A | +| power_B | complex | VA | PUBLIC | | | | Total complex power injected on phase B | +| power_C | complex | VA | PUBLIC | | | | Total complex power injected on phase C | +| WSadj | double | m/s | PUBLIC | | | | Speed of wind at hub height | +| wind_speed_adjusted | double | m/s | PUBLIC | | | | Speed of wind at hub height | +| Wind_Speed | double | m/s | PUBLIC | | | | Wind speed at 5-15m level (typical measurement height) | +| wind_speed | double | m/s | PUBLIC | | | | Wind speed at 5-15m level (typical measurement height) | +| air_density | double | kg/m^3 | PUBLIC | | | | Estimated air density | +| R_stator | double | pu*Ohm | PUBLIC | | | | Induction generator primary stator resistance in p.u. | +| X_stator | double | pu*Ohm | PUBLIC | | | | Induction generator primary stator reactance in p.u. | +| R_rotor | double | pu*Ohm | PUBLIC | | | | Induction generator primary rotor resistance in p.u. | +| X_rotor | double | pu*Ohm | PUBLIC | | | | Induction generator primary rotor reactance in p.u. | +| R_core | double | pu*Ohm | PUBLIC | | | | Induction generator primary core resistance in p.u. | +| X_magnetic | double | pu*Ohm | PUBLIC | | | | Induction generator primary core reactance in p.u. | +| Max_Vrotor | double | pu*V | PUBLIC | | | | Induction generator maximum induced rotor voltage in p.u., e.g. 1.2 | +| Min_Vrotor | double | pu*V | PUBLIC | | | | Induction generator minimum induced rotor voltage in p.u., e.g. 0.8 | +| Rs | double | pu*Ohm | PUBLIC | | | | Synchronous generator primary stator resistance in p.u. | +| Xs | double | pu*Ohm | PUBLIC | | | | Synchronous generator primary stator reactance in p.u. | +| Rg | double | pu*Ohm | PUBLIC | | | | Synchronous generator grounding resistance in p.u. | +| Xg | double | pu*Ohm | PUBLIC | | | | Synchronous generator grounding reactance in p.u. | +| Max_Ef | double | pu*V | PUBLIC | | | | Synchronous generator maximum induced rotor voltage in p.u., e.g. 0.8 | +| Min_Ef | double | pu*V | PUBLIC | | | | Synchronous generator minimum induced rotor voltage in p.u., e.g. 0.8 | +| pf | double | pu | PUBLIC | | | | Desired power factor in CONSTANTP mode (can be modified over time) | +| power_factor | double | pu | PUBLIC | | | | Desired power factor in CONSTANTP mode (can be modified over time) | +| voltage_A | complex | V | PUBLIC | | | | Terminal voltage on phase A | +| voltage_B | complex | V | PUBLIC | | | | Terminal voltage on phase B | +| voltage_C | complex | V | PUBLIC | | | | Terminal voltage on phase C | +| current_A | complex | A | PUBLIC | | | | Calculated terminal current on phase A | +| current_B | complex | A | PUBLIC | | | | Calculated terminal current on phase B | +| current_C | complex | A | PUBLIC | | | | Calculated terminal current on phase C | +| EfA | complex | V | PUBLIC | | | | Synchronous generator induced voltage on phase A | +| EfB | complex | V | PUBLIC | | | | Synchronous generator induced voltage on phase B | +| EfC | complex | V | PUBLIC | | | | Synchronous generator induced voltage on phase C | +| Vrotor_A | complex | V | PUBLIC | | | | Induction generator induced voltage on phase A in p.u. | +| Vrotor_B | complex | V | PUBLIC | | | | Induction generator induced voltage on phase B in p.u. | +| Vrotor_C | complex | V | PUBLIC | | | | Induction generator induced voltage on phase C in p.u. | +| Irotor_A | complex | V | PUBLIC | | | | Induction generator induced current on phase A in p.u. | +| Irotor_B | complex | V | PUBLIC | | | | Induction generator induced current on phase B in p.u. | +| Irotor_C | complex | V | PUBLIC | | | | Induction generator induced current on phase C in p.u. | +| phases | set | | PUBLIC | CHARSET | S N C B A | | Specifies which phases to connect to - currently not supported and assumes three-phase connection | + +### power_electronics + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| generator_mode | enumeration | | PUBLIC | | SUPPLY_DRIVEN CONSTANT_PF CONSTANT_PQ CONSTANT_V UNKNOWN | | | +| generator_status | enumeration | | PUBLIC | | ONLINE OFFLINE | | | +| converter_type | enumeration | | PUBLIC | | CURRENT_SOURCED VOLTAGE_SOURCED | | | +| switch_type | enumeration | | PUBLIC | | DARLINGTON IBJT JFET SCR MOSFET BJT IDEAL_SWITCH | | | +| filter_type | enumeration | | PUBLIC | | BAND_PASS BAND_STOP HIGH_PASS LOW_PASS | | | +| filter_implementation | enumeration | | PUBLIC | | PARALLEL_RESONANT SERIES_RESONANT INDUCTIVE CAPACITVE IDEAL_FILTER | | | +| filter_frequency | enumeration | | PUBLIC | | F240HZ F180HZ F120HZ | | | +| power_type | enumeration | | PUBLIC | | DC AC | | | +| Rated_kW | double | kW | PUBLIC | | | | | +| Max_P | double | kW | PUBLIC | | | | | +| Min_P | double | kW | PUBLIC | | | | | +| Rated_kVA | double | kVA | PUBLIC | | | | | +| Rated_kV | double | kV | PUBLIC | | | | | +| phases | set | | PUBLIC | CHARSET | S N C B A | | | + +### energy_storage + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| generator_mode | enumeration | | PUBLIC | | SUPPLY_DRIVEN CONSTANT_PF CONSTANT_PQ CONSTANT_V UNKNOWN | | | +| generator_status | enumeration | | PUBLIC | | ONLINE OFFLINE | | | +| power_type | enumeration | | PUBLIC | | DC AC | | | +| Rinternal | double | | PUBLIC | | | | | +| V_Max | double | V | PUBLIC | | | | | +| I_Max | complex | A | PUBLIC | | | | | +| E_Max | double | | PUBLIC | | | | | +| Energy | double | | PUBLIC | | | | | +| efficiency | double | | PUBLIC | | | | | +| Rated_kVA | double | kVA | PUBLIC | | | | | +| V_Out | complex | V | PUBLIC | | | | | +| I_Out | complex | A | PUBLIC | | | | | +| VA_Out | complex | VA | PUBLIC | | | | | +| V_In | complex | V | PUBLIC | | | | | +| I_In | complex | A | PUBLIC | | | | | +| V_Internal | complex | V | PUBLIC | | | | | +| I_Internal | complex | A | PUBLIC | | | | | +| I_Prev | complex | A | PUBLIC | | | | | +| phases | set | | PUBLIC | CHARSET | S N C B A | | | + +### inverter + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| inverter_type | enumeration | | PUBLIC | | FOUR_QUADRANT PWM TWELVE_PULSE SIX_PULSE TWO_PULSE | | LEGACY MODEL: Sets efficiencies and other parameters; if using four_quadrant_control_mode, set this to FOUR_QUADRANT | +| four_quadrant_control_mode | enumeration | | PUBLIC | | VOLTAGE_SOURCE GROUP_LOAD_FOLLOWING LOAD_FOLLOWING VOLT_VAR_FREQ_PWR VOLT_VAR CONSTANT_PF CONSTANT_PQ NONE | | FOUR QUADRANT MODEL: Activates various control modes | +| pf_reg | enumeration | | PUBLIC | | EXCLUDED INCLUDED_ALT INCLUDED | | Activate (or not) power factor regulation in four_quadrant_control_mode | +| generator_status | enumeration | | PUBLIC | | ONLINE OFFLINE | | describes whether the generator is online or offline | +| generator_mode | enumeration | | PUBLIC | | SUPPLY_DRIVEN CONSTANT_PF CONSTANT_PQ CONSTANT_V UNKNOWN | | LEGACY MODEL: Selects generator control mode when using legacy model; in non-legacy models, this should be SUPPLY_DRIVEN. | +| inverter_convergence_criterion | double | | PUBLIC | | | | The maximum change in error threshold for exitting deltamode. | +| V_In | complex | V | PUBLIC | | | | DC voltage | +| I_In | complex | A | PUBLIC | | | | DC current | +| VA_In | complex | VA | PUBLIC | | | | DC power | +| VA_Out | complex | VA | PUBLIC | | | | AC power | +| Vdc | double | V | PUBLIC | | | | LEGACY MODEL: DC voltage | +| phaseA_V_Out | complex | V | PUBLIC | | | | AC voltage on A phase in three-phase system; 240-V connection on a triplex system | +| phaseB_V_Out | complex | V | PUBLIC | | | | AC voltage on B phase in three-phase system | +| phaseC_V_Out | complex | V | PUBLIC | | | | AC voltage on C phase in three-phase system | +| phaseA_I_Out | complex | V | PUBLIC | | | | AC current on A phase in three-phase system; 240-V connection on a triplex system | +| phaseB_I_Out | complex | V | PUBLIC | | | | AC current on B phase in three-phase system | +| phaseC_I_Out | complex | V | PUBLIC | | | | AC current on C phase in three-phase system | +| power_A | complex | VA | PUBLIC | | | | AC power on A phase in three-phase system; 240-V connection on a triplex system | +| power_B | complex | VA | PUBLIC | | | | AC power on B phase in three-phase system | +| power_C | complex | VA | PUBLIC | | | | AC power on C phase in three-phase system | +| curr_VA_out_A | complex | VA | PUBLIC | | | | AC power on A phase in three-phase system; 240-V connection on a triplex system | +| curr_VA_out_B | complex | VA | PUBLIC | | | | AC power on B phase in three-phase system | +| curr_VA_out_C | complex | VA | PUBLIC | | | | AC power on C phase in three-phase system | +| prev_VA_out_A | complex | VA | PUBLIC | | | | AC power on A phase in three-phase system; 240-V connection on a triplex system | +| prev_VA_out_B | complex | VA | PUBLIC | | | | AC power on B phase in three-phase system | +| prev_VA_out_C | complex | VA | PUBLIC | | | | AC power on C phase in three-phase system | +| P_Out | double | VA | PUBLIC | | | | FOUR QUADRANT MODEL: Scheduled real power out in CONSTANT_PQ control mode | +| Q_Out | double | VAr | PUBLIC | | | | FOUR QUADRANT MODEL: Schedule reactive power out in CONSTANT_PQ control mode | +| power_in | double | W | PUBLIC | | | | LEGACY MODEL: No longer used | +| rated_power | double | VA | PUBLIC | | | | FOUR QUADRANT MODEL: The rated power of the inverter | +| rated_battery_power | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: The rated power of battery when battery is attached | +| inverter_efficiency | double | | PUBLIC | | | | FOUR QUADRANT MODEL: The efficiency of the inverter | +| battery_soc | double | pu | PUBLIC | | | | FOUR QUADRANT MODEL: The state of charge of an attached battery | +| soc_reserve | double | pu | PUBLIC | | | | FOUR QUADRANT MODEL: The reserve state of charge of an attached battery for islanding cases | +| power_factor | double | unit | PUBLIC | | | | FOUR QUADRANT MODEL: The power factor used for CONSTANT_PF control mode | +| islanded_state | bool | | PUBLIC | | | | FOUR QUADRANT MODEL: Boolean used to let control modes to act under island conditions | +| nominal_frequency | double | Hz | PUBLIC | | | | | +| Pref | double | | PUBLIC | | | | DELTAMODE: The real power reference. | +| Qref | double | | PUBLIC | | | | DELTAMODE: The reactive power reference. | +| kpd | double | | PUBLIC | | | | DELTAMODE: The d-axis integration gain for the current modulation PI controller. | +| kpq | double | | PUBLIC | | | | DELTAMODE: The q-axis integration gain for the current modulation PI controller. | +| kid | double | | PUBLIC | | | | DELTAMODE: The d-axis proportional gain for the current modulation PI controller. | +| kiq | double | | PUBLIC | | | | DELTAMODE: The q-axis proportional gain for the current modulation PI controller. | +| kdd | double | | PUBLIC | | | | DELTAMODE: The d-axis differentiator gain for the current modulation PID controller | +| kdq | double | | PUBLIC | | | | DELTAMODE: The q-axis differentiator gain for the current modulation PID controller | +| epA | double | | PUBLIC | | | | DELTAMODE: The real current error for phase A or triplex phase. | +| epB | double | | PUBLIC | | | | DELTAMODE: The real current error for phase B. | +| epC | double | | PUBLIC | | | | DELTAMODE: The real current error for phase C. | +| eqA | double | | PUBLIC | | | | DELTAMODE: The reactive current error for phase A or triplex phase. | +| eqB | double | | PUBLIC | | | | DELTAMODE: The reactive current error for phase B. | +| eqC | double | | PUBLIC | | | | DELTAMODE: The reactive current error for phase C. | +| delta_epA | double | | PUBLIC | | | | DELTAMODE: The change in real current error for phase A or triplex phase. | +| delta_epB | double | | PUBLIC | | | | DELTAMODE: The change in real current error for phase B. | +| delta_epC | double | | PUBLIC | | | | DELTAMODE: The change in real current error for phase C. | +| delta_eqA | double | | PUBLIC | | | | DELTAMODE: The change in reactive current error for phase A or triplex phase. | +| delta_eqB | double | | PUBLIC | | | | DELTAMODE: The change in reactive current error for phase B. | +| delta_eqC | double | | PUBLIC | | | | DELTAMODE: The change in reactive current error for phase C. | +| mdA | double | | PUBLIC | | | | DELTAMODE: The d-axis current modulation for phase A or triplex phase. | +| mdB | double | | PUBLIC | | | | DELTAMODE: The d-axis current modulation for phase B. | +| mdC | double | | PUBLIC | | | | DELTAMODE: The d-axis current modulation for phase C. | +| mqA | double | | PUBLIC | | | | DELTAMODE: The q-axis current modulation for phase A or triplex phase. | +| mqB | double | | PUBLIC | | | | DELTAMODE: The q-axis current modulation for phase B. | +| mqC | double | | PUBLIC | | | | DELTAMODE: The q-axis current modulation for phase C. | +| delta_mdA | double | | PUBLIC | | | | DELTAMODE: The change in d-axis current modulation for phase A or triplex phase. | +| delta_mdB | double | | PUBLIC | | | | DELTAMODE: The change in d-axis current modulation for phase B. | +| delta_mdC | double | | PUBLIC | | | | DELTAMODE: The change in d-axis current modulation for phase C. | +| delta_mqA | double | | PUBLIC | | | | DELTAMODE: The change in q-axis current modulation for phase A or triplex phase. | +| delta_mqB | double | | PUBLIC | | | | DELTAMODE: The change in q-axis current modulation for phase B. | +| delta_mqC | double | | PUBLIC | | | | DELTAMODE: The change in q-axis current modulation for phase C. | +| IdqA | complex | | PUBLIC | | | | DELTAMODE: The dq-axis current for phase A or triplex phase. | +| IdqB | complex | | PUBLIC | | | | DELTAMODE: The dq-axis current for phase B. | +| IdqC | complex | | PUBLIC | | | | DELTAMODE: The dq-axis current for phase C. | +| Tfreq_delay | double | | PUBLIC | | | | DELTAMODE: The time constant for delayed frequency seen by the inverter | +| inverter_droop_fp | bool | | PUBLIC | | | | DELTAMODE: Boolean used to indicate whether inverter f/p droop is included or not | +| R_fp | double | | PUBLIC | | | | DELTAMODE: The droop parameter of the f/p droop | +| Tvol_delay | double | | PUBLIC | | | | DELTAMODE: The time constant for delayed voltage seen by the inverter | +| inverter_droop_vq | bool | | PUBLIC | | | | DELTAMODE: Boolean used to indicate whether inverter q/v droop is included or not | +| R_vq | double | | PUBLIC | | | | DELTAMODE: The droop parameter of the v/q droop | +| Tp_delay | double | | PUBLIC | | | | DELTAMODE: The time constant for delayed real power seen by the VSI droop controller | +| Tq_delay | double | | PUBLIC | | | | DELTAMODE: The time constant for delayed reactive power seen by the VSI droop controller | +| VSI_Rfilter | complex | pu | PUBLIC | | | | VSI filter resistance (p.u.) | +| VSI_Xfilter | complex | pu | PUBLIC | | | | VSI filter inductance (p.u.) | +| VSI_mode | enumeration | | PUBLIC | | VSI_DROOP VSI_ISOCHRONOUS | | VSI MODEL: Selects VSI mode for either isochronous or droop one | +| VSI_freq | double | | PUBLIC | | | | VSI frequency | +| ki_Vterminal | double | | PUBLIC | | | | DELTAMODE: The integrator gain for the VSI terminal voltage modulation | +| kp_Vterminal | double | | PUBLIC | | | | DELTAMODE: The proportional gain for the VSI terminal voltage modulation | +| enable_ramp_rates_real | bool | | PUBLIC | | | | DELTAMODE: Boolean used to indicate whether inverter ramp rate is enforced or not | +| max_ramp_up_real | double | W/s | PUBLIC | | | | DELTAMODE: The real power ramp up rate limit | +| max_ramp_down_real | double | W/s | PUBLIC | | | | DELTAMODE: The real power ramp down rate limit | +| enable_ramp_rates_reactive | bool | | PUBLIC | | | | DELTAMODE: Boolean used to indicate whether inverter ramp rate is enforced or not | +| max_ramp_up_reactive | double | VAr/s | PUBLIC | | | | DELTAMODE: The reactive power ramp up rate limit | +| max_ramp_down_reactive | double | VAr/s | PUBLIC | | | | DELTAMODE: The reactive power ramp down rate limit | +| dynamic_model_mode | enumeration | | PUBLIC | | PI PID | | DELTAMODE: Underlying model to use for deltamode control | +| enable_1547_checks | bool | | PUBLIC | | | | DELTAMODE: Enable IEEE 1547-2003 disconnect checking | +| reconnect_time | double | s | PUBLIC | | | | DELTAMODE: Time delay after IEEE 1547-2003 violation clears before resuming generation | +| inverter_1547_status | bool | | PUBLIC | | | | DELTAMODE: Indicator if the inverter is curtailed due to a 1547 violation or not | +| IEEE_1547_version | enumeration | | PUBLIC | | IEEE1547A IEEE1547 NONE | | DELTAMODE: Version of IEEE 1547 to use to populate defaults | +| over_freq_high_cutout | double | Hz | PUBLIC | | | | DELTAMODE: OF2 set point for IEEE 1547a | +| over_freq_high_disconenct_time | double | s | PUBLIC | | | | DELTAMODE: OF2 clearing time for IEEE1547a | +| over_freq_low_cutout | double | Hz | PUBLIC | | | | DELTAMODE: OF1 set point for IEEE 1547a | +| over_freq_low_disconenct_time | double | s | PUBLIC | | | | DELTAMODE: OF1 clearing time for IEEE 1547a | +| under_freq_high_cutout | double | Hz | PUBLIC | | | | DELTAMODE: UF2 set point for IEEE 1547a | +| under_freq_high_disconenct_time | double | s | PUBLIC | | | | DELTAMODE: UF2 clearing time for IEEE1547a | +| under_freq_low_cutout | double | Hz | PUBLIC | | | | DELTAMODE: UF1 set point for IEEE 1547a | +| under_freq_low_disconenct_time | double | s | PUBLIC | | | | DELTAMODE: UF1 clearing time for IEEE 1547a | +| under_voltage_low_cutout | double | pu | PUBLIC | | | | Lowest voltage threshold for undervoltage | +| under_voltage_middle_cutout | double | pu | PUBLIC | | | | Middle-lowest voltage threshold for undervoltage | +| under_voltage_high_cutout | double | pu | PUBLIC | | | | High value of low voltage threshold for undervoltage | +| over_voltage_low_cutout | double | pu | PUBLIC | | | | Lowest voltage value for overvoltage | +| over_voltage_high_cutout | double | pu | PUBLIC | | | | High voltage value for overvoltage | +| under_voltage_low_disconnect_time | double | s | PUBLIC | | | | Lowest voltage clearing time for undervoltage | +| under_voltage_middle_disconnect_time | double | s | PUBLIC | | | | Middle-lowest voltage clearing time for undervoltage | +| under_voltage_high_disconnect_time | double | s | PUBLIC | | | | Highest voltage clearing time for undervoltage | +| over_voltage_low_disconnect_time | double | s | PUBLIC | | | | Lowest voltage clearing time for overvoltage | +| over_voltage_high_disconnect_time | double | s | PUBLIC | | | | Highest voltage clearing time for overvoltage | +| IEEE_1547_trip_method | enumeration | | PUBLIC | | OVER_VOLTAGE_HIGH OVER_VOLTAGE_LOW UNDER_VOLTAGE_HIGH UNDER_VOLTAGE_MID UNDER_VOLTAGE_LOW UNDER_FREQUENCY_LOW UNDER_FREQUENCY_HIGH OVER_FREQUENCY_LOW OVER_FREQUENCY_HIGH NONE | | High over-voltage level trip | +| phases | set | | PUBLIC | CHARSET | S N C B A | | The phases the inverter is attached to | +| use_multipoint_efficiency | bool | | PUBLIC | | | | FOUR QUADRANT MODEL: boolean to used the multipoint efficiency curve for the inverter when solar is attached | +| inverter_manufacturer | enumeration | | PUBLIC | | XANTREX SMA FRONIUS NONE | | MULTIPOINT EFFICIENCY MODEL: the manufacturer of the inverter to setup up pre-existing efficiency curves | +| maximum_dc_power | double | | PUBLIC | | | | MULTIPOINT EFFICIENCY MODEL: the maximum dc power point for the efficiency curve | +| maximum_dc_voltage | double | | PUBLIC | | | | MULTIPOINT EFFICIENCY MODEL: the maximum dc voltage point for the efficiency curve | +| minimum_dc_power | double | | PUBLIC | | | | MULTIPOINT EFFICIENCY MODEL: the minimum dc power point for the efficiency curve | +| c_0 | double | | PUBLIC | | | | MULTIPOINT EFFICIENCY MODEL: the first coefficient in the efficienty curve | +| c_1 | double | | PUBLIC | | | | MULTIPOINT EFFICIENCY MODEL: the second coefficient in the efficienty curve | +| c_2 | double | | PUBLIC | | | | MULTIPOINT EFFICIENCY MODEL: the third coefficient in the efficienty curve | +| c_3 | double | | PUBLIC | | | | MULTIPOINT EFFICIENCY MODEL: the fourth coefficient in the efficienty curve | +| sense_object | object | | PUBLIC | | | | FOUR QUADRANT MODEL: name of the object the inverter is trying to mitigate the load on (node/link) in LOAD_FOLLOWING | +| max_charge_rate | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: maximum rate the battery can be charged in LOAD_FOLLOWING | +| max_discharge_rate | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: maximum rate the battery can be discharged in LOAD_FOLLOWING | +| charge_on_threshold | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: power level at which the inverter should try charging the battery in LOAD_FOLLOWING | +| charge_off_threshold | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: power level at which the inverter should cease charging the battery in LOAD_FOLLOWING | +| discharge_on_threshold | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: power level at which the inverter should try discharging the battery in LOAD_FOLLOWING | +| discharge_off_threshold | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: power level at which the inverter should cease discharging the battery in LOAD_FOLLOWING | +| excess_input_power | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: Excess power at the input of the inverter that is otherwise just lost, or could be shunted to a battery | +| charge_lockout_time | double | s | PUBLIC | | | | FOUR QUADRANT MODEL: Lockout time when a charging operation occurs before another LOAD_FOLLOWING dispatch operation can occur | +| discharge_lockout_time | double | s | PUBLIC | | | | FOUR QUADRANT MODEL: Lockout time when a discharging operation occurs before another LOAD_FOLLOWING dispatch operation can occur | +| pf_reg_activate | double | | PUBLIC | | | | FOUR QUADRANT MODEL: Lowest acceptable power-factor level below which power-factor regulation will activate. | +| pf_reg_deactivate | double | | PUBLIC | | | | FOUR QUADRANT MODEL: Lowest acceptable power-factor above which no power-factor regulation is needed. | +| pf_target | double | | PUBLIC | | | | FOUR QUADRANT MODEL: Desired power-factor to maintain (signed) positive is inductive | +| pf_reg_high | double | | PUBLIC | | | | FOUR QUADRANT MODEL: Upper limit for power-factor - if exceeds, go full reverse reactive | +| pf_reg_low | double | | PUBLIC | | | | FOUR QUADRANT MODEL: Lower limit for power-factor - if exceeds, stop regulating - pf_target_var is below this | +| pf_reg_activate_lockout_time | double | s | PUBLIC | | | | FOUR QUADRANT MODEL: Mandatory pause between the deactivation of power-factor regulation and it reactivation | +| disable_volt_var_if_no_input_power | bool | | PUBLIC | | | | | +| delay_time | double | s | PUBLIC | | | | | +| max_var_slew_rate | double | VAr/s | PUBLIC | | | | | +| max_pwr_slew_rate | double | W/s | PUBLIC | | | | | +| volt_var_sched | char1024 | | PUBLIC | | | | | +| freq_pwr_sched | char1024 | | PUBLIC | | | | | +| charge_threshold | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: Level at which all inverters in the group will begin charging attached batteries. Regulated minimum load level. | +| discharge_threshold | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: Level at which all inverters in the group will begin discharging attached batteries. Regulated maximum load level. | +| group_max_charge_rate | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: Sum of the charge rates of the batteries involved in the group load-following. | +| group_max_discharge_rate | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: Sum of the discharge rates of the batteries involved in the group load-following. | +| group_rated_power | double | W | PUBLIC | | | | FOUR QUADRANT MODEL: Sum of the inverter power ratings of the inverters involved in the group power-factor regulation. | +| V_base | double | V | PUBLIC | | | | FOUR QUADRANT MODEL: The base voltage on the grid side of the inverter. Used in VOLT_VAR control mode. | +| V1 | double | pu | PUBLIC | | | | FOUR QUADRANT MODEL: voltage point 1 in volt/var curve. Used in VOLT_VAR control mode. | +| Q1 | double | pu | PUBLIC | | | | FOUR QUADRANT MODEL: VAR point 1 in volt/var curve. Used in VOLT_VAR control mode. | +| V2 | double | pu | PUBLIC | | | | FOUR QUADRANT MODEL: voltage point 2 in volt/var curve. Used in VOLT_VAR control mode. | +| Q2 | double | pu | PUBLIC | | | | FOUR QUADRANT MODEL: VAR point 2 in volt/var curve. Used in VOLT_VAR control mode. | +| V3 | double | pu | PUBLIC | | | | FOUR QUADRANT MODEL: voltage point 3 in volt/var curve. Used in VOLT_VAR control mode. | +| Q3 | double | pu | PUBLIC | | | | FOUR QUADRANT MODEL: VAR point 3 in volt/var curve. Used in VOLT_VAR control mode. | +| V4 | double | pu | PUBLIC | | | | FOUR QUADRANT MODEL: voltage point 4 in volt/var curve. Used in VOLT_VAR control mode. | +| Q4 | double | pu | PUBLIC | | | | FOUR QUADRANT MODEL: VAR point 4 in volt/var curve. Used in VOLT_VAR control mode. | +| volt_var_control_lockout | double | s | PUBLIC | | | | FOUR QUADRANT QUADRANT MODEL: the lockout time between volt/var actions. | + +### dc_dc_converter + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| dc_dc_converter_type | enumeration | | PUBLIC | | BUCK_BOOST BOOST BUCK | | | +| generator_mode | enumeration | | PUBLIC | | SUPPLY_DRIVEN CONSTANT_PF CONSTANT_PQ CONSTANT_V UNKNOWN | | | +| V_Out | complex | V | PUBLIC | | | | | +| I_Out | complex | A | PUBLIC | | | | | +| Vdc | complex | V | PUBLIC | | | | | +| VA_Out | complex | VA | PUBLIC | | | | | +| P_Out | double | | PUBLIC | | | | | +| Q_Out | double | | PUBLIC | | | | | +| service_ratio | double | | PUBLIC | | | | | +| V_In | complex | V | PUBLIC | | | | | +| I_In | complex | A | PUBLIC | | | | | +| VA_In | complex | VA | PUBLIC | | | | | +| phases | set | | PUBLIC | CHARSET | S N C B A | | | + +### rectifier + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| rectifier_type | enumeration | | PUBLIC | | TWELVE_PULSE SIX_PULSE THREE_PULSE TWO_PULSE ONE_PULSE | | | +| generator_mode | enumeration | | PUBLIC | | SUPPLY_DRIVEN CONSTANT_PF CONSTANT_PQ CONSTANT_V UNKNOWN | | | +| V_Out | complex | V | PUBLIC | | | | | +| V_Rated | double | V | PUBLIC | | | | | +| I_Out | complex | A | PUBLIC | | | | | +| VA_Out | complex | VA | PUBLIC | | | | | +| P_Out | double | | PUBLIC | | | | | +| Q_Out | double | | PUBLIC | | | | | +| Vdc | complex | V | PUBLIC | | | | | +| voltage_A | complex | V | PUBLIC | | | | | +| voltage_B | complex | V | PUBLIC | | | | | +| voltage_C | complex | V | PUBLIC | | | | | +| current_A | complex | V | PUBLIC | | | | | +| current_B | complex | V | PUBLIC | | | | | +| current_C | complex | V | PUBLIC | | | | | +| power_A_In | complex | VA | PUBLIC | | | | | +| power_B_In | complex | VA | PUBLIC | | | | | +| power_C_In | complex | VA | PUBLIC | | | | | +| phases | set | | PUBLIC | CHARSET | S N C B A | | | + +### microturbine + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| generator_mode | enumeration | | PUBLIC | | SUPPLY_DRIVEN CONSTANT_PF CONSTANT_PQ CONSTANT_V UNKNOWN | | | +| generator_status | enumeration | | PUBLIC | | ONLINE OFFLINE | | | +| power_type | enumeration | | PUBLIC | | DC AC | | | +| Rinternal | double | | PUBLIC | | | | | +| Rload | double | | PUBLIC | | | | | +| V_Max | double | V | PUBLIC | | | | | +| I_Max | complex | A | PUBLIC | | | | | +| frequency | double | Hz | PUBLIC | | | | | +| Max_Frequency | double | Hz | PUBLIC | | | | | +| Min_Frequency | double | Hz | PUBLIC | | | | | +| Fuel_Used | double | kVA | PUBLIC | | | | | +| Heat_Out | double | kVA | PUBLIC | | | | | +| KV | double | | PUBLIC | | | | | +| Power_Angle | double | | PUBLIC | | | | | +| Max_P | double | kW | PUBLIC | | | | | +| Min_P | double | kW | PUBLIC | | | | | +| phaseA_V_Out | complex | kV | PUBLIC | | | | | +| phaseB_V_Out | complex | kV | PUBLIC | | | | | +| phaseC_V_Out | complex | kV | PUBLIC | | | | | +| phaseA_I_Out | complex | A | PUBLIC | | | | | +| phaseB_I_Out | complex | A | PUBLIC | | | | | +| phaseC_I_Out | complex | A | PUBLIC | | | | | +| power_A_Out | complex | | PUBLIC | | | | | +| power_B_Out | complex | | PUBLIC | | | | | +| power_C_Out | complex | | PUBLIC | | | | | +| VA_Out | complex | | PUBLIC | | | | | +| pf_Out | double | | PUBLIC | | | | | +| E_A_Internal | complex | | PUBLIC | | | | | +| E_B_Internal | complex | | PUBLIC | | | | | +| E_C_Internal | complex | | PUBLIC | | | | | +| efficiency | double | | PUBLIC | | | | | +| Rated_kVA | double | kVA | PUBLIC | | | | | +| phases | set | | PUBLIC | CHARSET | S N C B A | | | + +### battery + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| generator_mode | enumeration | | PUBLIC | | POWER_VOLTAGE_HYBRID VOLTAGE_CONTROLLED POWER_DRIVEN SUPPLY_DRIVEN CONSTANT_PF CONSTANT_PQ CONSTANT_V UNKNOWN | UNKNOWN | LEGACY MODEL: Selects generator control mode when using legacy model; in non-legacy models, this should be SUPPLY_DRIVEN. | +| additional_controls | enumeration | | PUBLIC | | LINEAR_TEMPERATURE NONE | NONE | LEGACY MODEL: In conjunction with POWER_DRIVEN, VOLTAGE_CONTROLLED, and POWER_VOLTAGE_HYBRID, this will activate control set points that adjust with temperature | +| generator_status | enumeration | | PUBLIC | | ONLINE OFFLINE | ONLINE | describes whether the generator is online or offline | +| rfb_size | enumeration | | PUBLIC | | LARGE MED_HIGH_ENERGY MED_COMMERCIAL SMALL HOUSEHOLD | | Default settings for certain sizes of batteries | +| power_type | enumeration | | PUBLIC | | DC AC | | LEGACY MODEL: Not currently used | +| battery_state | enumeration | | PUBLIC | | CONFLICTED EMPTY FULL WAITING DISCHARGING CHARGING | | Describes the current state of the battery | +| number_battery_state_changes | double | | PUBLIC | | | | LEGACY MODEL: Number of times battery switches between charging and discharging | +| monitored_power | double | W | PUBLIC | | | | LEGACY MODEL: output only; power output value of parent meter when performing load following modes (POWER_DRIVEN) | +| power_set_high | double | W | PUBLIC | | | | LEGACY MODEL: high set point of dead band for load following (POWER_DRIVEN) | +| power_set_low | double | W | PUBLIC | | | | LEGACY MODEL: low set point of dead band for load following (POWER_DRIVEN) | +| power_set_high_highT | double | W | PUBLIC | | | | LEGACY MODEL: high set point of dead band for load following at higher temperatures (POWER_DRIVEN + LINEAR_TEMPERATURE) | +| power_set_low_highT | double | W | PUBLIC | | | | LEGACY MODEL: low set point of dead band for load following at higher temperatures (POWER_DRIVEN + LINEAR_TEMPERATURE) | +| check_power_low | double | W | PUBLIC | | | | LEGACY MODEL: high set point of dead band for load following at lower temperatures (POWER_DRIVEN + LINEAR_TEMPERATURE) | +| check_power_high | double | W | PUBLIC | | | | LEGACY MODEL: low set point of dead band for load following at lower temperatures (POWER_DRIVEN + LINEAR_TEMPERATURE) | +| voltage_set_high | double | V | PUBLIC | | | | LEGACY MODEL: high set point for voltage control | +| voltage_set_low | double | V | PUBLIC | | | | LEGACY MODEL: low set point for voltage control | +| deadband | double | V | PUBLIC | | | 0 V | LEGACY MODEL: voltage deadband | +| sensitivity | double | | PUBLIC | | | | LEGACY MODEL: describes how sensitive the control is to temperature excursions; defines slope of linear control | +| high_temperature | double | degF | PUBLIC | | | 100 degF | LEGACY MODEL: high temperature of linear control; defines slope | +| midpoint_temperature | double | degF | PUBLIC | | | 50 degF | LEGACY MODEL: midpoint temperature of linear control; defines slope | +| low_temperature | double | degF | PUBLIC | | | 0 degF | LEGACY MODEL: low temperature of linear control; defines slope | +| scheduled_power | double | W | PUBLIC | | | | LEGACY MODEL: real power output of battery/inverter system | +| Rinternal | double | Ohm | PUBLIC | | | 10 Ohm | LEGACY MODEL: the internal resistance of the battery. | +| V_Max | double | V | PUBLIC | | | 0 V | LEGACY MODEL: the maximum terminal voltage of the battery. | +| I_Max | complex | A | PUBLIC | | | 0 A | LEGACY MODEL: the maximum current output of the battery. | +| E_Max | double | Wh | PUBLIC | | | 0 Wh | LEGACY MODEL: the maximum capacity of the battery. | +| P_Max | double | W | PUBLIC | | | 0 W | LEGACY MODEL: the maximum power output of the battery. | +| power_factor | double | | PUBLIC | | | | LEGACY MODEL: the power factor output of the battery. | +| Energy | double | Wh | PUBLIC | | | -1 | LEGACY MODEL: the available capacity of the battery. | +| efficiency | double | unit | PUBLIC | | | 0 unit | LEGACY MODEL: the efficiency of the battery. | +| base_efficiency | double | unit | PUBLIC | | | 0 unit | LEGACY MODEL: the efficiency of the battery at rated voltaged and current. | +| parasitic_power_draw | double | W | PUBLIC | | | 0 W | LEGACY MODEL: the parasytic power draw of the battery when idle. | +| Rated_kVA | double | kVA | PUBLIC | DEPRECATED | | 1 kVA | LEGACY MODEL: the rated power of the battery. | +| V_Out | complex | V | PUBLIC | | | | LEGACY MODEL: the AC voltage at the terminals of the battery. | +| I_Out | complex | A | PUBLIC | | | | LEGACY MODEL: the AC current output of the battery. | +| VA_Out | complex | VA | PUBLIC | | | | LEGACY MODEL: the power output of the battery. | +| V_In | complex | V | PUBLIC | | | | LEGACY MODEL: the voltage at the terminals of the battery. | +| I_In | complex | A | PUBLIC | | | | LEGACY MODEL: the current flowing into the battery of the battery. | +| V_Internal | complex | V | PUBLIC | | | | LEGACY MODEL: the internal voltage of the battery. | +| I_Internal | complex | A | PUBLIC | | | | LEGACY MODEL: the internal current of the battery. | +| I_Prev | complex | A | PUBLIC | | | | LEGACY MODEL: the previous current output of the battery. | +| power_transferred | double | | PUBLIC | | | | LEGACY MODEL: the power output of the battery. | +| use_internal_battery_model | bool | | PUBLIC | | | FALSE | Enables the INTERNAL BATTERY MODEL. | +| battery_type | enumeration | | PUBLIC | | LEAD_ACID LI_ION UNKNOWN | | INTERNAL BATTERY MODEL: the type of the battery. Used to determine the soc vs voltage curve. | +| nominal_voltage | double | V | PUBLIC | | | | INTERNAL BATTERY MODEL: the rated DC voltage at the terminals of the battery. | +| rated_power | double | W | PUBLIC | | | | INTERNAL BATTERY MODEL: the rated power output of the battery. | +| battery_capacity | double | Wh | PUBLIC | | | | INTERNAL BATTERY MODEL: the rated battery capacity of the battery. | +| round_trip_efficiency | double | pu | PUBLIC | | | | INTERNAL BATTERY MODEL: the round trip efficiency of the battery according to a full discharge/charge cycle. | +| state_of_charge | double | pu | PUBLIC | | | -1 pu | INTERNAL BATTERY MODEL: the current state of charge of the battery. | +| battery_load | double | W | PUBLIC | | | | INTERNAL BATTERY MODEL: the current power output of the battery. | +| reserve_state_of_charge | double | pu | PUBLIC | | | 0 pu | INTERNAL BATTERY MODEL: the reserve state of charge the battery can reach. | + +### solar + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| generator_mode | enumeration | | PUBLIC | | SUPPLY_DRIVEN CONSTANT_PF CONSTANT_PQ CONSTANT_V UNKNOWN | | | +| generator_status | enumeration | | PUBLIC | | ONLINE OFFLINE | | | +| panel_type | enumeration | | PUBLIC | | CONCENTRATOR THIN_FILM_GA_AS AMORPHOUS_SILICON MULTI_CRYSTAL_SILICON SINGLE_CRYSTAL_SILICON | | | +| power_type | enumeration | | PUBLIC | | DC AC | | | +| INSTALLATION_TYPE | enumeration | | PUBLIC | | GROUND_MOUNTED ROOF_MOUNTED | | | +| SOLAR_TILT_MODEL | enumeration | | PUBLIC | | PLAYERVALUE SOLPOS DEFAULT | DEFAULT | solar tilt model used to compute insolation values | +| SOLAR_POWER_MODEL | enumeration | | PUBLIC | | FLATPLATE DEFAULT | DEFAULT | | +| a_coeff | double | | PUBLIC | | | -2.81 | a coefficient for module temperature correction formula | +| b_coeff | double | s/m | PUBLIC | | | -0.0455 s/m | b coefficient for module temperature correction formula | +| dT_coeff | double | m^2*degC/kW | PUBLIC | | | 0 m^2*degC/kW | Temperature difference coefficient for module temperature correction formula | +| T_coeff | double | %/degC | PUBLIC | | | -0.5 %/degC | Maximum power temperature coefficient for module temperature correction formula | +| NOCT | double | degF | PUBLIC | | | 118.4 degF | Nominal operating cell temperature NOCT in deg F | +| Tmodule | double | degF | PUBLIC | | | | Temperature of PV module | +| Tambient | double | degC | PUBLIC | | | 25 degC | Ambient temperature for cell efficiency calculations | +| wind_speed | double | mph | PUBLIC | | | 0 mph | Wind speed | +| ambient_temperature | double | degF | PUBLIC | | | 77 degF | Current ambient temperature of air from climate data | +| Insolation | double | W/sf | PUBLIC | | | 0 W/sf | | +| Rinternal | double | Ohm | PUBLIC | | | 0.05 Ohm | | +| Rated_Insolation | double | W/sf | PUBLIC | | | 92.902 W/sf | | +| Pmax_temp_coeff | double | | PUBLIC | | | | temperature coefficient of rated power in %/degC | +| Voc_temp_coeff | double | | PUBLIC | | | | | +| V_Max | complex | V | PUBLIC | | | 27.1+0i | Vmax of solar module found on specs | +| Voc_Max | complex | V | PUBLIC | | | 34+0i | Voc max of solar module | +| Voc | complex | V | PUBLIC | | | 34+0i | | +| efficiency | double | unit | PUBLIC | | | | | +| area | double | sf | PUBLIC | | | | solar panel area | +| soiling | double | pu | PUBLIC | | | 0.95 pu | Soiling of array factor - representing dirt on array | +| derating | double | pu | PUBLIC | | | 0.95 pu | Panel derating to account for manufacturing variances | +| Tcell | double | degC | PUBLIC | | | 69.8 degF | | +| Rated_kVA | double | kVA | PUBLIC | DEPRECATED | | | This variable has issues with inconsistent handling in the code, so we will deprecate this in the future (VA maps to kVA, for example). | +| rated_power | double | W | PUBLIC | | | | Used to define the size of the solar panel in power rather than square footage. | +| P_Out | complex | kW | PUBLIC | | | | | +| V_Out | complex | V | PUBLIC | | | | | +| I_Out | complex | A | PUBLIC | | | | | +| VA_Out | complex | VA | PUBLIC | | | | | +| weather | object | | PUBLIC | | | | | +| shading_factor | double | pu | PUBLIC | | | 1 pu | Shading factor for scaling solar power to the array | +| tilt_angle | double | deg | PUBLIC | | | 45 deg | Tilt angle of PV array | +| orientation_azimuth | double | deg | PUBLIC | | | 180 deg | Facing direction of the PV array | +| latitude_angle_fix | bool | | PUBLIC | | | FALSE | Fix tilt angle to installation latitude value | +| orientation | enumeration | | PUBLIC | | FIXED_AXIS DEFAULT | DEFAULT | | +| phases | set | | PUBLIC | RECALC|CHARSET|EXTENDED|DEPRECATED|REQUIRED|OUTPUT|DYNAMIC | S N C B A | | | + +### central_dg_control + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| controlled_dgs | char32 | | PUBLIC | | | | the group ID of the dg objects the controller controls. | +| feederhead_meter | object | | PUBLIC | | | | the name of the meter. | +| control_mode_0 | enumeration | | PUBLIC | | PEAK_SHAVING CONSTANT_PF NO_CONTROL | | | +| control_mode_1 | enumeration | | PUBLIC | | PEAK_SHAVING CONSTANT_PF NO_CONTROL | | | +| control_mode_2 | enumeration | | PUBLIC | | PEAK_SHAVING CONSTANT_PF NO_CONTROL | | | +| control_mode_3 | enumeration | | PUBLIC | | PEAK_SHAVING CONSTANT_PF NO_CONTROL | | | +| peak_S | double | W | PUBLIC | | | | | +| pf_low | double | unit | PUBLIC | | | | | +| pf_high | double | unit | PUBLIC | | | | | + +### controller_dg + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| groupid_dg | char32 | | PUBLIC | | | | the group ID of the dg objects the controller controls. | +| ki | double | | PUBLIC | | | | parameter of the propotional control | +| kp | double | | PUBLIC | | | | parameter of the integral control | +| gain | double | | PUBLIC | | | | Gain of the controller | +| ki_QV | double | | PUBLIC | | | | parameter of the propotional control for secondary voltage control | +| kp_QV | double | | PUBLIC | | | | parameter of the integral control for secondary voltage control | +| gain_QV | double | | PUBLIC | | | | Gain of the controller for secondary voltage control | + +### industrial + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| naics_code | int32 | | PUBLIC | REQUIRED | | 0 | NAICS facility code | +| power_pf | double | | PUBLIC | | | 1.0 | power factor for constant power load | +| impedance_pf | double | | PUBLIC | | | 1.0 | power factor for constant impedance load | +| operating_factor | double | pu | PUBLIC | | | | fraction of facility power capacity that is operating | +| operating_capacity | double | MW | PUBLIC | | | | facility power when operating at full capacity | +| total_power | double | W | PUBLIC | OUTPUT | | 0 MW | total facility power demand | + +### database + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| username | char32 | | PUBLIC | | | | user name | +| password | char32 | | PUBLIC | | | | user password | +| hostname | char256 | | PUBLIC | | | | server hostname | +| port | int32 | | PUBLIC | | | | TCP port number | +| database | char256 | | PUBLIC | | | | database name | +| options | set | | PUBLIC | | OVERWRITE NEWDB NOCREATE SHOWQUERY NONE | | destroy existing files before output dump/backup results (risky) | +| sync_interval | double | s | PUBLIC | | | | interval at which on_sync is called | +| tz_offset | int32 | | PUBLIC | | | | timezone offset used by timestamp in the database | +| uses_dst | bool | | PUBLIC | | | | timestamps in database include summer time offsets | +| logname | char32 | | PUBLIC | | | | name of log table | +| logtag | method | | PUBLIC | | | | property tag add method | + +### recorder + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| trigger | char32 | | PUBLIC | | | | condition to trigger recorder | +| file | char1024 | | PUBLIC | REQUIRED | | | file in which to record data | +| filetype | char8 | | PUBLIC | | | | file type to use when storing data | +| mode | char32 | | PUBLIC | | | file | recorder operating mode | +| multifile | char1024 | | PUBLIC | | | | | +| limit | int32 | | PUBLIC | | | 0 | limit on number of rows to record (0=none) | +| plotcommands | char1024 | | PUBLIC | | | | | +| xdata | char32 | | PUBLIC | | | | | +| columns | char32 | | PUBLIC | | | | | +| flush | int32 | | PUBLIC | | | -1 | row flush mode (-1=when full, 0=every row, >0=interval in seconds) | +| format | bool | | PUBLIC | | | 0 | | +| interval | double | s | PUBLIC | | | -1 s | sampling interval | +| strftime_format | char256 | | PUBLIC | | | | date/time format | +| property | method | | PUBLIC | REQUIRED | | | list of properties to sample | +| output | enumeration | | PUBLIC | | SVG PNG PDF JPG GIF EPS SCREEN | | | +| header_units | enumeration | | PUBLIC | | NONE ALL DEFAULT | DEFAULT | header option for output of units | +| line_units | enumeration | | PUBLIC | | NONE ALL DEFAULT | DEFAULT | inline option for output of units | + +### auction + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| unit | char32 | | PUBLIC | | | | unit of quantity | +| period | double | s | PUBLIC | | | | interval of time between market clearings | +| latency | double | s | PUBLIC | | | | latency between market clearing and delivery | +| market_id | int64 | | REFERENCE | | | | unique identifier of market clearing | +| network | object | | PUBLIC | | | | the comm network used by object to talk to the market (if any) | +| verbose | bool | | PUBLIC | | | | enable verbose auction operations | +| linkref | object | | PUBLIC | DEPRECATED | | | reference to link object that has demand as power_out (only used when not all loads are bidding) | +| pricecap | double | | PUBLIC | DEPRECATED | | | the maximum price (magnitude) allowed | +| price_cap | double | | PUBLIC | | | | the maximum price (magnitude) allowed | +| special_mode | enumeration | | PUBLIC | | BUYERS_ONLY SELLERS_ONLY NONE | | | +| statistic_mode | enumeration | | PUBLIC | | OFF ON | | | +| fixed_price | double | | PUBLIC | | | | | +| fixed_quantity | double | | PUBLIC | | | | | +| capacity_reference_object | object | | PUBLIC | | | | | +| capacity_reference_property | char32 | | PUBLIC | | | | | +| capacity_reference_bid_price | double | | PUBLIC | | | | | +| max_capacity_reference_bid_quantity | double | | PUBLIC | | | | | +| capacity_reference_bid_quantity | double | | PUBLIC | | | | | +| init_price | double | | PUBLIC | | | | | +| init_stdev | double | | PUBLIC | | | | | +| future_mean_price | double | | PUBLIC | | | | | +| use_future_mean_price | bool | | PUBLIC | | | | | +| current_market.start_time | timestamp | | PUBLIC | | | | | +| current_market.end_time | timestamp | | PUBLIC | | | | | +| current_market.clearing_price | double | $ | PUBLIC | | | | | +| current_market.clearing_quantity | double | | PUBLIC | | | | | +| current_market.clearing_type | enumeration | | PUBLIC | | NULL FAILURE EXACT MARGINAL_PRICE MARGINAL_BUYER MARGINAL_SELLER | | | +| current_market.marginal_quantity_load | double | | PUBLIC | | | | | +| current_market.marginal_quantity | double | | PUBLIC | | | | | +| current_market.marginal_quantity_bid | double | | PUBLIC | | | | | +| current_market.marginal_quantity_frac | double | | PUBLIC | | | | | +| current_market.seller_total_quantity | double | | PUBLIC | | | | | +| current_market.buyer_total_quantity | double | | PUBLIC | | | | | +| current_market.seller_min_price | double | | PUBLIC | | | | | +| current_market.buyer_total_unrep | double | | PUBLIC | | | | | +| current_market.cap_ref_unrep | double | | PUBLIC | | | | | +| next_market.start_time | timestamp | | PUBLIC | | | | | +| next_market.end_time | timestamp | | PUBLIC | | | | | +| next_market.clearing_price | double | $ | PUBLIC | | | | | +| next_market.clearing_quantity | double | | PUBLIC | | | | | +| next_market.clearing_type | enumeration | | PUBLIC | | NULL FAILURE EXACT MARGINAL_PRICE MARGINAL_BUYER MARGINAL_SELLER | | | +| next_market.marginal_quantity_load | double | | PUBLIC | | | | | +| next_market.marginal_quantity_bid | double | | PUBLIC | | | | | +| next_market.marginal_quantity_frac | double | | PUBLIC | | | | | +| next_market.seller_total_quantity | double | | PUBLIC | | | | | +| next_market.buyer_total_quantity | double | | PUBLIC | | | | | +| next_market.seller_min_price | double | | PUBLIC | | | | | +| next_market.cap_ref_unrep | double | | PUBLIC | | | | | +| past_market.start_time | timestamp | | PUBLIC | | | | | +| past_market.end_time | timestamp | | PUBLIC | | | | | +| past_market.clearing_price | double | $ | PUBLIC | | | | | +| past_market.clearing_quantity | double | | PUBLIC | | | | | +| past_market.clearing_type | enumeration | | PUBLIC | | NULL FAILURE EXACT MARGINAL_PRICE MARGINAL_BUYER MARGINAL_SELLER | | | +| past_market.marginal_quantity_load | double | | PUBLIC | | | | | +| past_market.marginal_quantity_bid | double | | PUBLIC | | | | | +| past_market.marginal_quantity_frac | double | | PUBLIC | | | | | +| past_market.seller_total_quantity | double | | PUBLIC | | | | | +| past_market.buyer_total_quantity | double | | PUBLIC | | | | | +| past_market.seller_min_price | double | | PUBLIC | | | | | +| past_market.cap_ref_unrep | double | | PUBLIC | | | | | +| margin_mode | enumeration | | PUBLIC | | PROB DENY NORMAL | | | +| warmup | int32 | | PUBLIC | | | | | +| ignore_failed_market | enumeration | | PUBLIC | | TRUE FALSE | | | +| ignore_pricecap | enumeration | | PUBLIC | | TRUE FALSE | | | +| transaction_log_file | char256 | | PUBLIC | | | | | +| transaction_log_limit | int32 | | PUBLIC | | | | | +| curve_log_file | char256 | | PUBLIC | | | | | +| curve_log_limit | int32 | | PUBLIC | | | | | +| curve_log_info | enumeration | | PUBLIC | | EXTRA NORMAL | | | + +### controller + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| simple_mode | enumeration | | PUBLIC | | DOUBLE_RAMP WATERHEATER HOUSE_PRECOOL HOUSE_PREHEAT HOUSE_COOL HOUSE_HEAT NONE | | | +| bid_mode | enumeration | | PUBLIC | | PROXY OFF ON | | | +| use_override | enumeration | | PUBLIC | | ON OFF | | | +| ramp_low | double | degF | PUBLIC | | | | the comfort response below the setpoint | +| ramp_high | double | degF | PUBLIC | | | | the comfort response above the setpoint | +| range_low | double | | PUBLIC | | | | the setpoint limit on the low side | +| range_high | double | | PUBLIC | | | | the setpoint limit on the high side | +| target | char32 | | PUBLIC | | | | the observed property (e.g., air temperature) | +| setpoint | char32 | | PUBLIC | | | | the controlled property (e.g., heating setpoint) | +| demand | char32 | | PUBLIC | | | | the controlled load when on | +| load | char32 | | PUBLIC | | | | the current controlled load | +| total | char32 | | PUBLIC | | | | the uncontrolled load (if any) | +| market | char32 | | PUBLIC | | | | the market to bid into | +| state | char32 | | PUBLIC | | | | the state property of the controlled load | +| avg_target | char32 | | PUBLIC | | | | | +| std_target | char32 | | PUBLIC | | | | | +| bid_price | double | | REFERENCE | | | | the bid price | +| bid_quantity | double | | REFERENCE | | | | the bid quantity | +| set_temp | double | degF | REFERENCE | | | | the reset value | +| base_setpoint | double | degF | PUBLIC | | | | | +| market_price | double | | PUBLIC | | | | the current market clearing price seen by the controller. | +| period | double | s | PUBLIC | | | | interval of time between market clearings | +| control_mode | enumeration | | PUBLIC | | DEV_LEVEL DOUBLE_RAMP RAMP | | | +| resolve_mode | enumeration | | PUBLIC | | SLIDING DEADBAND | | | +| slider_setting | double | | PUBLIC | | | | | +| slider_setting_heat | double | | PUBLIC | | | | | +| slider_setting_cool | double | | PUBLIC | | | | | +| override | char32 | | PUBLIC | | | | | +| heating_range_high | double | degF | PUBLIC | | | | | +| heating_range_low | double | degF | PUBLIC | | | | | +| heating_ramp_high | double | | PUBLIC | | | | | +| heating_ramp_low | double | | PUBLIC | | | | | +| cooling_range_high | double | degF | PUBLIC | | | | | +| cooling_range_low | double | degF | PUBLIC | | | | | +| cooling_ramp_high | double | | PUBLIC | | | | | +| cooling_ramp_low | double | | PUBLIC | | | | | +| heating_base_setpoint | double | degF | PUBLIC | | | | | +| cooling_base_setpoint | double | degF | PUBLIC | | | | | +| deadband | char32 | | PUBLIC | | | | | +| heating_setpoint | char32 | | PUBLIC | | | | | +| heating_demand | char32 | | PUBLIC | | | | | +| cooling_setpoint | char32 | | PUBLIC | | | | | +| cooling_demand | char32 | | PUBLIC | | | | | +| sliding_time_delay | double | s | PUBLIC | | | | time interval desired for the sliding resolve mode to change from cooling or heating to off | +| use_predictive_bidding | bool | | PUBLIC | | | | | +| device_actively_engaged | double | | PUBLIC | | | | | +| cleared_market | int32 | | PUBLIC | | | | | +| locked | int32 | | PUBLIC | | | | | +| p_ON | double | | PUBLIC | | | | | +| p_OFF | double | | PUBLIC | | | | | +| p_ONLOCK | double | | PUBLIC | | | | | +| p_OFFLOCK | double | | PUBLIC | | | | | +| delta_u | double | | PUBLIC | | | | | +| regulation_market_on | char32 | | PUBLIC | | | | the willing to change state from ON->OFF market to bid into for regulation case | +| regulation_market_off | char32 | | PUBLIC | | | | the willing to change state from OFF->ON market to bid into for regulation case | +| fast_regulation_signal | double | s | PUBLIC | | | | the regulation signal that the controller compares against (i.e., how often is there a control action | +| market_price_on | double | | PUBLIC | | | | the current market clearing price seen by the controller in ON->OFF regulation market | +| market_price_off | double | | PUBLIC | | | | the current market clearing price seen by the controller in OFF->ON regulation market | +| period_on | double | s | PUBLIC | | | | interval of time between market clearings in ON->OFF regulation market | +| period_off | double | s | PUBLIC | | | | interval of time between market clearings in OFF->ON regulation market | +| regulation_period | int32 | | PUBLIC | | | | fast regulation signal period | +| r1 | double | | PUBLIC | | | | temporary diagnostic variable | +| mu0 | double | | PUBLIC | | | | temporary diagnostic variable | +| mu1 | double | | PUBLIC | | | | temporary diagnostic variable | +| average_target | char32 | | PUBLIC | | | | | +| standard_deviation_target | char32 | | PUBLIC | | | | | +| bid_id | int64 | | PUBLIC | | | | | +| bid_delay | int32 | | PUBLIC | | | | | +| thermostat_state | char32 | | PUBLIC | | | | The name of the thermostat state property within the object being controlled | +| proxy_average | double | | PUBLIC | | | | | +| proxy_standard_deviation | double | | PUBLIC | | | | | +| proxy_market_id | int64 | | PUBLIC | | | | | +| proxy_market2_id | int64 | | PUBLIC | | | | | +| proxy_clear_price | double | $ | PUBLIC | | | | | +| proxy_clear_price2 | double | $ | PUBLIC | | | | | +| proxy_price_cap | double | | PUBLIC | | | | | +| proxy_price_cap2 | double | | PUBLIC | | | | | +| proxy_market_unit | char32 | | PUBLIC | | | | | +| proxy_initial_price | double | | PUBLIC | | | | | +| proxy_marginal_fraction | double | | PUBLIC | | | | | +| proxy_marginal_fraction2 | double | | PUBLIC | | | | | +| proxy_clearing_quantity | double | | PUBLIC | | | | | +| proxy_clearing_quantity2 | double | | PUBLIC | | | | | +| proxy_seller_total_quantity | double | | PUBLIC | | | | | +| proxy_seller_total_quantity2 | double | | PUBLIC | | | | | +| proxy_margin_mode | enumeration | | PUBLIC | | PROB DENY NORMAL | | | +| proxy_clearing_type | enumeration | | PUBLIC | | NULL FAILURE EXACT MARGINAL_PRICE MARGINAL_BUYER MARGINAL_SELLER | | | +| proxy_clearing_type2 | enumeration | | PUBLIC | | NULL FAILURE EXACT MARGINAL_PRICE MARGINAL_BUYER MARGINAL_SELLER | | | + +### stubauction + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| unit | char32 | | PUBLIC | | | | unit of quantity | +| period | double | s | PUBLIC | | | | interval of time between market clearings | +| last.P | double | | PUBLIC | | | | last cleared price | +| current_market.clearing_price | double | | PUBLIC | | | | next cleared price | +| past_market.clearing_price | double | | PUBLIC | | | | last cleared price | +| next.P | double | | PUBLIC | | | | next cleared price | +| avg24 | double | | PUBLIC | | | | daily average of price | +| std24 | double | | PUBLIC | | | | daily stdev of price | +| avg72 | double | | PUBLIC | | | | three day price average | +| std72 | double | | PUBLIC | | | | three day price stdev | +| avg168 | double | | PUBLIC | | | | weekly average of price | +| std168 | double | | PUBLIC | | | | weekly stdev of price | +| market_id | int64 | | REFERENCE | | | | unique identifier of market clearing | +| verbose | bool | | PUBLIC | | | | enable verbose stubauction operations | +| control_mode | enumeration | | PUBLIC | | DISABLED NORMAL | | the control mode to use for determining average and deviation calculations | + +### passive_controller + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| input_state | int32 | | PUBLIC | | | | | +| input_setpoint | double | | PUBLIC | | | | | +| input_chained | bool | | PUBLIC | | | | | +| observation | double | | REFERENCE | | | | the observed value | +| mean_observation | double | | REFERENCE | | | | the observed mean value | +| stdev_observation | double | | REFERENCE | | | | the observed standard deviation value | +| expectation | double | | REFERENCE | | | | the observed expected value | +| sensitivity | double | | PUBLIC | DEPRECATED | | | the sensitivity of the control actuator to observation deviations | +| period | double | s | PUBLIC | | | | the cycle period for the controller logic | +| expectation_prop | char32 | | PUBLIC | DEPRECATED | | | the name of the property to observe for the expected value | +| expectation_obj | object | | PUBLIC | DEPRECATED | | | the object to watch for the expectation property | +| expectation_property | char32 | | PUBLIC | | | | the name of the property to observe for the expected value | +| expectation_object | object | | PUBLIC | | | | the object to watch for the expectation property | +| setpoint_prop | char32 | | PUBLIC | DEPRECATED | | | the name of the setpoint property in the parent object | +| setpoint | char32 | | PUBLIC | | | | the name of the setpoint property in the parent object | +| state_prop | char32 | | PUBLIC | DEPRECATED | | | the name of the actuator property in the parent object | +| state_property | char32 | | PUBLIC | | | | the name of the actuator property in the parent object | +| observation_obj | object | | PUBLIC | DEPRECATED | | | the object to observe | +| observation_prop | char32 | | PUBLIC | DEPRECATED | | | the name of the observation property | +| observation_object | object | | PUBLIC | | | | the object to observe | +| observation_property | char32 | | PUBLIC | | | | the name of the observation property | +| mean_observation_prop | char32 | | PUBLIC | DEPRECATED | | | the name of the mean observation property | +| stdev_observation_prop | char32 | | PUBLIC | DEPRECATED | | | the name of the standard deviation observation property | +| stdev_observation_property | char32 | | PUBLIC | | | | the name of the standard deviation observation property | +| cycle_length | int32 | | PUBLIC | DEPRECATED | | | length of time between processing cycles | +| base_setpoint | double | | PUBLIC | | | | the base setpoint to base control off of | +| critical_day | double | | PUBLIC | | | | used to switch between TOU and CPP days, 1 is CPP, 0 is TOU | +| two_tier_cpp | bool | | PUBLIC | | | | | +| daily_elasticity | double | | PUBLIC | | | | | +| sub_elasticity_first_second | double | | PUBLIC | | | | | +| sub_elasticity_first_third | double | | PUBLIC | | | | | +| second_tier_hours | int32 | | PUBLIC | | | | | +| third_tier_hours | int32 | | PUBLIC | | | | | +| first_tier_hours | int32 | | PUBLIC | | | | | +| first_tier_price | double | | PUBLIC | | | | | +| second_tier_price | double | | PUBLIC | | | | | +| third_tier_price | double | | PUBLIC | | | | | +| old_first_tier_price | double | | PUBLIC | | | | | +| old_second_tier_price | double | | PUBLIC | | | | | +| old_third_tier_price | double | | PUBLIC | | | | | +| Percent_change_in_price | double | | PUBLIC | | | | | +| Percent_change_in_peakoffpeak_ratio | double | | PUBLIC | | | | | +| Percent_change_in_Criticalpeakoffpeak_ratio | double | | PUBLIC | | | | | +| linearize_elasticity | bool | | PUBLIC | | | | | +| price_offset | double | | PUBLIC | | | | | +| pool_pump_model | bool | | PUBLIC | | | | Boolean flag for turning on the pool pump version of the DUTYCYCLE control | +| base_duty_cycle | double | | PUBLIC | | | | This is the duty cycle before modification due to the price signal | +| trigger_time_under_frequency | int32 | | PUBLIC | | | | Time to stay in triggered off state in seconds | +| trigger_time_over_frequency | int32 | | PUBLIC | | | | Time to stay in triggered on state in seconds | +| release_time_under_frequency | int32 | | PUBLIC | | | | Time to stay in released on state in seconds | +| release_time_over_frequency | int32 | | PUBLIC | | | | Time to stay in released off state in seconds | +| release_point_under_frequency | double | | PUBLIC | | | | Frequency value for releasing GFA in under frequency mode | +| release_point_over_frequency | double | | PUBLIC | | | | Frequency value for releasing GFA in over frequency mode | +| trigger_point_under_frequency | double | | PUBLIC | | | | Frequency value for triggereing GFA in under frequency mode | +| trigger_point_over_frequency | double | | PUBLIC | | | | Frequency value for triggereing GFA in over frequency mode | +| frequency | double | | PUBLIC | | | | Frequency value | +| PFC_mode | enumeration | | PUBLIC | | OVER_UNDER_FREQUENCY UNDER_FREQUENCY OVER_FREQUENCY | | operation mode of the primary frequency controller | +| PFC_state | enumeration | | PUBLIC | | RELEASED_ON RELEASED_OFF FORCED_ON FORCED_OFF TRIGGERED_ON TRIGGERED_OFF FREE | | State of the primary frequency controller | +| state_observed | char32 | | PUBLIC | | | | the name of the observed state property in the parent object | +| power_observed | char32 | | PUBLIC | | | | the name of the observed state property in the parent object | +| output_observed | int32 | | PUBLIC | | | | | +| bid_delay | int32 | | PUBLIC | | | | time the controller will bid in advance before clearing | +| voltage_lockout | double | % | PUBLIC | | | | lockout primary frequency control if voltage is deviating % from nominal | +| voltage_lockout_time | double | s | PUBLIC | | | | voltage lockout period | +| voltage_lockout_state | int32 | | PUBLIC | | | | value to determine if water heater is in voltage lockout | +| distribution_type | enumeration | | PUBLIC | | UNIFORM EXPONENTIAL NORMAL | | | +| comfort_level | double | | PUBLIC | | | | | +| range_high | double | | PUBLIC | | | | | +| range_low | double | | PUBLIC | | | | | +| ramp_high | double | | PUBLIC | | | | | +| ramp_low | double | | PUBLIC | | | | | +| prob_off | double | | PUBLIC | | | | | +| output_state | int32 | | REFERENCE | | | | the target setpoint given the input observations | +| output_setpoint | double | | PUBLIC | | | | | +| control_mode | enumeration | | PUBLIC | | PRIMARY_FREQUENCY_CONTROL DIRECT_LOAD_CONTROL ELASTICITY_MODEL PROBABILITY_OFF DUTYCYCLE RAMP NONE | | the control mode to use for determining controller action | +| dlc_mode | enumeration | | PUBLIC | | CYCLING OFF | | this mode is roughly designed to force cycle an AC unit | +| cycle_length_off | double | s | PUBLIC | | | | | +| cycle_length_on | double | s | PUBLIC | | | | | + +### double_controller + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| thermostat_mode | enumeration | | PUBLIC | | COOL HEAT OFF INVALID | | | +| last_mode | enumeration | | REFERENCE | | COOL HEAT OFF INVALID | | | +| resolve_mode | enumeration | | PUBLIC | | STICKY DEADBAND NONE | | | +| setup_mode | enumeration | | PUBLIC | | HOUSE NONE | | | +| bid_mode | enumeration | | PUBLIC | | OFF ON | | | +| last_mode_timer | int64 | | PUBLIC | | | | | +| cool_ramp_low | double | | PUBLIC | | | | | +| cool_ramp_high | double | | PUBLIC | | | | | +| cool_range_low | double | | PUBLIC | | | | | +| cool_range_high | double | | PUBLIC | | | | | +| cool_set_base | double | | PUBLIC | | | | | +| cool_setpoint | double | | PUBLIC | | | | | +| heat_ramp_low | double | | PUBLIC | | | | | +| heat_ramp_high | double | | PUBLIC | | | | | +| heat_range_low | double | | PUBLIC | | | | | +| heat_range_high | double | | PUBLIC | | | | | +| heat_set_base | double | | PUBLIC | | | | | +| heat_setpoint | double | | PUBLIC | | | | | +| temperature_name | char32 | | PUBLIC | | | | | +| cool_setpoint_name | char32 | | PUBLIC | | | | | +| cool_demand_name | char32 | | PUBLIC | | | | | +| heat_setpoint_name | char32 | | PUBLIC | | | | | +| heat_demand_name | char32 | | PUBLIC | | | | | +| load_name | char32 | | PUBLIC | | | | | +| total_load_name | char32 | | PUBLIC | | | | | +| deadband_name | char32 | | PUBLIC | | | | | +| state_name | char32 | | PUBLIC | | | | | +| market | object | | PUBLIC | | | | the market to bid into | +| market_period | double | | PUBLIC | | | | | +| bid_price | double | | REFERENCE | | | | the bid price | +| bid_quant | double | | REFERENCE | | | | the bid quantity | +| load | char32 | | PUBLIC | | | | the current controlled load | +| total | char32 | | PUBLIC | | | | the uncontrolled load (if any) | +| last_price | double | | PUBLIC | | | | | +| temperature | double | | PUBLIC | | | | | +| cool_bid | double | | PUBLIC | | | | | +| heat_bid | double | | PUBLIC | | | | | +| cool_demand | double | | PUBLIC | | | | | +| heat_demand | double | | PUBLIC | | | | | +| price | double | | PUBLIC | | | | | +| avg_price | double | | PUBLIC | | | | | +| stdev_price | double | | PUBLIC | | | | | + +### stub_bidder + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| bid_period | double | s | PUBLIC | | | | | +| count | int16 | | PUBLIC | | | | | +| market | object | | PUBLIC | | | | | +| role | enumeration | | PUBLIC | | SELLER BUYER | | | +| price | double | | PUBLIC | | | | | +| quantity | double | | PUBLIC | | | | | +| bid_id | int64 | | PUBLIC | | | | | + +### generator_controller + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| generator_state | enumeration | | PUBLIC | | STARTING RUNNING OFF | | Current generator state | +| amortization_type | enumeration | | PUBLIC | | LINEAR_BID LINEAR_COST EXPONENTIAL | | Amortization compounding method | +| generator_state_number | int32 | | PUBLIC | | | | Current generator state as numeric value | +| market | object | | PUBLIC | | | | Market the object will watch and bid into | +| bid_curve | char1024 | | PUBLIC | | | | Bidding curve text format | +| bid_curve_file | char1024 | | PUBLIC | | | | Bidding curve file name | +| bid_generator_rating | double | VA | PUBLIC | | | | Size of generator in VA for the bid curve | +| update_curve | bool | | PUBLIC | | | | Flag to force updating of bidding curve parse | +| is_marginal_gen | bool | | PUBLIC | | | | Flag to indicate if the generator is a marginal generator | +| generator_rating | double | VA | PUBLIC | | | | Size of generator in VA for the active bid | +| generator_output | double | | PUBLIC | | | | Current real power output of generator | +| input_unit_base | double | MW | PUBLIC | | | | Base multiplier for generator bid units | +| startup_cost | double | $ | PUBLIC | | | | Cost to start the generator from OFF status | +| shutdown_cost | double | $ | PUBLIC | | | | Cost to shut down the generator prematurely | +| minimum_runtime | double | s | PUBLIC | | | | Minimum time the generator should run to avoid shutdown cost | +| minimum_downtime | double | s | PUBLIC | | | | Minimum down time for the generator before it can bid again | +| capacity_factor | double | | PUBLIC | | | | Calculation of generator's current capacity factor based on the market period | +| amortization_factor | double | 1/s | PUBLIC | | | | Exponential decay factor in 1/s for shutdown cost repayment | +| bid_delay | double | | PUBLIC | | | | Time before a market closes to bid | +| generator_attachment | enumeration | | PUBLIC | | BUILDING STANDALONE | | Generator attachment type - determines interactions | +| building_load_curr | double | | PUBLIC | | | | Present building load value (if BUILDING attachment) | +| building_load_bid | double | | PUBLIC | | | | Expected building load value for currently bidding market period (if BUILDING attachment) | +| year_runtime_limit | double | h | PUBLIC | | | | Total number of hours the generator can run in a year | +| current_year_runtime | double | h | PUBLIC | | | | Total number of hours generator has run this year | +| runtime_year_end | char1024 | | PUBLIC | | | | Date and time the generator runtime year resets | +| scaling_factor | double | unit | PUBLIC | | | | scaling factor applied to license premium calculation | +| license_premium | double | | PUBLIC | | | | current value of the generator license premium calculated | +| hours_in_year | double | h | PUBLIC | | | | Number of hours assumed for the total year | +| op_and_maint_cost | double | $ | PUBLIC | | | | Operation and maintenance cost per runtime year | +| bid_id | int64 | | PUBLIC | | | | | + +### supervisory_control + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| unit | char32 | | PUBLIC | | | | unit of quantity | +| period | double | s | PUBLIC | | | | interval of time between market clearings | +| market_id | int32 | | REFERENCE | | | | unique identifier of market clearing | +| nominal_frequency | double | Hz | PUBLIC | | | | nominal frequency | +| droop | double | % | PUBLIC | | | | droop value for the supervisor | +| frequency_deadband | double | Hz | PUBLIC | | | | frequency deadband for assigning trigger frequencies | +| PFC_mode | enumeration | | PUBLIC | | OVER_UNDER_FREQUENCY UNDER_FREQUENCY OVER_FREQUENCY | | operation mode of the primary frequency controller | +| bid_sort_mode | enumeration | | PUBLIC | | VOLTAGE_EXTREMES VOLTAGE_DEVIAION_FROM_NOMINAL POWER_DECREASING POWER_INCREASING NONE | | Determines how the bids into the market is sorted to contruct the PF curve | + +### simple + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| objective | char1024 | | PUBLIC | | | | Optimization objective value | +| variable | char1024 | | PUBLIC | | | | Optimization decision variables | +| constraint | char1024 | | PUBLIC | | | | Optimization constraints | +| delta | double | | PUBLIC | | | | Change applied to decision variable | +| epsilon | double | | PUBLIC | | | | Precision of objective value | +| trials | int32 | | PUBLIC | | | | Limits on number of trials | +| goal | enumeration | | PUBLIC | | MAXIMUM MINIMUM EXTREMUM | EXTREMUM | Optimization objective goal | + +### powerflow_object + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| phases | set | | PUBLIC | CHARSET|REQUIRED | A B C D N S G | | phases to which this object is connected | +| nominal_voltage | double | V | PUBLIC | REQUIRED | | | nominal voltage for this object | +| supernode_name | char1024 | | PUBLIC | | | | | + +### powerflow_library + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | + +### node + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| bustype | enumeration | | PUBLIC | | SWING_PQ SWING PV PQ | PQ | defines whether the node is a PQ, PV, or SWING node | +| busflags | set | | PUBLIC | | ISSOURCE HASSOURCE | HASSOURCE | flag indicates node has a source for voltage, i.e. connects to the swing node | +| reference_bus | object | | PUBLIC | | | | reference bus from which frequency is defined | +| maximum_voltage_error | double | V | PUBLIC | | | 0 V | convergence voltage limit or convergence criteria | +| voltage_A | complex | V | PUBLIC | OUTPUT | | | bus voltage, Phase A to ground | +| voltage_B | complex | V | PUBLIC | OUTPUT | | | bus voltage, Phase B to ground | +| voltage_C | complex | V | PUBLIC | OUTPUT | | | bus voltage, Phase C to ground | +| voltage_AB | complex | V | PUBLIC | OUTPUT | | | line voltages, Phase AB | +| voltage_BC | complex | V | PUBLIC | OUTPUT | | | line voltages, Phase BC | +| voltage_CA | complex | V | PUBLIC | OUTPUT | | | line voltages, Phase CA | +| current_A | complex | A | HIDDEN | OUTPUT | | | bus current injection (in = positive), this an accumulator only, not a output or input variable | +| current_B | complex | A | HIDDEN | OUTPUT | | | bus current injection (in = positive), this an accumulator only, not a output or input variable | +| current_C | complex | A | HIDDEN | OUTPUT | | | bus current injection (in = positive), this an accumulator only, not a output or input variable | +| power_A | complex | VA | HIDDEN | OUTPUT | | | bus power injection (in = positive), this an accumulator only, not a output or input variable | +| power_B | complex | VA | HIDDEN | OUTPUT | | | bus power injection (in = positive), this an accumulator only, not a output or input variable | +| power_C | complex | VA | HIDDEN | OUTPUT | | | bus power injection (in = positive), this an accumulator only, not a output or input variable | +| shunt_A | complex | S | HIDDEN | OUTPUT | | | bus shunt admittance, this an accumulator only, not a output or input variable | +| shunt_B | complex | S | HIDDEN | OUTPUT | | | bus shunt admittance, this an accumulator only, not a output or input variable | +| shunt_C | complex | S | HIDDEN | OUTPUT | | | bus shunt admittance, this an accumulator only, not a output or input variable | +| prerotated_current_A | complex | A | HIDDEN | OUTPUT | | | deltamode-functionality - bus current injection (in = positive), but will not be rotated by powerflow for off-nominal frequency, this an accumulator only, not a output or input variable | +| prerotated_current_B | complex | A | HIDDEN | OUTPUT | | | deltamode-functionality - bus current injection (in = positive), but will not be rotated by powerflow for off-nominal frequency, this an accumulator only, not a output or input variable | +| prerotated_current_C | complex | A | HIDDEN | OUTPUT | | | deltamode-functionality - bus current injection (in = positive), but will not be rotated by powerflow for off-nominal frequency, this an accumulator only, not a output or input variable | +| current_AB | complex | A | HIDDEN | OUTPUT | | | bus current delta-connected injection (in = positive), this an accumulator only, not a output or input variable | +| current_BC | complex | A | HIDDEN | OUTPUT | | | bus current delta-connected injection (in = positive), this an accumulator only, not a output or input variable | +| current_CA | complex | A | HIDDEN | OUTPUT | | | bus current delta-connected injection (in = positive), this an accumulator only, not a output or input variable | +| current_AN | complex | A | HIDDEN | OUTPUT | | | bus current wye-connected injection (in = positive), this an accumulator only, not a output or input variable | +| current_BN | complex | A | HIDDEN | OUTPUT | | | bus current wye-connected injection (in = positive), this an accumulator only, not a output or input variable | +| current_CN | complex | A | HIDDEN | OUTPUT | | | bus current wye-connected injection (in = positive), this an accumulator only, not a output or input variable | +| power_AB | complex | VA | HIDDEN | OUTPUT | | | bus power delta-connected injection (in = positive), this an accumulator only, not a output or input variable | +| power_BC | complex | VA | HIDDEN | OUTPUT | | | bus power delta-connected injection (in = positive), this an accumulator only, not a output or input variable | +| power_CA | complex | VA | HIDDEN | OUTPUT | | | bus power delta-connected injection (in = positive), this an accumulator only, not a output or input variable | +| power_AN | complex | VA | HIDDEN | OUTPUT | | | bus power wye-connected injection (in = positive), this an accumulator only, not a output or input variable | +| power_BN | complex | VA | HIDDEN | OUTPUT | | | bus power wye-connected injection (in = positive), this an accumulator only, not a output or input variable | +| power_CN | complex | VA | HIDDEN | OUTPUT | | | bus power wye-connected injection (in = positive), this an accumulator only, not a output or input variable | +| shunt_AB | complex | S | HIDDEN | OUTPUT | | | bus shunt delta-connected admittance, this an accumulator only, not a output or input variable | +| shunt_BC | complex | S | HIDDEN | OUTPUT | | | bus shunt delta-connected admittance, this an accumulator only, not a output or input variable | +| shunt_CA | complex | S | HIDDEN | OUTPUT | | | bus shunt delta-connected admittance, this an accumulator only, not a output or input variable | +| shunt_AN | complex | S | HIDDEN | OUTPUT | | | bus shunt wye-connected admittance, this an accumulator only, not a output or input variable | +| shunt_BN | complex | S | HIDDEN | OUTPUT | | | bus shunt wye-connected admittance, this an accumulator only, not a output or input variable | +| shunt_CN | complex | S | HIDDEN | OUTPUT | | | bus shunt wye-connected admittance, this an accumulator only, not a output or input variable | +| mean_repair_time | double | s | PUBLIC | | | 0 s | Time after a fault clears for the object to be back in service | +| frequency_measure_type | enumeration | | PUBLIC | | PLL SIMPLE NONE | | PLL frequency measurement | +| sfm_Tf | double | s | PUBLIC | | | | Transducer time constant for simplified frequency measurement (seconds) | +| pll_Kp | double | pu | PUBLIC | | | | Proportional gain of PLL frequency measurement | +| pll_Ki | double | pu | PUBLIC | | | | Integration gain of PLL frequency measurement | +| measured_angle_A | double | rad | PUBLIC | | | | bus angle measurement, phase A | +| measured_frequency_A | double | Hz | PUBLIC | | | | frequency measurement, phase A | +| measured_angle_B | double | rad | PUBLIC | | | | bus angle measurement, phase B | +| measured_frequency_B | double | Hz | PUBLIC | | | | frequency measurement, phase B | +| measured_angle_C | double | rad | PUBLIC | | | | bus angle measurement, phase C | +| measured_frequency_C | double | Hz | PUBLIC | | | | frequency measurement, phase C | +| measured_frequency | double | Hz | PUBLIC | | | | frequency measurement - average of present phases | +| service_status | enumeration | | PUBLIC | | OUT_OF_SERVICE IN_SERVICE | | In and out of service flag | +| service_status_double | double | | PUBLIC | | | | In and out of service flag - type double - will indiscriminately override service_status - useful for schedules | +| previous_uptime | double | min | PUBLIC | | | | Previous time between disconnects of node in minutes | +| current_uptime | double | min | PUBLIC | | | | Current time since last disconnect of node in minutes | +| Norton_dynamic | bool | | PUBLIC | | | | Flag to indicate a Norton-equivalent connection -- used for generators and deltamode | +| generator_dynamic | bool | | PUBLIC | | | | Flag to indicate a voltage-sourcing or swing-type generator is present -- used for generators and deltamode | +| GFA_enable | bool | | PUBLIC | | | | Disable/Enable Grid Friendly Appliance(TM)-type functionality | +| GFA_freq_low_trip | double | Hz | PUBLIC | | | | Low frequency trip point for Grid Friendly Appliance(TM)-type functionality | +| GFA_freq_high_trip | double | Hz | PUBLIC | | | | High frequency trip point for Grid Friendly Appliance(TM)-type functionality | +| GFA_volt_low_trip | double | pu | PUBLIC | | | | Low voltage trip point for Grid Friendly Appliance(TM)-type functionality | +| GFA_volt_high_trip | double | pu | PUBLIC | | | | High voltage trip point for Grid Friendly Appliance(TM)-type functionality | +| GFA_reconnect_time | double | s | PUBLIC | | | | Reconnect time for Grid Friendly Appliance(TM)-type functionality | +| GFA_freq_disconnect_time | double | s | PUBLIC | | | | Frequency violation disconnect time for Grid Friendly Appliance(TM)-type functionality | +| GFA_volt_disconnect_time | double | s | PUBLIC | | | | Voltage violation disconnect time for Grid Friendly Appliance(TM)-type functionality | +| GFA_status | bool | | PUBLIC | | | | Low frequency trip point for Grid Friendly Appliance(TM)-type functionality | +| GFA_trip_method | enumeration | | PUBLIC | | OVER_VOLTAGE UNDER_VOLTAGE OVER_FREQUENCY UNDER_FREQUENCY NONE | | GFA trip for over-voltage | +| topological_parent | object | | PUBLIC | | | | topological parent as per GLM configuration | + +### link + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| status | enumeration | | PUBLIC | | OPEN CLOSED | CLOSED | | +| from | object | | PUBLIC | REQUIRED | | | from_node - source node | +| to | object | | PUBLIC | REQUIRED | | | to_node - load node | +| power_in | complex | VA | PUBLIC | OUTPUT | | | power flow in (w.r.t from node) | +| power_out | complex | VA | PUBLIC | OUTPUT | | | power flow out (w.r.t to node) | +| power_out_real | double | W | PUBLIC | OUTPUT | | | power flow out (w.r.t to node), real | +| power_losses | complex | VA | PUBLIC | OUTPUT | | | power losses | +| power_in_A | complex | VA | PUBLIC | OUTPUT | | | power flow in (w.r.t from node), phase A | +| power_in_B | complex | VA | PUBLIC | OUTPUT | | | power flow in (w.r.t from node), phase B | +| power_in_C | complex | VA | PUBLIC | OUTPUT | | | power flow in (w.r.t from node), phase C | +| power_out_A | complex | VA | PUBLIC | OUTPUT | | | power flow out (w.r.t to node), phase A | +| power_out_B | complex | VA | PUBLIC | OUTPUT | | | power flow out (w.r.t to node), phase B | +| power_out_C | complex | VA | PUBLIC | OUTPUT | | | power flow out (w.r.t to node), phase C | +| power_losses_A | complex | VA | PUBLIC | OUTPUT | | | power losses, phase A | +| power_losses_B | complex | VA | PUBLIC | OUTPUT | | | power losses, phase B | +| power_losses_C | complex | VA | PUBLIC | OUTPUT | | | power losses, phase C | +| current_out_A | complex | A | PUBLIC | OUTPUT | | | current flow out of link (w.r.t. to node), phase A | +| current_out_B | complex | A | PUBLIC | OUTPUT | | | current flow out of link (w.r.t. to node), phase B | +| current_out_C | complex | A | PUBLIC | OUTPUT | | | current flow out of link (w.r.t. to node), phase C | +| current_in_A | complex | A | PUBLIC | OUTPUT | | | current flow to link (w.r.t from node), phase A | +| current_in_B | complex | A | PUBLIC | OUTPUT | | | current flow to link (w.r.t from node), phase B | +| current_in_C | complex | A | PUBLIC | OUTPUT | | | current flow to link (w.r.t from node), phase C | +| fault_current_in_A | complex | A | PUBLIC | OUTPUT | | | fault current flowing in, phase A | +| fault_current_in_B | complex | A | PUBLIC | OUTPUT | | | fault current flowing in, phase B | +| fault_current_in_C | complex | A | PUBLIC | OUTPUT | | | fault current flowing in, phase C | +| fault_current_out_A | complex | A | PUBLIC | OUTPUT | | | fault current flowing out, phase A | +| fault_current_out_B | complex | A | PUBLIC | OUTPUT | | | fault current flowing out, phase B | +| fault_current_out_C | complex | A | PUBLIC | OUTPUT | | | fault current flowing out, phase C | +| fault_voltage_A | complex | A | PUBLIC | | | | fault voltage, phase A | +| fault_voltage_B | complex | A | PUBLIC | | | | fault voltage, phase B | +| fault_voltage_C | complex | A | PUBLIC | | | | fault voltage, phase C | +| flow_direction | set | | PUBLIC | OUTPUT | CN CR CF BN BR BF AN AR AF UNKNOWN | | flag used for describing direction of the flow of power | +| mean_repair_time | double | s | PUBLIC | | | | Time after a fault clears for the object to be back in service | +| continuous_rating | double | A | PUBLIC | | | | Continuous rating for this link object (set individual line segments | +| emergency_rating | double | A | PUBLIC | | | | Emergency rating for this link object (set individual line segments | +| inrush_convergence_value | double | V | PUBLIC | | | | Tolerance, as change in line voltage drop between iterations, for deltamode in-rush completion | + +### capacitor + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| pt_phase | set | | PUBLIC | CHARSET | N D C B A | | Phase(s) that the PT is on, used as measurement points for control | +| phases_connected | set | | PUBLIC | CHARSET | N D C B A | | phases capacitor is connected to | +| switchA | enumeration | | PUBLIC | | CLOSED OPEN | OPEN | capacitor A switch open or close | +| switchB | enumeration | | PUBLIC | | CLOSED OPEN | OPEN | capacitor B switch open or close | +| switchC | enumeration | | PUBLIC | | CLOSED OPEN | OPEN | capacitor C switch open or close | +| control | enumeration | | PUBLIC | | CURRENT VARVOLT VOLT VAR MANUAL | MANUAL | control operation strategy | +| cap_A_switch_count | double | | PUBLIC | OUTPUT | | -1 | number of switch operations on Phase A | +| cap_B_switch_count | double | | PUBLIC | OUTPUT | | -1 | number of switch operations on Phase B | +| cap_C_switch_count | double | | PUBLIC | OUTPUT | | -1 | number of switch operations on Phase C | +| voltage_set_high | double | V | PUBLIC | | | | Turn off if voltage is above this set point | +| voltage_set_low | double | V | PUBLIC | | | | Turns on if voltage is below this set point | +| VAr_set_high | double | VAr | PUBLIC | | | | high VAR set point for VAR control (turn off) | +| VAr_set_low | double | VAr | PUBLIC | | | | low VAR set point for VAR control (turn on) | +| current_set_low | double | A | PUBLIC | | | | high current set point for current control mode (turn on) | +| current_set_high | double | A | PUBLIC | | | | low current set point for current control mode (turn off) | +| capacitor_A | double | VAr | PUBLIC | | | | Capacitance value for phase A or phase AB | +| capacitor_B | double | VAr | PUBLIC | | | | Capacitance value for phase B or phase BC | +| capacitor_C | double | VAr | PUBLIC | | | | Capacitance value for phase C or phase CA | +| cap_nominal_voltage | double | V | PUBLIC | | | | Nominal voltage for the capacitor. Used for calculation of capacitance value | +| time_delay | double | s | PUBLIC | | | | control time delay | +| dwell_time | double | s | PUBLIC | | | | Time for system to remain constant before a state change will be passed | +| lockout_time | double | s | PUBLIC | | | | Time for capacitor to remain locked out from further switching operations (VARVOLT control) | +| remote_sense | object | | PUBLIC | | | | Remote object for sensing values used for control schemes | +| remote_sense_B | object | | PUBLIC | | | | Secondary Remote object for sensing values used for control schemes (VARVOLT uses two) | +| control_level | enumeration | | PUBLIC | | INDIVIDUAL BANK | INDIVIDUAL | define bank or individual control | + +### fuse + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| phase_A_status | enumeration | | PUBLIC | | GOOD BLOWN | GOOD | | +| phase_B_status | enumeration | | PUBLIC | | GOOD BLOWN | GOOD | | +| phase_C_status | enumeration | | PUBLIC | | GOOD BLOWN | GOOD | | +| repair_dist_type | enumeration | | PUBLIC | | EXPONENTIAL NONE | NONE | | +| current_limit | double | A | PUBLIC | | | 9999 A | | +| mean_replacement_time | double | s | PUBLIC | | | | | +| fuse_resistance | double | Ohm | PUBLIC | | | -1 Ohm | The resistance value of the fuse when it is not blown. | + +### meter + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| measured_real_energy | double | Wh | PUBLIC | OUTPUT | | | metered real energy consumption, cummalitive | +| measured_real_energy_delta | double | Wh | PUBLIC | OUTPUT | | | delta in metered real energy consumption from last specified measured_energy_delta_timestep | +| measured_reactive_energy | double | VAh | PUBLIC | OUTPUT | | | metered reactive energy consumption, cummalitive | +| measured_reactive_energy_delta | double | VAh | PUBLIC | OUTPUT | | | delta in metered reactive energy consumption from last specified measured_energy_delta_timestep | +| measured_energy_delta_timestep | double | s | PUBLIC | OUTPUT | | | Period of timestep for real and reactive delta energy calculation | +| measured_power | complex | VA | PUBLIC | OUTPUT | | | metered complex power | +| measured_power_A | complex | VA | PUBLIC | OUTPUT | | | metered complex power on phase A | +| measured_power_B | complex | VA | PUBLIC | OUTPUT | | | metered complex power on phase B | +| measured_power_C | complex | VA | PUBLIC | OUTPUT | | | metered complex power on phase C | +| measured_demand | double | W | PUBLIC | OUTPUT | | | greatest metered real power during simulation | +| measured_real_power | double | W | PUBLIC | OUTPUT | | | metered real power | +| measured_reactive_power | double | VAr | PUBLIC | OUTPUT | | | metered reactive power | +| meter_power_consumption | complex | VA | PUBLIC | OUTPUT | | | metered power used for operating the meter; standby and communication losses | +| measured_voltage_A | complex | V | PUBLIC | OUTPUT | | | measured line-to-neutral voltage on phase A | +| measured_voltage_B | complex | V | PUBLIC | OUTPUT | | | measured line-to-neutral voltage on phase B | +| measured_voltage_C | complex | V | PUBLIC | OUTPUT | | | measured line-to-neutral voltage on phase C | +| measured_voltage_AB | complex | V | PUBLIC | OUTPUT | | | measured line-to-line voltage on phase AB | +| measured_voltage_BC | complex | V | PUBLIC | OUTPUT | | | measured line-to-line voltage on phase BC | +| measured_voltage_CA | complex | V | PUBLIC | OUTPUT | | | measured line-to-line voltage on phase CA | +| measured_real_max_voltage_in_interval_A | double | | PUBLIC | OUTPUT | | | measured real max line-to-neutral voltage on phase A over a specified interval | +| measured_real_max_voltage_in_interval_B | double | | PUBLIC | OUTPUT | | | measured real max line-to-neutral voltage on phase B over a specified interval | +| measured_real_max_voltage_in_interval_C | double | | PUBLIC | OUTPUT | | | measured real max line-to-neutral voltage on phase C over a specified interval | +| measured_reactive_max_voltage_in_interval_A | double | | PUBLIC | OUTPUT | | | measured reactive max line-to-neutral voltage on phase A over a specified interval | +| measured_reactive_max_voltage_in_interval_B | double | | PUBLIC | OUTPUT | | | measured reactive max line-to-neutral voltage on phase B over a specified interval | +| measured_reactive_max_voltage_in_interval_C | double | | PUBLIC | OUTPUT | | | measured reactive max line-to-neutral voltage on phase C over a specified interval | +| measured_real_max_voltage_in_interval_AB | double | | PUBLIC | OUTPUT | | | measured real max line-to-line voltage on phase A over a specified interval | +| measured_real_max_voltage_in_interval_BC | double | | PUBLIC | OUTPUT | | | measured real max line-to-line voltage on phase B over a specified interval | +| measured_real_max_voltage_in_interval_CA | double | | PUBLIC | OUTPUT | | | measured real max line-to-line voltage on phase C over a specified interval | +| measured_reactive_max_voltage_in_interval_AB | double | | PUBLIC | OUTPUT | | | measured reactive max line-to-line voltage on phase A over a specified interval | +| measured_reactive_max_voltage_in_interval_BC | double | | PUBLIC | OUTPUT | | | measured reactive max line-to-line voltage on phase B over a specified interval | +| measured_reactive_max_voltage_in_interval_CA | double | | PUBLIC | OUTPUT | | | measured reactive max line-to-line voltage on phase C over a specified interval | +| measured_real_min_voltage_in_interval_A | double | | PUBLIC | OUTPUT | | | measured real min line-to-neutral voltage on phase A over a specified interval | +| measured_real_min_voltage_in_interval_B | double | | PUBLIC | OUTPUT | | | measured real min line-to-neutral voltage on phase B over a specified interval | +| measured_real_min_voltage_in_interval_C | double | | PUBLIC | OUTPUT | | | measured real min line-to-neutral voltage on phase C over a specified interval | +| measured_reactive_min_voltage_in_interval_A | double | | PUBLIC | OUTPUT | | | measured reactive min line-to-neutral voltage on phase A over a specified interval | +| measured_reactive_min_voltage_in_interval_B | double | | PUBLIC | OUTPUT | | | measured reactive min line-to-neutral voltage on phase B over a specified interval | +| measured_reactive_min_voltage_in_interval_C | double | | PUBLIC | OUTPUT | | | measured reactive min line-to-neutral voltage on phase C over a specified interval | +| measured_real_min_voltage_in_interval_AB | double | | PUBLIC | OUTPUT | | | measured real min line-to-line voltage on phase A over a specified interval | +| measured_real_min_voltage_in_interval_BC | double | | PUBLIC | OUTPUT | | | measured real min line-to-line voltage on phase B over a specified interval | +| measured_real_min_voltage_in_interval_CA | double | | PUBLIC | OUTPUT | | | measured real min line-to-line voltage on phase C over a specified interval | +| measured_reactive_min_voltage_in_interval_AB | double | | PUBLIC | OUTPUT | | | measured reactive min line-to-line voltage on phase A over a specified interval | +| measured_reactive_min_voltage_in_interval_BC | double | | PUBLIC | OUTPUT | | | measured reactive min line-to-line voltage on phase B over a specified interval | +| measured_reactive_min_voltage_in_interval_CA | double | | PUBLIC | OUTPUT | | | measured reactive min line-to-line voltage on phase C over a specified interval | +| measured_avg_voltage_mag_in_interval_A | double | | PUBLIC | OUTPUT | | | measured avg line-to-neutral voltage magnitude on phase A over a specified interval | +| measured_avg_voltage_mag_in_interval_B | double | | PUBLIC | OUTPUT | | | measured avg line-to-neutral voltage magnitude on phase B over a specified interval | +| measured_avg_voltage_mag_in_interval_C | double | | PUBLIC | OUTPUT | | | measured avg line-to-neutral voltage magnitude on phase C over a specified interval | +| measured_avg_voltage_mag_in_interval_AB | double | | PUBLIC | OUTPUT | | | measured avg line-to-line voltage magnitude on phase A over a specified interval | +| measured_avg_voltage_mag_in_interval_BC | double | | PUBLIC | OUTPUT | | | measured avg line-to-line voltage magnitude on phase B over a specified interval | +| measured_avg_voltage_mag_in_interval_CA | double | | PUBLIC | OUTPUT | | | measured avg line-to-line voltage magnitude on phase C over a specified interval | +| measured_current_A | complex | A | PUBLIC | OUTPUT | | | measured current on phase A | +| measured_current_B | complex | A | PUBLIC | OUTPUT | | | measured current on phase B | +| measured_current_C | complex | A | PUBLIC | OUTPUT | | | measured current on phase C | +| customer_interrupted | bool | | PUBLIC | OUTPUT | | | Reliability flag - goes active if the customer is in an 'interrupted' state | +| customer_interrupted_secondary | bool | | PUBLIC | OUTPUT | | | Reliability flag - goes active if the customer is in an 'secondary interrupted' state - i.e., momentary | +| monthly_bill | double | $ | PUBLIC | OUTPUT | | | Accumulator for the current month's bill | +| previous_monthly_bill | double | $ | PUBLIC | OUTPUT | | | Total monthly bill for the previous month | +| previous_monthly_energy | double | kWh | PUBLIC | OUTPUT | | | Total monthly energy for the previous month | +| monthly_fee | double | $ | PUBLIC | OUTPUT | | | Once a month flat fee for customer hook-up | +| monthly_energy | double | kWh | PUBLIC | OUTPUT | | | Accumulator for the current month's energy consumption | +| bill_mode | enumeration | | PUBLIC | | TIERED_RTP HOURLY TIERED UNIFORM NONE | NONE | Billing structure desired | +| power_market | object | | PUBLIC | | | | Market (auction object) where the price is being received from | +| bill_day | int32 | | PUBLIC | | | 15 | day of month bill is to be processed (currently limited to days 1-28) | +| price | double | $/kWh | PUBLIC | | | | current price of electricity | +| price_base | double | $/kWh | PUBLIC | | | | Used only in TIERED_RTP mode to describe the price before the first tier | +| first_tier_price | double | $/kWh | PUBLIC | | | | price of electricity between first tier and second tier energy usage | +| first_tier_energy | double | kWh | PUBLIC | | | | switching point between base price and first tier price | +| second_tier_price | double | $/kWh | PUBLIC | | | | price of electricity between second tier and third tier energy usage | +| second_tier_energy | double | kWh | PUBLIC | | | | switching point between first tier price and second tier price | +| third_tier_price | double | $/kWh | PUBLIC | | | | price of electricity when energy usage exceeds third tier energy usage | +| third_tier_energy | double | kWh | PUBLIC | | | | switching point between second tier price and third tier price | + +### line + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| configuration | object | | PUBLIC | REQUIRED | | | reference to library object that describes this line's configuration | +| length | double | ft | PUBLIC | REQUIRED | | | length of this line | + +### line_sensor + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| measured_phase | enumeration | | PUBLIC | REQUIRED | C B A | | phase from which measurement is taken | +| measured_voltage | complex | V | PUBLIC | OUTPUT | | | voltage measurement (with noise) | +| measured_current | complex | A | PUBLIC | OUTPUT | | | current measurement (with noise) | +| measured_power | complex | VA | PUBLIC | OUTPUT | | | power measurement (with noise) | +| location | double | ft | PUBLIC | REQUIRED | | | sensor placement downline | +| covariance | double_array | | PUBLIC | | | | sensor covariance matrix (components are [Vr Vi Ir Ii]) | + +### line_spacing + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| distance_AB | double | ft | PUBLIC | | | 0 ft | | +| distance_BC | double | ft | PUBLIC | | | 0 ft | | +| distance_AC | double | ft | PUBLIC | | | 0 ft | | +| distance_AN | double | ft | PUBLIC | | | 0 ft | | +| distance_BN | double | ft | PUBLIC | | | 0 ft | | +| distance_CN | double | ft | PUBLIC | | | 0 ft | | +| distance_AE | double | ft | PUBLIC | | | 0 ft | distance between phase A wire and earth | +| distance_BE | double | ft | PUBLIC | | | 0 ft | distance between phase B wire and earth | +| distance_CE | double | ft | PUBLIC | | | 0 ft | distance between phase C wire and earth | +| distance_NE | double | ft | PUBLIC | | | 0 ft | distance between neutral wire and earth | + +### overhead_line + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | + +### underground_line + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | + +### overhead_line_conductor + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| geometric_mean_radius | double | ft | PUBLIC | REQUIRED | | | radius of the conductor | +| resistance | double | Ohm/mile | PUBLIC | REQUIRED | | | resistance in Ohms/mile of the conductor | +| diameter | double | in | PUBLIC | REQUIRED | | | Diameter of line for capacitance calculations | +| rating.summer.continuous | double | A | PUBLIC | | | 1000 A | Continuous summer amp rating | +| rating.summer.emergency | double | A | PUBLIC | | | 2000 A | Emergency summer amp rating | +| rating.winter.continuous | double | A | PUBLIC | | | 1000 A | Continuous winter amp rating | +| rating.winter.emergency | double | A | PUBLIC | | | 2000 A | Emergency winter amp rating | + +### underground_line_conductor + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| outer_diameter | double | in | PUBLIC | REQUIRED | | | Outer diameter of conductor and sheath | +| conductor_gmr | double | ft | PUBLIC | | | | Geometric mean radius of the conductor | +| conductor_diameter | double | in | PUBLIC | REQUIRED | | | Diameter of conductor | +| conductor_resistance | double | Ohm/mile | PUBLIC | | | | Resistance of conductor in ohm/mile | +| neutral_gmr | double | ft | PUBLIC | | | | Geometric mean radius of an individual neutral conductor/strand | +| neutral_diameter | double | in | PUBLIC | REQUIRED | | | Diameter of individual neutral conductor/strand of concentric neutral | +| neutral_resistance | double | Ohm/mile | PUBLIC | | | | Resistance of an individual neutral conductor/strand in ohm/mile | +| neutral_strands | int16 | | PUBLIC | | | | Number of cable strands in neutral conductor | +| shield_thickness | double | in | PUBLIC | | | | The thickness of Tape shield in inches | +| shield_diameter | double | in | PUBLIC | | | | The outside diameter of Tape shield in inches | +| insulation_relative_permitivitty | double | unit | PUBLIC | | | 1 unit | Permitivitty of insulation, relative to air | +| shield_gmr | double | ft | PUBLIC | | | | Geometric mean radius of shielding sheath | +| shield_resistance | double | Ohm/mile | PUBLIC | | | | Resistance of shielding sheath in ohms/mile | +| rating.summer.continuous | double | A | PUBLIC | | | 1000 A | amp rating in summer, continuous | +| rating.summer.emergency | double | A | PUBLIC | | | 2000 A | amp rating in summer, short term | +| rating.winter.continuous | double | A | PUBLIC | | | 1000 A | amp rating in winter, continuous | +| rating.winter.emergency | double | A | PUBLIC | | | 2000 A | amp rating in winter, short term | + +### line_configuration + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| conductor_A | object | | PUBLIC | | | | | +| conductor_B | object | | PUBLIC | | | | | +| conductor_C | object | | PUBLIC | | | | | +| conductor_N | object | | PUBLIC | | | | | +| spacing | object | | PUBLIC | | | | | +| z11 | complex | Ohm/mile | PUBLIC | | | 0+0j | | +| z12 | complex | Ohm/mile | PUBLIC | | | 0+0j | | +| z13 | complex | Ohm/mile | PUBLIC | | | 0+0j | | +| z21 | complex | Ohm/mile | PUBLIC | | | 0+0j | | +| z22 | complex | Ohm/mile | PUBLIC | | | 0+0j | | +| z23 | complex | Ohm/mile | PUBLIC | | | 0+0j | | +| z31 | complex | Ohm/mile | PUBLIC | | | 0+0j | | +| z32 | complex | Ohm/mile | PUBLIC | | | 0+0j | | +| z33 | complex | Ohm/mile | PUBLIC | | | 0+0j | | +| c11 | double | nF/mile | PUBLIC | | | 0 nF/mile | | +| c12 | double | nF/mile | PUBLIC | | | 0 nF/mile | | +| c13 | double | nF/mile | PUBLIC | | | 0 nF/mile | | +| c21 | double | nF/mile | PUBLIC | | | 0 nF/mile | | +| c22 | double | nF/mile | PUBLIC | | | 0 nF/mile | | +| c23 | double | nF/mile | PUBLIC | | | 0 nF/mile | | +| c31 | double | nF/mile | PUBLIC | | | 0 nF/mile | | +| c32 | double | nF/mile | PUBLIC | | | 0 nF/mile | | +| c33 | double | nF/mile | PUBLIC | | | 0 nF/mile | | +| rating.summer.continuous | double | A | PUBLIC | | | 1000 A | amp rating in summer, continuous | +| rating.summer.emergency | double | A | PUBLIC | | | 2000 A | amp rating in summer, short term | +| rating.winter.continuous | double | A | PUBLIC | | | 1000 A | amp rating in winter, continuous | +| rating.winter.emergency | double | A | PUBLIC | | | 2000 A | amp rating in winter, short term | + +### transformer_configuration + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| connect_type | enumeration | | PUBLIC | | SINGLE_PHASE_CENTER_TAPPED SINGLE_PHASE DELTA_GWYE DELTA_DELTA WYE_WYE UNKNOWN | UNKNOWN | transformation connection type | +| install_type | enumeration | | PUBLIC | | VAULT PADMOUNT POLETOP UNKNOWN | UNKNOWN | transformation installation type | +| coolant_type | enumeration | | PUBLIC | | DRY MINERAL_OIL UNKNOWN | UNKNOWN | transformation coolant type | +| cooling_type | enumeration | | PUBLIC | | DFOW DFOA NDFOW NDFOA FA OA UNKNOWN | UNKNOWN | transformation cooling type | +| primary_voltage | double | V | PUBLIC | REQUIRED | | | primary voltage level in L-L value kV | +| secondary_voltage | double | V | PUBLIC | REQUIRED | | | secondary voltage level kV | +| power_rating | double | kVA | PUBLIC | REQUIRED | | | kVA rating of transformer, total | +| powerA_rating | double | kVA | PUBLIC | | | | kVA rating of transformer, phase A | +| powerB_rating | double | kVA | PUBLIC | | | | kVA rating of transformer, phase B | +| powerC_rating | double | kVA | PUBLIC | | | | kVA rating of transformer, phase C | +| powerN_rating | double | kVA | PUBLIC | | | | kVA rating of transformer, neutral | +| resistance | double | pu*Ohm | PUBLIC | | | | Series impedance, pu, real | +| reactance | double | pu*Ohm | PUBLIC | | | | Series impedance, pu, imag | +| impedance | complex | pu*Ohm | PUBLIC | | | | Series impedance, pu | +| resistance1 | double | pu*Ohm | PUBLIC | | | | Secondary series impedance (only used when you want to define each individual winding seperately, pu, real | +| reactance1 | double | pu*Ohm | PUBLIC | | | | Secondary series impedance (only used when you want to define each individual winding seperately, pu, imag | +| impedance1 | complex | pu*Ohm | PUBLIC | | | | Secondary series impedance (only used when you want to define each individual winding seperately, pu | +| resistance2 | double | pu*Ohm | PUBLIC | | | | Secondary series impedance (only used when you want to define each individual winding seperately, pu, real | +| reactance2 | double | pu*Ohm | PUBLIC | | | | Secondary series impedance (only used when you want to define each individual winding seperately, pu, imag | +| impedance2 | complex | pu*Ohm | PUBLIC | | | | Secondary series impedance (only used when you want to define each individual winding seperately, pu | +| shunt_resistance | double | pu*Ohm | PUBLIC | | | +1e+09 pu*Ohm | Shunt impedance on primary side, pu, real | +| shunt_reactance | double | pu*Ohm | PUBLIC | | | +1e+09 pu*Ohm | Shunt impedance on primary side, pu, imag | +| shunt_impedance | complex | pu*Ohm | PUBLIC | | | +1e+09+1e+09j pu*Ohm | Shunt impedance on primary side, pu | +| core_coil_weight | double | lb | PUBLIC | | | | The weight of the core and coil assembly in pounds | +| tank_fittings_weight | double | lb | PUBLIC | | | | The weight of the tank and fittings in pounds | +| oil_volume | double | gal | PUBLIC | | | | The number of gallons of oil in the transformer | +| rated_winding_time_constant | double | h | PUBLIC | | | | The rated winding time constant in hours | +| rated_winding_hot_spot_rise | double | degC | PUBLIC | | | | winding hottest-spot rise over ambient temperature at rated load, degrees C | +| rated_top_oil_rise | double | degC | PUBLIC | | | | top-oil hottest-spot rise over ambient temperature at rated load, degrees C | +| no_load_loss | double | pu | PUBLIC | | | | Another method of specifying transformer impedances, defined as per unit power values (shunt) | +| full_load_loss | double | pu | PUBLIC | | | | Another method of specifying transformer impedances, defined as per unit power values (shunt and series) | +| reactance_resistance_ratio | double | | PUBLIC | | | | the reactance to resistance ratio (X/R) | +| installed_insulation_life | double | h | PUBLIC | | | | the normal lifetime of the transformer insulation at rated load, hours | +| magnetization_location | enumeration | | PUBLIC | | BOTH SECONDARY PRIMARY NONE | | winding to place magnetization influence for in-rush calculations | +| inrush_saturation_enabled | bool | | PUBLIC | | | | flag to include saturation effects during inrush calculations | +| L_A | double | pu | PUBLIC | | | +0.2 pu | Air core inductance of transformer | +| phi_K | double | pu | PUBLIC | | | +1.17 pu | Knee flux value where the air core inductance interstes the flux axis of the saturation curve | +| phi_M | double | pu | PUBLIC | | | +1 pu | Peak magnetization flux at rated voltage of the saturation curve | +| I_M | double | pu | PUBLIC | | | +0.01 pu | Peak magnetization current at rated voltage of the saturation curve | +| T_D | double | | PUBLIC | | | +0.5 | Inrush decay time constant for inrush current | + +### transformer + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| configuration | object | | PUBLIC | REQUIRED | | | Configuration library used for transformer setup | +| climate | object | | PUBLIC | | | | climate object used to describe thermal model ambient temperature | +| ambient_temperature | double | degC | PUBLIC | | | | ambient temperature in degrees C | +| top_oil_hot_spot_temperature | double | degC | PUBLIC | | | | top-oil hottest-spot temperature, degrees C | +| winding_hot_spot_temperature | double | degC | PUBLIC | | | | winding hottest-spot temperature, degrees C | +| percent_loss_of_life | double | | PUBLIC | | | | the percent loss of life | +| aging_constant | double | | PUBLIC | | | | the aging rate slope for the transformer insulation | +| use_thermal_model | bool | | PUBLIC | | | | boolean to enable use of thermal model | +| transformer_replacement_count | double | | PUBLIC | | | | counter of the number times the transformer has been replaced due to lifetime failure | +| aging_granularity | double | s | PUBLIC | | | | maximum timestep before updating thermal and aging model in seconds | +| phase_A_primary_flux_value | double | Wb | PUBLIC | | | | instantaneous magnetic flux in phase A on the primary side of the transformer during saturation calculations | +| phase_B_primary_flux_value | double | Wb | PUBLIC | | | | instantaneous magnetic flux in phase B on the primary side of the transformer during saturation calculations | +| phase_C_primary_flux_value | double | Wb | PUBLIC | | | | instantaneous magnetic flux in phase C on the primary side of the transformer during saturation calculations | +| phase_A_secondary_flux_value | double | Wb | PUBLIC | | | | instantaneous magnetic flux in phase A on the secondary side of the transformer during saturation calculations | +| phase_B_secondary_flux_value | double | Wb | PUBLIC | | | | instantaneous magnetic flux in phase B on the secondary side of the transformer during saturation calculations | +| phase_C_secondary_flux_value | double | Wb | PUBLIC | | | | instantaneous magnetic flux in phase C on the secondary side of the transformer during saturation calculations | + +### load + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| load_class | enumeration | | PUBLIC | | A I C R U | U | Flag to track load type, not currently used for anything except sorting | +| constant_power_A | complex | VA | PUBLIC | | | 0 VA | constant power load on phase A, specified as VA | +| constant_power_B | complex | VA | PUBLIC | | | 0 VA | constant power load on phase B, specified as VA | +| constant_power_C | complex | VA | PUBLIC | | | 0 VA | constant power load on phase C, specified as VA | +| constant_power_A_real | double | W | PUBLIC | | | 0 W | constant power load on phase A, real only, specified as W | +| constant_power_B_real | double | W | PUBLIC | | | 0 W | constant power load on phase B, real only, specified as W | +| constant_power_C_real | double | W | PUBLIC | | | 0 W | constant power load on phase C, real only, specified as W | +| constant_power_A_reac | double | VAr | PUBLIC | | | 0 VAr | constant power load on phase A, imaginary only, specified as VAr | +| constant_power_B_reac | double | VAr | PUBLIC | | | 0 VAr | constant power load on phase B, imaginary only, specified as VAr | +| constant_power_C_reac | double | VAr | PUBLIC | | | 0 VAr | constant power load on phase C, imaginary only, specified as VAr | +| constant_current_A | complex | A | PUBLIC | | | 0 A | constant current load on phase A, specified as Amps | +| constant_current_B | complex | A | PUBLIC | | | 0 A | constant current load on phase B, specified as Amps | +| constant_current_C | complex | A | PUBLIC | | | 0 A | constant current load on phase C, specified as Amps | +| constant_current_A_real | double | A | PUBLIC | | | 0 A | constant current load on phase A, real only, specified as Amps | +| constant_current_B_real | double | A | PUBLIC | | | 0 A | constant current load on phase B, real only, specified as Amps | +| constant_current_C_real | double | A | PUBLIC | | | 0 A | constant current load on phase C, real only, specified as Amps | +| constant_current_A_reac | double | A | PUBLIC | | | 0 A | constant current load on phase A, imaginary only, specified as Amps | +| constant_current_B_reac | double | A | PUBLIC | | | 0 A | constant current load on phase B, imaginary only, specified as Amps | +| constant_current_C_reac | double | A | PUBLIC | | | 0 A | constant current load on phase C, imaginary only, specified as Amps | +| constant_impedance_A | complex | Ohm | PUBLIC | | | 0 Ohm | constant impedance load on phase A, specified as Ohms | +| constant_impedance_B | complex | Ohm | PUBLIC | | | 0 Ohm | constant impedance load on phase B, specified as Ohms | +| constant_impedance_C | complex | Ohm | PUBLIC | | | 0 Ohm | constant impedance load on phase C, specified as Ohms | +| constant_impedance_A_real | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance load on phase A, real only, specified as Ohms | +| constant_impedance_B_real | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance load on phase B, real only, specified as Ohms | +| constant_impedance_C_real | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance load on phase C, real only, specified as Ohms | +| constant_impedance_A_reac | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance load on phase A, imaginary only, specified as Ohms | +| constant_impedance_B_reac | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance load on phase B, imaginary only, specified as Ohms | +| constant_impedance_C_reac | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance load on phase C, imaginary only, specified as Ohms | +| constant_power_AN | complex | VA | PUBLIC | | | 0 VA | constant power wye-connected load on phase A, specified as VA | +| constant_power_BN | complex | VA | PUBLIC | | | 0 VA | constant power wye-connected load on phase B, specified as VA | +| constant_power_CN | complex | VA | PUBLIC | | | 0 VA | constant power wye-connected load on phase C, specified as VA | +| constant_power_AN_real | double | W | PUBLIC | | | 0 W | constant power wye-connected load on phase A, real only, specified as W | +| constant_power_BN_real | double | W | PUBLIC | | | 0 W | constant power wye-connected load on phase B, real only, specified as W | +| constant_power_CN_real | double | W | PUBLIC | | | 0 W | constant power wye-connected load on phase C, real only, specified as W | +| constant_power_AN_reac | double | VAr | PUBLIC | | | 0 VAr | constant power wye-connected load on phase A, imaginary only, specified as VAr | +| constant_power_BN_reac | double | VAr | PUBLIC | | | 0 VAr | constant power wye-connected load on phase B, imaginary only, specified as VAr | +| constant_power_CN_reac | double | VAr | PUBLIC | | | 0 VAr | constant power wye-connected load on phase C, imaginary only, specified as VAr | +| constant_current_AN | complex | A | PUBLIC | | | 0 A | constant current wye-connected load on phase A, specified as Amps | +| constant_current_BN | complex | A | PUBLIC | | | 0 A | constant current wye-connected load on phase B, specified as Amps | +| constant_current_CN | complex | A | PUBLIC | | | 0 A | constant current wye-connected load on phase C, specified as Amps | +| constant_current_AN_real | double | A | PUBLIC | | | 0 A | constant current wye-connected load on phase A, real only, specified as Amps | +| constant_current_BN_real | double | A | PUBLIC | | | 0 A | constant current wye-connected load on phase B, real only, specified as Amps | +| constant_current_CN_real | double | A | PUBLIC | | | 0 A | constant current wye-connected load on phase C, real only, specified as Amps | +| constant_current_AN_reac | double | A | PUBLIC | | | 0 A | constant current wye-connected load on phase A, imaginary only, specified as Amps | +| constant_current_BN_reac | double | A | PUBLIC | | | 0 A | constant current wye-connected load on phase B, imaginary only, specified as Amps | +| constant_current_CN_reac | double | A | PUBLIC | | | 0 A | constant current wye-connected load on phase C, imaginary only, specified as Amps | +| constant_impedance_AN | complex | Ohm | PUBLIC | | | 0 Ohm | constant impedance wye-connected load on phase A, specified as Ohms | +| constant_impedance_BN | complex | Ohm | PUBLIC | | | 0 Ohm | constant impedance wye-connected load on phase B, specified as Ohms | +| constant_impedance_CN | complex | Ohm | PUBLIC | | | 0 Ohm | constant impedance wye-connected load on phase C, specified as Ohms | +| constant_impedance_AN_real | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance wye-connected load on phase A, real only, specified as Ohms | +| constant_impedance_BN_real | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance wye-connected load on phase B, real only, specified as Ohms | +| constant_impedance_CN_real | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance wye-connected load on phase C, real only, specified as Ohms | +| constant_impedance_AN_reac | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance wye-connected load on phase A, imaginary only, specified as Ohms | +| constant_impedance_BN_reac | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance wye-connected load on phase B, imaginary only, specified as Ohms | +| constant_impedance_CN_reac | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance wye-connected load on phase C, imaginary only, specified as Ohms | +| constant_power_AB | complex | VA | PUBLIC | | | 0 VA | constant power delta-connected load on phase A, specified as VA | +| constant_power_BC | complex | VA | PUBLIC | | | 0 VA | constant power delta-connected load on phase B, specified as VA | +| constant_power_CA | complex | VA | PUBLIC | | | 0 VA | constant power delta-connected load on phase C, specified as VA | +| constant_power_AB_real | double | W | PUBLIC | | | 0 W | constant power delta-connected load on phase A, real only, specified as W | +| constant_power_BC_real | double | W | PUBLIC | | | 0 W | constant power delta-connected load on phase B, real only, specified as W | +| constant_power_CA_real | double | W | PUBLIC | | | 0 W | constant power delta-connected load on phase C, real only, specified as W | +| constant_power_AB_reac | double | VAr | PUBLIC | | | 0 VAr | constant power delta-connected load on phase A, imaginary only, specified as VAr | +| constant_power_BC_reac | double | VAr | PUBLIC | | | 0 VAr | constant power delta-connected load on phase B, imaginary only, specified as VAr | +| constant_power_CA_reac | double | VAr | PUBLIC | | | 0 VAr | constant power delta-connected load on phase C, imaginary only, specified as VAr | +| constant_current_AB | complex | A | PUBLIC | | | 0 A | constant current delta-connected load on phase A, specified as Amps | +| constant_current_BC | complex | A | PUBLIC | | | 0 A | constant current delta-connected load on phase B, specified as Amps | +| constant_current_CA | complex | A | PUBLIC | | | 0 A | constant current delta-connected load on phase C, specified as Amps | +| constant_current_AB_real | double | A | PUBLIC | | | 0 A | constant current delta-connected load on phase A, real only, specified as Amps | +| constant_current_BC_real | double | A | PUBLIC | | | 0 A | constant current delta-connected load on phase B, real only, specified as Amps | +| constant_current_CA_real | double | A | PUBLIC | | | 0 A | constant current delta-connected load on phase C, real only, specified as Amps | +| constant_current_AB_reac | double | A | PUBLIC | | | 0 A | constant current delta-connected load on phase A, imaginary only, specified as Amps | +| constant_current_BC_reac | double | A | PUBLIC | | | 0 A | constant current delta-connected load on phase B, imaginary only, specified as Amps | +| constant_current_CA_reac | double | A | PUBLIC | | | 0 A | constant current delta-connected load on phase C, imaginary only, specified as Amps | +| constant_impedance_AB | complex | Ohm | PUBLIC | | | 0 Ohm | constant impedance delta-connected load on phase A, specified as Ohms | +| constant_impedance_BC | complex | Ohm | PUBLIC | | | 0 Ohm | constant impedance delta-connected load on phase B, specified as Ohms | +| constant_impedance_CA | complex | Ohm | PUBLIC | | | 0 Ohm | constant impedance delta-connected load on phase C, specified as Ohms | +| constant_impedance_AB_real | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance delta-connected load on phase A, real only, specified as Ohms | +| constant_impedance_BC_real | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance delta-connected load on phase B, real only, specified as Ohms | +| constant_impedance_CA_real | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance delta-connected load on phase C, real only, specified as Ohms | +| constant_impedance_AB_reac | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance delta-connected load on phase A, imaginary only, specified as Ohms | +| constant_impedance_BC_reac | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance delta-connected load on phase B, imaginary only, specified as Ohms | +| constant_impedance_CA_reac | double | Ohm | PUBLIC | | | 0 Ohm | constant impedance delta-connected load on phase C, imaginary only, specified as Ohms | +| measured_voltage_A | complex | V | PUBLIC | OUTPUT | | | current measured voltage on phase A | +| measured_voltage_B | complex | V | PUBLIC | OUTPUT | | | current measured voltage on phase B | +| measured_voltage_C | complex | V | PUBLIC | OUTPUT | | | current measured voltage on phase C | +| measured_voltage_AB | complex | V | PUBLIC | OUTPUT | | | current measured voltage on phases AB | +| measured_voltage_BC | complex | V | PUBLIC | OUTPUT | | | current measured voltage on phases BC | +| measured_voltage_CA | complex | V | PUBLIC | OUTPUT | | | current measured voltage on phases CA | +| phase_loss_protection | bool | | PUBLIC | | | FALSE | Trip all three phases of the load if a fault occurs | +| base_power_A | double | VA | PUBLIC | | | 0 VA | in similar format as ZIPload, this represents the nominal power on phase A before applying ZIP fractions | +| base_power_B | double | VA | PUBLIC | | | 0 VA | in similar format as ZIPload, this represents the nominal power on phase B before applying ZIP fractions | +| base_power_C | double | VA | PUBLIC | | | 0 VA | in similar format as ZIPload, this represents the nominal power on phase C before applying ZIP fractions | +| power_pf_A | double | pu | PUBLIC | | | 1 pu | in similar format as ZIPload, this is the power factor of the phase A constant power portion of load | +| current_pf_A | double | pu | PUBLIC | | | 1 pu | in similar format as ZIPload, this is the power factor of the phase A constant current portion of load | +| impedance_pf_A | double | pu | PUBLIC | | | 1 pu | in similar format as ZIPload, this is the power factor of the phase A constant impedance portion of load | +| power_pf_B | double | pu | PUBLIC | | | 1 pu | in similar format as ZIPload, this is the power factor of the phase B constant power portion of load | +| current_pf_B | double | pu | PUBLIC | | | 1 pu | in similar format as ZIPload, this is the power factor of the phase B constant current portion of load | +| impedance_pf_B | double | pu | PUBLIC | | | 1 pu | in similar format as ZIPload, this is the power factor of the phase B constant impedance portion of load | +| power_pf_C | double | pu | PUBLIC | | | 1 pu | in similar format as ZIPload, this is the power factor of the phase C constant power portion of load | +| current_pf_C | double | pu | PUBLIC | | | 1 pu | in similar format as ZIPload, this is the power factor of the phase C constant current portion of load | +| impedance_pf_C | double | pu | PUBLIC | | | 1 pu | in similar format as ZIPload, this is the power factor of the phase C constant impedance portion of load | +| power_fraction_A | double | pu | PUBLIC | | | 0 pu | this is the constant power fraction of base power on phase A | +| current_fraction_A | double | pu | PUBLIC | | | 0 pu | this is the constant current fraction of base power on phase A | +| impedance_fraction_A | double | pu | PUBLIC | | | 0 pu | this is the constant impedance fraction of base power on phase A | +| power_fraction_B | double | pu | PUBLIC | | | 0 pu | this is the constant power fraction of base power on phase B | +| current_fraction_B | double | pu | PUBLIC | | | 0 pu | this is the constant current fraction of base power on phase B | +| impedance_fraction_B | double | pu | PUBLIC | | | 0 pu | this is the constant impedance fraction of base power on phase B | +| power_fraction_C | double | pu | PUBLIC | | | 0 pu | this is the constant power fraction of base power on phase C | +| current_fraction_C | double | pu | PUBLIC | | | 0 pu | this is the constant current fraction of base power on phase C | +| impedance_fraction_C | double | pu | PUBLIC | | | 0 pu | this is the constant impedance fraction of base power on phase C | + +### regulator_configuration + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| connect_type | enumeration | | PUBLIC | REQUIRED | CLOSED_DELTA OPEN_DELTA_CABA OPEN_DELTA_BCAC OPEN_DELTA_ABBC WYE_WYE UNKNOWN | UNKNOWN | Designation of connection style | +| band_center | double | V | PUBLIC | | | 0 V | band center setting of regulator control | +| band_width | double | V | PUBLIC | | | 0 V | band width setting of regulator control | +| time_delay | double | s | PUBLIC | | | 0 s | mechanical time delay between tap changes | +| dwell_time | double | s | PUBLIC | | | 0 s | time delay before a control action of regulator control | +| raise_taps | int16 | | PUBLIC | | | 0 | number of regulator raise taps, or the maximum raise voltage tap position | +| lower_taps | int16 | | PUBLIC | | | 0 | number of regulator lower taps, or the minimum lower voltage tap position | +| current_transducer_ratio | double | pu | PUBLIC | | | 0 pu | primary rating of current transformer | +| power_transducer_ratio | double | pu | PUBLIC | | | 0 pu | potential transformer rating | +| compensator_r_setting_A | double | V | PUBLIC | | | 0 V | Line Drop Compensation R setting of regulator control (in volts) on Phase A | +| compensator_r_setting_B | double | V | PUBLIC | | | 0 V | Line Drop Compensation R setting of regulator control (in volts) on Phase B | +| compensator_r_setting_C | double | V | PUBLIC | | | 0 V | Line Drop Compensation R setting of regulator control (in volts) on Phase C | +| compensator_x_setting_A | double | V | PUBLIC | | | 0 V | Line Drop Compensation X setting of regulator control (in volts) on Phase A | +| compensator_x_setting_B | double | V | PUBLIC | | | 0 V | Line Drop Compensation X setting of regulator control (in volts) on Phase B | +| compensator_x_setting_C | double | V | PUBLIC | | | 0 V | Line Drop Compensation X setting of regulator control (in volts) on Phase C | +| CT_phase | set | | PUBLIC | CHARSET | C B A | ABC | phase(s) monitored by CT | +| PT_phase | set | | PUBLIC | CHARSET | C B A | ABC | phase(s) monitored by PT | +| regulation | double | % | PUBLIC | | | 0 % | regulation of voltage regulator in % | +| control_level | enumeration | | PUBLIC | | BANK INDIVIDUAL | INDIVIDUAL | Designates whether control is on per-phase or banked level | +| Control | enumeration | | PUBLIC | | REMOTE_NODE LINE_DROP_COMP OUTPUT_VOLTAGE MANUAL | MANUAL | Type of control used for regulating voltage | +| reverse_flow_control | enumeration | | PUBLIC | | LOCK_CURRENT_POSITION LOCK_NEUTRAL LOCK_NONE | LOCK_NONE | Type of control used when power is flowing in reverse through the regulator | +| Type | enumeration | | PUBLIC | | B A | B | Defines regulator type | +| tap_pos_A | int16 | | PUBLIC | | | 999 | initial tap position of phase A | +| tap_pos_B | int16 | | PUBLIC | | | 999 | initial tap position of phase B | +| tap_pos_C | int16 | | PUBLIC | | | 999 | initial tap position of phase C | + +### regulator + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| configuration | object | | PUBLIC | REQUIRED | | | reference to the regulator_configuration object used to determine regulator properties | +| tap_A | int16 | | PUBLIC | | | | current tap position of tap A | +| tap_B | int16 | | PUBLIC | | | | current tap position of tap B | +| tap_C | int16 | | PUBLIC | | | | current tap position of tap C | +| tap_A_change_count | double | | PUBLIC | OUTPUT | | | count of all physical tap changes on phase A since beginning of simulation (plus initial value) | +| tap_B_change_count | double | | PUBLIC | OUTPUT | | | count of all physical tap changes on phase B since beginning of simulation (plus initial value) | +| tap_C_change_count | double | | PUBLIC | OUTPUT | | | count of all physical tap changes on phase C since beginning of simulation (plus initial value) | +| sense_node | object | | PUBLIC | | | | Node to be monitored for voltage control in remote sense mode | +| regulator_resistance | double | Ohm | PUBLIC | | | | The resistance value of the regulator when it is not blown. | + +### triplex_node + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| bustype | enumeration | | PUBLIC | | SWING_PQ SWING PV PQ | | defines whether the node is a PQ, PV, or SWING node | +| busflags | set | | PUBLIC | | ISSOURCE HASSOURCE | | flag indicates node has a source for voltage, i.e. connects to the swing node | +| reference_bus | object | | PUBLIC | | | | reference bus from which frequency is defined | +| maximum_voltage_error | double | V | PUBLIC | | | | convergence voltage limit or convergence criteria | +| voltage_1 | complex | V | PUBLIC | | | | bus voltage, phase 1 to ground | +| voltage_2 | complex | V | PUBLIC | | | | bus voltage, phase 2 to ground | +| voltage_N | complex | V | PUBLIC | | | | bus voltage, phase N to ground | +| voltage_12 | complex | V | PUBLIC | | | | bus voltage, phase 1 to 2 | +| voltage_1N | complex | V | PUBLIC | | | | bus voltage, phase 1 to N | +| voltage_2N | complex | V | PUBLIC | | | | bus voltage, phase 2 to N | +| current_1 | complex | A | PUBLIC | | | | constant current load on phase 1, also acts as accumulator | +| current_2 | complex | A | PUBLIC | | | | constant current load on phase 2, also acts as accumulator | +| current_N | complex | A | PUBLIC | | | | constant current load on phase N, also acts as accumulator | +| current_1_real | double | A | PUBLIC | | | | constant current load on phase 1, real | +| current_2_real | double | A | PUBLIC | | | | constant current load on phase 2, real | +| current_N_real | double | A | PUBLIC | | | | constant current load on phase N, real | +| current_1_reac | double | A | PUBLIC | | | | constant current load on phase 1, imag | +| current_2_reac | double | A | PUBLIC | | | | constant current load on phase 2, imag | +| current_N_reac | double | A | PUBLIC | | | | constant current load on phase N, imag | +| current_12 | complex | A | PUBLIC | | | | constant current load on phase 1 to 2 | +| current_12_real | double | A | PUBLIC | | | | constant current load on phase 1 to 2, real | +| current_12_reac | double | A | PUBLIC | | | | constant current load on phase 1 to 2, imag | +| prerotated_current_1 | complex | A | HIDDEN | | | | deltamode-functionality - bus current injection (in = positive), but will not be rotated by powerflow for off-nominal frequency, this an accumulator only, not a output or input variable | +| prerotated_current_2 | complex | A | HIDDEN | | | | deltamode-functionality - bus current injection (in = positive), but will not be rotated by powerflow for off-nominal frequency, this an accumulator only, not a output or input variable | +| prerotated_current_12 | complex | A | HIDDEN | | | | deltamode-functionality - bus current injection (in = positive), but will not be rotated by powerflow for off-nominal frequency, this an accumulator only, not a output or input variable | +| residential_nominal_current_1 | complex | A | HIDDEN | | | | posted current on phase 1 from a residential object, if attached | +| residential_nominal_current_2 | complex | A | HIDDEN | | | | posted current on phase 2 from a residential object, if attached | +| residential_nominal_current_12 | complex | A | HIDDEN | | | | posted current on phase 1 to 2 from a residential object, if attached | +| residential_nominal_current_1_real | double | A | HIDDEN | | | | posted current on phase 1, real, from a residential object, if attached | +| residential_nominal_current_1_imag | double | A | HIDDEN | | | | posted current on phase 1, imag, from a residential object, if attached | +| residential_nominal_current_2_real | double | A | HIDDEN | | | | posted current on phase 2, real, from a residential object, if attached | +| residential_nominal_current_2_imag | double | A | HIDDEN | | | | posted current on phase 2, imag, from a residential object, if attached | +| residential_nominal_current_12_real | double | A | HIDDEN | | | | posted current on phase 1 to 2, real, from a residential object, if attached | +| residential_nominal_current_12_imag | double | A | HIDDEN | | | | posted current on phase 1 to 2, imag, from a residential object, if attached | +| power_1 | complex | VA | PUBLIC | | | | constant power on phase 1 (120V) | +| power_2 | complex | VA | PUBLIC | | | | constant power on phase 2 (120V) | +| power_12 | complex | VA | PUBLIC | | | | constant power on phase 1 to 2 (240V) | +| power_1_real | double | W | PUBLIC | | | | constant power on phase 1, real | +| power_2_real | double | W | PUBLIC | | | | constant power on phase 2, real | +| power_12_real | double | W | PUBLIC | | | | constant power on phase 1 to 2, real | +| power_1_reac | double | VAr | PUBLIC | | | | constant power on phase 1, imag | +| power_2_reac | double | VAr | PUBLIC | | | | constant power on phase 2, imag | +| power_12_reac | double | VAr | PUBLIC | | | | constant power on phase 1 to 2, imag | +| shunt_1 | complex | S | PUBLIC | | | | constant shunt impedance on phase 1 | +| shunt_2 | complex | S | PUBLIC | | | | constant shunt impedance on phase 2 | +| shunt_12 | complex | S | PUBLIC | | | | constant shunt impedance on phase 1 to 2 | +| impedance_1 | complex | Ohm | PUBLIC | | | | constant series impedance on phase 1 | +| impedance_2 | complex | Ohm | PUBLIC | | | | constant series impedance on phase 2 | +| impedance_12 | complex | Ohm | PUBLIC | | | | constant series impedance on phase 1 to 2 | +| impedance_1_real | double | Ohm | PUBLIC | | | | constant series impedance on phase 1, real | +| impedance_2_real | double | Ohm | PUBLIC | | | | constant series impedance on phase 2, real | +| impedance_12_real | double | Ohm | PUBLIC | | | | constant series impedance on phase 1 to 2, real | +| impedance_1_reac | double | Ohm | PUBLIC | | | | constant series impedance on phase 1, imag | +| impedance_2_reac | double | Ohm | PUBLIC | | | | constant series impedance on phase 2, imag | +| impedance_12_reac | double | Ohm | PUBLIC | | | | constant series impedance on phase 1 to 2, imag | +| house_present | bool | | PUBLIC | | | | boolean for detecting whether a house is attached, not an input | +| GFA_enable | bool | | PUBLIC | | | | Disable/Enable Grid Friendly Applicance(TM)-type functionality | +| GFA_freq_low_trip | double | Hz | PUBLIC | | | | Low frequency trip point for Grid Friendly Appliance(TM)-type functionality | +| GFA_freq_high_trip | double | Hz | PUBLIC | | | | High frequency trip point for Grid Friendly Appliance(TM)-type functionality | +| GFA_volt_low_trip | double | pu | PUBLIC | | | | Low voltage trip point for Grid Friendly Appliance(TM)-type functionality | +| GFA_volt_high_trip | double | pu | PUBLIC | | | | High voltage trip point for Grid Friendly Appliance(TM)-type functionality | +| GFA_reconnect_time | double | s | PUBLIC | | | | Reconnect time for Grid Friendly Appliance(TM)-type functionality | +| GFA_freq_disconnect_time | double | s | PUBLIC | | | | Frequency violation disconnect time for Grid Friendly Appliance(TM)-type functionality | +| GFA_volt_disconnect_time | double | s | PUBLIC | | | | Voltage violation disconnect time for Grid Friendly Appliance(TM)-type functionality | +| GFA_status | bool | | PUBLIC | | | | Low frequency trip point for Grid Friendly Appliance(TM)-type functionality | +| service_status | enumeration | | PUBLIC | | OUT_OF_SERVICE IN_SERVICE | | In and out of service flag | +| service_status_double | double | | PUBLIC | | | | In and out of service flag - type double - will indiscriminately override service_status - useful for schedules | +| previous_uptime | double | min | PUBLIC | | | | Previous time between disconnects of node in minutes | +| current_uptime | double | min | PUBLIC | | | | Current time since last disconnect of node in minutes | +| topological_parent | object | | PUBLIC | | | | topological parent as per GLM configuration | +| frequency_measure_type | enumeration | | PUBLIC | | PLL SIMPLE NONE | | PLL frequency measurement | +| sfm_Tf | double | s | PUBLIC | | | | Transducer time constant for simplified frequency measurement (seconds) | +| pll_Kp | double | pu | PUBLIC | | | | Proportional gain of PLL frequency measurement | +| pll_Ki | double | pu | PUBLIC | | | | Integration gain of PLL frequency measurement | +| measured_angle_1 | double | rad | PUBLIC | | | | bus angle measurement, phase 1N | +| measured_frequency_1 | double | Hz | PUBLIC | | | | frequency measurement, phase 1N | +| measured_angle_2 | double | rad | PUBLIC | | | | bus angle measurement, phase 2N | +| measured_frequency_2 | double | Hz | PUBLIC | | | | frequency measurement, phase 2N | +| measured_angle_12 | double | rad | PUBLIC | | | | bus angle measurement, across the phases | +| measured_frequency_12 | double | Hz | PUBLIC | | | | frequency measurement, across the phases | +| measured_frequency | double | Hz | PUBLIC | | | | frequency measurement - average of present phases | + +### triplex_meter + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| measured_real_energy | double | Wh | PUBLIC | | | | metered real energy consumption | +| measured_real_energy_delta | double | Wh | PUBLIC | | | | delta in metered real energy consumption from last specified measured_energy_delta_timestep | +| measured_reactive_energy | double | VAh | PUBLIC | | | | metered reactive energy consumption | +| measured_reactive_energy_delta | double | VAh | PUBLIC | | | | delta in metered reactive energy consumption from last specified measured_energy_delta_timestep | +| measured_energy_delta_timestep | double | s | PUBLIC | | | | Period of timestep for real and reactive delta energy calculation | +| measured_power | complex | VA | PUBLIC | | | | metered power | +| indiv_measured_power_1 | complex | VA | PUBLIC | | | | metered power, phase 1 | +| indiv_measured_power_2 | complex | VA | PUBLIC | | | | metered power, phase 2 | +| indiv_measured_power_N | complex | VA | PUBLIC | | | | metered power, phase N | +| measured_demand | double | W | PUBLIC | | | | metered demand (peak of power) | +| measured_real_power | double | W | PUBLIC | | | | metered real power | +| measured_reactive_power | double | VAr | PUBLIC | | | | metered reactive power | +| meter_power_consumption | complex | VA | PUBLIC | | | | power consumed by meter operation | +| measured_voltage_1 | complex | V | PUBLIC | | | | measured voltage, phase 1 to ground | +| measured_voltage_2 | complex | V | PUBLIC | | | | measured voltage, phase 2 to ground | +| measured_voltage_12 | complex | V | PUBLIC | | | | measured voltage, phase 1 to phase 2 | +| measured_voltage_N | complex | V | PUBLIC | | | | measured voltage, phase N to ground | +| measured_real_max_voltage_1_in_interval | double | | PUBLIC | | | | measured real max line-to-ground voltage on phase 1 over a specified interval | +| measured_real_max_voltage_2_in_interval | double | | PUBLIC | | | | measured real max line-to-ground voltage on phase 2 over a specified interval | +| measured_real_max_voltage_12_in_interval | double | | PUBLIC | | | | measured real max line-to-ground voltage on phase 12 over a specified interval | +| measured_imag_max_voltage_1_in_interval | double | | PUBLIC | | | | measured imaginary max line-to-ground voltage on phase 1 over a specified interval | +| measured_imag_max_voltage_2_in_interval | double | | PUBLIC | | | | measured imaginary max line-to-ground voltage on phase 2 over a specified interval | +| measured_imag_max_voltage_12_in_interval | double | | PUBLIC | | | | measured imaginary max line-to-ground voltage on phase 12 over a specified interval | +| measured_real_min_voltage_1_in_interval | double | | PUBLIC | | | | measured real min line-to-ground voltage on phase 1 over a specified interval | +| measured_real_min_voltage_2_in_interval | double | | PUBLIC | | | | measured real min line-to-ground voltage on phase 2 over a specified interval | +| measured_real_min_voltage_12_in_interval | double | | PUBLIC | | | | measured real min line-to-ground voltage on phase 12 over a specified interval | +| measured_imag_min_voltage_1_in_interval | double | | PUBLIC | | | | measured imaginary min line-to-ground voltage on phase 1 over a specified interval | +| measured_imag_min_voltage_2_in_interval | double | | PUBLIC | | | | measured imaginary min line-to-ground voltage on phase 2 over a specified interval | +| measured_imag_min_voltage_12_in_interval | double | | PUBLIC | | | | measured imaginary min line-to-ground voltage on phase 12 over a specified interval | +| measured_avg_voltage_mag_1_in_interval | double | | PUBLIC | | | | measured average line-to-ground voltage magnitude on phase 1 over a specified interval | +| measured_avg_voltage_mag_2_in_interval | double | | PUBLIC | | | | measured average line-to-ground voltage magnitude on phase 2 over a specified interval | +| measured_avg_voltage_mag_12_in_interval | double | | PUBLIC | | | | measured average line-to-ground voltage magnitude on phase 12 over a specified interval | +| measured_current_1 | complex | A | PUBLIC | | | | measured current, phase 1 | +| measured_current_2 | complex | A | PUBLIC | | | | measured current, phase 2 | +| measured_current_N | complex | A | PUBLIC | | | | measured current, phase N | +| customer_interrupted | bool | | PUBLIC | | | | Reliability flag - goes active if the customer is in an interrupted state | +| customer_interrupted_secondary | bool | | PUBLIC | | | | Reliability flag - goes active if the customer is in a secondary interrupted state - i.e., momentary | +| monthly_bill | double | $ | PUBLIC | | | | Accumulator for the current month's bill | +| previous_monthly_bill | double | $ | PUBLIC | | | | Total monthly bill for the previous month | +| previous_monthly_energy | double | kWh | PUBLIC | | | | | +| monthly_fee | double | $ | PUBLIC | | | | Total monthly energy for the previous month | +| monthly_energy | double | kWh | PUBLIC | | | | Accumulator for the current month's energy | +| bill_mode | enumeration | | PUBLIC | | TIERED_RTP HOURLY TIERED UNIFORM NONE | | Designates the bill mode to be used | +| power_market | object | | PUBLIC | | | | Designates the auction object where prices are read from for bill mode | +| bill_day | int32 | | PUBLIC | | | | Day bill is to be processed (assumed to occur at midnight of that day) | +| price | double | $/kWh | PUBLIC | | | | Standard uniform pricing | +| price_base | double | $/kWh | PUBLIC | | | | Used only in TIERED_RTP mode to describe the price before the first tier | +| first_tier_price | double | $/kWh | PUBLIC | | | | first tier price of energy between first and second tier energy | +| first_tier_energy | double | kWh | PUBLIC | | | | price of energy on tier above price or price base | +| second_tier_price | double | $/kWh | PUBLIC | | | | first tier price of energy between second and third tier energy | +| second_tier_energy | double | kWh | PUBLIC | | | | price of energy on tier above first tier | +| third_tier_price | double | $/kWh | PUBLIC | | | | first tier price of energy greater than third tier energy | +| third_tier_energy | double | kWh | PUBLIC | | | | price of energy on tier above second tier | + +### triplex_line + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | + +### triplex_line_configuration + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| conductor_1 | object | | PUBLIC | | | | conductor type for phase 1 | +| conductor_2 | object | | PUBLIC | | | | conductor type for phase 2 | +| conductor_N | object | | PUBLIC | | | | conductor type for phase N | +| insulation_thickness | double | in | PUBLIC | | | | thickness of insulation around cabling | +| diameter | double | in | PUBLIC | | | | total diameter of cable | +| spacing | object | | PUBLIC | | | | defines the line spacing configuration | +| z11 | complex | Ohm/mile | PUBLIC | | | | phase 1 self-impedance, used for direct entry of impedance values | +| z12 | complex | Ohm/mile | PUBLIC | | | | phase 1-2 induced impedance, used for direct entry of impedance values | +| z21 | complex | Ohm/mile | PUBLIC | | | | phase 2-1 induced impedance, used for direct entry of impedance values | +| z22 | complex | Ohm/mile | PUBLIC | | | | phase 2 self-impedance, used for direct entry of impedance values | +| rating.summer.continuous | double | A | PUBLIC | | | | amp rating in summer, continuous | +| rating.summer.emergency | double | A | PUBLIC | | | | amp rating in summer, short term | +| rating.winter.continuous | double | A | PUBLIC | | | | amp rating in winter, continuous | +| rating.winter.emergency | double | A | PUBLIC | | | | amp rating in winter, short term | + +### triplex_line_conductor + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| resistance | double | Ohm/mile | PUBLIC | | | | resistance of cable in ohm/mile | +| geometric_mean_radius | double | ft | PUBLIC | | | | geometric mean radius of the cable | +| rating.summer.continuous | double | A | PUBLIC | | | | amp ratings for the cable during continuous operation in summer | +| rating.summer.emergency | double | A | PUBLIC | | | | amp ratings for the cable during short term operation in summer | +| rating.winter.continuous | double | A | PUBLIC | | | | amp ratings for the cable during continuous operation in winter | +| rating.winter.emergency | double | A | PUBLIC | | | | amp ratings for the cable during short term operation in winter | + +### switch_coordinator + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| status | enumeration | | PUBLIC | | DIRECT TOGGLE ARMED IDLE | | switch coordination status | +| arm | method | | PUBLIC | | | | method to arm a switch | +| disarm | method | | PUBLIC | | | | method to disarm a switch | +| connect | method | | PUBLIC | | | | method to connect switches | +| armed | set | | PUBLIC | OUTPUT | NONE | | set of armed switches | + +### switch + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| phase_A_state | enumeration | | PUBLIC | | CLOSED OPEN | CLOSED | state of phase A switch | +| phase_B_state | enumeration | | PUBLIC | | CLOSED OPEN | CLOSED | state of phase B switch | +| phase_C_state | enumeration | | PUBLIC | | CLOSED OPEN | CLOSED | state of phase C switch | +| operating_mode | enumeration | | PUBLIC | | BANKED INDIVIDUAL | BANKED | switch bank operating mode | +| switch_resistance | double | Ohm | PUBLIC | | | | The resistance value of the switch when it is not blown. | + +### substation + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| zero_sequence_voltage | complex | V | PUBLIC | | | | The zero sequence representation of the voltage for the substation object. | +| positive_sequence_voltage | complex | V | PUBLIC | | | | The positive sequence representation of the voltage for the substation object. | +| negative_sequence_voltage | complex | V | PUBLIC | | | | The negative sequence representation of the voltage for the substation object. | +| base_power | double | VA | PUBLIC | | | | The 3 phase VA power rating of the substation. | +| power_convergence_value | double | VA | PUBLIC | | | | Default convergence criterion before power is posted to pw_load objects if connected, otherwise ignored | +| reference_phase | enumeration | | PUBLIC | | PHASE_C PHASE_B PHASE_A | PHASE_A | The reference phase for the positive sequence voltage. | +| transmission_level_constant_power_load | complex | VA | PUBLIC | OUTPUT | | | the average constant power load to be posted directly to the pw_load object. | +| transmission_level_constant_current_load | complex | A | PUBLIC | OUTPUT | | | the average constant current load at nominal voltage to be posted directly to the pw_load object. | +| transmission_level_constant_impedance_load | complex | Ohm | PUBLIC | OUTPUT | | | the average constant impedance load at nominal voltage to be posted directly to the pw_load object. | +| distribution_load | complex | VA | PUBLIC | OUTPUT | | | The total load of all three phases at the substation object. | +| distribution_power_A | complex | VA | PUBLIC | OUTPUT | | | | +| distribution_power_B | complex | VA | PUBLIC | OUTPUT | | | | +| distribution_power_C | complex | VA | PUBLIC | OUTPUT | | | | +| distribution_voltage_A | complex | V | PUBLIC | OUTPUT | | | | +| distribution_voltage_B | complex | V | PUBLIC | OUTPUT | | | | +| distribution_voltage_C | complex | V | PUBLIC | OUTPUT | | | | +| distribution_voltage_AB | complex | V | PUBLIC | OUTPUT | | | | +| distribution_voltage_BC | complex | V | PUBLIC | OUTPUT | | | | +| distribution_voltage_CA | complex | V | PUBLIC | OUTPUT | | | | +| distribution_current_A | complex | A | PUBLIC | OUTPUT | | | | +| distribution_current_B | complex | A | PUBLIC | OUTPUT | | | | +| distribution_current_C | complex | A | PUBLIC | OUTPUT | | | | +| distribution_real_energy | double | Wh | PUBLIC | OUTPUT | | | | + +### pqload + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| weather | object | | PUBLIC | | | | | +| T_nominal | double | degF | PUBLIC | | | | | +| Zp_T | double | ohm/degF | PUBLIC | | | | | +| Zp_H | double | ohm/% | PUBLIC | | | | | +| Zp_S | double | ohm*h/Btu | PUBLIC | | | | | +| Zp_W | double | ohm/mph | PUBLIC | | | | | +| Zp_R | double | ohm*h/in | PUBLIC | | | | | +| Zp | double | ohm | PUBLIC | | | | | +| Zq_T | double | F/degF | PUBLIC | | | | | +| Zq_H | double | F/% | PUBLIC | | | | | +| Zq_S | double | F*h/Btu | PUBLIC | | | | | +| Zq_W | double | F/mph | PUBLIC | | | | | +| Zq_R | double | F*h/in | PUBLIC | | | | | +| Zq | double | F | PUBLIC | | | | | +| Im_T | double | A/degF | PUBLIC | | | | | +| Im_H | double | A/% | PUBLIC | | | | | +| Im_S | double | A*h/Btu | PUBLIC | | | | | +| Im_W | double | A/mph | PUBLIC | | | | | +| Im_R | double | A*h/in | PUBLIC | | | | | +| Im | double | A | PUBLIC | | | | | +| Ia_T | double | deg/degF | PUBLIC | | | | | +| Ia_H | double | deg/% | PUBLIC | | | | | +| Ia_S | double | deg*h/Btu | PUBLIC | | | | | +| Ia_W | double | deg/mph | PUBLIC | | | | | +| Ia_R | double | deg*h/in | PUBLIC | | | | | +| Ia | double | deg | PUBLIC | | | | | +| Pp_T | double | W/degF | PUBLIC | | | | | +| Pp_H | double | W/% | PUBLIC | | | | | +| Pp_S | double | W*h/Btu | PUBLIC | | | | | +| Pp_W | double | W/mph | PUBLIC | | | | | +| Pp_R | double | W*h/in | PUBLIC | | | | | +| Pp | double | W | PUBLIC | | | | | +| Pq_T | double | VAr/degF | PUBLIC | | | | | +| Pq_H | double | VAr/% | PUBLIC | | | | | +| Pq_S | double | VAr*h/Btu | PUBLIC | | | | | +| Pq_W | double | VAr/mph | PUBLIC | | | | | +| Pq_R | double | VAr*h/in | PUBLIC | | | | | +| Pq | double | VAr | PUBLIC | | | | | +| input_temp | double | degF | REFERENCE | | | | | +| input_humid | double | % | REFERENCE | | | | | +| input_solar | double | Btu/h | REFERENCE | | | | | +| input_wind | double | mph | REFERENCE | | | | | +| input_rain | double | in/h | REFERENCE | | | | | +| output_imped_p | double | Ohm | REFERENCE | | | | | +| output_imped_q | double | Ohm | REFERENCE | | | | | +| output_current_m | double | A | REFERENCE | | | | | +| output_current_a | double | deg | REFERENCE | | | | | +| output_power_p | double | W | REFERENCE | | | | | +| output_power_q | double | VAr | REFERENCE | | | | | +| output_impedance | complex | ohm | REFERENCE | | | | | +| output_current | complex | A | REFERENCE | | | | | +| output_power | complex | VA | REFERENCE | | | | | + +### voltdump + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| group | char32 | | PUBLIC | | | | the group ID to output data for (all nodes if empty) | +| runtime | timestamp | | PUBLIC | | | NEVER | the time to check voltage data | +| filename | char256 | | PUBLIC | REQUIRED | | | the file to dump the voltage data into | +| file | char256 | | PUBLIC | DEPRECATED | | | the file to dump the voltage data into | +| runcount | int32 | | REFERENCE | | | 0 | the number of times the file has been written to | +| maxcount | int32 | | PUBLIC | | | -1 | the maximum number of times the file is written | +| mode | enumeration | | PUBLIC | | polar rect | rect | dumps the voltages in either polar or rectangular notation | +| filemode | char8 | | PUBLIC | | | | sets the file write mode | +| version | int32 | | PUBLIC | | | 0 | dump format version | +| interval | double | s | PUBLIC | | | 0 s | interval at which voltdump runs | + +### series_reactor + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| phase_A_impedance | complex | Ohm | PUBLIC | | | | Series impedance of reactor on phase A | +| phase_A_resistance | double | Ohm | PUBLIC | | | | Resistive portion of phase A's impedance | +| phase_A_reactance | double | Ohm | PUBLIC | | | | Reactive portion of phase A's impedance | +| phase_B_impedance | complex | Ohm | PUBLIC | | | | Series impedance of reactor on phase B | +| phase_B_resistance | double | Ohm | PUBLIC | | | | Resistive portion of phase B's impedance | +| phase_B_reactance | double | Ohm | PUBLIC | | | | Reactive portion of phase B's impedance | +| phase_C_impedance | complex | Ohm | PUBLIC | | | | Series impedance of reactor on phase C | +| phase_C_resistance | double | Ohm | PUBLIC | | | | Resistive portion of phase C's impedance | +| phase_C_reactance | double | Ohm | PUBLIC | | | | Reactive portion of phase C's impedance | +| rated_current_limit | double | A | PUBLIC | | | | Rated current limit for the reactor | + +### restoration + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| reconfig_attempts | int32 | | PUBLIC | | | | Number of reconfigurations/timestep to try before giving up | +| reconfig_iteration_limit | int32 | | PUBLIC | | | | Number of iterations to let PF go before flagging this as a bad reconfiguration | +| source_vertex | object | | PUBLIC | | | | Source vertex object for reconfiguration | +| faulted_section | object | | PUBLIC | | | | Faulted section for reconfiguration | +| feeder_power_limit | char1024 | | PUBLIC | | | | Comma-separated power limit (VA) for feeders during reconfiguration | +| feeder_power_links | char1024 | | PUBLIC | | | | Comma-separated list of link-based objects for monitoring power through | +| feeder_vertex_list | char1024 | | PUBLIC | | | | Comma-separated object list that defines the feeder vertices | +| microgrid_power_limit | char1024 | | PUBLIC | | | | Comma-separated power limit (complex VA) for microgrids during reconfiguration | +| microgrid_power_links | char1024 | | PUBLIC | | | | Comma-separated list of link-based objects for monitoring power through | +| microgrid_vertex_list | char1024 | | PUBLIC | | | | Comma-separated object list that defines the microgrid vertices | +| lower_voltage_limit | double | pu | PUBLIC | | | | Lower voltage limit for the reconfiguration validity checks - per unit | +| upper_voltage_limit | double | pu | PUBLIC | | | | Upper voltage limit for the reconfiguration validity checks - per unit | +| output_filename | char1024 | | PUBLIC | | | | Output text file name to describe final or attempted switching operations | +| generate_all_scenarios | bool | | PUBLIC | | | | Flag to determine if restoration reconfiguration and continues, or explores the full space | + +### frequency_gen + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| Frequency_Mode | enumeration | | PUBLIC | | AUTO OFF | | Frequency object operations mode | +| Frequency | double | Hz | PUBLIC | | | | Instantaneous frequency value | +| FreqChange | double | Hz/s | PUBLIC | | | | Frequency change from last timestep | +| Deadband | double | Hz | PUBLIC | | | | Frequency deadband of the governor | +| Tolerance | double | % | PUBLIC | | | | % threshold a power difference must be before it is cared about | +| M | double | pu*s | PUBLIC | | | | Inertial constant of the system | +| D | double | % | PUBLIC | | | | Load-damping constant | +| Rated_power | double | W | PUBLIC | | | | Rated power of system (base power) | +| Gen_power | double | W | PUBLIC | | | | Mechanical power equivalent | +| Load_power | double | W | PUBLIC | | | | Last sensed load value | +| Gov_delay | double | s | PUBLIC | | | | Governor delay time | +| Ramp_rate | double | W/s | PUBLIC | | | | Ramp ideal ramp rate | +| Low_Freq_OI | double | Hz | PUBLIC | | | | Low frequency setpoint for GFA devices | +| High_Freq_OI | double | Hz | PUBLIC | | | | High frequency setpoint for GFA devices | +| avg24 | double | Hz | PUBLIC | | | | Average of last 24 hourly instantaneous measurements | +| std24 | double | Hz | PUBLIC | | | | Standard deviation of last 24 hourly instantaneous measurements | +| avg168 | double | Hz | PUBLIC | | | | Average of last 168 hourly instantaneous measurements | +| std168 | double | Hz | PUBLIC | | | | Standard deviation of last 168 hourly instantaneous measurements | +| Num_Resp_Eqs | int32 | | PUBLIC | | | | Total number of equations the response can contain | + +### volt_var_control + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| control_method | enumeration | | PUBLIC | | STANDBY ACTIVE | | IVVC activated or in standby | +| capacitor_delay | double | s | PUBLIC | | | | Default capacitor time delay - overridden by local defintions | +| regulator_delay | double | s | PUBLIC | | | | Default regulator time delay - overriden by local definitions | +| desired_pf | double | | PUBLIC | | | | Desired power-factor magnitude at the substation transformer or regulator | +| d_max | double | | PUBLIC | | | | Scaling constant for capacitor switching on - typically 0.3 - 0.6 | +| d_min | double | | PUBLIC | | | | Scaling constant for capacitor switching off - typically 0.1 - 0.4 | +| substation_link | object | | PUBLIC | | | | Substation link, transformer, or regulator to measure power factor | +| pf_phase | set | | PUBLIC | CHARSET | C B A | | Phase to include in power factor monitoring | +| regulator_list | char1024 | | PUBLIC | | | | List of voltage regulators for the system, separated by commas | +| capacitor_list | char1024 | | PUBLIC | | | | List of controllable capacitors on the system separated by commas | +| voltage_measurements | char1024 | | PUBLIC | | | | List of voltage measurement devices, separated by commas | +| minimum_voltages | char1024 | | PUBLIC | | | | Minimum voltages allowed for feeder, separated by commas | +| maximum_voltages | char1024 | | PUBLIC | | | | Maximum voltages allowed for feeder, separated by commas | +| desired_voltages | char1024 | | PUBLIC | | | | Desired operating voltages for the regulators, separated by commas | +| max_vdrop | char1024 | | PUBLIC | | | | Maximum voltage drop between feeder and end measurements for each regulator, separated by commas | +| high_load_deadband | char1024 | | PUBLIC | | | | High loading case voltage deadband for each regulator, separated by commas | +| low_load_deadband | char1024 | | PUBLIC | | | | Low loading case voltage deadband for each regulator, separated by commas | +| pf_signed | bool | | PUBLIC | | | | Set to true to consider the sign on the power factor. Otherwise, it just maintains the deadband of +/-desired_pf | + +### fault_check + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| check_mode | enumeration | | PUBLIC | | ALL ONCHANGE SINGLE | | Frequency of fault checks | +| output_filename | char1024 | | PUBLIC | | | | Output filename for list of unsupported nodes | +| reliability_mode | bool | | PUBLIC | | | | General flag indicating if fault_check is operating under faulting or restoration mode -- reliability set this | +| strictly_radial | bool | | PUBLIC | | | | Flag to indicate if a system is known to be strictly radial -- uses radial assumptions for reliability alterations | +| full_output_file | bool | | PUBLIC | | | | Flag to indicate if the output_filename report contains both supported and unsupported nodes -- if false, just does unsupported | +| grid_association | bool | | PUBLIC | | | | Flag to indicate if multiple, distinct grids are allowed in a GLM, or if anything not attached to the master swing is removed | +| eventgen_object | object | | PUBLIC | | | | Link to generic eventgen object to handle unexpected faults | + +### motor + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| base_power | double | W | PUBLIC | | | | base power | +| n | double | | PUBLIC | | | | ratio of stator auxiliary windings to stator main windings | +| Rds | double | ohm | PUBLIC | | | | d-axis resistance | +| Rqs | double | ohm | PUBLIC | | | | q-asis resistance | +| Rr | double | ohm | PUBLIC | | | | rotor resistance | +| Xm | double | ohm | PUBLIC | | | | magnetizing reactance | +| Xr | double | ohm | PUBLIC | | | | rotor reactance | +| Xc_run | double | ohm | PUBLIC | | | | running capacitor reactance | +| Xc_start | double | ohm | PUBLIC | | | | starting capacitor reactance | +| Xd_prime | double | ohm | PUBLIC | | | | d-axis reactance | +| Xq_prime | double | ohm | PUBLIC | | | | q-axis reactance | +| A_sat | double | | PUBLIC | | | | flux saturation parameter, A | +| b_sat | double | | PUBLIC | | | | flux saturation parameter, b | +| H | double | | PUBLIC | | | | moment of inertia | +| To_prime | double | s | PUBLIC | | | | rotor time constant | +| capacitor_speed | double | % | PUBLIC | | | | percentage speed of nominal when starting capacitor kicks in | +| trip_time | double | s | PUBLIC | | | | time motor can stay stalled before tripping off | +| reconnect_time | double | s | PUBLIC | | | | time before tripped motor reconnects | +| mechanical_torque | double | | PUBLIC | | | | mechanical torque applied to the motor | +| iteration_count | double | | PUBLIC | | | | maximum number of iterations for steady state model | +| delta_mode_voltage_trigger | double | % | PUBLIC | | | | percentage voltage of nominal when delta mode is triggered | +| delta_mode_rotor_speed_trigger | double | % | PUBLIC | | | | percentage speed of nominal when delta mode is triggered | +| delta_mode_voltage_exit | double | % | PUBLIC | | | | percentage voltage of nominal to exit delta mode | +| delta_mode_rotor_speed_exit | double | % | PUBLIC | | | | percentage speed of nominal to exit delta mode | +| maximum_speed_error | double | | PUBLIC | | | | maximum speed error for the steady state model | +| wr | double | | PUBLIC | | | | rotor speed | +| motor_status | enumeration | | PUBLIC | | OFF TRIPPED STALLED RUNNING | | the current status of the motor | +| motor_status_number | int32 | | PUBLIC | | | | the current status of the motor as an integer | +| motor_override | enumeration | | PUBLIC | | OFF ON | | override function to dictate if motor is turned off or on | +| motor_operation_type | enumeration | | PUBLIC | | THREE-PHASE SINGLE-PHASE | | current operation type of the motor - deltamode related | +| triplex_connection_type | enumeration | | PUBLIC | | TRIPLEX_12 TRIPLEX_2N TRIPLEX_1N | | Describes how the motor will connect to the triplex devices | +| wb | double | rad/s | HIDDEN | | | | base speed | +| ws | double | | HIDDEN | | | | system speed | +| psi_b | complex | | HIDDEN | | | | backward rotating flux | +| psi_f | complex | | HIDDEN | | | | forward rotating flux | +| psi_dr | complex | | HIDDEN | | | | Rotor d axis flux | +| psi_qr | complex | | HIDDEN | | | | Rotor q axis flux | +| Ids | complex | | HIDDEN | | | | time before tripped motor reconnects | +| Iqs | complex | | HIDDEN | | | | time before tripped motor reconnects | +| If | complex | | HIDDEN | | | | forward current | +| Ib | complex | | HIDDEN | | | | backward current | +| Is | complex | | HIDDEN | | | | motor current | +| Ss | complex | | HIDDEN | | | | motor power | +| electrical_torque | double | | HIDDEN | | | | electrical torque | +| Vs | complex | | HIDDEN | | | | motor voltage | +| motor_trip | bool | | PUBLIC | | | | boolean variable to check if motor is tripped | +| trip | double | | HIDDEN | | | | current time in tripped state | +| reconnect | double | | HIDDEN | | | | current time since motor was tripped | +| rs | double | pu | PUBLIC | | | | stator resistance | +| rr | double | pu | PUBLIC | | | | rotor resistance | +| lm | double | pu | PUBLIC | | | | magnetizing reactance | +| lls | double | pu | PUBLIC | | | | stator leakage reactance | +| llr | double | pu | PUBLIC | | | | rotor leakage reactance | +| TPIM_rated_mechanical_Load_torque | double | | PUBLIC | | | | rated mechanical load torque applied to three-phase induction motor | +| friction_coefficient | double | | PUBLIC | | | | coefficient of speed-dependent torque | +| TPIM_initial_status | enumeration | | PUBLIC | | STATIONARY RUNNING | | initial status of three-phase induction motor: RUNNING or STATIONARY | +| wsyn | double | | HIDDEN | | | | system frequency in pu | +| phips | complex | | HIDDEN | | | | positive sequence stator flux | +| phins_cj | complex | | HIDDEN | | | | conjugate of negative sequence stator flux | +| phipr | complex | | HIDDEN | | | | positive sequence rotor flux | +| phinr_cj | complex | | HIDDEN | | | | conjugate of negative sequence rotor flux | +| omgr0 | double | | HIDDEN | | | | dc component of rotor speed | +| TL | double | | HIDDEN | | | | actually applied mechanical torque | +| Ias | complex | | HIDDEN | | | | motor phase-a stator current | +| Ibs | complex | | HIDDEN | | | | motor phase-b stator current | +| Ics | complex | | HIDDEN | | | | motor phase-c stator current | +| Smt | complex | | HIDDEN | | | | motor complex power | +| Vas | complex | | HIDDEN | | | | motor phase-a stator-to-ground voltage | +| Vbs | complex | | HIDDEN | | | | motor phase-b stator-to-ground voltage | +| Vcs | complex | | HIDDEN | | | | motor phase-c stator-to-ground voltage | +| Ips | complex | | HIDDEN | | | | positive sequence stator current | +| Ipr | complex | | HIDDEN | | | | positive sequence rotor current | +| Ins_cj | complex | | HIDDEN | | | | conjugate of negative sequence stator current | +| Inr_cj | complex | | HIDDEN | | | | conjugate of negative sequence rotor current | +| Ls | double | | HIDDEN | | | | stator synchronous reactance | +| Lr | double | | HIDDEN | | | | rotor synchronous reactance | +| sigma1 | double | | HIDDEN | | | | intermediate variable 1 associated with synch. react. | +| sigma2 | double | | HIDDEN | | | | intermediate variable 2 associated with synch. react. | + +### billdump + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| group | char32 | | PUBLIC | | | | the group ID to output data for (all nodes if empty) | +| runtime | timestamp | | PUBLIC | | | | the time to check voltage data | +| filename | char256 | | PUBLIC | | | | the file to dump the voltage data into | +| runcount | int32 | | REFERENCE | | | | the number of times the file has been written to | +| meter_type | enumeration | | PUBLIC | | METER TRIPLEX_METER | | describes whether to collect from 3-phase or S-phase meters | + +### power_metrics + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| SAIFI | double | | PUBLIC | | | | Displays annual SAIFI values as per IEEE 1366-2003 | +| SAIFI_int | double | | PUBLIC | | | | Displays SAIFI values over the period specified by base_time_value as per IEEE 1366-2003 | +| SAIDI | double | | PUBLIC | | | | Displays annual SAIDI values as per IEEE 1366-2003 | +| SAIDI_int | double | | PUBLIC | | | | Displays SAIDI values over the period specified by base_time_value as per IEEE 1366-2003 | +| CAIDI | double | | PUBLIC | | | | Displays annual CAIDI values as per IEEE 1366-2003 | +| CAIDI_int | double | | PUBLIC | | | | Displays SAIDI values over the period specified by base_time_value as per IEEE 1366-2003 | +| ASAI | double | | PUBLIC | | | | Displays annual AISI values as per IEEE 1366-2003 | +| ASAI_int | double | | PUBLIC | | | | Displays AISI values over the period specified by base_time_value as per IEEE 1366-2003 | +| MAIFI | double | | PUBLIC | | | | Displays annual MAIFI values as per IEEE 1366-2003 | +| MAIFI_int | double | | PUBLIC | | | | Displays MAIFI values over the period specified by base_time_value as per IEEE 1366-2003 | +| base_time_value | double | s | PUBLIC | | | | time period over which _int values are claculated | + +### currdump + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| group | char32 | | PUBLIC | | | | the group ID to output data for (all links if empty) | +| runtime | timestamp | | PUBLIC | | | NEVER | the time to check current data | +| filename | char256 | | PUBLIC | REQUIRED | | | the file to dump the current data into | +| runcount | int32 | | REFERENCE | | | 0 | the number of times the file has been written to | +| maxcount | int32 | | PUBLIC | | | 1 | the maximum number of times the file is written | +| interval | double | s | PUBLIC | | | 0 s | interval at which currdump runs | +| filemode | char8 | | PUBLIC | | | w | sets the file write mode | +| mode | enumeration | | PUBLIC | | POLAR RECT | RECT | | +| version | int32 | | PUBLIC | | | 0 | dump format version | + +### recloser + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| retry_time | double | s | PUBLIC | | | | the amount of time in seconds to wait before the recloser attempts to close | +| max_number_of_tries | double | | PUBLIC | | | | the number of times the recloser will try to close before permanently opening | +| number_of_tries | double | | PUBLIC | OUTPUT | | | Current number of tries recloser has attempted | + +### sectionalizer + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | + +### emissions + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| Nuclear_Order | double | | PUBLIC | | | | | +| Hydroelectric_Order | double | | PUBLIC | | | | | +| Solarthermal_Order | double | | PUBLIC | | | | | +| Biomass_Order | double | | PUBLIC | | | | | +| Wind_Order | double | | PUBLIC | | | | | +| Coal_Order | double | | PUBLIC | | | | | +| Naturalgas_Order | double | | PUBLIC | | | | | +| Geothermal_Order | double | | PUBLIC | | | | | +| Petroleum_Order | double | | PUBLIC | | | | | +| Naturalgas_Max_Out | double | kWh | PUBLIC | | | | | +| Coal_Max_Out | double | kWh | PUBLIC | | | | | +| Biomass_Max_Out | double | kWh | PUBLIC | | | | | +| Geothermal_Max_Out | double | kWh | PUBLIC | | | | | +| Hydroelectric_Max_Out | double | kWh | PUBLIC | | | | | +| Nuclear_Max_Out | double | kWh | PUBLIC | | | | | +| Wind_Max_Out | double | kWh | PUBLIC | | | | | +| Petroleum_Max_Out | double | kWh | PUBLIC | | | | | +| Solarthermal_Max_Out | double | kWh | PUBLIC | | | | | +| Naturalgas_Out | double | kWh | PUBLIC | | | | | +| Coal_Out | double | kWh | PUBLIC | | | | | +| Biomass_Out | double | kWh | PUBLIC | | | | | +| Geothermal_Out | double | kWh | PUBLIC | | | | | +| Hydroelectric_Out | double | kWh | PUBLIC | | | | | +| Nuclear_Out | double | kWh | PUBLIC | | | | | +| Wind_Out | double | kWh | PUBLIC | | | | | +| Petroleum_Out | double | kWh | PUBLIC | | | | | +| Solarthermal_Out | double | kWh | PUBLIC | | | | | +| Naturalgas_Conv_Eff | double | Btu/kWh | PUBLIC | | | | | +| Coal_Conv_Eff | double | Btu/kWh | PUBLIC | | | | | +| Biomass_Conv_Eff | double | Btu/kWh | PUBLIC | | | | | +| Geothermal_Conv_Eff | double | Btu/kWh | PUBLIC | | | | | +| Hydroelectric_Conv_Eff | double | Btu/kWh | PUBLIC | | | | | +| Nuclear_Conv_Eff | double | Btu/kWh | PUBLIC | | | | | +| Wind_Conv_Eff | double | Btu/kWh | PUBLIC | | | | | +| Petroleum_Conv_Eff | double | Btu/kWh | PUBLIC | | | | | +| Solarthermal_Conv_Eff | double | Btu/kWh | PUBLIC | | | | | +| Naturalgas_CO2 | double | lb/Btu | PUBLIC | | | | | +| Coal_CO2 | double | lb/Btu | PUBLIC | | | | | +| Biomass_CO2 | double | lb/Btu | PUBLIC | | | | | +| Geothermal_CO2 | double | lb/Btu | PUBLIC | | | | | +| Hydroelectric_CO2 | double | lb/Btu | PUBLIC | | | | | +| Nuclear_CO2 | double | lb/Btu | PUBLIC | | | | | +| Wind_CO2 | double | lb/Btu | PUBLIC | | | | | +| Petroleum_CO2 | double | lb/Btu | PUBLIC | | | | | +| Solarthermal_CO2 | double | lb/Btu | PUBLIC | | | | | +| Naturalgas_SO2 | double | lb/Btu | PUBLIC | | | | | +| Coal_SO2 | double | lb/Btu | PUBLIC | | | | | +| Biomass_SO2 | double | lb/Btu | PUBLIC | | | | | +| Geothermal_SO2 | double | lb/Btu | PUBLIC | | | | | +| Hydroelectric_SO2 | double | lb/Btu | PUBLIC | | | | | +| Nuclear_SO2 | double | lb/Btu | PUBLIC | | | | | +| Wind_SO2 | double | lb/Btu | PUBLIC | | | | | +| Petroleum_SO2 | double | lb/Btu | PUBLIC | | | | | +| Solarthermal_SO2 | double | lb/Btu | PUBLIC | | | | | +| Naturalgas_NOx | double | lb/Btu | PUBLIC | | | | | +| Coal_NOx | double | lb/Btu | PUBLIC | | | | | +| Biomass_NOx | double | lb/Btu | PUBLIC | | | | | +| Geothermal_NOx | double | lb/Btu | PUBLIC | | | | | +| Hydroelectric_NOx | double | lb/Btu | PUBLIC | | | | | +| Nuclear_NOx | double | lb/Btu | PUBLIC | | | | | +| Wind_NOx | double | lb/Btu | PUBLIC | | | | | +| Petroleum_NOx | double | lb/Btu | PUBLIC | | | | | +| Solarthermal_NOx | double | lb/Btu | PUBLIC | | | | | +| Naturalgas_emissions_CO2 | double | lb | PUBLIC | | | | | +| Naturalgas_emissions_SO2 | double | lb | PUBLIC | | | | | +| Naturalgas_emissions_NOx | double | lb | PUBLIC | | | | | +| Coal_emissions_CO2 | double | lb | PUBLIC | | | | | +| Coal_emissions_SO2 | double | lb | PUBLIC | | | | | +| Coal_emissions_NOx | double | lb | PUBLIC | | | | | +| Biomass_emissions_CO2 | double | lb | PUBLIC | | | | | +| Biomass_emissions_SO2 | double | lb | PUBLIC | | | | | +| Biomass_emissions_NOx | double | lb | PUBLIC | | | | | +| Geothermal_emissions_CO2 | double | lb | PUBLIC | | | | | +| Geothermal_emissions_SO2 | double | lb | PUBLIC | | | | | +| Geothermal_emissions_NOx | double | lb | PUBLIC | | | | | +| Hydroelectric_emissions_CO2 | double | lb | PUBLIC | | | | | +| Hydroelectric_emissions_SO2 | double | lb | PUBLIC | | | | | +| Hydroelectric_emissions_NOx | double | lb | PUBLIC | | | | | +| Nuclear_emissions_CO2 | double | lb | PUBLIC | | | | | +| Nuclear_emissions_SO2 | double | lb | PUBLIC | | | | | +| Nuclear_emissions_NOx | double | lb | PUBLIC | | | | | +| Wind_emissions_CO2 | double | lb | PUBLIC | | | | | +| Wind_emissions_SO2 | double | lb | PUBLIC | | | | | +| Wind_emissions_NOx | double | lb | PUBLIC | | | | | +| Petroleum_emissions_CO2 | double | lb | PUBLIC | | | | | +| Petroleum_emissions_SO2 | double | lb | PUBLIC | | | | | +| Petroleum_emissions_NOx | double | lb | PUBLIC | | | | | +| Solarthermal_emissions_CO2 | double | lb | PUBLIC | | | | | +| Solarthermal_emissions_SO2 | double | lb | PUBLIC | | | | | +| Solarthermal_emissions_NOx | double | lb | PUBLIC | | | | | +| Total_emissions_CO2 | double | lb | PUBLIC | | | | | +| Total_emissions_SO2 | double | lb | PUBLIC | | | | | +| Total_emissions_NOx | double | lb | PUBLIC | | | | | +| Total_energy_out | double | kWh | PUBLIC | | | | | +| Region | double | | PUBLIC | | | | | +| cycle_interval | double | s | PUBLIC | | | | | + +### load_tracker + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| target | object | | PUBLIC | | | | target object to track the load of | +| target_property | char256 | | PUBLIC | | | | property on the target object representing the load | +| operation | enumeration | | PUBLIC | | ANGLE MAGNITUDE IMAGINARY REAL | | operation to perform on complex property types | +| full_scale | double | | PUBLIC | | | | magnitude of the load at full load, used for feed-forward control | +| setpoint | double | | PUBLIC | | | | load setpoint to track to | +| deadband | double | | PUBLIC | | | | percentage deadband | +| damping | double | | PUBLIC | | | | load setpoint to track to | +| output | double | | PUBLIC | | | | output scaling value | +| feedback | double | | PUBLIC | | | | the feedback signal, for reference purposes | + +### triplex_load + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| load_class | enumeration | | PUBLIC | | A I C R U | | Flag to track load type, not currently used for anything except sorting | +| constant_power_1 | complex | VA | PUBLIC | | | | constant power load on split phase 1, specified as VA | +| constant_power_2 | complex | VA | PUBLIC | | | | constant power load on split phase 2, specified as VA | +| constant_power_12 | complex | VA | PUBLIC | | | | constant power load on split phase 12, specified as VA | +| constant_power_1_real | double | W | PUBLIC | | | | constant power load on spit phase 1, real only, specified as W | +| constant_power_2_real | double | W | PUBLIC | | | | constant power load on phase 2, real only, specified as W | +| constant_power_12_real | double | W | PUBLIC | | | | constant power load on phase 12, real only, specified as W | +| constant_power_1_reac | double | VAr | PUBLIC | | | | constant power load on phase 1, imaginary only, specified as VAr | +| constant_power_2_reac | double | VAr | PUBLIC | | | | constant power load on phase 2, imaginary only, specified as VAr | +| constant_power_12_reac | double | VAr | PUBLIC | | | | constant power load on phase 12, imaginary only, specified as VAr | +| constant_current_1 | complex | A | PUBLIC | | | | constant current load on phase 1, specified as Amps | +| constant_current_2 | complex | A | PUBLIC | | | | constant current load on phase 2, specified as Amps | +| constant_current_12 | complex | A | PUBLIC | | | | constant current load on phase 12, specified as Amps | +| constant_current_1_real | double | A | PUBLIC | | | | constant current load on phase 1, real only, specified as Amps | +| constant_current_2_real | double | A | PUBLIC | | | | constant current load on phase 2, real only, specified as Amps | +| constant_current_12_real | double | A | PUBLIC | | | | constant current load on phase 12, real only, specified as Amps | +| constant_current_1_reac | double | A | PUBLIC | | | | constant current load on phase 1, imaginary only, specified as Amps | +| constant_current_2_reac | double | A | PUBLIC | | | | constant current load on phase 2, imaginary only, specified as Amps | +| constant_current_12_reac | double | A | PUBLIC | | | | constant current load on phase 12, imaginary only, specified as Amps | +| constant_impedance_1 | complex | Ohm | PUBLIC | | | | constant impedance load on phase 1, specified as Ohms | +| constant_impedance_2 | complex | Ohm | PUBLIC | | | | constant impedance load on phase 2, specified as Ohms | +| constant_impedance_12 | complex | Ohm | PUBLIC | | | | constant impedance load on phase 12, specified as Ohms | +| constant_impedance_1_real | double | Ohm | PUBLIC | | | | constant impedance load on phase 1, real only, specified as Ohms | +| constant_impedance_2_real | double | Ohm | PUBLIC | | | | constant impedance load on phase 2, real only, specified as Ohms | +| constant_impedance_12_real | double | Ohm | PUBLIC | | | | constant impedance load on phase 12, real only, specified as Ohms | +| constant_impedance_1_reac | double | Ohm | PUBLIC | | | | constant impedance load on phase 1, imaginary only, specified as Ohms | +| constant_impedance_2_reac | double | Ohm | PUBLIC | | | | constant impedance load on phase 2, imaginary only, specified as Ohms | +| constant_impedance_12_reac | double | Ohm | PUBLIC | | | | constant impedance load on phase 12, imaginary only, specified as Ohms | +| measured_voltage_1 | complex | V | PUBLIC | | | | measured voltage on phase 1 | +| measured_voltage_2 | complex | V | PUBLIC | | | | measured voltage on phase 2 | +| measured_voltage_12 | complex | V | PUBLIC | | | | measured voltage on phase 12 | +| base_power_1 | double | VA | PUBLIC | | | | in similar format as ZIPload, this represents the nominal power on phase 1 before applying ZIP fractions | +| base_power_2 | double | VA | PUBLIC | | | | in similar format as ZIPload, this represents the nominal power on phase 2 before applying ZIP fractions | +| base_power_12 | double | VA | PUBLIC | | | | in similar format as ZIPload, this represents the nominal power on phase 12 before applying ZIP fractions | +| power_pf_1 | double | pu | PUBLIC | | | | in similar format as ZIPload, this is the power factor of the phase 1 constant power portion of load | +| current_pf_1 | double | pu | PUBLIC | | | | in similar format as ZIPload, this is the power factor of the phase 1 constant current portion of load | +| impedance_pf_1 | double | pu | PUBLIC | | | | in similar format as ZIPload, this is the power factor of the phase 1 constant impedance portion of load | +| power_pf_2 | double | pu | PUBLIC | | | | in similar format as ZIPload, this is the power factor of the phase 2 constant power portion of load | +| current_pf_2 | double | pu | PUBLIC | | | | in similar format as ZIPload, this is the power factor of the phase 2 constant current portion of load | +| impedance_pf_2 | double | pu | PUBLIC | | | | in similar format as ZIPload, this is the power factor of the phase 2 constant impedance portion of load | +| power_pf_12 | double | pu | PUBLIC | | | | in similar format as ZIPload, this is the power factor of the phase 12 constant power portion of load | +| current_pf_12 | double | pu | PUBLIC | | | | in similar format as ZIPload, this is the power factor of the phase 12 constant current portion of load | +| impedance_pf_12 | double | pu | PUBLIC | | | | in similar format as ZIPload, this is the power factor of the phase 12 constant impedance portion of load | +| power_fraction_1 | double | pu | PUBLIC | | | | this is the constant power fraction of base power on phase 1 | +| current_fraction_1 | double | pu | PUBLIC | | | | this is the constant current fraction of base power on phase 1 | +| impedance_fraction_1 | double | pu | PUBLIC | | | | this is the constant impedance fraction of base power on phase 1 | +| power_fraction_2 | double | pu | PUBLIC | | | | this is the constant power fraction of base power on phase 2 | +| current_fraction_2 | double | pu | PUBLIC | | | | this is the constant current fraction of base power on phase 2 | +| impedance_fraction_2 | double | pu | PUBLIC | | | | this is the constant impedance fraction of base power on phase 2 | +| power_fraction_12 | double | pu | PUBLIC | | | | this is the constant power fraction of base power on phase 12 | +| current_fraction_12 | double | pu | PUBLIC | | | | this is the constant current fraction of base power on phase 12 | +| impedance_fraction_12 | double | pu | PUBLIC | | | | this is the constant impedance fraction of base power on phase 12 | + +### impedance_dump + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| group | char32 | | PUBLIC | | | | the group ID to output data for (all links if empty) | +| filename | char256 | | PUBLIC | | | | the file to dump the current data into | +| runtime | timestamp | | PUBLIC | | | | the time to check voltage data | +| runcount | int32 | | REFERENCE | | | | the number of times the file has been written to | + +### vfd + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| rated_motor_speed | double | 1/min | PUBLIC | | | | Rated speed of the VFD in RPM. Default = 1800 RPM | +| desired_motor_speed | double | 1/min | PUBLIC | | | | Desired speed of the VFD In ROM. Default = 1800 RPM (max) | +| motor_poles | double | | PUBLIC | | | | Number of Motor Poles. Default = 4 | +| rated_output_voltage | double | V | PUBLIC | | | | Line to Line Voltage - VFD Rated voltage. Default to TO node nominal_voltage | +| rated_horse_power | double | hp | PUBLIC | | | | Rated Horse Power of the VFD. Default = 75 HP | +| nominal_output_frequency | double | Hz | PUBLIC | | | | Nominal VFD output frequency. Default = 60 Hz | +| desired_output_frequency | double | Hz | PUBLIC | | | | VFD desired output frequency based on the desired RPM | +| current_output_frequency | double | Hz | PUBLIC | | | | VFD currently output frequency | +| efficiency | double | % | PUBLIC | | | | Current VFD efficiency based on the load/VFD output Horsepower | +| stable_time | double | s | PUBLIC | | | | Time taken by the VFD to reach desired frequency (based on RPM). Default = 1.45 seconds | +| vfd_state | enumeration | | PUBLIC | | STEADY_STATE CHANGING OFF | | Current state of the VFD | + +### pole + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| pole_status | enumeration | | PUBLIC | | FAILED OK | | pole status | +| tilt_angle | double | rad | PUBLIC | | | | tilt angle of pole | +| tilt_direction | double | deg | PUBLIC | | | | tilt direction of pole | +| weather | object | | PUBLIC | | | | weather data | +| configuration | object | | PUBLIC | | | | configuration data | +| equipment_area | double | sf | PUBLIC | | | | equipment cross sectional area | +| equipment_height | double | ft | PUBLIC | | | | equipment height on pole | +| pole_stress | double | pu | PUBLIC | | | | ratio of actual stress to critical stress | +| pole_stress_polynomial_a | double | ft*lb | PUBLIC | | | | constant a of the pole stress polynomial function | +| pole_stress_polynomial_b | double | ft*lb | PUBLIC | | | | constant b of the pole stress polynomial function | +| pole_stress_polynomial_c | double | ft*lb | PUBLIC | | | | constant c of the pole stress polynomial function | +| susceptibility | double | pu*s/m | PUBLIC | | | | susceptibility of pole to wind stress (derivative of pole stress w.r.t wind speed) | +| total_moment | double | ft*lb | PUBLIC | | | | the total moment on the pole. | +| resisting_moment | double | ft*lb | PUBLIC | | | | the resisting moment on the pole. | +| critical_wind_speed | double | m/s | PUBLIC | | | | wind speed at pole failure | +| install_year | int32 | | PUBLIC | | | | the year of pole was installed | +| repair_time | double | h | PUBLIC | | | | typical repair time after pole failure | + +### pole_configuration + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| pole_type | enumeration | | PUBLIC | | STEEL CONCRETE WOOD | | material from which pole is made | +| design_ice_thickness | double | in | PUBLIC | | | | design ice thickness on conductors | +| design_wind_loading | double | psi | PUBLIC | | | | design wind loading on pole | +| design_temperature | double | degF | PUBLIC | | | | design temperature for pole | +| overload_factor_vertical | double | | PUBLIC | | | | design overload factor (vertical) | +| overload_factor_transverse_general | double | | PUBLIC | | | | design overload factor (transverse general) | +| overload_factor_transverse_crossing | double | | PUBLIC | | | | design overload factor (transverse crossing) | +| overload_factor_transverse_wire | double | | PUBLIC | | | | design overload factor (transverse wire) | +| overload_factor_longitudinal_general | double | | PUBLIC | | | | design overload factor (longitudinal general) | +| overload_factor_longitudinal_deadend | double | | PUBLIC | | | | design overload factor (longitudinal deadend) | +| strength_factor_250b_wood | double | | PUBLIC | | | | design strength factor (Rule 250B wood structure) | +| strength_factor_250b_support | double | | PUBLIC | | | | design strength factor (Rule 250B support hardware) | +| strength_factor_250c_wood | double | | PUBLIC | | | | design strength factor (Rule 250C wood structure) | +| strength_factor_250c_support | double | | PUBLIC | | | | design strength factor (Rule 250C support hardware) | +| pole_length | double | ft | PUBLIC | | | | total length of pole (including underground portion) | +| pole_depth | double | ft | PUBLIC | | | | depth of pole underground | +| ground_diameter | double | in | PUBLIC | | | | diameter of pole at ground level | +| top_diameter | double | in | PUBLIC | | | | diameter of pole at top | +| fiber_strength | double | psi | PUBLIC | | | | pole structural strength | +| repair_time | double | h | PUBLIC | | | | pole repair time | +| degradation_rate | double | in/yr | PUBLIC | | | | rate of pole degradation. | +| treatment_method | enumeration | | PUBLIC | | CCA PENTA CREOSOTE NONE | | pole degradation prevention treatment | + +### metrics + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| report_file | char1024 | | PUBLIC | | | | | +| customer_group | char1024 | | PUBLIC | | | | | +| module_metrics_object | object | | PUBLIC | | | | | +| metrics_of_interest | char1024 | | PUBLIC | | | | | +| metric_interval | double | s | PUBLIC | | | | | +| report_interval | double | s | PUBLIC | | | | | + +### eventgen + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| target_group | char1024 | | PUBLIC | | | | | +| fault_type | char256 | | PUBLIC | | | | | +| failure_dist | enumeration | | PUBLIC | | TRIANGLE BETA GAMMA WEIBULL RAYLEIGH EXPONENTIAL PARETO BERNOULLI LOGNORMAL NORMAL UNIFORM | | | +| restoration_dist | enumeration | | PUBLIC | | TRIANGLE BETA GAMMA WEIBULL RAYLEIGH EXPONENTIAL PARETO BERNOULLI LOGNORMAL NORMAL UNIFORM | | | +| failure_dist_param_1 | double | | PUBLIC | | | | | +| failure_dist_param_2 | double | | PUBLIC | | | | | +| restoration_dist_param_1 | double | | PUBLIC | | | | | +| restoration_dist_param_2 | double | | PUBLIC | | | | | +| manual_outages | char1024 | | PUBLIC | | | | | +| max_outage_length | double | s | PUBLIC | | | | | +| max_simultaneous_faults | int32 | | PUBLIC | | | | | +| controlled_switch | char256 | | PUBLIC | | | | Name of a switch to manually fault/un-fault | +| switch_state | int32 | | PUBLIC | | | | Current state (1=closed, 0=open) for the controlled switch | +| external_fault_event | char1024 | | PUBLIC | | | | This variable is populated from external programs with a fault they would like to add/remove to the system. | +| use_external_faults | bool | | PUBLIC | | | | Boolean to let the object know to check for faults messages from an external source. | + +### cost + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| total | double | $ | PUBLIC | OUTPUT | | | Total cost of outages | +| type | set | | PUBLIC | | WAGES LIGHTS COOKING HEATING ELDERCARE BUSINESS LODGING GEN_ALL GEN_COMFORT GEN_BASIC SEPTIC WATER FOOD | | Type of costs incurred during outages | + +### residential_enduse + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| shape | loadshape | | PUBLIC | | | | | +| load | enduse | | PUBLIC | | | | the enduse load description | +| energy | complex | kVAh | PUBLIC | | | | the total energy consumed since the last meter reading | +| power | complex | kVA | PUBLIC | | | | the total power consumption of the load | +| peak_demand | complex | kVA | PUBLIC | | | | the peak power consumption since the last meter reading | +| heatgain | double | Btu/h | PUBLIC | | | | the heat transferred from the enduse to the parent | +| cumulative_heatgain | double | Btu | PUBLIC | | | | the cumulative heatgain from the enduse to the parent | +| heatgain_fraction | double | pu | PUBLIC | | | | the fraction of the heat that goes to the parent | +| current_fraction | double | pu | PUBLIC | | | | the fraction of total power that is constant current | +| impedance_fraction | double | pu | PUBLIC | | | | the fraction of total power that is constant impedance | +| power_fraction | double | pu | PUBLIC | | | | the fraction of the total power that is constant power | +| power_factor | double | | PUBLIC | | | | the power factor of the load | +| constant_power | complex | kVA | PUBLIC | | | | the constant power portion of the total load | +| constant_current | complex | kVA | PUBLIC | | | | the constant current portion of the total load | +| constant_admittance | complex | kVA | PUBLIC | | | | the constant admittance portion of the total load | +| voltage_factor | double | pu | PUBLIC | | | | the voltage change factor | +| breaker_amps | double | A | PUBLIC | | | | the rated breaker amperage | +| configuration | set | | PUBLIC | | IS220 IS110 | | the load configuration options | +| override | enumeration | | PUBLIC | | OFF ON NORMAL | NORMAL | | +| power_state | enumeration | | PUBLIC | | UNKNOWN ON OFF | OFF | | + +### appliance + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| powers | complex_array | | PUBLIC | | | | | +| impedances | complex_array | | PUBLIC | | | | | +| currents | complex_array | | PUBLIC | | | | | +| durations | double_array | | PUBLIC | | | | | +| transitions | double_array | | PUBLIC | | | | | +| heatgains | double_array | | PUBLIC | | | | | + +### house + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| weather | object | | PUBLIC | | | | reference to the climate object | +| floor_area | double | sf | PUBLIC | | | +0 | home conditioned floor area | +| gross_wall_area | double | sf | PUBLIC | | | +0 | gross outdoor wall area | +| ceiling_height | double | ft | PUBLIC | | | +0 | average ceiling height | +| aspect_ratio | double | | PUBLIC | | | +0 | aspect ratio of the home's footprint | +| envelope_UA | double | Btu/degF/h | PUBLIC | | | +0 | overall UA of the home's envelope | +| window_wall_ratio | double | | PUBLIC | | | +0 | ratio of window area to wall area | +| number_of_doors | double | | PUBLIC | | | +0 | ratio of door area to wall area | +| exterior_wall_fraction | double | | PUBLIC | | | +0 | ratio of exterior wall area to total wall area | +| interior_exterior_wall_ratio | double | | PUBLIC | | | +0 | ratio of interior to exterior walls | +| exterior_ceiling_fraction | double | | PUBLIC | | | +0 | ratio of external ceiling sf to floor area | +| exterior_floor_fraction | double | | PUBLIC | | | +0 | ratio of floor area used in UA calculation | +| window_shading | double | | PUBLIC | | | +0 | transmission coefficient through window due to glazing | +| window_exterior_transmission_coefficient | double | | PUBLIC | | | +0 | coefficient for the amount of energy that passes through window | +| solar_heatgain_factor | double | | REFERENCE | | | +0 | product of the window area, window transmitivity, and the window exterior transmission coefficient | +| airchange_per_hour | double | unit/h | PUBLIC | | | -1 | number of air-changes per hour | +| airchange_UA | double | Btu/degF/h | PUBLIC | | | +0 | additional UA due to air infiltration | +| UA | double | Btu/degF/h | PUBLIC | | | -1 | the total UA | +| internal_gain | double | Btu/h | PUBLIC | | | +0 | internal heat gains | +| solar_gain | double | Btu/h | PUBLIC | | | +0 | solar heat gains | +| incident_solar_radiation | double | Btu/h/sf | PUBLIC | | | +0 | average incident solar radiation hitting the house | +| heat_cool_gain | double | Btu/h | PUBLIC | | | +0 | system heat gains(losses) | +| include_solar_quadrant | set | | PUBLIC | | ALL ALLWALLS W S E N H NONE | ALLWALLS | bit set for determining which solar incidence quadrants should be included in the solar heatgain | +| horizontal_diffuse_solar_radiation | double | Btu/h/sf | PUBLIC | | | +0 | incident solar radiation hitting the top of the house | +| north_incident_solar_radiation | double | Btu/h/sf | PUBLIC | | | +0 | incident solar radiation hitting the north side of the house | +| northwest_incident_solar_radiation | double | Btu/h/sf | PUBLIC | | | +0 | incident solar radiation hitting the northwest side of the house | +| west_incident_solar_radiation | double | Btu/h/sf | PUBLIC | | | +0 | incident solar radiation hitting the west side of the house | +| southwest_incident_solar_radiation | double | Btu/h/sf | PUBLIC | | | +0 | incident solar radiation hitting the southwest side of the house | +| south_incident_solar_radiation | double | Btu/h/sf | PUBLIC | | | +0 | incident solar radiation hitting the south side of the house | +| southeast_incident_solar_radiation | double | Btu/h/sf | PUBLIC | | | +0 | incident solar radiation hitting the southeast side of the house | +| east_incident_solar_radiation | double | Btu/h/sf | PUBLIC | | | +0 | incident solar radiation hitting the east side of the house | +| northeast_incident_solar_radiation | double | Btu/h/sf | PUBLIC | | | +0 | incident solar radiation hitting the northeast side of the house | +| heating_cop_curve | enumeration | | PUBLIC | | CURVED LINEAR FLAT DEFAULT | DEFAULT | Defines the function type to use for the adjusted heating COP as a function of outside air temperature. | +| heating_cap_curve | enumeration | | PUBLIC | | CURVED LINEAR FLAT DEFAULT | DEFAULT | Defines the function type to use for the adjusted heating capacity as a function of outside air temperature. | +| cooling_cop_curve | enumeration | | PUBLIC | | CURVED LINEAR FLAT DEFAULT | DEFAULT | Defines the function type to use for the adjusted cooling COP as a function of outside air temperature. | +| cooling_cap_curve | enumeration | | PUBLIC | | CURVED LINEAR FLAT DEFAULT | DEFAULT | Defines the function type to use for the adjusted cooling capacity as a function of outside air temperature. | +| use_latent_heat | bool | | PUBLIC | | | TRUE | Boolean for using the heat latency of the air to the humidity when cooling. | +| include_fan_heatgain | bool | | PUBLIC | | | TRUE | Boolean to choose whether to include the heat generated by the fan in the ETP model. | +| thermostat_deadband | double | degF | PUBLIC | | | +0 | deadband of thermostat control | +| dlc_offset | double | degF | PUBLIC | | | +0 | used as a cap to offset the thermostat deadband for direct load control applications | +| thermostat_cycle_time | int16 | | PUBLIC | | | 0 | minimum time in seconds between thermostat updates | +| thermostat_off_cycle_time | int16 | | PUBLIC | | | -1 | the minimum amount of time the thermostat cycle must stay in the off state | +| thermostat_on_cycle_time | int16 | | PUBLIC | | | -1 | the minimum amount of time the thermostat cycle must stay in the on state | +| thermostat_last_cycle_time | timestamp | | PUBLIC | | | 0 | last time the thermostat changed state | +| heating_setpoint | double | degF | PUBLIC | | | +0 | thermostat heating setpoint | +| cooling_setpoint | double | degF | PUBLIC | | | +0 | thermostat cooling setpoint | +| design_heating_setpoint | double | degF | PUBLIC | | | +0 | system design heating setpoint | +| design_cooling_setpoint | double | degF | PUBLIC | | | +0 | system design cooling setpoint | +| over_sizing_factor | double | | PUBLIC | | | +0 | over sizes the heating and cooling system from standard specifications (0.2 ='s 120% sizing) | +| simulate_window_openings | bool | | PUBLIC | | | FALSE | activates a representation of an occupant opening a window and de-activating the HVAC system | +| is_window_open | double | | PUBLIC | | | +0 | defines the state of the window opening, 1=open, 2=closed | +| window_low_temperature_cutoff | double | degF | PUBLIC | | | +60 | lowest temperature at which the window opening might occur | +| window_high_temperature_cutoff | double | degF | PUBLIC | | | +80 | highest temperature at which the window opening might occur | +| window_quadratic_coefficient | double | | PUBLIC | | | +0 | quadratic coefficient for describing function between low and high temperature cutoffs | +| window_linear_coefficient | double | | PUBLIC | | | +0 | linear coefficient for describing function between low and high temperature cutoffs | +| window_constant_coefficient | double | | PUBLIC | | | +1 | constant coefficient for describing function between low and high temperature cutoffs | +| window_temperature_delta | double | | PUBLIC | | | +5 | change in outdoor temperature required to update the window opening model | +| design_heating_capacity | double | Btu/h | PUBLIC | | | +0 | system heating capacity | +| design_cooling_capacity | double | Btu/h | PUBLIC | | | +0 | system cooling capacity | +| cooling_design_temperature | double | degF | PUBLIC | | | +0 | system cooling design temperature | +| heating_design_temperature | double | degF | PUBLIC | | | +0 | system heating design temperature | +| design_peak_solar | double | Btu/h/sf | PUBLIC | | | +0 | system design solar load | +| design_internal_gains | double | Btu/h | PUBLIC | | | +0 | system design internal gains | +| air_heat_fraction | double | pu | PUBLIC | | | +0 | fraction of heat gain/loss that goes to air (as opposed to mass) | +| mass_solar_gain_fraction | double | pu | PUBLIC | | | +0 | fraction of the heat gain/loss from the solar gains that goes to the mass | +| mass_internal_gain_fraction | double | pu | PUBLIC | | | +0 | fraction of heat gain/loss from the internal gains that goes to the mass | +| auxiliary_heat_capacity | double | Btu/h | PUBLIC | | | +0 | installed auxiliary heating capacity | +| aux_heat_deadband | double | degF | PUBLIC | | | +0 | temperature offset from standard heat activation to auxiliary heat activation | +| aux_heat_temperature_lockout | double | degF | PUBLIC | | | +0 | temperature at which auxiliary heat will not engage above | +| aux_heat_time_delay | double | s | PUBLIC | | | +0 | time required for heater to run until auxiliary heating engages | +| cooling_supply_air_temp | double | degF | PUBLIC | | | +50 | temperature of air blown out of the cooling system | +| heating_supply_air_temp | double | degF | PUBLIC | | | +150 | temperature of air blown out of the heating system | +| duct_pressure_drop | double | inH2O | PUBLIC | | | +0 | end-to-end pressure drop for the ventilation ducts, in inches of water | +| fan_design_power | double | W | PUBLIC | | | -1 | designed maximum power draw of the ventilation fan | +| fan_low_power_fraction | double | pu | PUBLIC | | | +0 | fraction of ventilation fan power draw during low-power mode (two-speed only) | +| fan_power | double | kW | REFERENCE | | | +0 | current ventilation fan power draw | +| fan_design_airflow | double | cfm | PUBLIC | | | +0 | designed airflow for the ventilation system | +| fan_impedance_fraction | double | pu | PUBLIC | | | +0.2534 | Impedance component of fan ZIP load | +| fan_power_fraction | double | pu | PUBLIC | | | +0.0135 | Power component of fan ZIP load | +| fan_current_fraction | double | pu | PUBLIC | | | +0.7332 | Current component of fan ZIP load | +| fan_power_factor | double | pu | PUBLIC | | | +0.96 | Power factor of the fan load | +| heating_demand | double | kW | REFERENCE | | | +0 | the current power draw to run the heating system | +| cooling_demand | double | kW | REFERENCE | | | +0 | the current power draw to run the cooling system | +| heating_COP | double | pu | PUBLIC | | | +0 | system heating performance coefficient | +| cooling_COP | double | Btu/kWh | PUBLIC | | | +0 | system cooling performance coefficient | +| air_temperature | double | degF | PUBLIC | DYNAMIC | | +0 | indoor air temperature | +| outdoor_temperature | double | degF | PUBLIC | | | +0 | outdoor air temperature | +| outdoor_rh | double | % | PUBLIC | | | +0 | outdoor relative humidity | +| mass_heat_capacity | double | Btu/degF | PUBLIC | | | +0 | interior mass heat capacity | +| mass_heat_coeff | double | Btu/degF/h | PUBLIC | | | +0 | interior mass heat exchange coefficient | +| mass_temperature | double | degF | PUBLIC | DYNAMIC | | +0 | interior mass temperature | +| air_volume | double | cf | PUBLIC | | | +0 | air volume | +| air_mass | double | lb | PUBLIC | | | +0 | air mass | +| air_heat_capacity | double | Btu/degF | PUBLIC | | | +0 | air thermal mass | +| latent_load_fraction | double | pu | PUBLIC | | | +0 | fractional increase in cooling load due to latent heat | +| total_thermal_mass_per_floor_area | double | Btu/degF/sf | PUBLIC | | | +0 | | +| interior_surface_heat_transfer_coeff | double | Btu/h/degF/sf | PUBLIC | | | +0 | | +| number_of_stories | double | | PUBLIC | | | +0 | number of stories within the structure | +| is_AUX_on | double | | PUBLIC | OUTPUT | | +0 | logic statement to determine population statistics - is the AUX on? 0 no, 1 yes | +| is_HEAT_on | double | | PUBLIC | OUTPUT | | +0 | logic statement to determine population statistics - is the HEAT on? 0 no, 1 yes | +| is_COOL_on | double | | PUBLIC | OUTPUT | | +0 | logic statement to determine population statistics - is the COOL on? 0 no, 1 yes | +| thermal_storage_present | double | | PUBLIC | | | +0 | logic statement for determining if energy storage is present | +| thermal_storage_in_use | double | | PUBLIC | | | +0 | logic statement for determining if energy storage is being utilized | +| thermostat_mode | enumeration | | PUBLIC | | COOL HEAT AUTO OFF | AUTO | tells the thermostat whether it is even allowed to heat or cool the house. | +| system_type | set | | PUBLIC | | RESISTIVE TWOSTAGE FORCEDAIR AIRCONDITIONING GAS NONE | NONE | heating/cooling system type/options | +| auxiliary_strategy | set | | PUBLIC | | LOCKOUT TIMER DEADBAND NONE | NONE | auxiliary heating activation strategies | +| system_mode | enumeration | | PUBLIC | | AUX COOL OFF HEAT UNKNOWN | UNKNOWN | heating/cooling system operation state | +| last_system_mode | enumeration | | PUBLIC | | AUX COOL OFF HEAT UNKNOWN | UNKNOWN | heating/cooling system operation state | +| heating_system_type | enumeration | | PUBLIC | | RESISTANCE HEAT_PUMP GAS NONE UNKNOWN | HEAT_PUMP | heating system type | +| cooling_system_type | enumeration | | PUBLIC | | HEAT_PUMP ELECTRIC NONE UNKNOWN | UNKNOWN | cooling system type | +| auxiliary_system_type | enumeration | | PUBLIC | | ELECTRIC NONE UNKNOWN | UNKNOWN | auxiliary heating type | +| fan_type | enumeration | | PUBLIC | | TWO_SPEED ONE_SPEED NONE UNKNOWN | UNKNOWN | fan type | +| thermal_integrity_level | enumeration | | PUBLIC | | UNKNOWN VERY_GOOD GOOD ABOVE_NORMAL NORMAL BELOW_NORMAL LITTLE VERY_LITTLE | UNKNOWN | default envelope UA settings | +| glass_type | enumeration | | PUBLIC | | LOW_E_GLASS GLASS OTHER | LOW_E_GLASS | glass used in the windows | +| window_frame | enumeration | | PUBLIC | | INSULATED WOOD THERMAL_BREAK ALUMINIUM ALUMINUM NONE | THERMAL_BREAK | type of window frame | +| glazing_treatment | enumeration | | PUBLIC | | HIGH_S LOW_S REFL ABS CLEAR OTHER | CLEAR | the treatment to increase the reflectivity of the exterior windows | +| glazing_layers | enumeration | | PUBLIC | | OTHER THREE TWO ONE | TWO | number of layers of glass in each window | +| motor_model | enumeration | | PUBLIC | | FULL BASIC NONE | NONE | indicates the level of detail used in modelling the hvac motor parameters | +| motor_efficiency | enumeration | | PUBLIC | | VERY_GOOD GOOD AVERAGE POOR VERY_POOR | AVERAGE | when using motor model, describes the efficiency of the motor | +| last_mode_timer | int64 | | PUBLIC | OUTPUT | | | | +| hvac_motor_efficiency | double | unit | PUBLIC | | | +1 | when using motor model, percent efficiency of hvac motor | +| hvac_motor_loss_power_factor | double | unit | PUBLIC | | | +0.125 | when using motor model, power factor of motor losses | +| Rroof | double | degF*sf*h/Btu | PUBLIC | | | +0 | roof R-value | +| Rwall | double | degF*sf*h/Btu | PUBLIC | | | +0 | wall R-value | +| Rfloor | double | degF*sf*h/Btu | PUBLIC | | | +0 | floor R-value | +| Rwindows | double | degF*sf*h/Btu | PUBLIC | | | +0 | window R-value | +| Rdoors | double | degF*sf*h/Btu | PUBLIC | | | +0 | door R-value | +| hvac_breaker_rating | double | A | PUBLIC | | | +0 | determines the amount of current the HVAC circuit breaker can handle | +| hvac_power_factor | double | unit | PUBLIC | | | +0 | power factor of hvac | +| hvac_load | double | kW | PUBLIC | OUTPUT | | | heating/cooling system load | +| last_heating_load | double | kW | PUBLIC | OUTPUT | | | stores the previous heating/cooling system load | +| last_cooling_load | double | kW | PUBLIC | OUTPUT | | | stores the previous heating/cooling system load | +| hvac_power | complex | kVA | PUBLIC | OUTPUT | | | describes hvac load complex power consumption | +| total_load | double | kW | PUBLIC | OUTPUT | | | total panel enduse load | +| panel | enduse | | PUBLIC | | | | the enduse load description | +| panel.energy | complex | kVAh | PUBLIC | | | | the total energy consumed since the last meter reading | +| panel.power | complex | kVA | PUBLIC | | | | the total power consumption of the load | +| panel.peak_demand | complex | kVA | PUBLIC | | | | the peak power consumption since the last meter reading | +| panel.heatgain | double | Btu/h | PUBLIC | | | | the heat transferred from the enduse to the parent | +| panel.cumulative_heatgain | double | Btu | PUBLIC | | | | the cumulative heatgain from the enduse to the parent | +| panel.heatgain_fraction | double | pu | PUBLIC | | | | the fraction of the heat that goes to the parent | +| panel.current_fraction | double | pu | PUBLIC | | | | the fraction of total power that is constant current | +| panel.impedance_fraction | double | pu | PUBLIC | | | | the fraction of total power that is constant impedance | +| panel.power_fraction | double | pu | PUBLIC | | | | the fraction of the total power that is constant power | +| panel.power_factor | double | | PUBLIC | | | | the power factor of the load | +| panel.constant_power | complex | kVA | PUBLIC | | | | the constant power portion of the total load | +| panel.constant_current | complex | kVA | PUBLIC | | | | the constant current portion of the total load | +| panel.constant_admittance | complex | kVA | PUBLIC | | | | the constant admittance portion of the total load | +| panel.voltage_factor | double | pu | PUBLIC | | | | the voltage change factor | +| panel.breaker_amps | double | A | PUBLIC | | | | the rated breaker amperage | +| panel.configuration | set | | PUBLIC | | IS220 IS110 | | the load configuration options | +| design_internal_gain_density | double | W/sf | PUBLIC | | | +0.6 | average density of heat generating devices in the house | +| compressor_on | bool | | PUBLIC | OUTPUT | | | | +| compressor_count | int64 | | PUBLIC | OUTPUT | | | | +| hvac_last_on | timestamp | | PUBLIC | OUTPUT | | | | +| hvac_last_off | timestamp | | PUBLIC | OUTPUT | | | | +| hvac_period_length | double | s | PUBLIC | OUTPUT | | | | +| hvac_duty_cycle | double | | PUBLIC | OUTPUT | | | | +| a | double | | HIDDEN | OUTPUT | | | | +| b | double | | HIDDEN | OUTPUT | | | | +| c | double | | HIDDEN | OUTPUT | | | | +| d | double | | HIDDEN | OUTPUT | | | | +| c1 | double | | HIDDEN | OUTPUT | | | | +| c2 | double | | HIDDEN | OUTPUT | | | | +| A3 | double | | HIDDEN | OUTPUT | | | | +| A4 | double | | HIDDEN | OUTPUT | | | | +| k1 | double | | HIDDEN | OUTPUT | | | | +| k2 | double | | HIDDEN | OUTPUT | | | | +| r1 | double | | HIDDEN | OUTPUT | | | | +| r2 | double | | HIDDEN | OUTPUT | | | | +| Teq | double | | HIDDEN | OUTPUT | | | | +| Tevent | double | | HIDDEN | OUTPUT | | | | +| Qi | double | | HIDDEN | OUTPUT | | | | +| Qa | double | | HIDDEN | OUTPUT | | | | +| Qm | double | | HIDDEN | OUTPUT | | | | +| Qh | double | | HIDDEN | OUTPUT | | | | +| Qlatent | double | | HIDDEN | OUTPUT | | | | +| dTair | double | | HIDDEN | OUTPUT | | | | +| adj_cooling_cap | double | | HIDDEN | OUTPUT | | | | +| adj_heating_cap | double | | HIDDEN | OUTPUT | | | | +| adj_cooling_cop | double | | HIDDEN | OUTPUT | | | | +| adj_heating_cop | double | | HIDDEN | OUTPUT | | | | +| thermostat_control | enumeration | | PUBLIC | | NONE BAND FULL | FULL | determine level of internal thermostatic control | +| gas_enduses | char1024 | | PUBLIC | | | | list of implicit enduses that use gas instead of electricity | +| circuit | method | | PROTECTED | | | | smart breaker message handlers | +| load_power_fraction | double | | PUBLIC | | | +0.8 | fraction of total load that is constant power | +| load_impedance_fraction | double | | PUBLIC | | | +0.2 | fraction of total load that is constant impedance | +| load_current_fraction | double | | PUBLIC | | | +0 | fraction of total load that is constant current | + +### waterheater + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| tank_volume | double | gal | PUBLIC | | | | the volume of water in the tank when it is full | +| tank_UA | double | Btu*h/degF | PUBLIC | | | | the UA of the tank (surface area divided by R-value) | +| tank_diameter | double | ft | PUBLIC | | | | the diameter of the water heater tank | +| tank_height | double | ft | PUBLIC | | | | the height of the water heater tank | +| water_demand | double | gpm | PUBLIC | | | | the hot water draw from the water heater | +| heating_element_capacity | double | kW | PUBLIC | | | | the power of the heating element | +| inlet_water_temperature | double | degF | PUBLIC | | | | the inlet temperature of the water tank | +| waterheater_model | enumeration | | PUBLIC | | NONE FORTRAN TWONODE ONENODE | | the water heater model to use | +| heat_mode | enumeration | | PUBLIC | | HEAT_PUMP GASHEAT ELECTRIC | | the energy source for heating the water heater | +| location | enumeration | | PUBLIC | | GARAGE INSIDE | | whether the water heater is inside or outside | +| tank_setpoint | double | degF | PUBLIC | | | | the temperature around which the water heater will heat its contents | +| thermostat_deadband | double | degF | PUBLIC | | | | the degree to heat the water tank, when needed | +| temperature | double | degF | PUBLIC | | | | the outlet temperature of the water tank | +| height | double | ft | PUBLIC | | | | the height of the hot water column within the water tank | +| demand | complex | kVA | PUBLIC | | | | the water heater power consumption | +| actual_load | double | kW | PUBLIC | | | | the actual load based on the current voltage across the coils | +| previous_load | double | kW | PUBLIC | | | | the previous load based on voltage across the coils at the last sync operation | +| actual_power | complex | kVA | PUBLIC | | | | the actual power based on the current voltage across the coils | +| is_waterheater_on | double | | PUBLIC | | | | simple logic output to determine state of waterheater (1-on, 0-off) | +| gas_fan_power | double | kW | PUBLIC | | | | load of a running gas waterheater | +| gas_standby_power | double | kW | PUBLIC | | | | load of a gas waterheater in standby | +| heat_pump_coefficient_of_performance | double | Btu/kWh | PUBLIC | | | | current COP of the water heater pump - currently calculated internally and not an input | +| Tcontrol | double | degF | PUBLIC | | | | in heat pump operation, defines the blended temperature used for turning on and off HP - currently calculated internally and not an input | +| current_tank_status | enumeration | | PUBLIC | | EMPTY PARTIAL FULL | | | +| dr_signal | double | | PUBLIC | | | | the on/off signal to send to the fortran waterheater model | +| COP | double | | PUBLIC | | | | the cop of the fortran heat pump water heater model. | +| operating_mode | double | | PUBLIC | | | | the operating mode the fortran water heater should be using. | +| fortran_sim_time | double | s | PUBLIC | | | | the amount of time the fortran model should simulate. | +| waterheater_power | double | kW | PUBLIC | | | | the current power draw from the fortran water heater. | +| load_state | enumeration | | PUBLIC | | STABLE RECOVERING DEPLETING | | | +| actual_voltage | double | | HIDDEN | | | | | +| nominal_voltage | double | | HIDDEN | | | | | +| re_override | enumeration | | PUBLIC | | OV_OFF OV_NORMAL OV_ON | | the override setting for the water heater | + +### lights + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| type | enumeration | | PUBLIC | | HID SSL CFL FLUORESCENT INCANDESCENT | | lighting type (affects power_factor) | +| placement | enumeration | | PUBLIC | | OUTDOOR INDOOR | | lighting location (affects where heatgains go) | +| installed_power | double | kW | PUBLIC | | | | installed lighting capacity | +| power_density | double | W/sf | PUBLIC | | | | installed power density | +| curtailment | double | pu | PUBLIC | | | | lighting curtailment factor | +| demand | double | pu | PUBLIC | | | | the current lighting demand | +| actual_power | complex | kVA | PUBLIC | | | | actual power demand of lights object | + +### refrigerator + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| size | double | cf | PUBLIC | | | | volume of the refrigerator | +| rated_capacity | double | Btu/h | PUBLIC | | | | | +| temperature | double | degF | PUBLIC | | | | | +| setpoint | double | degF | PUBLIC | | | | | +| deadband | double | degF | PUBLIC | | | | | +| cycle_time | double | s | PUBLIC | | | | | +| output | double | | PUBLIC | | | | | +| event_temp | double | | PUBLIC | | | | | +| UA | double | Btu/degF/h | PUBLIC | | | | | +| compressor_off_normal_energy | double | | PUBLIC | | | | | +| compressor_off_normal_power | double | W | PUBLIC | | | | | +| compressor_on_normal_energy | double | | PUBLIC | | | | | +| compressor_on_normal_power | double | W | PUBLIC | | | | | +| defrost_energy | double | | PUBLIC | | | | | +| defrost_power | double | W | PUBLIC | | | | | +| icemaking_energy | double | | PUBLIC | | | | | +| icemaking_power | double | W | PUBLIC | | | | | +| ice_making_probability | double | | PUBLIC | | | | | +| FF_Door_Openings | int32 | | PUBLIC | | | | | +| door_opening_energy | int32 | | PUBLIC | | | | | +| door_opening_power | int32 | | PUBLIC | | | | | +| DO_Thershold | double | | PUBLIC | | | | | +| dr_mode_double | double | | PUBLIC | | | | | +| energy_needed | double | | PUBLIC | | | | | +| energy_used | double | | PUBLIC | | | | | +| refrigerator_power | double | | PUBLIC | | | | | +| icemaker_running | bool | | PUBLIC | | | | | +| check_DO | int32 | | PUBLIC | | | | | +| is_240 | bool | | PUBLIC | | | | | +| defrostDelayed | double | | PUBLIC | | | | | +| long_compressor_cycle_due | bool | | PUBLIC | | | | | +| long_compressor_cycle_time | double | | PUBLIC | | | | | +| long_compressor_cycle_power | double | | PUBLIC | | | | | +| long_compressor_cycle_energy | double | | PUBLIC | | | | | +| long_compressor_cycle_threshold | double | | PUBLIC | | | | | +| defrost_criterion | enumeration | | PUBLIC | | COMPRESSOR_TIME DOOR_OPENINGS TIMED | | | +| run_defrost | bool | | PUBLIC | | | | | +| door_opening_criterion | double | | PUBLIC | | | | | +| compressor_defrost_time | double | | PUBLIC | | | | | +| delay_defrost_time | double | | PUBLIC | | | | | +| daily_door_opening | int32 | | PUBLIC | | | | | +| state | enumeration | | PUBLIC | | COMPRESSSOR_ON_NORMAL COMPRESSSOR_ON_LONG COMPRESSSOR_OFF_NORMAL DEFROST | | | + +### clotheswasher + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| motor_power | double | kW | PUBLIC | | | | | +| circuit_split | double | | PUBLIC | | | | | +| queue | double | unit | PUBLIC | | | | the total laundry accumulated | +| demand | double | unit/day | PUBLIC | | | | the amount of laundry accumulating daily | +| energy_meter | complex | kWh | PUBLIC | | | | | +| stall_voltage | double | V | PUBLIC | | | | | +| start_voltage | double | V | PUBLIC | | | | | +| clothesWasherPower | double | | PUBLIC | | | | | +| stall_impedance | complex | Ohm | PUBLIC | | | | | +| trip_delay | double | s | PUBLIC | | | | | +| reset_delay | double | s | PUBLIC | | | | | +| Is_on | double | | PUBLIC | | | | | +| normal_perc | double | | PUBLIC | | | | | +| perm_press_perc | double | | PUBLIC | | | | | +| NORMAL_PREWASH_POWER | double | | PUBLIC | | | | | +| NORMAL_WASH_POWER | double | | PUBLIC | | | | | +| NORMAL_SPIN_LOW_POWER | double | | PUBLIC | | | | | +| NORMAL_SPIN_MEDIUM_POWER | double | | PUBLIC | | | | | +| NORMAL_SPIN_HIGH_POWER | double | | PUBLIC | | | | | +| NORMAL_SMALLWASH_POWER | double | | PUBLIC | | | | | +| NORMAL_PREWASH_ENERGY | double | | PUBLIC | | | | | +| NORMAL_WASH_ENERGY | double | | PUBLIC | | | | | +| NORMAL_SPIN_LOW_ENERGY | double | | PUBLIC | | | | | +| NORMAL_SPIN_MEDIUM_ENERGY | double | | PUBLIC | | | | | +| NORMAL_SPIN_HIGH_ENERGY | double | | PUBLIC | | | | | +| NORMAL_SMALLWASH_ENERGY | double | | PUBLIC | | | | | +| PERMPRESS_PREWASH_POWER | double | | PUBLIC | | | | | +| PERMPRESS_WASH_POWER | double | | PUBLIC | | | | | +| PERMPRESS_SPIN_LOW_POWER | double | | PUBLIC | | | | | +| PERMPRESS_SPIN_MEDIUM_POWER | double | | PUBLIC | | | | | +| PERMPRESS_SPIN_HIGH_POWER | double | | PUBLIC | | | | | +| PERMPRESS_SMALLWASH_POWER | double | | PUBLIC | | | | | +| PERMPRESS_PREWASH_ENERGY | double | | PUBLIC | | | | | +| PERMPRESS_WASH_ENERGY | double | | PUBLIC | | | | | +| PERMPRESS_SPIN_LOW_ENERGY | double | | PUBLIC | | | | | +| PERMPRESS_SPIN_MEDIUM_ENERGY | double | | PUBLIC | | | | | +| PERMPRESS_SPIN_HIGH_ENERGY | double | | PUBLIC | | | | | +| PERMPRESS_SMALLWASH_ENERGY | double | | PUBLIC | | | | | +| GENTLE_PREWASH_POWER | double | | PUBLIC | | | | | +| GENTLE_WASH_POWER | double | | PUBLIC | | | | | +| GENTLE_SPIN_LOW_POWER | double | | PUBLIC | | | | | +| GENTLE_SPIN_MEDIUM_POWER | double | | PUBLIC | | | | | +| GENTLE_SPIN_HIGH_POWER | double | | PUBLIC | | | | | +| GENTLE_SMALLWASH_POWER | double | | PUBLIC | | | | | +| GENTLE_PREWASH_ENERGY | double | | PUBLIC | | | | | +| GENTLE_WASH_ENERGY | double | | PUBLIC | | | | | +| GENTLE_SPIN_LOW_ENERGY | double | | PUBLIC | | | | | +| GENTLE_SPIN_MEDIUM_ENERGY | double | | PUBLIC | | | | | +| GENTLE_SPIN_HIGH_ENERGY | double | | PUBLIC | | | | | +| GENTLE_SMALLWASH_ENERGY | double | | PUBLIC | | | | | +| queue_min | double | unit | PUBLIC | | | | | +| queue_max | double | unit | PUBLIC | | | | | +| clotheswasher_run_prob | double | | PUBLIC | | | | | +| state | enumeration | | PUBLIC | | SPIN4 SPIN3 SPIN2 SPIN1 WASH PREWASH STOPPED | | | +| spin_mode | enumeration | | PUBLIC | | SMALLWASH SPIN_WASH SPIN_HIGH SPIN_MEDIUM SPIN_LOW | | | +| wash_mode | enumeration | | PUBLIC | | GENTLE PERM_PRESS NORMAL | | | + +### dishwasher + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| control_power | double | W | PUBLIC | | | | | +| dishwasher_coil_power_1 | double | W | PUBLIC | | | | | +| dishwasher_coil_power_2 | double | W | PUBLIC | | | | | +| dishwasher_coil_power_3 | double | W | PUBLIC | | | | | +| motor_power | double | W | PUBLIC | | | | | +| circuit_split | double | | PUBLIC | | | | | +| queue | double | unit | PUBLIC | | | | number of loads accumulated | +| stall_voltage | double | V | PUBLIC | | | | | +| start_voltage | double | V | PUBLIC | | | | | +| stall_impedance | complex | Ohm | PUBLIC | | | | | +| trip_delay | double | s | PUBLIC | | | | | +| reset_delay | double | s | PUBLIC | | | | | +| total_power | double | W | PUBLIC | | | | | +| state | enumeration | | PUBLIC | | HEATEDDRY_ONLY CONTROL_ONLY COIL_ONLY MOTOR_COIL_ONLY MOTOR_ONLY TRIPPED STALLED STOPPED | | | +| energy_baseline | double | kWh | PUBLIC | | | | | +| energy_used | double | kWh | PUBLIC | | | | | +| control_check1 | bool | | PUBLIC | | | | | +| control_check2 | bool | | PUBLIC | | | | | +| control_check3 | bool | | PUBLIC | | | | | +| control_check4 | bool | | PUBLIC | | | | | +| control_check5 | bool | | PUBLIC | | | | | +| control_check6 | bool | | PUBLIC | | | | | +| control_check7 | bool | | PUBLIC | | | | | +| control_check8 | bool | | PUBLIC | | | | | +| control_check9 | bool | | PUBLIC | | | | | +| control_check10 | bool | | PUBLIC | | | | | +| control_check11 | bool | | PUBLIC | | | | | +| control_check12 | bool | | PUBLIC | | | | | +| control_check_temp | bool | | PUBLIC | | | | | +| motor_only_check1 | bool | | PUBLIC | | | | | +| motor_only_check2 | bool | | PUBLIC | | | | | +| motor_only_check3 | bool | | PUBLIC | | | | | +| motor_only_check4 | bool | | PUBLIC | | | | | +| motor_only_check5 | bool | | PUBLIC | | | | | +| motor_only_check6 | bool | | PUBLIC | | | | | +| motor_only_check7 | bool | | PUBLIC | | | | | +| motor_only_check8 | bool | | PUBLIC | | | | | +| motor_only_check9 | bool | | PUBLIC | | | | | +| motor_only_temp1 | bool | | PUBLIC | | | | | +| motor_only_temp2 | bool | | PUBLIC | | | | | +| motor_coil_only_check1 | bool | | PUBLIC | | | | | +| motor_coil_only_check2 | bool | | PUBLIC | | | | | +| heateddry_check1 | bool | | PUBLIC | | | | | +| heateddry_check2 | bool | | PUBLIC | | | | | +| coil_only_check1 | bool | | PUBLIC | | | | | +| coil_only_check2 | bool | | PUBLIC | | | | | +| coil_only_check3 | bool | | PUBLIC | | | | | +| Heateddry_option_check | bool | | PUBLIC | | | | | +| queue_min | double | unit | PUBLIC | | | | | +| queue_max | double | unit | PUBLIC | | | | | +| pulse_interval_1 | double | s | PUBLIC | | | | | +| pulse_interval_2 | double | s | PUBLIC | | | | | +| pulse_interval_3 | double | s | PUBLIC | | | | | +| pulse_interval_4 | double | s | PUBLIC | | | | | +| pulse_interval_5 | double | s | PUBLIC | | | | | +| pulse_interval_6 | double | s | PUBLIC | | | | | +| pulse_interval_7 | double | s | PUBLIC | | | | | +| pulse_interval_8 | double | s | PUBLIC | | | | | +| pulse_interval_9 | double | s | PUBLIC | | | | | +| pulse_interval_10 | double | s | PUBLIC | | | | | +| pulse_interval_11 | double | s | PUBLIC | | | | | +| pulse_interval_12 | double | s | PUBLIC | | | | | +| pulse_interval_13 | double | s | PUBLIC | | | | | +| pulse_interval_14 | double | s | PUBLIC | | | | | +| pulse_interval_15 | double | s | PUBLIC | | | | | +| pulse_interval_16 | double | s | PUBLIC | | | | | +| pulse_interval_17 | double | s | PUBLIC | | | | | +| pulse_interval_18 | double | s | PUBLIC | | | | | +| pulse_interval_19 | double | s | PUBLIC | | | | | +| dishwasher_run_prob | double | | PUBLIC | | | | | +| energy_needed | double | kWh | PUBLIC | | | | | +| dishwasher_demand | double | kWh | PUBLIC | | | | | +| daily_dishwasher_demand | double | kWh | PUBLIC | | | | | +| actual_dishwasher_demand | double | kWh | PUBLIC | | | | | +| motor_on_off | double | | PUBLIC | | | | | +| motor_coil_on_off | double | | PUBLIC | | | | | +| is_240 | bool | | PUBLIC | | | | load is 220/240 V (across both phases) | + +### occupantload + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| number_of_occupants | int32 | | PUBLIC | | | | | +| occupancy_fraction | double | unit | PUBLIC | | | | | +| heatgain_per_person | double | Btu/h | PUBLIC | | | | | + +### plugload + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| circuit_split | double | | PUBLIC | | | | | +| demand | double | unit | PUBLIC | | | | | +| installed_power | double | kW | PUBLIC | | | | installed plugs capacity | +| actual_power | complex | kVA | PUBLIC | | | | actual power demand | + +### microwave + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| installed_power | double | kW | PUBLIC | | | | rated microwave power level | +| standby_power | double | kW | PUBLIC | | | | standby microwave power draw (unshaped only) | +| circuit_split | double | | PUBLIC | | | | | +| state | enumeration | | PUBLIC | | ON OFF | | on/off state of the microwave | +| cycle_length | double | s | PUBLIC | | | | length of the combined on/off cycle between uses | +| runtime | double | s | PUBLIC | | | | | +| state_time | double | s | PUBLIC | | | | | + +### range + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| oven_volume | double | gal | PUBLIC | | | | the volume of the oven | +| oven_UA | double | Btu/degF/h | PUBLIC | | | | the UA of the oven (surface area divided by R-value) | +| oven_diameter | double | ft | PUBLIC | | | | the diameter of the oven | +| oven_demand | double | gpm | PUBLIC | | | | the hot food take out from the oven | +| heating_element_capacity | double | kW | PUBLIC | | | | the power of the heating element | +| inlet_food_temperature | double | degF | PUBLIC | | | | the inlet temperature of the food | +| heat_mode | enumeration | | PUBLIC | | GASHEAT ELECTRIC | | the energy source for heating the oven | +| location | enumeration | | PUBLIC | | GARAGE INSIDE | | whether the range is inside or outside | +| oven_setpoint | double | degF | PUBLIC | | | | the temperature around which the oven will heat its contents | +| thermostat_deadband | double | degF | PUBLIC | | | | the degree to heat the food in the oven, when needed | +| temperature | double | degF | PUBLIC | | | | the outlet temperature of the oven | +| height | double | ft | PUBLIC | | | | the height of the oven | +| food_density | double | | PUBLIC | | | | food density | +| specificheat_food | double | | PUBLIC | | | | | +| queue_cooktop | double | unit | PUBLIC | | | | number of loads accumulated | +| queue_oven | double | unit | PUBLIC | | | | number of loads accumulated | +| queue_min | double | unit | PUBLIC | | | | | +| queue_max | double | unit | PUBLIC | | | | | +| time_cooktop_operation | double | | PUBLIC | | | | | +| time_cooktop_setting | double | | PUBLIC | | | | | +| cooktop_run_prob | double | | PUBLIC | | | | | +| oven_run_prob | double | | PUBLIC | | | | | +| cooktop_coil_setting_1 | double | kW | PUBLIC | | | | | +| cooktop_coil_setting_2 | double | kW | PUBLIC | | | | | +| cooktop_coil_setting_3 | double | kW | PUBLIC | | | | | +| total_power_oven | double | kW | PUBLIC | | | | | +| total_power_cooktop | double | kW | PUBLIC | | | | | +| total_power_range | double | kW | PUBLIC | | | | | +| demand_cooktop | double | unit/day | PUBLIC | | | | number of loads accumulating daily | +| demand_oven | double | unit/day | PUBLIC | | | | number of loads accumulating daily | +| stall_voltage | double | V | PUBLIC | | | | | +| start_voltage | double | V | PUBLIC | | | | | +| stall_impedance | complex | Ohm | PUBLIC | | | | | +| trip_delay | double | s | PUBLIC | | | | | +| reset_delay | double | s | PUBLIC | | | | | +| time_oven_operation | double | s | PUBLIC | | | | | +| time_oven_setting | double | s | PUBLIC | | | | | +| state_cooktop | enumeration | | PUBLIC | | CT_TRIPPED CT_STALLED STAGE_8_ONLY STAGE_7_ONLY STAGE_6_ONLY CT_STOPPED | | | +| cooktop_energy_baseline | double | kWh | PUBLIC | | | | | +| cooktop_energy_used | double | | PUBLIC | | | | | +| Toff | double | | PUBLIC | | | | | +| Ton | double | | PUBLIC | | | | | +| cooktop_interval_setting_1 | double | s | PUBLIC | | | | | +| cooktop_interval_setting_2 | double | s | PUBLIC | | | | | +| cooktop_interval_setting_3 | double | s | PUBLIC | | | | | +| cooktop_energy_needed | double | kWh | PUBLIC | | | | | +| heat_needed | bool | | PUBLIC | | | | | +| oven_check | bool | | PUBLIC | | | | | +| remainon | bool | | PUBLIC | | | | | +| cooktop_check | bool | | PUBLIC | | | | | +| actual_load | double | kW | PUBLIC | | | | the actual load based on the current voltage across the coils | +| previous_load | double | kW | PUBLIC | | | | the actual load based on current voltage stored for use in controllers | +| actual_power | complex | kVA | PUBLIC | | | | the actual power based on the current voltage across the coils | +| is_range_on | double | | PUBLIC | | | | simple logic output to determine state of range (1-on, 0-off) | + +### freezer + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| size | double | cf | PUBLIC | | | | | +| rated_capacity | double | Btu/h | PUBLIC | | | | | +| temperature | double | degF | PUBLIC | | | | | +| setpoint | double | degF | PUBLIC | | | | | +| deadband | double | degF | PUBLIC | | | | | +| next_time | timestamp | | PUBLIC | | | | | +| output | double | | PUBLIC | | | | | +| event_temp | double | | PUBLIC | | | | | +| UA | double | Btu/degF/h | PUBLIC | | | | | +| state | enumeration | | PUBLIC | | ON OFF | | | + +### dryer + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| motor_power | double | W | PUBLIC | | | | | +| dryer_coil_power | double | W | PUBLIC | | | | | +| controls_power | double | W | PUBLIC | | | | | +| circuit_split | double | | PUBLIC | | | | | +| queue | double | unit | PUBLIC | | | | number of loads accumulated | +| queue_min | double | unit | PUBLIC | | | | | +| queue_max | double | unit | PUBLIC | | | | | +| stall_voltage | double | V | PUBLIC | | | | | +| start_voltage | double | V | PUBLIC | | | | | +| stall_impedance | complex | Ohm | PUBLIC | | | | | +| trip_delay | double | s | PUBLIC | | | | | +| reset_delay | double | s | PUBLIC | | | | | +| total_power | double | W | PUBLIC | | | | | +| state | enumeration | | PUBLIC | | CONTROL_ONLY MOTOR_COIL_ONLY MOTOR_ONLY TRIPPED STALLED STOPPED | | | +| energy_baseline | double | kWh | PUBLIC | | | | | +| energy_used | double | kWh | PUBLIC | | | | | +| next_t | double | | PUBLIC | | | | | +| control_check | bool | | PUBLIC | | | | | +| motor_only_check1 | bool | | PUBLIC | | | | | +| motor_only_check2 | bool | | PUBLIC | | | | | +| motor_only_check3 | bool | | PUBLIC | | | | | +| motor_only_check4 | bool | | PUBLIC | | | | | +| motor_only_check5 | bool | | PUBLIC | | | | | +| motor_only_check6 | bool | | PUBLIC | | | | | +| dryer_on | bool | | PUBLIC | | | | | +| dryer_ready | bool | | PUBLIC | | | | | +| dryer_check | bool | | PUBLIC | | | | | +| motor_coil_only_check1 | bool | | PUBLIC | | | | | +| motor_coil_only_check2 | bool | | PUBLIC | | | | | +| motor_coil_only_check3 | bool | | PUBLIC | | | | | +| motor_coil_only_check4 | bool | | PUBLIC | | | | | +| motor_coil_only_check5 | bool | | PUBLIC | | | | | +| motor_coil_only_check6 | bool | | PUBLIC | | | | | +| dryer_run_prob | double | | PUBLIC | | | | | +| dryer_turn_on | double | | PUBLIC | | | | | +| pulse_interval_1 | double | s | PUBLIC | | | | | +| pulse_interval_2 | double | s | PUBLIC | | | | | +| pulse_interval_3 | double | s | PUBLIC | | | | | +| pulse_interval_4 | double | s | PUBLIC | | | | | +| pulse_interval_5 | double | s | PUBLIC | | | | | +| pulse_interval_6 | double | s | PUBLIC | | | | | +| pulse_interval_7 | double | s | PUBLIC | | | | | +| energy_needed | double | kWh | PUBLIC | | | | | +| daily_dryer_demand | double | kWh | PUBLIC | | | | | +| actual_dryer_demand | double | kWh | PUBLIC | | | | | +| motor_on_off | double | | PUBLIC | | | | | +| motor_coil_on_off | double | | PUBLIC | | | | | +| is_240 | bool | | PUBLIC | | | | load is 220/240 V (across both phases) | + +### evcharger + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| charger_type | enumeration | | PUBLIC | | HIGH MEDIUM LOW | | | +| vehicle_type | enumeration | | PUBLIC | | HYBRID ELECTRIC | | | +| state | enumeration | | PUBLIC | | WORK HOME UNKNOWN | | | +| p_go_home | double | unit/h | PUBLIC | | | | | +| p_go_work | double | unit/h | PUBLIC | | | | | +| work_dist | double | mile | PUBLIC | | | | | +| capacity | double | kWh | PUBLIC | | | | | +| charge | double | unit | PUBLIC | | | | | +| charge_at_work | bool | | PUBLIC | | | | | +| charge_throttle | double | unit | PUBLIC | | | | | +| charger_efficiency | double | unit | PUBLIC | | | | Efficiency of the charger in terms of energy in to battery stored | +| power_train_efficiency | double | mile/kWh | PUBLIC | | | | Miles per kWh of battery charge | +| mileage_classification | double | mile | PUBLIC | | | | Miles expected range on battery only | +| demand_profile | char1024 | | PUBLIC | | | | | + +### ZIPload + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| heat_fraction | double | | PUBLIC | | | | fraction of ZIPload that is transferred as heat | +| base_power | double | kW | PUBLIC | | | | base real power of the overall load | +| power_pf | double | | PUBLIC | | | | power factor for constant power portion | +| current_pf | double | | PUBLIC | | | | power factor for constant current portion | +| impedance_pf | double | | PUBLIC | | | | power factor for constant impedance portion | +| is_240 | bool | | PUBLIC | | | | load is 220/240 V (across both phases) | +| breaker_val | double | A | PUBLIC | | | | Amperage of connected breaker | +| actual_power | complex | kVA | PUBLIC | | | | variable to pull actual load as function of voltage | +| multiplier | double | | PUBLIC | | | | this variable is used to modify the base power as a function of multiplier x base_power | +| heatgain_only | bool | | PUBLIC | | | | allows the zipload to generate heat only (no kW), not activated by default | +| demand_response_mode | bool | | PUBLIC | | | | Activates equilibrium dynamic representation of demand response | +| number_of_devices | int16 | | PUBLIC | | | | Number of devices to model - base power is the total load of all devices | +| thermostatic_control_range | int16 | | PUBLIC | | | | Range of the thermostat's control operation | +| number_of_devices_off | double | | PUBLIC | | | | Total number of devices that are off | +| number_of_devices_on | double | | PUBLIC | | | | Total number of devices that are on | +| rate_of_cooling | double | K/h | PUBLIC | | | | rate at which devices cool down | +| rate_of_heating | double | K/h | PUBLIC | | | | rate at which devices heat up | +| temperature | int16 | | PUBLIC | | | | temperature of the device's controlled media (eg air temp or water temp) | +| phi | double | | PUBLIC | | | | duty cycle of the device | +| demand_rate | double | 1/h | PUBLIC | | | | consumer demand rate that prematurely turns on a device or population | +| nominal_power | double | | PUBLIC | | | | the rated amount of power demanded by devices that are on | +| duty_cycle | double | pu | PUBLIC | | | | fraction of time in the on state | +| recovery_duty_cycle | double | pu | PUBLIC | | | | fraction of time in the on state, while in recovery interval | +| period | double | h | PUBLIC | | | | time interval to apply duty cycle | +| phase | double | pu | PUBLIC | | | | initial phase of load; duty will be assumed to occur at beginning of period | + +### thermal_storage + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| total_capacity | double | Btu | PUBLIC | | | | total storage capacity of unit | +| stored_capacity | double | Btu | PUBLIC | | | | amount of capacity that is stored | +| recharge_power | double | kW | PUBLIC | | | | installed compressor power usage | +| discharge_power | double | kW | PUBLIC | | | | installed pump power usage | +| recharge_pf | double | | PUBLIC | | | | installed compressor power factor | +| discharge_pf | double | | PUBLIC | | | | installed pump power factor | +| discharge_schedule_type | enumeration | | PUBLIC | | EXTERNAL INTERNAL | | Scheduling method for discharging | +| recharge_schedule_type | enumeration | | PUBLIC | | EXTERNAL INTERNAL | | Scheduling method for charging | +| recharge_time | double | | PUBLIC | | | | Flag indicating if recharging is available at the current time (1 or 0) | +| discharge_time | double | | PUBLIC | | | | Flag indicating if discharging is available at the current time (1 or 0) | +| discharge_rate | double | Btu/h | PUBLIC | | | | rating of discharge or cooling | +| SOC | double | % | PUBLIC | | | | state of charge as percentage of total capacity | +| k | double | W/m/K | PUBLIC | | | | coefficient of thermal conductivity (W/m/K) | + +### evcharger_det + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| charge_rate | double | W | PUBLIC | | | | Current demanded charge rate of the vehicle | +| variation_mean | double | s | PUBLIC | | | | Mean of normal variation of schedule variation | +| variation_std_dev | double | s | PUBLIC | | | | Standard deviation of normal variation of schedule times | +| variation_trip_mean | double | mile | PUBLIC | | | | Mean of normal variation of trip distance variation | +| variation_trip_std_dev | double | mile | PUBLIC | | | | Standard deviation of normal variation of trip distance | +| mileage_classification | double | mile | PUBLIC | | | | Mileage classification of electric vehicle | +| work_charging_available | bool | | PUBLIC | | | | Charging available when at work | +| data_file | char1024 | | PUBLIC | | | | Path to .CSV file with vehicle travel information | +| vehicle_index | int32 | | PUBLIC | | | | Index of vehicles in file this particular vehicle's data | +| vehicle_location | enumeration | | PUBLIC | | DRIVING_WORK DRIVING_HOME WORK HOME UNKNOWN | | | +| travel_distance | double | mile | PUBLIC | | | | Distance vehicle travels from home to home | +| arrival_at_work | double | | PUBLIC | | | | Time vehicle arrives at work - HHMM | +| duration_at_work | double | s | PUBLIC | | | | Duration the vehicle remains at work | +| arrival_at_home | double | | PUBLIC | | | | Time vehicle arrives at home - HHMM | +| duration_at_home | double | s | PUBLIC | | | | Duration the vehicle remains at home | +| battery_capacity | double | kWh | PUBLIC | | | | Current capacity of the battery in kWh | +| battery_SOC | double | % | PUBLIC | | | | State of charge of battery | +| battery_size | double | kWh | PUBLIC | | | | Full capacity of battery | +| mileage_efficiency | double | mile/kWh | PUBLIC | | | | Efficiency of drive train in mile/kWh | +| maximum_charge_rate | double | W | PUBLIC | | | | Maximum output rate of charger in kW | +| charging_efficiency | double | unit | PUBLIC | | | | Efficiency of charger (ratio) when charging | + +### rbsa + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| floor_area | double | sf | PUBLIC | | | | building floor area | +| filename | method | | PUBLIC | | | | RBSA data file | +| composition | method | | PUBLIC | | | | load composition specification | +| total_real_power | double | W | PUBLIC | | | | total real power | +| total_reactive_power | double | W | PUBLIC | | | | total reactive power | +| total_power_A | complex | W | PUBLIC | | | | total complex power on phase A | +| total_power_B | complex | W | PUBLIC | | | | total complex power on phase B | +| total_power_C | complex | W | PUBLIC | | | | total complex power on phase C | +| weather | object | | PUBLIC | | | | weather object for temperature and solar gain | +| tariff | object | | PUBLIC | | | | tariff object for energy price sensitivity | + +### tariff + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| rate_design | char32 | | PUBLIC | | | | | +| minimum_daily_charge | double | $/day | PUBLIC | | | | | +| energy_charge_base | double | $/kWh | PUBLIC | | | | | +| energy_charge_100 | double | $/kWh | PUBLIC | | | | | +| energy_charge_400 | double | $/kWh | PUBLIC | | | | | +| average_total_rate | double | $/kWh | PUBLIC | | | | | +| minimum_average_rate_limit | double | $/kWh | PUBLIC | | | | | +| discount | double | | PUBLIC | | | | | + +### billing + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| tariff | object | | PUBLIC | REQUIRED | | | reference to the tariff object used for this bill | +| meter | object | | PUBLIC | REQUIRED | | | reference to the meter object use for this bill | +| bill_day | int32 | | PUBLIC | | | | day of month when the bill is generated | +| bill_date | timestamp | | PUBLIC | OUTPUT | | | date of the last bill generated | +| billing_days | int32 | | PUBLIC | OUTPUT | | | number of day of last bill | +| total_bill | double | $ | PUBLIC | OUTPUT | | | last bill total | +| total_charges | double | $ | PUBLIC | OUTPUT | | | last bill total charges | +| energy_charges | double | $ | PUBLIC | OUTPUT | | | last bill energy charges | +| capacity_charges | double | $ | PUBLIC | OUTPUT | | | last bill capacity charges | +| ramping_charges | double | $ | PUBLIC | OUTPUT | | | last bill ramping charges | +| fixed_charges | double | $ | PUBLIC | OUTPUT | | | last bill fixed charges | +| total_credits | double | $ | PUBLIC | OUTPUT | | | last bill total credits | +| energy_credits | double | $ | PUBLIC | OUTPUT | | | last bill energy credits | +| capacity_credits | double | $ | PUBLIC | OUTPUT | | | last bill capacity credits | +| ramping_credits | double | $ | PUBLIC | OUTPUT | | | last bill ramping credits | +| fixed_credits | double | $ | PUBLIC | OUTPUT | | | last bill fixed credits | +| metering_interval | double | s | PUBLIC | | | | interval at which meter is observed | +| baseline_demand | double | kWh/day | PUBLIC | | | | daily demand of baseline tier | + +### player + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| property | char256 | | PUBLIC | REQUIRED | | | property to play values into | +| file | char1024 | | PUBLIC | REQUIRED | | | file from which to read values | +| filetype | char8 | | PUBLIC | | | | | +| mode | char32 | | PUBLIC | | | | | +| loop | int32 | | PUBLIC | | | 0 | number of time to loop the player | + +### shaper + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| file | char1024 | | PUBLIC | | | | | +| filetype | char8 | | PUBLIC | | | | | +| mode | char32 | | PUBLIC | | | | | +| group | char256 | | PUBLIC | | | | | +| property | char256 | | PUBLIC | | | | | +| magnitude | double | | PUBLIC | | | | | +| events | double | | PUBLIC | | | | | + +### multi_recorder + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| interval | double | s | PUBLIC | | | -1 s | sampling interval | +| property | method | | PUBLIC | REQUIRED | | | list of properties to sample | +| trigger | char32 | | PUBLIC | | | | condition to trigger recorder | +| file | char1024 | | PUBLIC | REQUIRED | | | file in which to record data | +| filetype | char8 | | PUBLIC | | | | file type to use when storing data | +| mode | char32 | | PUBLIC | | | file | recorder operating mode | +| multifile | char1024 | | PUBLIC | | | | | +| limit | int32 | | PUBLIC | | | 0 | limit on number of rows to record (0=none) | +| plotcommands | char1024 | | PUBLIC | | | | | +| xdata | char32 | | PUBLIC | | | | | +| columns | char32 | | PUBLIC | | | | | +| format | char32 | | PUBLIC | | | 0 | | +| output | enumeration | | PUBLIC | | SVG PNG PDF JPG GIF EPS SCREEN | | | +| header_units | enumeration | | PUBLIC | | NONE ALL DEFAULT | | | +| line_units | enumeration | | PUBLIC | | NONE ALL DEFAULT | | | + +### collector + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| trigger | char32 | | PUBLIC | | | | | +| file | char1024 | | PUBLIC | | | | | +| limit | int32 | | PUBLIC | | | | | +| group | char256 | | PUBLIC | | | | | +| flush | int32 | | PUBLIC | | | | | +| interval | double | s | PUBLIC | | | | | +| property | method | | PUBLIC | | | | | + +### histogram + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| filename | char1024 | | PUBLIC | | | | the name of the file to write | +| filetype | char8 | | PUBLIC | | | | the format to output a histogram in | +| mode | char32 | | PUBLIC | | | | the mode of file output | +| group | char1024 | | PUBLIC | | | | the GridLAB-D group expression to use for this histogram | +| bins | char1024 | | PUBLIC | | | | the specific bin values to use | +| property | char256 | | PUBLIC | | | | the property to sample | +| min | double | | PUBLIC | | | | the minimum value of the auto-sized bins to use | +| max | double | | PUBLIC | | | | the maximum value of the auto-sized bins to use | +| samplerate | double | s | PUBLIC | | | | the rate at which samples are read | +| countrate | double | s | PUBLIC | | | | the reate at which bins are counted and written | +| bin_count | int32 | | PUBLIC | | | | the number of auto-sized bins to use | +| limit | int32 | | PUBLIC | | | | the number of samples to write | + +### group_recorder + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| file | char256 | | PUBLIC | | | | output file name | +| group | char1024 | | PUBLIC | | | | group definition string | +| interval | double | s | PUBLIC | | | | recordering interval (0 'every iteration', -1 'on change') | +| flush_interval | double | s | PUBLIC | | | | file flush interval (0 never, negative on samples) | +| strict | bool | | PUBLIC | | | | causes the group_recorder to stop the simulation should there be a problem opening or writing with the group_recorder | +| print_units | bool | | PUBLIC | | | | flag to append units to each written value, if applicable | +| property | char256 | | PUBLIC | | | | property to record | +| limit | int32 | | PUBLIC | | | | the maximum number of lines to write to the file | +| format | bool | | PUBLIC | | | | determines whether output timestamp is formatted to be formatted as human-readable (default) or epoch | +| complex_part | enumeration | | PUBLIC | | ANG_RAD ANG_DEG MAG IMAG REAL NONE | | the complex part to record if complex properties are gathered | + +### violation_recorder + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| file | char256 | | PUBLIC | | | | output file name | +| summary | char256 | | PUBLIC | | | | summary output file name | +| virtual_substation | char256 | | PUBLIC | | | | name of the substation node to monitor for reverse flow violation | +| interval | double | s | PUBLIC | | | | recording interval (0 'every iteration', -1 'on change') | +| flush_interval | double | s | PUBLIC | | | | file flush interval (0 never, negative on samples) | +| strict | bool | | PUBLIC | | | | causes the violation_recorder to stop the simulation should there be a problem opening or writing with the violation_recorder | +| echo | bool | | PUBLIC | | | | causes the violation_recorder to echo messages to the screen | +| limit | int32 | | PUBLIC | | | | the maximum number of lines to write to the file | +| violation_delay | int32 | | PUBLIC | | | | the number of seconds to skip before recording violations | +| xfrmr_thermal_limit_upper | double | | PUBLIC | | | | xfrmr_thermal_limit_upper | +| xfrmr_thermal_limit_lower | double | | PUBLIC | | | | xfrmr_thermal_limit_lower | +| line_thermal_limit_upper | double | | PUBLIC | | | | line_thermal_limit_upper | +| line_thermal_limit_lower | double | | PUBLIC | | | | line_thermal_limit_lower | +| node_instantaneous_voltage_limit_upper | double | | PUBLIC | | | | node_instantaneous_voltage_limit_upper | +| node_instantaneous_voltage_limit_lower | double | | PUBLIC | | | | node_instantaneous_voltage_limit_lower | +| node_continuous_voltage_limit_upper | double | | PUBLIC | | | | node_continuous_voltage_limit_upper | +| node_continuous_voltage_limit_lower | double | | PUBLIC | | | | node_continuous_voltage_limit_lower | +| node_continuous_voltage_interval | double | | PUBLIC | | | | node_continuous_voltage_interval | +| secondary_dist_voltage_rise_upper_limit | double | | PUBLIC | | | | secondary_dist_voltage_rise_upper_limit | +| secondary_dist_voltage_rise_lower_limit | double | | PUBLIC | | | | secondary_dist_voltage_rise_lower_limit | +| substation_breaker_A_limit | double | | PUBLIC | | | | breaker_phase_A_limit | +| substation_breaker_B_limit | double | | PUBLIC | | | | breaker_phase_B_limit | +| substation_breaker_C_limit | double | | PUBLIC | | | | breaker_phase_C_limit | +| substation_pf_lower_limit | double | | PUBLIC | | | | substation_pf_lower_limit | +| inverter_v_chng_per_interval_upper_bound | double | | PUBLIC | | | | inverter_v_chng_per_interval_upper_bound | +| inverter_v_chng_per_interval_lower_bound | double | | PUBLIC | | | | inverter_v_chng_per_interval_lower_bound | +| inverter_v_chng_interval | double | | PUBLIC | | | | inverter_v_chng_interval | +| violation_flag | set | | PUBLIC | | ALLVIOLATIONS VIOLATION8 VIOLATION7 VIOLATION6 VIOLATION5 VIOLATION4 VIOLATION3 VIOLATION2 VIOLATION1 VIOLATION0 | | bit set for determining which violations to check | + +### metrics_collector + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| interval | double | s | PUBLIC | | | | Interval at which the metrics_collector output is stored in JSON format | + +### metrics_collector_writer + +| Property | Type | Unit | Access | Flags | Keywords | Default | Description | +| -------- | ---- | ---- | ------ | ----- | -------- | ------- | ----------- | +| filename | char256 | | PUBLIC | | | | the JSON formatted output file name | +| interval | double | s | PUBLIC | | | | Interval at which the metrics_collector_writer output is stored in JSON format | + +## Global data + +### Header data + +| Name | Type | Access | +| ---- | ---- | ------ | +| id | int32 | PROTECTED | +| class | string | PROTECTED | +| groupid | char32 | PROTECTED | +| name | string | PROTECTED | +| next | object | PROTECTED | +| parent | object | PROTECTED | +| child_count | int32 | PROTECTED | +| rank | int32 | PROTECTED | +| clock | timestamp | PROTECTED | +| valid_to | timestamp | PROTECTED | +| schedule_skew | int64 | PROTECTED | +| latitude | double | PROTECTED | +| longitude | double | PROTECTED | +| in_svc | timestamp | PROTECTED | +| out_svc | timestamp | PROTECTED | +| rng_state | int32 | PROTECTED | +| heartbeat | int64 | PROTECTED | +| guid | int64 | PROTECTED | +| profiler.presync | int32 | PROTECTED | +| profiler.sync | int32 | PROTECTED | +| profiler.postsync | int32 | PROTECTED | +| profiler.init | int32 | PROTECTED | +| profiler.heartbeat | int32 | PROTECTED | +| profiler.precommit | int32 | PROTECTED | +| profiler.commit | int32 | PROTECTED | +| profiler.finalize | int32 | PROTECTED | +| event.init | string | PROTECTED | +| event.precommit | string | PROTECTED | +| event.presync | string | PROTECTED | +| event.sync | string | PROTECTED | +| event.postsync | string | PROTECTED | +| event.commit | string | PROTECTED | +| event.finalize | string | PROTECTED | +| flags | int64 | PROTECTED | + +### Data Types + +| Type | Format | Default | Size | Converters | Comparators | +| ---- | ------- | ------- | ---- | ---------- | ----------- | +| double | decimal | 0.0 | 24 | tostr fromstr create stream | == <= >= != < > inside outside | +| complex | string | 0+0i | 48 | tostr fromstr create stream | == <= >= != < > inside outside | +| enumeration | string | 0 | 1024 | tostr fromstr create stream | == <= >= != < > inside outside | +| set | string | 0 | 1024 | tostr fromstr create stream | == <= >= != < > inside outside | +| int16 | integer | 0 | 6 | tostr fromstr create stream | == <= >= != < > inside outside | +| int32 | integer | 0 | 12 | tostr fromstr create stream | == <= >= != < > inside outside | +| int64 | integer | 0 | 24 | tostr fromstr create stream | == <= >= != < > inside outside | +| char8 | string | | 8 | tostr fromstr create stream | == <= >= != < > inside outside | +| char32 | string | | 32 | tostr fromstr create stream | == <= >= != < > inside outside | +| char256 | string | | 256 | tostr fromstr create stream | == <= >= != < > inside outside | +| char1024 | string | | 1024 | tostr fromstr create stream | == <= >= != < > inside outside | +| object | string | (na) | 64 | tostr fromstr create stream | == != | +| delegated | string | (na) | (na) | create stream | | +| bool | string | FALSE | 6 | tostr fromstr create stream | == != | +| timestamp | string | 0 | 32 | tostr fromstr create stream | == <= >= != < > inside outside | +| double_array | string | | 1024 | tostr fromstr create stream | | +| complex_array | string | | 1024 | tostr fromstr create stream | | +| real | decimal | 0.0 | 24 | tostr fromstr create stream | | +| float | decimal | 0.0 | 24 | tostr fromstr create stream | | +| loadshape | string | (na) | 1024 | tostr fromstr create stream | == <= >= != < > inside outside | +| enduse | string | (na) | 1024 | tostr fromstr create stream | == <= >= != < > inside outside | +| randomvar | string | (na) | 24 | tostr fromstr create stream | == <= >= != < > inside outside | +| method | string | (na) | (na) | create stream | | +| string | string | | (na) | create stream | == <= >= != < > inside outside | +| python | string | None | (na) | create stream | | + +### Global variables + +| Name | Module | Type | Access | Keywords | Value | +| ---- | ------ | ---- | ------ | -------- | ----- | +| version.major | | int32 | REFERENCE | | 4 | +| version.minor | | int32 | REFERENCE | | 2 | +| version.patch | | int32 | REFERENCE | | 13 | +| version.build | | int32 | REFERENCE | | 201012 | +| version.branch | | char256 | REFERENCE | | develop_add_markdown_output_options | +| version | | char1024 | REFERENCE | | 4.2.13-201012-develop_add_markdown_output_options | +| command_line | | char1024 | REFERENCE | | /usr/local/opt/gridlabd/4.2.13-201012-develop_add_markdown_output_options/bin/gridlabd.bin gldcore/converters/autotest/test_markdown.glm -o gldcore/converters/autotest/test_markdown.md | +| environment | | char1024 | PUBLIC | | batch | +| quiet | | bool | PUBLIC | | FALSE | +| warn | | bool | PUBLIC | | TRUE | +| debugger | | bool | PUBLIC | | FALSE | +| gdb | | bool | PUBLIC | | FALSE | +| debug | | bool | PUBLIC | | FALSE | +| test | | bool | PUBLIC | | FALSE | +| verbose | | bool | PUBLIC | | FALSE | +| iteration_limit | | int32 | PUBLIC | | 100 | +| workdir | | char1024 | REFERENCE | | /Users/dchassin/github/gridlabd | +| dumpfile | | char1024 | PUBLIC | | gridlabd.json | +| savefile | | char1024 | PUBLIC | | gldcore/converters/autotest/test_markdown.md | +| dumpall | | bool | PUBLIC | | FALSE | +| runchecks | | bool | PUBLIC | | FALSE | +| threadcount | | int32 | PUBLIC | | 1 | +| profiler | | bool | PUBLIC | | FALSE | +| pauseatexit | | bool | PUBLIC | | FALSE | +| testoutputfile | | char1024 | PUBLIC | | test.txt | +| xml_encoding | | int32 | PUBLIC | | 8 | +| clock | | timestamp | PUBLIC | | 2000-01-01 00:00:00 UTC | +| starttime | | timestamp | PUBLIC | | 2000-01-01 00:00:00 UTC | +| stoptime | | timestamp | PUBLIC | | NEVER | +| double_format | | char32 | PUBLIC | | %+lg | +| complex_format | | char256 | PUBLIC | | %+lg%+lg%c | +| object_format | | char32 | PUBLIC | | %s:%d | +| object_scan | | char32 | PUBLIC | | %[^:]:%d | +| object_tree_balance | | bool | PUBLIC | | FALSE | +| kmlfile | | char1024 | PUBLIC | | | +| kmlhost | | char1024 | PUBLIC | | https://raw.githubusercontent.com/slacgismo/gridlabd/master/gldcore/rt | +| modelname | | char1024 | REFERENCE | | gldcore/converters/autotest/test_markdown.glm | +| execdir | | char1024 | REFERENCE | | /usr/local/opt/gridlabd/4.2.13-201012-develop_add_markdown_output_options/bin | +| strictnames | | bool | PUBLIC | | TRUE | +| website | | char1024 | PUBLIC | | http://www.gridlabd.org/ | +| urlbase | | char1024 | PUBLIC | | http://www.gridlabd.org/ | +| randomstate | | int32 | PUBLIC | | -1342211304 | +| randomseed | | int32 | PUBLIC | | -1342211304 | +| include | | char1024 | REFERENCE | | | +| trace | | char1024 | PUBLIC | | | +| gdb_window | | bool | PUBLIC | | FALSE | +| tmp | | char1024 | PUBLIC | | /Users/dchassin/.gridlabd/tmp | +| force_compile | | int32 | PUBLIC | | 0 | +| nolocks | | bool | PUBLIC | | FALSE | +| skipsafe | | bool | PUBLIC | | FALSE | +| dateformat | | enumeration | PUBLIC | ISO US EURO ISO8601 | ISO | +| init_sequence | | enumeration | PUBLIC | CREATION DEFERRED BOTTOMUP TOPDOWN | DEFERRED | +| minimum_timestep | | int32 | PUBLIC | | 1 | +| platform | | char8 | REFERENCE | | MACOSX | +| suppress_repeat_messages | | bool | PUBLIC | | TRUE | +| maximum_synctime | | int32 | PUBLIC | | 60 | +| run_realtime | | bool | PUBLIC | | FALSE | +| enter_realtime | | timestamp | PUBLIC | | NEVER | +| realtime_metric | | double | REFERENCE | | +0 | +| no_deprecate | | bool | PUBLIC | | FALSE | +| streaming_io | | bool | PROTECTED | | FALSE | +| compileonly | | bool | PROTECTED | | TRUE | +| relax_naming_rules | | bool | PUBLIC | | FALSE | +| browser | | char1024 | PUBLIC | | safari | +| server_portnum | | int32 | PUBLIC | | 0 | +| server_quit_on_close | | bool | PUBLIC | | FALSE | +| client_allowed | | char1024 | PUBLIC | | | +| autoclean | | bool | PUBLIC | | TRUE | +| technology_readiness_level | | enumeration | PUBLIC | PRINCIPLE CONCEPT PROOF STANDALONE INTEGRATED DEMONSTRATED PROTOTYPE QUALIFIED PROVEN UNKNOWN | UNKNOWN | +| show_progress | | bool | PUBLIC | | TRUE | +| checkpoint_type | | enumeration | PUBLIC | NONE WALL SIM | NONE | +| checkpoint_file | | char1024 | PUBLIC | | | +| checkpoint_seqnum | | int32 | PUBLIC | | 0 | +| checkpoint_interval | | int32 | PUBLIC | | 0 | +| checkpoint_keepall | | bool | PUBLIC | | FALSE | +| check_version | | bool | PUBLIC | | FALSE | +| random_number_generator | | enumeration | PUBLIC | RNG2 RNG3 | RNG3 | +| mainloop_state | | enumeration | PUBLIC | INIT RUNNING PAUSED DONE LOCKED | INIT | +| pauseat | | timestamp | PUBLIC | | NEVER | +| infourl | | char1024 | PUBLIC | | http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&search= | +| hostname | | char1024 | PUBLIC | | localhost | +| hostaddr | | char32 | PUBLIC | | 127.0.0.1 | +| autostart_gui | | bool | PUBLIC | | TRUE | +| master | | char1024 | PUBLIC | | | +| master_port | | int64 | PUBLIC | | 0 | +| multirun_mode | | enumeration | PUBLIC | STANDALONE MASTER SLAVE LIBRARY | STANDALONE | +| multirun_conn | | enumeration | PUBLIC | NONE MEMORY SOCKET | NONE | +| signal_timeout | | int32 | PUBLIC | | 5000 | +| slave_port | | int16 | PUBLIC | | 6267 | +| slave_id | | int64 | PUBLIC | | 0 | +| return_code | | int32 | REFERENCE | | 0 | +| exit_code | | int16 | REFERENCE | | 0 | +| module_compiler_flags | | set | PUBLIC | NONE CLEAN KEEPWORK DEBUG VERBOSE | NONE | +| init_max_defer | | int32 | REFERENCE | | 64 | +| mt_analysis | | bool | PUBLIC | | FALSE | +| inline_block_size | | int32 | PUBLIC | | 1048576 | +| validate | | set | PUBLIC | NONE TSTD TALL TRUN TERR TEXC TOPT RALL RDIR RGLM | TSTD|RALL | +| sanitize | | set | PUBLIC | NAMES POSITIONS | NAMES|POSITIONS | +| sanitize_prefix | | char8 | PUBLIC | | GLD_ | +| sanitize_index | | char1024 | PUBLIC | | .txt | +| sanitize_offset | | char32 | PUBLIC | | | +| simulation_mode | | enumeration | PUBLIC | INIT EVENT DELTA DELTA_ITER ERROR | INIT | +| deltamode_allowed | | bool | PUBLIC | | FALSE | +| deltamode_timestep | | int32 | PUBLIC | | 10000000 | +| deltamode_maximumtime | | int64 | PUBLIC | | 3600000000000 | +| deltaclock | | int64 | PUBLIC | | 0 | +| delta_current_clock | | double | PUBLIC | | +0 | +| deltamode_updateorder | | char1024 | REFERENCE | | | +| deltamode_iteration_limit | | int32 | PUBLIC | | 10 | +| deltamode_forced_extra_timesteps | | int32 | PUBLIC | | 0 | +| deltamode_forced_always | | bool | PUBLIC | | FALSE | +| run_powerworld | | bool | PUBLIC | | FALSE | +| bigranks | | bool | PUBLIC | | TRUE | +| exename | | char1024 | REFERENCE | | /usr/local/opt/gridlabd/4.2.13-201012-develop_add_markdown_output_options/bin/gridlabd.bin | +| wget_options | | char1024 | PUBLIC | | maxsize:100MB;update:newer | +| curl_options | | char1024 | PUBLIC | | maxsize:100MB;update:newer | +| svnroot | | char1024 | PUBLIC | | http://gridlab-d.svn.sourceforge.net/svnroot/gridlab-d | +| github | | char1024 | PUBLIC | | https://github.com/gridlab-d | +| gitraw | | char1024 | PUBLIC | | https://raw.githubusercontent.com/gridlab-d | +| allow_reinclude | | bool | PUBLIC | | FALSE | +| output_message_context | | set | PUBLIC | NONE ALL LOAD CREATE EXEC TIME FIND CLASS OBJECT MODULE INDEX GLOBALS EXCEPTION AGGREGATE COMPARE CONVERT DELTAMODE ENDUSE ENVIRONMENT GUI HTTPCLIENT INSTANCE INTERPOLATE JOB KML LEGAL LINK LIST XML LOADSHAPE LOCALE LOCK MATCH MATLAB PROPERTY RANDOM REALTIME SANITIZE SAVE SCHEDULE SERVER SETUP STREAM TEST THREADPOOL TRANSFORM HTTP UNIT VALIDATE VERSION XCORE MAIN CMDARG | ALL | +| permissive_access | | int32 | PUBLIC | | 0 | +| relax_undefined_if | | bool | PUBLIC | | FALSE | +| literal_if | | bool | PUBLIC | | TRUE | +| validto_context | | enumeration | PUBLIC | SYNC PRECOMMIT COMMIT | 1129600256 | +| daemon_configfile | | char1024 | PUBLIC | | gridlabd.cnf | +| timezone_locale | | char1024 | REFERENCE | | UTC0 | +| glm_save_options | | set | PUBLIC | LEGACY MINIMAL NOGLOBALS NODEFAULTS NOMACROS NOINTERNALS ORIGINAL | MINIMAL | +| filesave_options | | set | PUBLIC | ALLINITIAL ALLMINIMAL ALL MODULES PROPERTIES CLASSES GLOBALS OBJECTS SCHEDULES FILTERS SCRIPTS CLOCK INITIAL MINIMAL | ALL | +| ignore_errors | | bool | PUBLIC | | FALSE | +| keep_progress | | bool | PUBLIC | | FALSE | +| allow_variant_aggregates | | bool | PUBLIC | | FALSE | +| progress | | double | REFERENCE | | +0 | +| server_keepalive | | bool | PUBLIC | | FALSE | +| pythonpath | | char1024 | PUBLIC | | . | +| datadir | | char1024 | PUBLIC | | /usr/local/opt/gridlabd/4.2.13-201012-develop_add_markdown_output_options/share/gridlabd | +| json_complex_format | | set | PUBLIC | STRING LIST DICT DEGREES RADIANS | STRING | +| rusage_file | | char1024 | PUBLIC | | gridlabd-rusage.csv | +| rusage_rate | | int64 | PUBLIC | | 0 | +| rusage | | char1024 | PUBLIC | | {} | +| message_flags | assert | set | PUBLIC | QUIET WARNING DEBUG VERBOSE | DEBUG|VERBOSE | +| message_flags | climate | set | PUBLIC | QUIET WARNING DEBUG VERBOSE | DEBUG|VERBOSE | +| library_path | | char1024 | PUBLIC | | /usr/local/opt/gridlabd/4.2.13-201012-develop_add_markdown_output_options/share/gridlabd/weather/US | +| message_flags | commercial | set | PUBLIC | QUIET WARNING DEBUG VERBOSE | DEBUG|VERBOSE | +| warn_control | | bool | PUBLIC | | TRUE | +| warn_low_temp | | double | PUBLIC | | +50 | +| warn_high_temp | | double | PUBLIC | | +90 | +| default_nominal_voltage_A | | complex | PUBLIC | | +240+0d | +| default_nominal_voltage_B | | complex | PUBLIC | | +268.328-26.5651d | +| default_nominal_voltage_C | | complex | PUBLIC | | +268.328+26.5651d | +| default_nominal_voltage | | double | PUBLIC | | +240 | +| default_weekday_code | | char32 | PUBLIC | | WEEKDAY | +| default_saturday_code | | char32 | PUBLIC | | SATURDAY | +| default_sunday_code | | char32 | PUBLIC | | SUNDAY | +| default_holiday_code | | char32 | PUBLIC | | HOLIDAY | +| default_month_heading | | char32 | PUBLIC | | Month | +| default_daytype_heading | | char32 | PUBLIC | | Daytype | +| default_hour_heading | | char32 | PUBLIC | | Hour | +| default_temperature_heating_balance | | double | PUBLIC | | +55 | +| default_temperature_cooling_balance | | double | PUBLIC | | +70 | +| default_temperature_heating_base | | double | PUBLIC | | +55 | +| default_temperature_cooling_base | | double | PUBLIC | | +70 | +| default_temperature_heating_design | | double | PUBLIC | | +0 | +| default_temperature_cooling_design | | double | PUBLIC | | +100 | +| default_solargain_base | | double | PUBLIC | | +0 | +| default_price_base | | double | PUBLIC | | +0 | +| default_occupancy_base | | double | PUBLIC | | +1 | +| temperature_variable_name | | char1024 | PUBLIC | | temperature | +| solargain_variable_name | | char1024 | PUBLIC | | solar_direct | +| price_variable_name | | char1024 | PUBLIC | | energy_price | +| occupancy_variable_name | | char1024 | PUBLIC | | occupancy_fraction | +| nightlight_threshold | | double | PUBLIC | | +0 W/m^2 | +| message_flags | generators | set | PUBLIC | QUIET WARNING DEBUG VERBOSE | DEBUG|VERBOSE | +| enable_subsecond_models | | bool | PUBLIC | | FALSE | +| deltamode_timestep | | double | PUBLIC | | +1e+07 ns | +| message_flags | industrial | set | PUBLIC | QUIET WARNING DEBUG VERBOSE | DEBUG|VERBOSE | +| naics_data_file | | char1024 | PUBLIC | | naics_data_file.csv | +| load_property_name | | char256 | PUBLIC | | base_power_ | +| message_flags | influxdb | set | PUBLIC | QUIET WARNING DEBUG VERBOSE | DEBUG|VERBOSE | +| default_username | | char32 | PUBLIC | | gridlabd | +| default_password | | char32 | PUBLIC | | gridlabd | +| default_hostname | | char256 | PUBLIC | | localhost | +| default_port | | int32 | PUBLIC | | 8086 | +| default_database | | char256 | PUBLIC | | gridlabd | +| connection_protocol | | char32 | PUBLIC | | http | +| synchronous_postdata | | bool | PUBLIC | | FALSE | +| message_flags | market | set | PUBLIC | QUIET WARNING DEBUG VERBOSE | DEBUG|VERBOSE | +| bid_offset | | double | PUBLIC | | +0.0001 $ | +| message_flags | optimize | set | PUBLIC | QUIET WARNING DEBUG VERBOSE | DEBUG|VERBOSE | +| message_flags | powerflow | set | PUBLIC | QUIET WARNING DEBUG VERBOSE | DEBUG|VERBOSE | +| show_matrix_values | | bool | PUBLIC | | FALSE | +| primary_voltage_ratio | | double | PUBLIC | | +60 | +| nominal_frequency | | double | PUBLIC | | +60 | +| require_voltage_control | | bool | PUBLIC | | FALSE | +| geographic_degree | | double | PUBLIC | | +0 | +| fault_impedance | | complex | PUBLIC | | +1e-06+0j | +| ground_impedance | | complex | PUBLIC | | +1e-06+0j | +| warning_underfrequency | | double | PUBLIC | | +55 | +| warning_overfrequency | | double | PUBLIC | | +65 | +| warning_undervoltage | | double | PUBLIC | | +0.8 | +| warning_overvoltage | | double | PUBLIC | | +1.2 | +| warning_voltageangle | | double | PUBLIC | | +2 | +| maximum_voltage_error | | double | PUBLIC | | +1e-06 | +| solver_method | powerflow | enumeration | PUBLIC | NR GS FBS | FBS | +| NR_matrix_file | | char256 | PUBLIC | | | +| NR_matrix_output_interval | powerflow | enumeration | PUBLIC | ALL PER_CALL ONCE NEVER | NEVER | +| NR_matrix_output_references | | bool | PUBLIC | | FALSE | +| line_capacitance | | bool | PUBLIC | | FALSE | +| line_limits | | bool | PUBLIC | | TRUE | +| lu_solver | | char256 | PUBLIC | | | +| NR_iteration_limit | | int64 | PUBLIC | | 500 | +| NR_deltamode_iteration_limit | | int64 | PUBLIC | | 10 | +| NR_superLU_procs | | int32 | PUBLIC | | 1 | +| default_maximum_voltage_error | | double | PUBLIC | | +1e-06 | +| default_maximum_power_error | | double | PUBLIC | | +0.0001 | +| NR_admit_change | | bool | PUBLIC | | TRUE | +| enable_subsecond_models | | bool | PUBLIC | | FALSE | +| all_powerflow_delta | | bool | PUBLIC | | FALSE | +| deltamode_timestep | | double | PUBLIC | | +1e+07 ns | +| current_frequency | | double | PUBLIC | | +60 Hz | +| master_frequency_update | | bool | PUBLIC | | FALSE | +| enable_frequency_dependence | | bool | PUBLIC | | FALSE | +| default_resistance | | double | PUBLIC | | +0.0001 | +| enable_inrush | | bool | PUBLIC | | FALSE | +| low_voltage_impedance_level | | double | PUBLIC | | +0.7 | +| enable_mesh_fault_current | | bool | PUBLIC | | FALSE | +| convergence_error_handling | powerflow | enumeration | PUBLIC | COLLAPSE IGNORE FATAL | FATAL | +| solver_profile_enable | | bool | PUBLIC | | FALSE | +| solver_profile_filename | | char1024 | PUBLIC | | solver_nr_profile.csv | +| solver_profile_headers_included | | bool | PUBLIC | | TRUE | +| solver_headers | | char1024 | PUBLIC | | timestamp,duration[microsec],iteration,bus_count,branch_count,error | +| solver_py_config | | char1024 | PUBLIC | | /usr/local/var/gridlabd/solver_py.conf | +| solver_dump_enable | | bool | PUBLIC | | FALSE | +| market_price_name | | char1024 | PUBLIC | | current_market.clearing_price | +| repair_time | | double | PUBLIC | | +24 h | +| climate_impact_zone | powerflow | enumeration | PUBLIC | NONE LOW MODERATE INTERMEDIATE HIGH EXTREME | NONE | +| message_flags | reliability | set | PUBLIC | QUIET WARNING DEBUG VERBOSE | DEBUG|VERBOSE | +| enable_subsecond_models | | bool | PUBLIC | | FALSE | +| maximum_event_length | | double | PUBLIC | | +432000 s | +| report_event_log | | bool | PUBLIC | | TRUE | +| deltamode_timestep | | int32 | PUBLIC | | 10000000 | +| default_cost_type | | set | PUBLIC | WAGES LIGHTS COOKING HEATING ELDERCARE BUSINESS LODGING GEN_ALL GEN_COMFORT GEN_BASIC SEPTIC WATER FOOD | LIGHTS|COOKING|HEATING|FOOD | +| FOOD_delay_time | | double | PUBLIC | | +8 h | +| FOOD_fixed_cost | | double | PUBLIC | | +72 $ | +| FOOD_variable_cost | | double | PUBLIC | | +0 $/h | +| WATER_delay_time | | double | PUBLIC | | +1 h | +| WATER_fixed_cost | | double | PUBLIC | | +0 $ | +| WATER_variable_cost | | double | PUBLIC | | +6.25 $/h | +| SEPTIC_delay_time | | double | PUBLIC | | +24 h | +| SEPTIC_fixed_cost | | double | PUBLIC | | +1492 $ | +| SEPTIC_variable_cost | | double | PUBLIC | | +0 $/h | +| GEN_BASIC_delay_time | | double | PUBLIC | | +0 h | +| GEN_BASIC_fixed_cost | | double | PUBLIC | | +4000 $ | +| GEN_BASIC_variable_cost | | double | PUBLIC | | +39 $/h | +| GEN_COMFORT_delay_time | | double | PUBLIC | | +0 h | +| GEN_COMFORT_fixed_cost | | double | PUBLIC | | +4000 $ | +| GEN_COMFORT_variable_cost | | double | PUBLIC | | +83 $/h | +| GEN_ALL_delay_time | | double | PUBLIC | | +0 h | +| GEN_ALL_fixed_cost | | double | PUBLIC | | +8000 $ | +| GEN_ALL_variable_cost | | double | PUBLIC | | +222 $/h | +| LODGING_delay_time | | double | PUBLIC | | +48 h | +| LODGING_fixed_cost | | double | PUBLIC | | +0 $ | +| LODGING_variable_cost | | double | PUBLIC | | +12.5 $/h | +| BUSINESS_delay_time | | double | PUBLIC | | +72 h | +| BUSINESS_fixed_cost | | double | PUBLIC | | +0 $ | +| BUSINESS_variable_cost | | double | PUBLIC | | +10 $/h | +| ELDERCARE_delay_time | | double | PUBLIC | | +24 h | +| ELDERCARE_fixed_cost | | double | PUBLIC | | +0 $ | +| ELDERCARE_variable_cost | | double | PUBLIC | | +12.5 $/h | +| HEATING_delay_time | | double | PUBLIC | | +1 h | +| HEATING_fixed_cost | | double | PUBLIC | | +100 $ | +| HEATING_variable_cost | | double | PUBLIC | | +2 $/h | +| COOKING_delay_time | | double | PUBLIC | | +12 h | +| COOKING_fixed_cost | | double | PUBLIC | | +100 $ | +| COOKING_variable_cost | | double | PUBLIC | | +1.5 $/h | +| LIGHTS_delay_time | | double | PUBLIC | | +0 h | +| LIGHTS_fixed_cost | | double | PUBLIC | | +100 $ | +| LIGHTS_variable_cost | | double | PUBLIC | | +1.5 $/h | +| WAGES_delay_time | | double | PUBLIC | | +48 h | +| WAGES_fixed_cost | | double | PUBLIC | | +0 $ | +| WAGES_variable_cost | | double | PUBLIC | | +12 $/h | +| message_flags | residential | set | PUBLIC | QUIET WARNING DEBUG VERBOSE | DEBUG|VERBOSE | +| default_line_voltage | | complex | PUBLIC | | +240+0d V | +| default_line_current | | complex | PUBLIC | | +0+0j A | +| default_outdoor_temperature | | double | PUBLIC | | +74 degF | +| default_humidity | | double | PUBLIC | | +75 % | +| default_solar | | double | PUBLIC | | +0 Btu/sf | +| default_etp_iterations | | int64 | PUBLIC | | 100 | +| ANSI_voltage_check | | bool | PUBLIC | | TRUE | +| enable_subsecond_models | | bool | PUBLIC | | FALSE | +| deltamode_timestep | | double | PUBLIC | | +1e+07 ns | +| all_house_delta | | bool | PUBLIC | | FALSE | +| implicit_enduses | residential | set | PUBLIC | NONE DRYER CLOTHESWASHER WATERHEATER EVCHARGER RANGE REFRIGERATOR FREEZER MICROWAVE DISHWASHER OCCUPANCY PLUGS LIGHTS | DRYER|CLOTHESWASHER|WATERHEATER|RANGE|REFRIGERATOR|FREEZER|MICROWAVE|DISHWASHER|PLUGS|LIGHTS | +| implicit_enduse_source | residential | enumeration | PUBLIC | EIA2015 RBSA2014_DISCRETE RBSA2014 ELCAP2010 ELCAP1990 | ELCAP1990 | +| house_low_temperature_warning | | double | PUBLIC | | +55 degF | +| house_high_temperature_warning | | double | PUBLIC | | +95 degF | +| thermostat_control_warning | | double | PUBLIC | | +4.94066e-324 | +| system_dwell_time | | double | PUBLIC | | +1 s | +| aux_cutin_temperature | | double | PUBLIC | | +10 degF | +| paneldump_filename | | char1024 | PUBLIC | | paneldump.csv | +| paneldump_interval | | int64 | PUBLIC | | 0 | +| paneldump_resolution | | double | PUBLIC | | +0 | +| default_nominal_voltage_A | | complex | PUBLIC | | +240+0d | +| default_nominal_voltage_B | | complex | PUBLIC | | +268.328-26.5651d | +| default_nominal_voltage_C | | complex | PUBLIC | | +268.328+26.5651d | +| default_nominal_voltage | | double | PUBLIC | | +240 | +| default_weekday_code | | char32 | PUBLIC | | WEEKDAY | +| default_saturday_code | | char32 | PUBLIC | | SATURDAY | +| default_sunday_code | | char32 | PUBLIC | | SUNDAY | +| default_holiday_code | | char32 | PUBLIC | | HOLIDAY | +| default_month_heading | | char32 | PUBLIC | | Month | +| default_daytype_heading | | char32 | PUBLIC | | Daytype | +| default_hour_heading | | char32 | PUBLIC | | Hour | +| default_temperature_heating_balance | | double | PUBLIC | | +55 | +| default_temperature_cooling_balance | | double | PUBLIC | | +70 | +| default_temperature_heating_base | | double | PUBLIC | | +55 | +| default_temperature_cooling_base | | double | PUBLIC | | +70 | +| default_temperature_heating_design | | double | PUBLIC | | +0 | +| default_temperature_cooling_design | | double | PUBLIC | | +100 | +| default_solargain_base | | double | PUBLIC | | +0 | +| default_price_base | | double | PUBLIC | | +0 | +| default_occupancy_base | | double | PUBLIC | | +1 | +| temperature_variable_name | | char1024 | PUBLIC | | temperature | +| solargain_variable_name | | char1024 | PUBLIC | | solar_direct | +| price_variable_name | | char1024 | PUBLIC | | energy_price | +| occupancy_variable_name | | char1024 | PUBLIC | | occupancy_fraction | +| message_flags | revenue | set | PUBLIC | QUIET WARNING DEBUG VERBOSE | DEBUG|VERBOSE | +| lowincome_discount | | double | PUBLIC | | +0 $ | +| program_credit | | double | PUBLIC | | +0 $ | +| program_credit_months | | char1024 | PUBLIC | | | +| summer_season_months | | char1024 | PUBLIC | | | +| winter_season_months | | char1024 | PUBLIC | | | +| billing_module | | char1024 | PUBLIC | | default_billing.py | +| billing_library | | char1024 | PUBLIC | | /usr/local/opt/gridlabd/current/share | +| billing_function | | char1024 | PUBLIC | | compute_bill | +| gnuplot_path | | char1024 | PUBLIC | | /usr/bin/gnuplot | +| flush_interval | | int32 | PUBLIC | | 0 | +| csv_data_only | | int32 | PUBLIC | | 0 | +| csv_header_type | tape | enumeration | PUBLIC | NAME NONE FULL | FULL | +| csv_keep_clean | | int32 | PUBLIC | | 0 | +| delta_mode_needed | | timestamp | PUBLIC | | NEVER | + From 4376e342b9b560b7f94f7e2b7115a48c60e9679e Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Thu, 22 Oct 2020 16:13:06 -0700 Subject: [PATCH 05/11] Update object.cpp (#777) * Update object.cpp * Fix interval update serrro in postsync for group_recorder * Update object.cpp * Update exec.cpp Co-authored-by: Alyona Teyber --- gldcore/exec.cpp | 45 +++++++++++++++++++++++------------------ gldcore/object.cpp | 13 ++++++++++-- tape/group_recorder.cpp | 2 +- 3 files changed, 37 insertions(+), 23 deletions(-) diff --git a/gldcore/exec.cpp b/gldcore/exec.cpp index 6e000d6e9..6819b579f 100644 --- a/gldcore/exec.cpp +++ b/gldcore/exec.cpp @@ -2499,34 +2499,39 @@ STATUS GldExec::exec_start(void) if ( global_run_realtime > 0 && iteration_counter > 0 ) { double metric=0; -#ifdef WIN32 - struct timeb tv; - ftime(&tv); - if ( 1000-tv.millitm >= 0 ) - { - IN_MYCONTEXT output_verbose("waiting %d msec", 1000-tv.millitm); - Sleep(1000-tv.millitm ); - metric = (1000-tv.millitm)/1000.0; - } - else - output_error("simulation failed to keep up with real time"); -#else struct timeval tv; gettimeofday(&tv, NULL); - if ( 1000000-tv.tv_usec >= 0 ) + unsigned int udiff = 1000000 - tv.tv_usec; + if ( global_run_realtime == 1 ) // lock onto system clock { - IN_MYCONTEXT output_verbose("waiting %d usec", 1000000-tv.tv_usec); - usleep(1000000-tv.tv_usec); - metric = (1000000-tv.tv_usec)/1000000.0; + int diff = global_clock - tv.tv_sec; + if ( diff < 0 ) + { + IN_MYCONTEXT output_verbose("skipping %d seconds to catch up", -diff); + global_realtime_metric = 0.0; + } + else if ( diff > 0 ) + { + global_realtime_metric = 1.0; + IN_MYCONTEXT output_verbose("sleeping %d seconds to catch up", diff); + sleep(diff); + gettimeofday(&tv, NULL); + udiff = 1000000 - tv.tv_usec; + } + global_clock = tv.tv_sec + 1; } else { - output_error("simulation failed to keep up with real time"); + global_clock++; + metric = (udiff)/1000000.0; + global_realtime_metric = global_realtime_metric*realtime_metric_decay + metric*(1-realtime_metric_decay); + } + if ( udiff >= 0 ) + { + IN_MYCONTEXT output_verbose("waiting %d usec to synchronize", udiff); + usleep(udiff); } -#endif wlock_sync(); - global_clock += global_run_realtime; - global_realtime_metric = global_realtime_metric*realtime_metric_decay + metric*(1-realtime_metric_decay); sync_reset(NULL); sync_set(NULL,global_clock,false); IN_MYCONTEXT output_verbose("realtime clock advancing to %d", (int)global_clock); diff --git a/gldcore/object.cpp b/gldcore/object.cpp index ed3540b3b..8752c42ed 100644 --- a/gldcore/object.cpp +++ b/gldcore/object.cpp @@ -1933,7 +1933,7 @@ TIMESTAMP _object_sync(OBJECT *obj, /**< the object to synchronize */ sync_time = plc_time; /* compute valid_to time */ - if(sync_time>TS_MAX) + if ( sync_time > TS_MAX ) obj->valid_to = TS_NEVER; else obj->valid_to = sync_time; // NOTE, this can be negative @@ -1996,10 +1996,19 @@ TIMESTAMP object_sync(OBJECT *obj, /**< the object to synchronize */ char *event = NULL; if ( obj->oclass->sync != NULL ) { + unsigned int iter = 0; + TIMESTAMP tt; do { /* don't call sync beyond valid horizon */ t2 = _object_sync(obj,(ts<(obj->valid_to>0?obj->valid_to:TS_NEVER)?ts:obj->valid_to),pass); - } while (t2>0 && ts>(t2<0?-t2:t2) && t2 global_iteration_limit ) + { + output_error("maximum iteration limit reached on valid_to sync update"); + return TS_INVALID; + } + tt = ( t2 < 0 ? -t2 : t2 ); + } while ( tt > global_clock && tt < ts ); + //} while (t2>0 && ts>(t2<0?-t2:t2) && t2 gl_globalclock ? next_write : gl_globalclock+1; } else { // on-change intervals simply short-circuit return TS_NEVER; From f84093d3a53cfc30c3e510b130ec2fb8d2803d5d Mon Sep 17 00:00:00 2001 From: aivanova5 Date: Fri, 23 Oct 2020 15:58:24 -0700 Subject: [PATCH 06/11] Revert "Update object.cpp (#777)" Reverting problematic merge This reverts commit 4376e342b9b560b7f94f7e2b7115a48c60e9679e. --- gldcore/exec.cpp | 45 ++++++++++++++++++----------------------- gldcore/object.cpp | 13 ++---------- tape/group_recorder.cpp | 2 +- 3 files changed, 23 insertions(+), 37 deletions(-) diff --git a/gldcore/exec.cpp b/gldcore/exec.cpp index 6819b579f..6e000d6e9 100644 --- a/gldcore/exec.cpp +++ b/gldcore/exec.cpp @@ -2499,39 +2499,34 @@ STATUS GldExec::exec_start(void) if ( global_run_realtime > 0 && iteration_counter > 0 ) { double metric=0; - struct timeval tv; - gettimeofday(&tv, NULL); - unsigned int udiff = 1000000 - tv.tv_usec; - if ( global_run_realtime == 1 ) // lock onto system clock +#ifdef WIN32 + struct timeb tv; + ftime(&tv); + if ( 1000-tv.millitm >= 0 ) { - int diff = global_clock - tv.tv_sec; - if ( diff < 0 ) - { - IN_MYCONTEXT output_verbose("skipping %d seconds to catch up", -diff); - global_realtime_metric = 0.0; - } - else if ( diff > 0 ) - { - global_realtime_metric = 1.0; - IN_MYCONTEXT output_verbose("sleeping %d seconds to catch up", diff); - sleep(diff); - gettimeofday(&tv, NULL); - udiff = 1000000 - tv.tv_usec; - } - global_clock = tv.tv_sec + 1; + IN_MYCONTEXT output_verbose("waiting %d msec", 1000-tv.millitm); + Sleep(1000-tv.millitm ); + metric = (1000-tv.millitm)/1000.0; } else + output_error("simulation failed to keep up with real time"); +#else + struct timeval tv; + gettimeofday(&tv, NULL); + if ( 1000000-tv.tv_usec >= 0 ) { - global_clock++; - metric = (udiff)/1000000.0; - global_realtime_metric = global_realtime_metric*realtime_metric_decay + metric*(1-realtime_metric_decay); + IN_MYCONTEXT output_verbose("waiting %d usec", 1000000-tv.tv_usec); + usleep(1000000-tv.tv_usec); + metric = (1000000-tv.tv_usec)/1000000.0; } - if ( udiff >= 0 ) + else { - IN_MYCONTEXT output_verbose("waiting %d usec to synchronize", udiff); - usleep(udiff); + output_error("simulation failed to keep up with real time"); } +#endif wlock_sync(); + global_clock += global_run_realtime; + global_realtime_metric = global_realtime_metric*realtime_metric_decay + metric*(1-realtime_metric_decay); sync_reset(NULL); sync_set(NULL,global_clock,false); IN_MYCONTEXT output_verbose("realtime clock advancing to %d", (int)global_clock); diff --git a/gldcore/object.cpp b/gldcore/object.cpp index 8752c42ed..ed3540b3b 100644 --- a/gldcore/object.cpp +++ b/gldcore/object.cpp @@ -1933,7 +1933,7 @@ TIMESTAMP _object_sync(OBJECT *obj, /**< the object to synchronize */ sync_time = plc_time; /* compute valid_to time */ - if ( sync_time > TS_MAX ) + if(sync_time>TS_MAX) obj->valid_to = TS_NEVER; else obj->valid_to = sync_time; // NOTE, this can be negative @@ -1996,19 +1996,10 @@ TIMESTAMP object_sync(OBJECT *obj, /**< the object to synchronize */ char *event = NULL; if ( obj->oclass->sync != NULL ) { - unsigned int iter = 0; - TIMESTAMP tt; do { /* don't call sync beyond valid horizon */ t2 = _object_sync(obj,(ts<(obj->valid_to>0?obj->valid_to:TS_NEVER)?ts:obj->valid_to),pass); - if ( iter++ > global_iteration_limit ) - { - output_error("maximum iteration limit reached on valid_to sync update"); - return TS_INVALID; - } - tt = ( t2 < 0 ? -t2 : t2 ); - } while ( tt > global_clock && tt < ts ); - //} while (t2>0 && ts>(t2<0?-t2:t2) && t20 && ts>(t2<0?-t2:t2) && t2 gl_globalclock ? next_write : gl_globalclock+1; + return next_write; } else { // on-change intervals simply short-circuit return TS_NEVER; From 6da4443bc791ddee318c2fb07083897ae966b8a6 Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Mon, 26 Oct 2020 14:10:13 -0700 Subject: [PATCH 07/11] Develop fix save conversion (#780) * Update main.cpp * Update save.cpp * Revert "Update object.cpp (#777)" This reverts commit 4376e342b9b560b7f94f7e2b7115a48c60e9679e. Reverting problematic PR Co-authored-by: Alyona Teyber --- gldcore/main.cpp | 5 +++-- gldcore/save.cpp | 10 ++++------ 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/gldcore/main.cpp b/gldcore/main.cpp index 87b2b8055..1cbfc928e 100644 --- a/gldcore/main.cpp +++ b/gldcore/main.cpp @@ -596,10 +596,10 @@ int pcloses(FILE *iop, bool wait=true) int GldMain::subcommand(const char *format, ...) { - char *command; + char *command = NULL; va_list ptr; va_start(ptr,format); - if ( vasprintf(&command,format,ptr) < 0 ) + if ( vasprintf(&command,format,ptr) < 0 || command == NULL ) { output_error("GldMain::subcommand(format='%s',...): memory allocation failed",format); return -1; @@ -658,6 +658,7 @@ int GldMain::subcommand(const char *format, ...) } output_verbose("subcommand '%s' -> status = %d",command,rc); } + free(command); return rc; } diff --git a/gldcore/save.cpp b/gldcore/save.cpp index 4f4fbc149..7b32155be 100644 --- a/gldcore/save.cpp +++ b/gldcore/save.cpp @@ -59,7 +59,6 @@ int saveall(const char *filename) } if ( ! known_format ) { - char converter_command[1024]; int rc; char converter_name[1024]; char input_name[1024]; @@ -72,13 +71,12 @@ int saveall(const char *filename) return 0; } sprintf(converter_name,"glm2%s.py",ext); - const char *converter_path = find_file(converter_name,NULL,R_OK); - if ( ! converter_path ) + char converter_path[1024]; + if ( ! find_file(converter_name,NULL,R_OK,converter_path,sizeof(converter_path)) ) { /* try using python output converter through json */ sprintf(converter_name,"json2%s.py",ext); - const char *converter_path = find_file(converter_name,NULL,R_OK); - if ( ! converter_path ) + if ( ! find_file(converter_name,NULL,R_OK,converter_path,sizeof(converter_path)) ) { output_error("saveall: extension '.%s' not a known format", ext); /* TROUBLESHOOT @@ -131,7 +129,7 @@ int saveall(const char *filename) save_options++; buffer[strlen(buffer)-1] = '\0'; } - rc = my_instance->subcommand(converter_command,"/usr/local/bin/python3 %s -i %s -o %s %s",converter_path,input_name,filename,save_options?save_options:""); + rc = my_instance->subcommand("/usr/local/bin/python3 %s -i %s -o %s %s",converter_path,input_name,filename,save_options?save_options:""); if ( rc != 0 ) { output_error("conversion from '%s' to output file '%s' failed (code %d)", input_name, filename, rc); From 09c3568eaf03fa752c3841b5fba8c338b0aeca8c Mon Sep 17 00:00:00 2001 From: Alyona Teyber Date: Mon, 26 Oct 2020 14:25:22 -0700 Subject: [PATCH 08/11] Develop fix realtime lockup - rev2 (#787) * Update object.cpp * Fix interval update serrro in postsync for group_recorder * Update object.cpp * Update exec.cpp * Update zipload.cpp * Update dutycycle_CPP_player.player Co-authored-by: David P. Chassin Co-authored-by: root --- gldcore/exec.cpp | 45 ++++++++++++--------- gldcore/object.cpp | 13 +++++- market/autotest/dutycycle_CPP_player.player | 2 - residential/zipload.cpp | 40 ++++++++++-------- tape/group_recorder.cpp | 2 +- 5 files changed, 61 insertions(+), 41 deletions(-) diff --git a/gldcore/exec.cpp b/gldcore/exec.cpp index 6e000d6e9..6819b579f 100644 --- a/gldcore/exec.cpp +++ b/gldcore/exec.cpp @@ -2499,34 +2499,39 @@ STATUS GldExec::exec_start(void) if ( global_run_realtime > 0 && iteration_counter > 0 ) { double metric=0; -#ifdef WIN32 - struct timeb tv; - ftime(&tv); - if ( 1000-tv.millitm >= 0 ) - { - IN_MYCONTEXT output_verbose("waiting %d msec", 1000-tv.millitm); - Sleep(1000-tv.millitm ); - metric = (1000-tv.millitm)/1000.0; - } - else - output_error("simulation failed to keep up with real time"); -#else struct timeval tv; gettimeofday(&tv, NULL); - if ( 1000000-tv.tv_usec >= 0 ) + unsigned int udiff = 1000000 - tv.tv_usec; + if ( global_run_realtime == 1 ) // lock onto system clock { - IN_MYCONTEXT output_verbose("waiting %d usec", 1000000-tv.tv_usec); - usleep(1000000-tv.tv_usec); - metric = (1000000-tv.tv_usec)/1000000.0; + int diff = global_clock - tv.tv_sec; + if ( diff < 0 ) + { + IN_MYCONTEXT output_verbose("skipping %d seconds to catch up", -diff); + global_realtime_metric = 0.0; + } + else if ( diff > 0 ) + { + global_realtime_metric = 1.0; + IN_MYCONTEXT output_verbose("sleeping %d seconds to catch up", diff); + sleep(diff); + gettimeofday(&tv, NULL); + udiff = 1000000 - tv.tv_usec; + } + global_clock = tv.tv_sec + 1; } else { - output_error("simulation failed to keep up with real time"); + global_clock++; + metric = (udiff)/1000000.0; + global_realtime_metric = global_realtime_metric*realtime_metric_decay + metric*(1-realtime_metric_decay); + } + if ( udiff >= 0 ) + { + IN_MYCONTEXT output_verbose("waiting %d usec to synchronize", udiff); + usleep(udiff); } -#endif wlock_sync(); - global_clock += global_run_realtime; - global_realtime_metric = global_realtime_metric*realtime_metric_decay + metric*(1-realtime_metric_decay); sync_reset(NULL); sync_set(NULL,global_clock,false); IN_MYCONTEXT output_verbose("realtime clock advancing to %d", (int)global_clock); diff --git a/gldcore/object.cpp b/gldcore/object.cpp index ed3540b3b..8752c42ed 100644 --- a/gldcore/object.cpp +++ b/gldcore/object.cpp @@ -1933,7 +1933,7 @@ TIMESTAMP _object_sync(OBJECT *obj, /**< the object to synchronize */ sync_time = plc_time; /* compute valid_to time */ - if(sync_time>TS_MAX) + if ( sync_time > TS_MAX ) obj->valid_to = TS_NEVER; else obj->valid_to = sync_time; // NOTE, this can be negative @@ -1996,10 +1996,19 @@ TIMESTAMP object_sync(OBJECT *obj, /**< the object to synchronize */ char *event = NULL; if ( obj->oclass->sync != NULL ) { + unsigned int iter = 0; + TIMESTAMP tt; do { /* don't call sync beyond valid horizon */ t2 = _object_sync(obj,(ts<(obj->valid_to>0?obj->valid_to:TS_NEVER)?ts:obj->valid_to),pass); - } while (t2>0 && ts>(t2<0?-t2:t2) && t2 global_iteration_limit ) + { + output_error("maximum iteration limit reached on valid_to sync update"); + return TS_INVALID; + } + tt = ( t2 < 0 ? -t2 : t2 ); + } while ( tt > global_clock && tt < ts ); + //} while (t2>0 && ts>(t2<0?-t2:t2) && t2 %s\n", duty_cycle, period, phase,ts); + // fflush(stdout); } // We're in duty cycle mode @@ -425,6 +429,10 @@ TIMESTAMP ZIPload::sync(TIMESTAMP t0, TIMESTAMP t1) next_time = t1 + (period * 3600) * (1 - phase) + 1; } } + // char ts[64] = "???"; + // gl_printtime(next_time,ts,sizeof(ts)); + // fprintf(stdout,"OV_NORMAL: duty_cycle=%g, period=%g, phase=%g, next_time --> %s\n", duty_cycle, period, phase,ts); + // fflush(stdout); last_duty_cycle = duty_cycle; } else if (this->re_override == OV_OFF) // After release or recovery time @@ -432,7 +440,7 @@ TIMESTAMP ZIPload::sync(TIMESTAMP t0, TIMESTAMP t1) if (phase <= 1 && t1>=next_time) { this->re_override = OV_NORMAL; - next_time = t1; + next_time = t1 + (period * 3600) * (1 - fmod(phase,1)) + 1; } else if (t1 >= next_time || next_time == TS_NEVER) // we just came from override ON { @@ -445,28 +453,18 @@ TIMESTAMP ZIPload::sync(TIMESTAMP t0, TIMESTAMP t1) phase -= 1 * recovery_duty_cycle / duty_cycle * (1 - fmod(phase,1)); // Track everything by the original duty cycle else phase = 0; //Start over - - /*if (phase < 0) - { - next_time = t1 + (period * 3600) * (recovery_duty_cycle - 0) + 1; - phase = 0; - }*/ } else // ON->OFF { - //if (multiplier == 1) // we just transitioned - //{ - //if (phase >= 1 * recovery_duty_cycle / duty_cycle) - // phase -= 1 * recovery_duty_cycle / duty_cycle; // Track everything by the original duty cycle - //else if (phase < 1) - // this->re_override = OV_NORMAL; - //} multiplier = 0; next_time = t1 + (period * 3600) * (1 - fmod(phase,1)) + 1; } } last_duty_cycle = duty_cycle; - + // char ts[64] = "???"; + // gl_printtime(next_time,ts,sizeof(ts)); + // fprintf(stdout,"OV_OFF: duty_cycle=%g, period=%g, phase=%g, next_time --> %s\n", duty_cycle, period, phase,ts); + // fflush(stdout); } else // override is ON, so no power { @@ -488,6 +486,10 @@ TIMESTAMP ZIPload::sync(TIMESTAMP t0, TIMESTAMP t1) last_duty_cycle = 0; } } + // char ts[64] = "???"; + // gl_printtime(next_time,ts,sizeof(ts)); + // fprintf(stdout,"OV_ON: duty_cycle=%g, period=%g, phase=%g, next_time --> %s\n", duty_cycle, period, phase,ts); + // fflush(stdout); } // last_duty_cycle = duty_cycle; } @@ -579,8 +581,14 @@ TIMESTAMP ZIPload::sync(TIMESTAMP t0, TIMESTAMP t1) load.power_factor = 0.0; } - if (next_time < t2 && next_time > 0) + if ( next_time < t2 && next_time > 0 ) t2 = next_time; + // char ts0[64], ts1[64], ts2[64]; + // gl_printtime(t0,ts0,sizeof(ts0)); + // gl_printtime(t1,ts1,sizeof(ts1)); + // gl_printtime(t2,ts2,sizeof(ts2)); + // fprintf(stdout,"ZIPload::sync(t0=%s,t1=%s) --> t2 = %s\n\n", ts0,ts1,ts2); + // fflush(stdout); return t2; } diff --git a/tape/group_recorder.cpp b/tape/group_recorder.cpp index a29d4af35..be2826617 100644 --- a/tape/group_recorder.cpp +++ b/tape/group_recorder.cpp @@ -241,7 +241,7 @@ TIMESTAMP group_recorder::postsync(TIMESTAMP t0, TIMESTAMP t1){ } //Default else -- Normal mode, just do what was done before - return next_write; + return next_write > gl_globalclock ? next_write : gl_globalclock+1; } else { // on-change intervals simply short-circuit return TS_NEVER; From 9b6330c52a5902f5e14a1acf4c561ce0b5ae4932 Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Tue, 27 Oct 2020 08:21:24 -0700 Subject: [PATCH 09/11] Update README.md (#788) * Update README.md * Update README.md * Update README.md --- README.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 9fa292393..cc98b17de 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,22 @@ ![master](https://github.com/dchassin/gridlabd/workflows/master/badge.svg) ![develop](https://github.com/slacgismo/gridlabd/workflows/develop/badge.svg?branch=develop) -The main documentation page for this project is located at http://docs.gridlabd.us/. +The documentation for this project is located at http://docs.gridlabd.us/. -## Important Note +This respository contains the source code to HiPAS GridLAB-D, which is being developed by SLAC National Accelerator Laboratory for the California Energy Commission under grant [EPC-17-046](https://www.energy.ca.gov/filebrowser/download/1147). This version of GridLAB-D is intended to be a commercial-grade version of the [US Department of Energy's research version of GridLAB-D developed by Pacific Northwest National Laboratory](https://github.com/gridlab-d/gridlab-d). -This repository is SLAC National Accelerator's version of HiPAS GridLAB-D. Only SLAC projects may contribute to this repository. Changes made in this repository will be migrated back to the [original GridLAB-D repository](https://github.com/gridlab-d/gridlab-d) at PNNL's discretion. +The source code in this repository is being developed in coordination with several other CEC and DOE projects conducted by or coordinated with SLAC and Stanford University. Only participating SLAC and Stanford projects may contribute to this repository. Changes made in this repository will be migrated back to the research version of GridLAB-D at PNNL's discretion. + +The following projects are actively contributing to HiPAS GridLAB-D at this time: + + * GLOW (CEC funding, Hitachi America Laboratories lead) + * OpenFIDO (CEC funding, SLAC National Accelerator Laboratory lead) + * PowerNET (DOE funding, Stanford University lead) + * PowerNET with Market (CEC funding, SLAC National Accelerator Laboratory lead) + * VADER (DOE funding, SLAC National Accelerator Laboratory lead) + * GRIP (DOE funding, SLAC National Accelerator Laboratory lead) + * TESS (DOE funding, SLAC National Accelerator Laboratory lead) + * Advanced Load Modeling (DOE funding, SLAC National Accelerator Laboratory lead) + * LoadInsight (DOE funding, SLAC National Accelerator Laboratory lead) # User quick start From 33d52f5a235dab03a08c6228464ba468d2153352 Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Tue, 27 Oct 2020 08:39:23 -0700 Subject: [PATCH 10/11] Update README.md --- README.md | 32 ++++++++++++++------------------ 1 file changed, 14 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index cc98b17de..71cba8505 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ The following projects are actively contributing to HiPAS GridLAB-D at this time # User quick start -The preferred method of using SLAC releases of GridLAB-D is to download the SLAC master image from docker hub (see https://cloud.docker.com/u/gridlabd/repository/docker/gridlabd/slac-master). You must install the docker daemon to use docker images. See https://www.docker.com/get-started for details. +The preferred method for running HiPAS GridLAB-D is to download the SLAC master image from docker hub (see https://cloud.docker.com/u/gridlabd/repository/docker/gridlabd/slac-master). You must install the docker daemon to use docker images. See https://www.docker.com/get-started for details. Once you have installed docker, you may issue the following commands to run GridLAB-D at the command line: ~~~ @@ -36,31 +36,27 @@ Note that this alias will interfere with the host-based installation. *Note*: This fork of [GridLAB-D](https://github.com/gridlab-d/gridlab-d) does not support MS Windows directly. You must use docker or a virtual machine running linux. -Normally on Linux and Mac OS X developers you should use the `install.sh` script to setup the system, perform the initial build, and install GridLAB-D for all users on the system. +Normally on Linux and Mac OS X developers should use the `install.sh` script to setup the system, perform the initial build, and install GridLAB-D for all users on the system. ~~~ host% git clone https://github.com/slacgismo/gridlabd gridlabd host% gridlabd/install.sh ~~~ -The `gridlabd` command is added to the `/usr/local/bin` folder, so this folder must be included in the path for all users, e.g., as specified in `/etc/profile` or `/etc/profile.d`. +To rebuild the source code and install again, use the `make system` command. You can use parallel builds using the `make -j system` command. -You may work with a user installation instead of a system installation. Assuming your development system is ready (see https://github.com/slacgismo/gridlabd/wiki/Install#mac-osx-and-linux for details), you can "quickly" download and build a host-based installation from a branch using the following commands: +If you have modified the branch name or version information, you must reconfigure your build using the `make reconfigure` command before using `make system`. -~~~ - host% git clone https://github.com/slacgismo/gridlabd -b _branch-name_ _work-folder_ - host% cd _work-folder_ - host% autoreconf -isf - host% ./configure --enable-silent-rules --prefix=$PWD/install [_options_] - host% make -j install - host% export PATH=$PWD/install/bin:$PATH - host% gridlabd --version - host% gridlabd --validate -~~~ +Each build of HiPAS GridLAB-D will be installed in `/usr/local/opt/gridlabd`. Links to the active version are added to the `/usr/local/bin` folder, so this folder must be included in the path for all users, e.g., as specified in `/etc/profile` or `/etc/profile.d`. Additional links are created in `/usr/local/lib` and `/usr/local/share`, as needed. + +You may use the `gridlabd version` command to manage which version is active on the system. See the [`gridlabd version`](http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&branch=master&folder=/Subcommand&doc=/Subcommand/Version.md) command for details. + +If you use `make install` to build only. You may use an inactive build by running the `gridlabd` command of that build instead of the system version. For example, if you only built `4.2.13-201019-develop` then you can run `/usr/local/opt/gridlabd/4.2.13-201019-develop/bin/gridlabd` to run it instead of the system version. + +Before using a build of gridlabd, you should always validate it using `gridlabd --validate` in the root folder of the source tree. + +## Building and Debugging -## Useful configure options - - `--with-mysql=/usr/local` to enable support for mysql (assuming you install mysql-dev on your system) - - `CXXFLAGS='-w -O0 -g'` to enable debugging of C++ source code (e.g., module code) - - `CFLAGS='-w -O0 -g'` to enable debugging of C source code (e.g., core code) +You can configure a debugging version using `make reconfigure-debug`. When debugging is enabled you can use the [`gridlabd trace`](http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&branch=master&folder=/Subcommand&doc=/Subcommand/Trace.md) command and the [`gridlabd gdb`](http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&branch=master&folder=/Subcommand&doc=/Subcommand/Gdb.md) (for linux) or [`gridlabd lldb`](http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&branch=master&folder=/Subcommand&doc=/Subcommand/Lldb.md) (for Mac OSX) commands to debug a simulation. ## Notes - The version number should contain the _branch-name_. If not, use the `which gridlabd` command to check that the path is correct. From 670c4acd4427d44c2e7ae9e567819f531d556f85 Mon Sep 17 00:00:00 2001 From: "David P. Chassin" Date: Tue, 27 Oct 2020 08:41:52 -0700 Subject: [PATCH 11/11] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 71cba8505..41d17569e 100644 --- a/README.md +++ b/README.md @@ -50,9 +50,9 @@ Each build of HiPAS GridLAB-D will be installed in `/usr/local/opt/gridlabd`. Li You may use the `gridlabd version` command to manage which version is active on the system. See the [`gridlabd version`](http://docs.gridlabd.us/index.html?owner=slacgismo&project=gridlabd&branch=master&folder=/Subcommand&doc=/Subcommand/Version.md) command for details. -If you use `make install` to build only. You may use an inactive build by running the `gridlabd` command of that build instead of the system version. For example, if you only built `4.2.13-201019-develop` then you can run `/usr/local/opt/gridlabd/4.2.13-201019-develop/bin/gridlabd` to run it instead of the system version. +You use `make install` to build only. To use an inactive build run the `gridlabd` command of that build instead of running the active version. For example, if you only built `4.2.13-201019-develop` then you can run `/usr/local/opt/gridlabd/4.2.13-201019-develop/bin/gridlabd` to run it instead of running `/usr/local/bin/gridlabd`. -Before using a build of gridlabd, you should always validate it using `gridlabd --validate` in the root folder of the source tree. +Before using a build of gridlabd, you should always validate it using `gridlabd --validate` in the root folder of the source tree. Be careful to verify that the branch of the source tree matches the branch of the version you are running. This is not checked automatically. ## Building and Debugging