Merge pull request #155 from mhearne-usgs/tsunami

Tsunami

Author: emthompson-usgs

adminpager

@@ -470,8 +470,16 @@ def main(args):
         if args.tsunami[1] not in ['on','off']:
             print('Tsunami syntax: adminpager --tsunami EVENT on/off')
             sys.exit(1)
-        result = pdataframe = admin.toggleTsunami(args.tsunami[0],args.tsunami[1])
+        #toggling re-runs PAGER, including whatever transfer may happen
+        result,stdout,stderr = admin.toggleTsunami(args.tsunami[0],args.tsunami[1])
         print('Tsunami status has been set to %s for event %s' % (args.tsunami[1],args.tsunami[0]))
+        if result:
+            lines = stdout.decode('utf-8').split('\n')
+            print('This event has been re-run successfully, with the output:')
+            for line in lines:
+                print(line)
+        if not result:
+            print('This event has not been re-run successfully, with the output:"%s"' % (stderr))
         sys.exit(0)
 
     if args.stats:
@@ -511,9 +519,11 @@ if __name__ == '__main__':
     To release an event: "adminpager --release EVENTID"
     To renotify for an event: "adminpager --renotify EVENTID"
 
-    Setting tsunami flag for an event (does not re-run):
+    Setting tsunami flag for an event (will re-run PAGER):
+    
     To toggle the tsunami flag ON for an event: "adminpager --tsunami EVENTID on"
     To toggle the tsunami flag OFF for an event: "adminpager --tsunami EVENTID off"
+    To allow PAGER to use ComCat/magnitude to determine tsunami behavior: "adminpager --tsunami EVENTID auto"
 
     Querying existing events:
     To print a list of the events from the last 14 days: "adminpager --query recent"
@@ -553,7 +563,7 @@ if __name__ == '__main__':
                            help="Print or change PAGER (and also possibly PAGER MAIL) primary/secondary status.")
     argparser.add_argument("--tsunami", nargs=2,
                            help="Toggle tsunami warning on PAGER alert",
-                           metavar=('EVENT','on/off'))
+                           metavar=('EVENT','on/off/auto'))
     argparser.add_argument('--query',nargs='*',metavar='PARAM',
                            help="List events that match the query. Params are [START/all/recent [MAG [ALERT [END [VERSION]]]]].")
     argparser.add_argument("--history", 

losspager/io/pagerdata.py

@@ -66,7 +66,7 @@ def setInputs(self,shakegrid,timezone_file,pagerversion,versioncode,
         self._elapsed_minutes = elapsed
 
     def setExposure(self,exposure,econ_exposure):
-        nmmi,self._maxmmi = self._get_maxmmi(exposure)
+        self._maxmmi,nmmi = self._get_maxmmi(exposure)
         #convert all numpy integers to python integers
         new_exposure = {}
         for key,value in exposure.items():

losspager/utils/admin.py

@@ -7,6 +7,7 @@
 import shutil
 import json
 import getpass
+from distutils.spawn import find_executable
 
 #local imports
 from losspager.utils.exception import PagerException
@@ -175,9 +176,12 @@ def createEventFolder(self,eventid,event_time):
                 authid,allids = ccinfo.getAssociatedIds()
                 allids.append(authid)
                 for eid in allids:
-                    eventfolder = os.path.join(outfolder,eid+event_time.strftime(DATETIMEFMT))
-                    if os.path.isdir(eventfolder):
-                        return eventfolder
+                    #here we need to look for the *folder* containing the *pattern* with
+                    #the eid in question. getEventFolder does this for us.
+                    teventfolder = self.getEventFolder(eid)
+                    if teventfolder is not None:
+                        eventfolder = teventfolder
+                        break
             except:
                 pass
         if not os.path.isdir(eventfolder):
@@ -402,19 +406,23 @@ def toggleTsunami(self,eventid,tsunami='off'):
         f.write('%s' % tsunami)
         f.close()
 
-        version_folders = sorted(glob.glob(os.path.join(event_folder,'version.*')))
-        jsonfile = os.path.join(version_folders[-1],'json','event.json')
-        f = open(jsonfile,'rt')
-        jdict = json.load(f)
-        f.close()
-        if jdict['event']['tsunami'] == tsunami:
-            return False
-        jdict['event']['tsunami'] = toggle[tsunami]
-        f = open(jsonfile,'wt')
-        json.dump(jdict,f)
-        f.close()
-        return True
-        
+        version_folder = sorted(glob.glob(os.path.join(event_folder,'version.*')))[-1]
+        res,stdout,stderr = self.runPager(version_folder,tsunami=tsunami)
+        return (res,stdout,stderr)
+
+    def runPager(self,versionfolder,release=False,cancel=False,tsunami='auto'):
+        gridfile = os.path.join(versionfolder,'grid.xml')
+        pagerbin = find_executable('pager')
+        if pagerbin is None:
+            raise PagerException('Could not find PAGER executable on this system.')
+        pagercmd = pagerbin + ' %s' % gridfile
+        if release:
+            pagercmd += ' --release'
+        if cancel:
+            pagercmd += ' --cancel'
+        pagercmd += ' --tsunami=%s' % tsunami
+        res,stdout,stderr = get_command_output(pagercmd)
+        return (res,stdout,stderr)
 
     def query(self,start_time=datetime.datetime(1800,1,1),end_time=datetime.datetime.utcnow(),
               mag_threshold=0.0,alert_threshold='green',version='last',eventid=None):

setup_env.sh

@@ -36,12 +36,12 @@ rm openquake.zip
 #pip install git+https://github.com/gem/oq-hazardlib.git
 
 #download MapIO, install it using pip locally
-curl --max-time 60 --retry 3 -L https://github.com/usgs/MapIO/archive/v0.5.157.zip -o mapio.zip
+curl --max-time 60 --retry 3 -L https://github.com/usgs/MapIO/archive/v0.6.zip -o mapio.zip
 pip install mapio.zip
 rm mapio.zip
 #pip install git+https://github.com/usgs/MapIO.git
 
-#download MapIO, install it using pip locally
+#download impactutils, install it using pip locally
 curl --max-time 60 --retry 3 -L https://github.com/usgs/earthquake-impact-utils/archive/master.zip -o impact.zip
 pip install impact.zip
 rm impact.zip