diff --git a/cea/workflows/ch_demand_forecasting.yml b/cea/workflows/ch_demand_forecasting.yml deleted file mode 100644 index f0cedb5251..0000000000 --- a/cea/workflows/ch_demand_forecasting.yml +++ /dev/null @@ -1,17 +0,0 @@ -# from CEA data management to solar radiation to energy demand - -- script: data-initializer - parameters: - databases-path: CH -- script: archetypes-mapper -- script: weather-helper - parameters: - weather: Zuerich-Kloten_1990_2010_TMY -- script: surroundings-helper - parameters: - buffer: 100 -- script: terrain-helper -- script: streets-helper -- script: radiation -- script: schedule-maker -- script: demand diff --git a/cea/workflows/ch_district_heating_network.yml b/cea/workflows/ch_district_heating_network.yml deleted file mode 100644 index fadd65c79b..0000000000 --- a/cea/workflows/ch_district_heating_network.yml +++ /dev/null @@ -1,23 +0,0 @@ -# from CEA data management to solar radiation to energy demand - -- script: data-initializer - parameters: - databases-path: CH -- script: archetypes-mapper -- script: weather-helper - parameters: - weather: Zuerich-Kloten_1990_2010_TMY -- script: surroundings-helper - parameters: - buffer: 100 -- script: terrain-helper -- script: streets-helper -- script: radiation -- script: schedule-maker -- script: demand -- script: network-layout - parameters: - network-type: DH -- script: thermal-network - parameters: - network-type: DH diff --git a/cea/workflows/ch_life_cycle_analysis.yml b/cea/workflows/ch_life_cycle_analysis.yml deleted file mode 100644 index 100481f5de..0000000000 --- a/cea/workflows/ch_life_cycle_analysis.yml +++ /dev/null @@ -1,19 +0,0 @@ -# from CEA data management to emissions and system costs - -- script: data-initializer - parameters: - databases-path: CH -- script: archetypes-mapper -- script: weather-helper - parameters: - weather: Zuerich-Kloten_1990_2010_TMY -- script: surroundings-helper - parameters: - buffer: 100 -- script: terrain-helper -- script: streets-helper -- script: radiation -- script: schedule-maker -- script: demand -- script: emissions -- script: system-costs diff --git a/cea/workflows/ch_solar_potential.yml b/cea/workflows/ch_solar_potential.yml deleted file mode 100644 index e94e606fb7..0000000000 --- a/cea/workflows/ch_solar_potential.yml +++ /dev/null @@ -1,27 +0,0 @@ -# from CEA data management to solar energy potential analysis including pv, pvt, sc - -- script: data-initializer - parameters: - databases-path: CH -- script: archetypes-mapper -- script: weather-helper - parameters: - weather: Zuerich-Kloten_1990_2010_TMY -- script: surroundings-helper - parameters: - buffer: 100 -- script: terrain-helper -- script: radiation -- script: photovoltaic -- script: solar-collector - parameters: - type-scpanel: FP -- script: solar-collector - parameters: - type-scpanel: ET -- script: photovoltaic-thermal - parameters: - type-scpanel: FP -- script: photovoltaic-thermal - parameters: - type-scpanel: ET diff --git a/cea/workflows/ch_data_management.yml b/cea/workflows/data_management_ch.yml similarity index 100% rename from cea/workflows/ch_data_management.yml rename to cea/workflows/data_management_ch.yml diff --git a/cea/workflows/sg_data_management.yml b/cea/workflows/data_management_sg.yml similarity index 100% rename from cea/workflows/sg_data_management.yml rename to cea/workflows/data_management_sg.yml diff --git a/cea/workflows/demand_forecast.yml b/cea/workflows/demand_forecast.yml new file mode 100644 index 0000000000..d2e19db8f5 --- /dev/null +++ b/cea/workflows/demand_forecast.yml @@ -0,0 +1,5 @@ +# from solar radiation to energy demand + +- script: radiation +- script: schedule-maker +- script: demand diff --git a/cea/workflows/district_cooling_network.yml b/cea/workflows/district_cooling_network.yml new file mode 100644 index 0000000000..235a85e2b7 --- /dev/null +++ b/cea/workflows/district_cooling_network.yml @@ -0,0 +1,11 @@ +# solar radiation to energy demand to district cooling network + +- script: radiation +- script: schedule-maker +- script: demand +- script: network-layout + parameters: + network-type: DC +- script: thermal-network + parameters: + network-type: DC diff --git a/cea/workflows/district_cooling_system.yml b/cea/workflows/district_cooling_system.yml deleted file mode 100644 index 207bb768db..0000000000 --- a/cea/workflows/district_cooling_system.yml +++ /dev/null @@ -1,61 +0,0 @@ -- config: default - "general:project": "${CEA_general_project}/../reference-case-open" - "radiation:daysim-bin-directory": "${CEA_radiation_daysim-bin-directory}" -- script: extract-reference-case - parameters: - destination: "{general:project}/.." - case: open -- config: . - "general:scenario-name": baseline -- script: data-initializer - parameters: - databases-path: SG - databases: [archetypes, assemblies, components] -- script: archetypes-mapper - parameters: - input-databases: [comfort, architecture, air-conditioning, internal-loads, supply, schedules] -- script: weather-helper - parameters: - weather: Singapore-Changi_1990_2010_TMY -- script: radiation - parameters: - consider-intersections: false -- script: schedule-maker -- script: demand -- script: emissions -- script: system-costs -- script: water-body-potential -- script: sewage-potential -- script: shallow-geothermal-potential -- script: photovoltaic -- script: solar-collector - parameters: - type-scpanel: FP -- script: solar-collector - parameters: - type-scpanel: ET -- script: photovoltaic-thermal - parameters: - type-scpanel: FP -- script: photovoltaic-thermal - parameters: - type-scpanel: ET -- script: network-layout - parameters: - network-type: DC - network-model: simplified - consider-only-buildings-with-demand: off -- script: thermal-network - parameters: - network-type: DC - network-model: simplified -- script: decentralized -- script: optimization - parameters: - network-type: DC - number-of-generations: 2 - population-size: 5 - random-seed: 100 -- script: multi-criteria-analysis - parameters: - generation: 2 \ No newline at end of file diff --git a/cea/workflows/district_heating_network.yml b/cea/workflows/district_heating_network.yml new file mode 100644 index 0000000000..032e7b1153 --- /dev/null +++ b/cea/workflows/district_heating_network.yml @@ -0,0 +1,11 @@ +# solar radiation to energy demand to district heating network + +- script: radiation +- script: schedule-maker +- script: demand +- script: network-layout + parameters: + network-type: DH +- script: thermal-network + parameters: + network-type: DH diff --git a/cea/workflows/district_heating_system.yml b/cea/workflows/district_heating_system.yml deleted file mode 100644 index e0a32f7334..0000000000 --- a/cea/workflows/district_heating_system.yml +++ /dev/null @@ -1,57 +0,0 @@ -- config: default - "general:project": "${CEA_general_project}/../reference-case-open" - "radiation:daysim-bin-directory": "${CEA_radiation_daysim-bin-directory}" -- script: extract-reference-case - parameters: - destination: "{general:project}/.." - case: open -- config: . - "general:scenario-name": baseline -- script: data-initializer - parameters: - databases-path: CH - databases: [archetypes, assemblies, components] -- script: weather-helper - parameters: - weather: Zug-inducity_1990_2010_TMY -- script: radiation - parameters: - consider-intersections: false -- script: schedule-maker -- script: demand -- script: emissions -- script: system-costs -- script: water-body-potential -- script: sewage-potential -- script: shallow-geothermal-potential -- script: photovoltaic -- script: solar-collector - parameters: - type-scpanel: FP -- script: solar-collector - parameters: - type-scpanel: ET -- script: photovoltaic-thermal - parameters: - type-scpanel: FP -- script: photovoltaic-thermal - parameters: - type-scpanel: ET -- script: network-layout - parameters: - network-type: DH - network-model: simplified -- script: thermal-network - parameters: - network-type: DH - network-model: simplified -- script: decentralized -- script: optimization - parameters: - network-type: DH - number-of-generations: 2 - population-size: 5 - random-seed: 100 -- script: multi-criteria-analysis - parameters: - generation: 2 \ No newline at end of file diff --git a/cea/workflows/ch_energy_optimization.yml b/cea/workflows/energy_optimization_ch.yml similarity index 66% rename from cea/workflows/ch_energy_optimization.yml rename to cea/workflows/energy_optimization_ch.yml index 6d814173bf..1e5cfc1b9a 100644 --- a/cea/workflows/ch_energy_optimization.yml +++ b/cea/workflows/energy_optimization_ch.yml @@ -1,17 +1,5 @@ -# from CEA data management to optimization of energy supply system, using the new optimization script. +# skip CEA data management, from radiation optimization of energy supply system, using the new optimization script. -- script: data-initializer - parameters: - databases-path: CH -- script: archetypes-mapper -- script: weather-helper - parameters: - weather: Zuerich-Kloten_1990_2010_TMY -- script: surroundings-helper - parameters: - buffer: 100 -- script: terrain-helper -- script: streets-helper - script: radiation - script: schedule-maker - script: demand diff --git a/cea/workflows/sg_energy_optimization.yml b/cea/workflows/energy_optimization_sg.yml similarity index 66% rename from cea/workflows/sg_energy_optimization.yml rename to cea/workflows/energy_optimization_sg.yml index 2038cd6b1e..980c160afd 100644 --- a/cea/workflows/sg_energy_optimization.yml +++ b/cea/workflows/energy_optimization_sg.yml @@ -1,17 +1,5 @@ -# from CEA data management to optimization of energy supply system, using the new optimization script. +# skip CEA data management, from radiation optimization of energy supply system, using the new optimization script. -- script: data-initializer - parameters: - databases-path: SG -- script: archetypes-mapper -- script: weather-helper - parameters: - weather: Singapore-Changi_1990_2010_TMY -- script: surroundings-helper - parameters: - buffer: 100 -- script: terrain-helper -- script: streets-helper - script: radiation - script: schedule-maker - script: demand diff --git a/cea/workflows/life_cycle_analysis.yml b/cea/workflows/life_cycle_analysis.yml new file mode 100644 index 0000000000..2c1af09919 --- /dev/null +++ b/cea/workflows/life_cycle_analysis.yml @@ -0,0 +1,7 @@ +# from solar radiation to emissions and system costs + +- script: radiation +- script: schedule-maker +- script: demand +- script: emissions +- script: system-costs diff --git a/cea/workflows/sg_demand_forecasting.yml b/cea/workflows/sg_demand_forecasting.yml deleted file mode 100644 index 41b1d69eaa..0000000000 --- a/cea/workflows/sg_demand_forecasting.yml +++ /dev/null @@ -1,17 +0,0 @@ -# from CEA data management to solar radiation to energy demand - -- script: data-initializer - parameters: - databases-path: SG -- script: archetypes-mapper -- script: weather-helper - parameters: - weather: Singapore-Changi_1990_2010_TMY -- script: surroundings-helper - parameters: - buffer: 100 -- script: terrain-helper -- script: streets-helper -- script: radiation -- script: schedule-maker -- script: demand diff --git a/cea/workflows/sg_district_cooling_network.yml b/cea/workflows/sg_district_cooling_network.yml deleted file mode 100644 index cb4d267352..0000000000 --- a/cea/workflows/sg_district_cooling_network.yml +++ /dev/null @@ -1,23 +0,0 @@ -# from CEA data management to solar radiation to energy demand - -- script: data-initializer - parameters: - databases-path: SG -- script: archetypes-mapper -- script: weather-helper - parameters: - weather: Singapore-Changi_1990_2010_TMY -- script: surroundings-helper - parameters: - buffer: 100 -- script: terrain-helper -- script: streets-helper -- script: radiation -- script: schedule-maker -- script: demand -- script: network-layout - parameters: - network-type: DC -- script: thermal-network - parameters: - network-type: DC diff --git a/cea/workflows/sg_life_cycle_analysis.yml b/cea/workflows/sg_life_cycle_analysis.yml deleted file mode 100644 index b79a5c65cc..0000000000 --- a/cea/workflows/sg_life_cycle_analysis.yml +++ /dev/null @@ -1,19 +0,0 @@ -# from CEA data management to emissions and system costs - -- script: data-initializer - parameters: - databases-path: SG -- script: archetypes-mapper -- script: weather-helper - parameters: - weather: Singapore-Changi_1990_2010_TMY -- script: surroundings-helper - parameters: - buffer: 100 -- script: terrain-helper -- script: streets-helper -- script: radiation -- script: schedule-maker -- script: demand -- script: emissions -- script: system-costs diff --git a/cea/workflows/sg_solar_potential.yml b/cea/workflows/sg_solar_potential.yml deleted file mode 100644 index eabcc0e36f..0000000000 --- a/cea/workflows/sg_solar_potential.yml +++ /dev/null @@ -1,27 +0,0 @@ -# from CEA data management to solar energy potential analysis including pv, pvt, sc - -- script: data-initializer - parameters: - databases-path: SG -- script: archetypes-mapper -- script: weather-helper - parameters: - weather: Singapore-Changi_1990_2010_TMY -- script: surroundings-helper - parameters: - buffer: 100 -- script: terrain-helper -- script: radiation -- script: photovoltaic -- script: solar-collector - parameters: - type-scpanel: FP -- script: solar-collector - parameters: - type-scpanel: ET -- script: photovoltaic-thermal - parameters: - type-scpanel: FP -- script: photovoltaic-thermal - parameters: - type-scpanel: ET diff --git a/cea/workflows/solar_potential.yml b/cea/workflows/solar_potential.yml new file mode 100644 index 0000000000..90fc3b6847 --- /dev/null +++ b/cea/workflows/solar_potential.yml @@ -0,0 +1,16 @@ +# from radiation to solar energy potential analysis including pv, pvt, sc + +- script: radiation +- script: photovoltaic +- script: solar-collector + parameters: + type-scpanel: FP +- script: solar-collector + parameters: + type-scpanel: ET +- script: photovoltaic-thermal + parameters: + type-scpanel: FP +- script: photovoltaic-thermal + parameters: + type-scpanel: ET