Merge pull request #2985 from quintel/efate_name

Renaming Efate to VUNH5
quintel · Jan 11, 2024 · d276523 · d276523
2 parents dd0fb5d + 2dad6c4
commit d276523
Show file tree

Hide file tree

Showing 16 changed files with 9 additions and 3 deletions.
diff --git a/datasets/NH5_efate/NH5_efate.derived.ad → datasets/VUNH5_efate/VUNH5_efate.derived.ad b/datasets/NH5_efate/NH5_efate.derived.ad → datasets/VUNH5_efate/VUNH5_efate.derived.ad
@@ -1,6 +1,6 @@
-- area = NH5_efate
-- id = 113138
-- parent_id = 113138
+- area = VUNH5_efate
+- id = 115694
+- parent_id = 115694
 - group = province_vanuatu
 - enabled.etengine = true
 - enabled.etmodel = true
@@ -28,6 +28,9 @@
 - has_aggregated_chemical_industry = false
 - has_detailed_chemical_industry = true
 - has_coal_oil_for_heating_built_environment = true
+- has_aquathermal_potential_for_surface_water = false
+- has_aquathermal_potential_for_waste_water = false
+- has_aquathermal_potential_for_drink_water = false
 - buildings_insulation_employment_constant = 0.0093
 - households_insulation_employment_constant = 0.014
 - co2_emission_1990_aviation_bunkers = 0.0001734
@@ -148,6 +151,9 @@
 - buildings_lt_heat_delivery_system_costs_eur_per_connection = 25386.0
 - buildings_mt_heat_delivery_system_costs_eur_per_connection = 16706.0
 - buildings_ht_heat_delivery_system_costs_eur_per_connection = 16706.0
+- aquathermal_potential_for_surface_water = 0.0
+- aquathermal_potential_for_waste_water = 0.0
+- aquathermal_potential_for_drink_water = 0.0
 - electric_vehicle_profile_1_share = 1.0
 - electric_vehicle_profile_2_share = 0.0
 - electric_vehicle_profile_3_share = 0.0

diff --git a/datasets/NH5_efate/carriers.csv → datasets/VUNH5_efate/carriers.csv b/datasets/NH5_efate/carriers.csv → datasets/VUNH5_efate/carriers.csv
diff --git a/...NH5_efate/curves/buildings_appliances.csv → ...NH5_efate/curves/buildings_appliances.csv b/...NH5_efate/curves/buildings_appliances.csv → ...NH5_efate/curves/buildings_appliances.csv
diff --git a/...ts/NH5_efate/curves/buildings_cooling.csv → .../VUNH5_efate/curves/buildings_cooling.csv b/...ts/NH5_efate/curves/buildings_cooling.csv → .../VUNH5_efate/curves/buildings_cooling.csv
diff --git a/...H5_efate/curves/households_appliances.csv → ...H5_efate/curves/households_appliances.csv b/...H5_efate/curves/households_appliances.csv → ...H5_efate/curves/households_appliances.csv
diff --git a/...s/NH5_efate/curves/households_cooling.csv → ...VUNH5_efate/curves/households_cooling.csv b/...s/NH5_efate/curves/households_cooling.csv → ...VUNH5_efate/curves/households_cooling.csv
diff --git a/...NH5_efate/curves/households_hot_water.csv → ...NH5_efate/curves/households_hot_water.csv b/...NH5_efate/curves/households_hot_water.csv → ...NH5_efate/curves/households_hot_water.csv
diff --git a/...ate/curves/industry_other_electricity.csv → ...ate/curves/industry_other_electricity.csv b/...ate/curves/industry_other_electricity.csv → ...ate/curves/industry_other_electricity.csv
diff --git a/.../NH5_efate/curves/industry_other_heat.csv → ...UNH5_efate/curves/industry_other_heat.csv b/.../NH5_efate/curves/industry_other_heat.csv → ...UNH5_efate/curves/industry_other_heat.csv
diff --git a/...s/weather/default/agriculture_heating.csv → ...s/weather/default/agriculture_heating.csv b/...s/weather/default/agriculture_heating.csv → ...s/weather/default/agriculture_heating.csv
diff --git a/...urves/weather/default/air_temperature.csv → ...urves/weather/default/air_temperature.csv b/...urves/weather/default/air_temperature.csv → ...urves/weather/default/air_temperature.csv
diff --git a/...efate/curves/weather/default/solar_pv.csv → ...efate/curves/weather/default/solar_pv.csv b/...efate/curves/weather/default/solar_pv.csv → ...efate/curves/weather/default/solar_pv.csv
diff --git a/...es/weather/default/solar_pv_profile_1.csv → ...es/weather/default/solar_pv_profile_1.csv b/...es/weather/default/solar_pv_profile_1.csv → ...es/weather/default/solar_pv_profile_1.csv
diff --git a/.../weather/default/wind_inland_baseline.csv → .../weather/default/wind_inland_baseline.csv b/.../weather/default/wind_inland_baseline.csv → .../weather/default/wind_inland_baseline.csv
diff --git a/...eather/default/wind_offshore_baseline.csv → ...eather/default/wind_offshore_baseline.csv b/...eather/default/wind_offshore_baseline.csv → ...eather/default/wind_offshore_baseline.csv
diff --git a/datasets/NH5_efate/graph_values.yml → datasets/VUNH5_efate/graph_values.yml b/datasets/NH5_efate/graph_values.yml → datasets/VUNH5_efate/graph_values.yml