Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-haz
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Seismic Hazard Model Project
nshmp-haz
Commits
adcb150b
Commit
adcb150b
authored
9 years ago
by
Powers, Peter M.
Browse files
Options
Downloads
Patches
Plain Diff
made SiteSet public
parent
7beb96b0
No related branches found
No related tags found
1 merge request
!94
Site handling refactor
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
src/org/opensha2/calc/Site.java
+0
-1
0 additions, 1 deletion
src/org/opensha2/calc/Site.java
src/org/opensha2/calc/SiteSet.java
+1
-1
1 addition, 1 deletion
src/org/opensha2/calc/SiteSet.java
src/org/opensha2/programs/HazardCalc.java
+2
-1
2 additions, 1 deletion
src/org/opensha2/programs/HazardCalc.java
with
3 additions
and
3 deletions
src/org/opensha2/calc/Site.java
+
0
−
1
View file @
adcb150b
...
@@ -21,7 +21,6 @@ import com.google.gson.JsonDeserializationContext;
...
@@ -21,7 +21,6 @@ import com.google.gson.JsonDeserializationContext;
import
com.google.gson.JsonDeserializer
;
import
com.google.gson.JsonDeserializer
;
import
com.google.gson.JsonElement
;
import
com.google.gson.JsonElement
;
import
com.google.gson.JsonObject
;
import
com.google.gson.JsonObject
;
import
com.google.gson.JsonParseException
;
import
com.google.gson.JsonSerializationContext
;
import
com.google.gson.JsonSerializationContext
;
import
com.google.gson.JsonSerializer
;
import
com.google.gson.JsonSerializer
;
...
...
This diff is collapsed.
Click to expand it.
src/org/opensha2/calc/SiteSet.java
+
1
−
1
View file @
adcb150b
...
@@ -47,7 +47,7 @@ import com.google.gson.JsonObject;
...
@@ -47,7 +47,7 @@ import com.google.gson.JsonObject;
*
*
* @author Peter Powers
* @author Peter Powers
*/
*/
final
class
SiteSet
implements
Iterable
<
Site
>
{
public
final
class
SiteSet
implements
Iterable
<
Site
>
{
final
private
GriddedRegion
region
;
final
private
GriddedRegion
region
;
final
private
Builder
builder
;
final
private
Builder
builder
;
...
...
This diff is collapsed.
Click to expand it.
src/org/opensha2/programs/HazardCalc.java
+
2
−
1
View file @
adcb150b
...
@@ -23,6 +23,7 @@ import org.opensha2.calc.Calcs;
...
@@ -23,6 +23,7 @@ import org.opensha2.calc.Calcs;
import
org.opensha2.calc.Hazard
;
import
org.opensha2.calc.Hazard
;
import
org.opensha2.calc.Results
;
import
org.opensha2.calc.Results
;
import
org.opensha2.calc.Site
;
import
org.opensha2.calc.Site
;
import
org.opensha2.calc.SiteSet
;
import
org.opensha2.eq.model.HazardModel
;
import
org.opensha2.eq.model.HazardModel
;
import
org.opensha2.gmm.Imt
;
import
org.opensha2.gmm.Imt
;
import
org.opensha2.util.Logging
;
import
org.opensha2.util.Logging
;
...
@@ -118,7 +119,7 @@ public class HazardCalc {
...
@@ -118,7 +119,7 @@ public class HazardCalc {
Iterable
<
Site
>
sites
=
config
.
sites
();
Iterable
<
Site
>
sites
=
config
.
sites
();
if
(
argCount
>
2
)
{
if
(
argCount
>
2
)
{
Path
sitePath
=
Paths
.
get
(
args
[
2
]);
Path
sitePath
=
Paths
.
get
(
args
[
2
]);
sites
=
Site
.
fromCsv
(
sitePath
);
sites
=
Site
Set
.
fromCsv
(
sitePath
);
log
.
info
(
""
);
log
.
info
(
""
);
StringBuilder
sb
=
new
StringBuilder
()
StringBuilder
sb
=
new
StringBuilder
()
.
append
(
"Site config:"
)
.
append
(
"Site config:"
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment