updating interface, starting packaging

utils/SnapPy/Snappy/EEMEP/Controller.py

@@ -21,6 +21,7 @@
 @author: heikok
 """
 
+import subprocess
 from PyQt5 import QtWidgets
 from collections import deque
 import datetime
@@ -78,6 +79,28 @@ def run(self):
             traceback.print_exc()
 
 
+class SnapVolcanoWorker(QThread):
+    finished = pyqtSignal()
+
+    def __init__(self, outputdir, volcanofile):
+        super().__init__()
+        self.outputdir = outputdir
+        self.volcanofile = volcanofile
+
+    def run(self):
+        """Run the snapVolcano as subprocess command."""
+
+        with open(os.path.join(self.outputdir, "snapVolcano.log"), "w") as fh:
+            process = subprocess.run(
+                ["snapVolcano", self.volcanofile],
+                stdout=fh,
+                stderr=fh,
+                cwd=self.outputdir,
+            )
+            process.wait()
+            self.finished.emit()
+
+
 class Controller:
     """
     Controller for EEMEP Widget. Starts the browserwidget as self.main and connects it to the form handler
@@ -402,7 +425,7 @@ def run_eemep_query(self, qDict):
             cheight = eemep_cheight_max
 
         eruptions = []
-        eruption = '<eruption start="{start}Z" end="{end}Z" bottom="{bottom:.0f}" top="{top:.0f}" rate="{rate:.0f}" m63="{m63:.2f}"/>'
+        eruption = '<eruption start="{start}Z" end="{end}Z" bottom="{bottom:.0f}" top="{top:.0f}" rate="{rate:.0f}" m63="{m63:.2f}"/>\n'
         eruptions.append(
             eruption.format(
                 start=startDT.isoformat(),
@@ -421,35 +444,36 @@ def run_eemep_query(self, qDict):
             self.lastOutputDir, ModelRunner.VOLCANO_FILENAME
         )
         self.lastQDict = qDict
-        sourceTerm = """<?xml version="1.0" encoding="UTF-8"?>
-<volcanic_eruption_run run_time_hours="{runTime}" output_directory="{outdir}">
+        ecModelRun = qDict["ecmodelrun"]
+        if not ecModelRun == "best":
+            ecModelRun += "Z"
+        snapMetModel = qDict["snap_metmodel"]
+        snapModelRun = qDict["snap_modelrun"]
+        if snapMetModel == "":
+            snapsetup = ""
+        else:
+            snapsetup = f"""
+  <!-- optional snap setup -->
+  <snap_model_setup>
+    <weather_forecast reference_date="{snapModelRun}" model="{snapMetModel}" />
+  </snap_model_setup>
+            """
+
+        self.lastSourceTerm = f"""<?xml version="1.0" encoding="UTF-8"?>
+<volcanic_eruption_run run_time_hours="{runTime}" output_directory="{self.lastOutputDir}">
 <model_setup use_restart_file="{restart}">
    <!-- reference_date might also be best_estimate, e.g. mix latest forecasts -->
-   <weather_forecast reference_date="{model_run}" model_start_time="{model_start_time}Z"/>
+   <weather_forecast reference_date="{ecModelRun}" model_start_time="{modelStartDT.isoformat()}Z"/>
 </model_setup>
-<volcano name="{volcano}" lat="{lat}" lon="{lon}" altitude="{alt:.0f}" />
+{snapsetup}
+<volcano name="{volcano}" lat="{latf:.3f}" lon="{lonf:.3f}" altitude="{altf:.0f}" />
 <eruptions>
 <!-- bottom and top of ash-cloud in m above ground -->
 <!-- rate in kg/s -->
-{eruptions}
+{"".join(eruptions)}
 </eruptions>
 
 </volcanic_eruption_run>"""
-        ecModelRun = qDict["ecmodelrun"]
-        if not ecModelRun == "best":
-            ecModelRun += "Z"
-        self.lastSourceTerm = sourceTerm.format(
-            lat=latf,
-            lon=lonf,
-            volcano=volcano,
-            alt=altf,
-            outdir=self.lastOutputDir,
-            restart=restart,
-            model_run=ecModelRun,
-            model_start_time=modelStartDT.isoformat(),
-            eruptions="\n".join(eruptions),
-            runTime=runTime,
-        )
         debug("output directory: {}".format(self.lastOutputDir))
         os.makedirs(self.lastOutputDir, exist_ok=True)
 
@@ -483,6 +507,11 @@ def run_eemep_query(self, qDict):
         self.model_update.update_log_signal.connect(self.update_log)
         self.model_update.start(QThread.LowPriority)
 
+        if snapsetup != "":
+            # start a background snap run on volcano.xml
+            self.snap_thread = SnapVolcanoWorker(self.lastOutputDir, self.volcano_file)
+            self.snap_thread.start()
+
 
 if __name__ == "__main__":
     app = QtWidgets.QApplication(sys.argv)

utils/SnapPy/Snappy/EEMEP/ModelRunner.py

@@ -151,8 +151,6 @@ def __init__(self, path, hpcMachine, npp=False):
             self.volcano = NppRun(volcano_path)
         else:
             self.volcano = VolcanoRun(volcano_path)
-            if self.volcano.snap_model_setup is not None:
-                SnapAshRunner(volcano_path)
 
         self.runtag = "eemep_{}".format(os.path.basename(self.volcano.outputDir))
         self.hpc_outdir = os.path.join(self.rundir, self.runtag)

utils/SnapPy/Snappy/EEMEP/SnapVolcanoTranslator.py

@@ -151,13 +151,15 @@ def run(self) -> int:
             fail due to missing meteo, but still give a good beginning.
         """
         with open(os.path.join(self.volcano.outputdir, "snap.outlog"), "w") as fh:
+            logger.info("Starting bsnap_naccident snap.input")
             proc = subprocess.run(
                 ["bsnap_naccident", "snap.input"],
                 cwd=self.volcano.outputdir,
                 stderr=fh,
                 stdout=fh,
             )
         with open(os.path.join(self.volcano.outputdir, "snapAddToa.outlog"), "w") as fh:
+            logger.info("Starting snapAddToa snap.nc")
             proc = subprocess.run(
                 ["snapAddToa", "snap.nc"],
                 cwd=self.volcano.outputdir,

utils/SnapPy/Snappy/EEMEP/resources/startScreenVolc.html

@@ -126,11 +126,11 @@ <h2>EEMEP Log</h2>
 
          <br clear="both" style="clear:both;"/>
          <label>MET-MODEL:</label>
-           <div style="float:right;">
-             <select name="metmodel">
-               <option selected="selected" value="nrpa_ec_0p1">EC 0.1, NRPA-domain</option>
-             </select>
-           </div>
+          <div style="float:right;">
+            <select name="metmodel">
+              <option selected="selected" value="nrpa_ec_0p1">EC 0.1, NRPA-domain</option>
+            </select>
+          </div>
 
 
          <br clear="both" style="clear:both;"/>
@@ -142,6 +142,22 @@ <h2>EEMEP Log</h2>
            </select>
          </div>
 
+          <br clear="both" style="clear:both;"/>
+          <label>SNAP-MET-MODEL:</label>
+          <div style="float:right;">
+            <select name="snap_metmodel">
+            <option value="">Off</option>
+            <option selected="selected" value="nrpa_ec_0p1">EC 0.1, NRPA-domain</option>
+            </select>
+          </div>
+          <br clear="both" style="clear:both;"/>
+          <label>EC-Model Runtime:</label>
+          <div style="float:right;">
+            <select name="snap_modelrun">
+              <option selected="selected" value="best">Best mixed</option>
+            </select>
+          </div>
+
          </div>
          </fieldset>
 

utils/SnapPy/Snappy/resources/snap.input_nrpa_ec_0p1.tmpl

@@ -12,6 +12,7 @@ WET.DEPOSITION.VERSION = 2
 
 *** particles distributed on components according to mass
 MAX.TOTALPARTICLES= 20000000
+MAX.PARTICLES.PER.RELEASE=5000
 
 
 REMOVE.RELATIVE.MASS.LIMIT= 0.

utils/SnapPy/debpkg.sh

@@ -65,8 +65,8 @@ if [ ! -f "Snappy/resources/1-s2.0-S0146645313000110-mmc1.zip" ]; then
 fi
 
 HOST=$(lsb_release --codename --short)
-export VERSION=2.4.3
-CHANGELOG="fixing non-continuous releases; adding column-output"
+export VERSION=2.4.7
+CHANGELOG="automatic snapash runs"
 export DEBEMAIL=${USER}@met.no
 rm --force debian
 ln --symbolic debian.$HOST debian