Merge pull request #90 from kuanshi/master

kz - minor patches for python packages and OQ exceptions in regionalGroundMotion
NHERI-SimCenter · Jun 25, 2021 · 48ae8bd · 48ae8bd
2 parents 840641a + 133646a
commit 48ae8bd
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 8 deletions.
diff --git a/modules/performRegionalEventSimulation/regionalGroundMotion/CreateStation.py b/modules/performRegionalEventSimulation/regionalGroundMotion/CreateStation.py
@@ -41,7 +41,6 @@
 import json
 import numpy as np
 import pandas as pd
-import requests
 
 
 def get_label(options, labels, label_name):
@@ -407,6 +406,8 @@ def get_zTR_ncm(lat, lon):
     Output:
         zTR: list of depth to bedrock
     """
+    import requests
+
     zTR = []
 
     # Looping over sites
@@ -439,6 +440,8 @@ def get_vsp_ncm(lat, lon, depth):
     Output:
         vsp: list of shear-wave velocity profile
     """
+    import requests
+
     vsp = []
     depthMin, depthInc, depthMax = [abs(x) for x in depth]
 

diff --git a/modules/performRegionalEventSimulation/regionalGroundMotion/FetchOpenQuake.py b/modules/performRegionalEventSimulation/regionalGroundMotion/FetchOpenQuake.py
@@ -80,16 +80,19 @@ def handleError(func, path, exc_info):
     if not os.path.isdir('./oq-engine'):
         try:
             os.system('git clone https://github.com/gem/oq-engine.git')
-            # switch to the stable version
-            owd = os.getcwd()
-            os.chdir('./oq-engine')
-            os.system('git clean -d -f')
-            os.system('git checkout '+oq_version)
-            os.chdir(owd)
+            try:
+                # switch to the stable version
+                owd = os.getcwd()
+                os.chdir('./oq-engine')
+                os.system('git clean -d -f')
+                os.system('git checkout '+oq_version)
+                os.chdir(owd)
+            except:
+                print('FetchOpenQuake: failed to switch to the OpenQuake commit '+oq_version)
         except:
             shutil.rmtree('oq-engine', onerror=handleError)
             print('FetchOpenQuake: could not clone https://github.com/gem/oq-engine.git')
-    shutil.copytree('./oq-engine/openquake',os.path.dirname(os.path.realpath(__file__))+'/openquake')
+    shutil.copytree('./oq-engine/openquake',os.path.dirname(os.path.realpath(__file__))+'/openquake',symlinks=True)
     shutil.rmtree('oq-engine', onerror=handleError)
 
 from openquake.baselib import config, version, performance, general, zeromq, hdf5, parallel