envvars passed to worker with aRun

- hrr plotting set to False - stdout and stderr form worker passed to /home/aamks/worker.log
aamks · Aug 23, 2023 · 38c0003 · 38c0003
1 parent a23efc2
commit 38c0003
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 260 deletions.
diff --git a/evac/fire_dto.py b/evac/fire_dto.py
diff --git a/manager/manager.py b/manager/manager.py
@@ -59,9 +59,9 @@ def add_workers(self):# {{{
 
         self._access_hosts()
         for i in self.s.query("SELECT host FROM workers WHERE conf_enabled=1 ORDER BY network,host"):
-                Popen("ssh -f -o ConnectTimeout=3 {} \" nohup gearman -w -h {} -f aRun xargs python3 {}/evac/worker.py > /dev/null 2>&1 &\"".format(i['host'], os.environ['AAMKS_SERVER'], os.environ['AAMKS_PATH']), shell=True)
-                print("ssh -f -o ConnectTimeout=3 {} \" nohup gearman -w -h {} -f aRun xargs python3 {}/evac/worker.py > /dev/null 2>&1 &\"".format(i['host'], os.environ['AAMKS_SERVER'], os.environ['AAMKS_PATH']))
-
+            cmd = f"ssh -f -o ConnectTimeout=3 {i['host']} \"AAMKS_PATH={os.environ['AAMKS_PATH']} AAMKS_WORKER=gearman AAMKS_SERVER={os.environ['AAMKS_SERVER']} nohup gearman -w -h {os.environ['AAMKS_SERVER']} -f aRun xargs python3 {os.environ['AAMKS_PATH']}/evac/worker.py >> /home/aamks/worker.log 2>&1 &\""
+            Popen(cmd, shell=True)
+            print(cmd)
         self._gearman_register_results_collector()
 
 # }}}

diff --git a/montecarlo/cfast_mcarlo.py b/montecarlo/cfast_mcarlo.py
@@ -617,7 +617,7 @@ def find_peak_hrr():
         hrr.fuel_control(load_density * fire_area)
         hrr.firefighting()
 
-        times, hrrs = hrr.get_old_format(plot=True)
+        times, hrrs = hrr.get_old_format(plot=False)
         areas = list(npround(npa(hrrs) / hrrpua, 2))
         flashover = t_up_to_hrr_peak if flashover else self.conf['simulation_time']*2