Merge pull request #238 from ucgmsim/gmsimviz

viktor76525 · web-flow · commit 84775cf0b53a · 2021-07-26T11:01:37.000+12:00
using data package like gmsimviz
diff --git a/qcore/config.py b/qcore/config.py
@@ -54,7 +54,6 @@ def get_machine_config(hostname=node(), config_path=None):
 
 
 class ConfigKeys(Enum):
-    GMT_DATA = auto()
     tools_dir = auto()
     cores_per_node = auto()
     MAX_JOB_WCT = auto()
diff --git a/qcore/configs/machine_local.json b/qcore/configs/machine_local.json
@@ -1,7 +1,6 @@
 {
-    "GMT_DATA" : "/nesi/project/nesi00213/PlottingData",
     "tools_dir" : "/nesi/project/nesi00213/tools",
     "cores_per_node" : 1,
     "MAX_NODES_PER_JOB" : 1,
     "MAX_JOB_WCT" : 1000
-}
+}
diff --git a/qcore/configs/machine_mahuika.json b/qcore/configs/machine_mahuika.json
@@ -1,5 +1,4 @@
 {
-    "GMT_DATA" : "/nesi/project/nesi00213/PlottingData",
     "tools_dir" : "/nesi/project/nesi00213/opt/mahuika/hybrid_sim_tools/",
     "cores_per_node" : 36,
     "MAX_NODES_PER_JOB" : 66,
diff --git a/qcore/configs/machine_maui.json b/qcore/configs/machine_maui.json
@@ -1,5 +1,4 @@
 {
-    "GMT_DATA" : "/nesi/project/nesi00213/PlottingData",
     "tools_dir" : "/nesi/project/nesi00213/opt/maui/hybrid_sim_tools/",
     "OpenSees" : "/nesi/project/nesi00213/opt/maui/software/OpenSees/3.2.0-CrayGNU-19.04/OpenSees",
     "cores_per_node" : 40,
diff --git a/qcore/configs/machine_nurion.json b/qcore/configs/machine_nurion.json
@@ -1,7 +1,6 @@
 {
-    "GMT_DATA" : "/home01/hpc11a02/gmsim/PlottingData",
     "tools_dir" : "/home01/hpc11a02/gmsim/tools/",
     "cores_per_node": 64,
     "MAX_NODES_PER_JOB" : 4970,
     "MAX_JOB_WCT" : 48
-}
+}
diff --git a/qcore/configs/machine_stampede2.json b/qcore/configs/machine_stampede2.json
@@ -1,7 +1,6 @@
 {
-  "GMT_DATA": "/work/06833/sungbae/stampede2/PlottingData",
   "tools_dir": "/work/06833/sungbae/stampede2/tools",
   "cores_per_node": 64,
   "MAX_NODES_PER_JOB" : 256,
   "MAX_JOB_WCT" : 48
-}
+}
diff --git a/qcore/gmt.py b/qcore/gmt.py
diff --git a/setup.py b/setup.py

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`		`- "GMT_DATA" : "/nesi/project/nesi00213/PlottingData",`
`3`	`2`	`"tools_dir" : "/nesi/project/nesi00213/tools",`
`4`	`3`	`"cores_per_node" : 1,`
`5`	`4`	`"MAX_NODES_PER_JOB" : 1,`
`6`	`5`	`"MAX_JOB_WCT" : 1000`
`7`		`-}`
	`6`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`{`
`2`		`- "GMT_DATA" : "/nesi/project/nesi00213/PlottingData",`
`3`	`2`	`"tools_dir" : "/nesi/project/nesi00213/opt/mahuika/hybrid_sim_tools/",`
`4`	`3`	`"cores_per_node" : 36,`
`5`	`4`	`"MAX_NODES_PER_JOB" : 66,`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`		`- "GMT_DATA" : "/home01/hpc11a02/gmsim/PlottingData",`
`3`	`2`	`"tools_dir" : "/home01/hpc11a02/gmsim/tools/",`
`4`	`3`	`"cores_per_node": 64,`
`5`	`4`	`"MAX_NODES_PER_JOB" : 4970,`
`6`	`5`	`"MAX_JOB_WCT" : 48`
`7`		`-}`
	`6`	`+}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,6 @@`
`1`	`1`	`{`
`2`		`- "GMT_DATA": "/work/06833/sungbae/stampede2/PlottingData",`
`3`	`2`	`"tools_dir": "/work/06833/sungbae/stampede2/tools",`
`4`	`3`	`"cores_per_node": 64,`
`5`	`4`	`"MAX_NODES_PER_JOB" : 256,`
`6`	`5`	`"MAX_JOB_WCT" : 48`
`7`		`-}`
	`6`	`+}`