PVGIS by default for heat demand and PV

Dockerfile

@@ -49,6 +49,9 @@ COPY --chown=simstadt:simstadt pyproject.toml uv.lock README.md ./
 RUN uv sync --frozen --no-install-project
 
 RUN uv pip install simstadt
+# Lets `simstadt <template-name> <citygml>` work out of the box using the templates
+# bundled with the PyPI package, without requiring users to mount/supply their own.
+ENV SIMSTADT_TEMPLATE_PATH=/opt/venv/lib/python3.11/site-packages/simstadt/templates
 RUN simstadt --install
 
 COPY --chown=simstadt:simstadt tests ./tests

src/simstadt/templates/101_HeatDemand.flow/02_WeatherProcessor.step/params.xml

@@ -17,7 +17,7 @@
   <void property="weatherDataSource">
    <object class="java.lang.Enum" method="valueOf">
     <class>de.hft.stuttgart.simstadt2.weather.WeatherDataSourceType</class>
-    <string>TMY3_HOURLY_FILE</string>
+    <string>PVGIS_DATABASE</string>
    </object>
   </void>
  </object>

src/simstadt/templates/103_PV.flow/02_WeatherProcessor.step/params.xml

@@ -17,7 +17,7 @@
   <void property="weatherDataSource">
    <object class="java.lang.Enum" method="valueOf">
     <class>de.hft.stuttgart.simstadt2.weather.WeatherDataSourceType</class>
-    <string>TMY3_HOURLY_FILE</string>
+    <string>PVGIS_DATABASE</string>
    </object>
   </void>
  </object>

src/simstadt/templates/104_HeatDemandWithShadow.flow/03_WeatherProcessor.step/params.xml

@@ -17,7 +17,7 @@
   <void property="weatherDataSource">
    <object class="java.lang.Enum" method="valueOf">
     <class>de.hft.stuttgart.simstadt2.weather.WeatherDataSourceType</class>
-    <string>TMY3_HOURLY_FILE</string>
+    <string>PVGIS_DATABASE</string>
    </object>
   </void>
  </object>

src/simstadt/templates/105_PVWithShadow.flow/03_WeatherProcessor.step/params.xml

@@ -17,7 +17,7 @@
   <void property="weatherDataSource">
    <object class="java.lang.Enum" method="valueOf">
     <class>de.hft.stuttgart.simstadt2.weather.WeatherDataSourceType</class>
-    <string>TMY3_HOURLY_FILE</string>
+    <string>PVGIS_DATABASE</string>
    </object>
   </void>
  </object>

src/simstadt/workflows.py

@@ -19,7 +19,9 @@ def _set_weather_file(meteonorm_filename: str | None) -> dict[str, str]:
         # No meteonorm file has been specified, fall back to PVGIS
         return {"<string>TMY3_HOURLY_FILE</string>": "<string>PVGIS_DATABASE</string>"}
     return {
-        "<string>METEONORM_FILE</string>": f"<string>{Path(meteonorm_filename).name}</string>"
+        "<string>METEONORM_FILE</string>": f"<string>{Path(meteonorm_filename).name}</string>",
+        # Make sure Meteonorm is actually used:
+        "<string>PVGIS_DATABASE</string>": "<string>TMY3_HOURLY_FILE</string>",
     }