diff --git a/LICENSE.md b/LICENSE.md
index 77a9ba19246e1addbc7895db86af957e8ca3c350..5050d8872fb76c24cc394ca0609f6e0cc4493ff2 100644
--- a/LICENSE.md
+++ b/LICENSE.md
@@ -1,4 +1,4 @@
-Unless otherwise noted, this software is in the public domain because it contains materials that originally came from the United States Geological Survey, an agency of the United States Department of Interior. For more information, see the official USGS [copyright policy](http://www.usgs.gov/visual-id/credit_usgs.html#copyright).
+Unless otherwise noted, this software is in the public domain because it contains materials that originally came from the United States Geological Survey (USGS), an agency of the United States Department of Interior. For more information, see the official USGS [copyright policy](http://www.usgs.gov/visual-id/credit_usgs.html#copyright).
Dependent libraries found in the [`lib`](/usgs/nshmp-haz/tree/master/lib) directory are distributed under open source (or open source-like) licenses/agreements. Appropriate license agreements for each library can be found in the [`lib`](/usgs/nshmp-haz/tree/master/lib) directory.
@@ -26,4 +26,4 @@ Dependent libraries found in the [`lib`](/usgs/nshmp-haz/tree/master/lib) direct
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-Information provided by this software may be preliminary or provisional and is subject to revision. It is being provided to meet the need for timely best science. The information has not received final approval by the U.S. Geological Survey (USGS) and is provided on the condition that neither the USGS nor the U.S. Government shall be held liable for any damages resulting from the authorized or unauthorized use of the information.
+Information provided by this software may be preliminary or provisional and is subject to revision. It is being provided to meet the need for timely best science. The information is provided on the condition that neither the USGS nor the U.S. Government shall be held liable for any damages resulting from the authorized or unauthorized use of the information.
diff --git a/README.md b/README.md
index c8af6d0ddbb8e6c29cad570dfb26fa3fa4e6c810..0048db9d88ffb390939b6eb5d2118c25f83e1a91 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
nshmp-haz
=========
-U.S. Geological Survey ([USGS](https://www.usgs.gov)) national neismic hazard mapping project ([NSHMP](https://earthquake.usgs.gov/hazards/)) codes for performing probabilistic seismic hazard (PSHA) and related analyses.
+U.S. Geological Survey ([USGS](https://www.usgs.gov)) National Seismic Hazard Mapping Project ([NSHMP](https://earthquake.usgs.gov/hazards/)) code for performing probabilistic seismic hazard (PSHA) and related analyses. These codes are intended for use with models developed by the NSHMP.
-These codes are intended for use with models developed by the NSHMP. Information relevant to obtaining, building, and running the code may be found in the [wiki](https://github.com/usgs/nshmp-haz/wiki/).
+Please see the [wiki](https://github.com/usgs/nshmp-haz/wiki/) for more information.
diff --git a/build.xml b/build.xml
index 0c085e675d271f8c96fa3ca90d4412d7a8367019..603b602691049ae00c150870215e65fe9decbc94 100644
--- a/build.xml
+++ b/build.xml
@@ -232,10 +232,10 @@
charset="UTF-8"
additionalparam="-notimestamp -Xdoclint:none">
<packageset dir="${src}">
- <include name="org/opensha2/**" />
- <exclude name="org/opensha2/etc/**" />
- <exclude name="org/opensha2/gcim/**" />
- <exclude name="org/opensha2/internal/**" />
+ <include name="gov/usgs/earthquake/nshmp/**" />
+ <exclude name="gov/usgs/earthquake/nshmp/etc/**" />
+ <exclude name="gov/usgs/earthquake/nshmp/gcim/**" />
+ <exclude name="gov/usgs/earthquake/nshmp/internal/**" />
</packageset>
<!--
@@ -244,7 +244,7 @@
<pathelement location="/Library/Java/JavaVirtualMachines/jdk1.7.0_45.jdk/Contents/Home/src.zip" />
</sourcepath>
the package element restricts the docs generated to nshmp-haz
- <package name="org.opensha2.*" />-->
+ <package name="gov.usgs.earthquake.nshmp.*" />-->
<bottom>
<, or spectral periods).
+* Hazard curves have been calculated for 3 `imts` ([intensity measures](http://usgs.github.io/nshmp-haz/javadoc/index.html?gov/usgs/earthquake/nshmp/gmm/Imt.html), or spectral periods).
* The `imls` (intensity measure levels or x-values) of the resultant curves have been explicitely defined for each `imt`.
See the [configuration specification](https://github.com/usgs/nshmp-haz/wiki/Configuration) for details on default values and supported options and formats.
diff --git a/etc/examples/5-complex-model/README.md b/etc/examples/5-complex-model/README.md
index 10e9ae7069042b9c7d71e79826dbd75d8898605d..4e7831411b23c94e2074fdb1c11e56930dc3ded4 100644
--- a/etc/examples/5-complex-model/README.md
+++ b/etc/examples/5-complex-model/README.md
@@ -6,7 +6,7 @@ __Working directory:__ `/path/to/nshmp-haz/etc/examples/5-complex-model`
Most PSHAs involve the use of more complex source models, the components of which might use different ground motion models. For this and ensuing examples, we'll use the 2008 USGS National Seismic Hazard Model (NSHM) for the western U.S. `nshmp-haz` uses an in-memory source model. The USGS NSHMs are quite large, so it's helpful to increase the amount memory available to Java when calling `HazardCalc`. For example, set your alias to:
```Shell
-alias hazard='java -Xms1024m -Xmx4096m -cp /path/to/nshmp-haz/dist/nshmp-haz.jar org.opensha2.HazardCalc'
+alias hazard='java -Xms1024m -Xmx4096m -cp /path/to/nshmp-haz/dist/nshmp-haz.jar gov.usgs.earthquake.nshmp.HazardCalc'
```
This will increase the minimum amount of memory Java requires to 1GB and will allow it to claim up to 4GB, assuming that much is available.
diff --git a/etc/examples/6-enhanced-output/README.md b/etc/examples/6-enhanced-output/README.md
index 1e444f8f8e2dee3bf38ce9772db97f5191ea41fa..273713e9279685c430ca4b334015f265def4db59 100644
--- a/etc/examples/6-enhanced-output/README.md
+++ b/etc/examples/6-enhanced-output/README.md
@@ -11,7 +11,7 @@ hazard ../../../../nshmp-model-cous-2008/Western\ US sites.geojson config.json
The [config](https://github.com/usgs/nshmp-haz/blob/master/etc/examples/6-enhanced-output/config.json) file for this example specified `GMM` and `SOURCE` as [output curve types](https://github.com/usgs/nshmp-haz/wiki/Configuration#calculation-configuration-parameters). Note that the output curves directory now contains additional directories of curves by source type and GMM. We also specified an [output flush limit](https://github.com/usgs/nshmp-haz/wiki/Configuration#calculation-configuration-parameters) of `1`. Doing so gives feedback on how long it takes each site calculation to run on a particular system.
-See the `nshmp-haz` wiki and JavDocs for more information on source types ([Wiki](https://github.com/usgs/nshmp-haz/wiki/Source-Types), [JavaDoc](http://usgs.github.io/nshmp-haz/javadoc/index.html?org/opensha2/eq/model/SourceType.html)) and GMMs ([Wiki](https://github.com/usgs/nshmp-haz/wiki/Ground-Motion-Models), [JavaDoc](http://usgs.github.io/nshmp-haz/javadoc/index.html?org/opensha2/gmm/Gmm.html)).
+See the `nshmp-haz` wiki and JavDocs for more information on source types ([Wiki](https://github.com/usgs/nshmp-haz/wiki/Source-Types), [JavaDoc](http://usgs.github.io/nshmp-haz/javadoc/index.html?gov/usgs/earthquake/nshmp/eq/model/SourceType.html)) and GMMs ([Wiki](https://github.com/usgs/nshmp-haz/wiki/Ground-Motion-Models), [JavaDoc](http://usgs.github.io/nshmp-haz/javadoc/index.html?gov/usgs/earthquake/nshmp/gmm/Gmm.html)).
#### Next: [Example 7 – Deaggregation](../7-deaggregation)
diff --git a/etc/examples/7-deaggregation/README.md b/etc/examples/7-deaggregation/README.md
index e6e904d790a0d9e4a3ab5e38f9f02317f786fca9..8f17cab63e3ac379a99bcf1b7ec086b232c3424d 100644
--- a/etc/examples/7-deaggregation/README.md
+++ b/etc/examples/7-deaggregation/README.md
@@ -6,7 +6,7 @@ __Working directory:__ `/path/to/nshmp-haz/etc/examples/7-deaggregation`
To perform a deaggregation of hazard, one must use the program `DeaggCalc`. Internally, `DeaggCalc` calls `HazardCalc` and then reprocesses the data to generate a comma-delimited file of distance, magnitude, and epsilon bins, and a text file of summary statistics and primary contributing sources. For this, it can be helpful to create a second system alias:
```Shell
-alias deagg='java -Xms1024m -Xmx4096m -cp /path/to/nshmp-haz/dist/nshmp-haz.jar org.opensha2.DeaggCalc'
+alias deagg='java -Xms1024m -Xmx4096m -cp /path/to/nshmp-haz/dist/nshmp-haz.jar gov.usgs.earthquake.nshmp.DeaggCalc'
```
`DeaggCalc` is similar to `HazardCalc` in every way except that the return-period of interest must be specified. For example, execute:
diff --git a/etc/examples/8-probabilities/README.md b/etc/examples/8-probabilities/README.md
index 52e120039f262e48e3675c3a12961e3d2b4553c7..84fcaa5cb24c21712c049288a5befa11f7189a3e 100644
--- a/etc/examples/8-probabilities/README.md
+++ b/etc/examples/8-probabilities/README.md
@@ -8,7 +8,7 @@ __Working directory:__ `/path/to/nshmp-haz/etc/examples/8-probabilities`
For this example, the following system alias is helpful:
```Shell
-alias rate='java -Xms1024m -Xmx4096m -cp /path/to/nshmp-haz/dist/nshmp-haz.jar org.opensha2.RateCalc'
+alias rate='java -Xms1024m -Xmx4096m -cp /path/to/nshmp-haz/dist/nshmp-haz.jar gov.usgs.earthquake.nshmp.RateCalc'
```
Assuming a copy of the 2008 USGS NSHM is available (see [Example 5](../5-complex-model)), execute:
diff --git a/etc/examples/README.md b/etc/examples/README.md
index 8583f20f67ba7c3dd5a3306f15e6915d543a55e1..891a52de801901a15134b11f8802e0ddf9f3bc95 100644
--- a/etc/examples/README.md
+++ b/etc/examples/README.md
@@ -4,7 +4,7 @@ Examples
These examples are designed to be executed locally while following the READMEs on GitHub. All examples avoid a lengthy call to Java and the `HazardCalc` program by using the following system alias:
```Shell
-alias hazard='java -cp /path/to/nshmp-haz/dist/nshmp-haz.jar org.opensha2.HazardCalc'
+alias hazard='java -cp /path/to/nshmp-haz/dist/nshmp-haz.jar gov.usgs.earthquake.nshmp.HazardCalc'
```
Because each example builds on prior concepts, it is best step through all the examples, however quickly.
diff --git a/etc/matlab/gmmExample.m b/etc/matlab/gmmExample.m
index e885686ef7543e55d43ac292999fe3808ec7529f..609bf1799d8f30c973ae46274a4987aec0f09dea 100644
--- a/etc/matlab/gmmExample.m
+++ b/etc/matlab/gmmExample.m
@@ -24,7 +24,7 @@ javaaddpath(nshmpHaz);
% Although the static classpath is generally a little faster, you must
% restart Matlab any time nshmp-haz.jar is rebuilt with updated code.
-import org.opensha2.etc.*
+import gov.usgs.earthquake.nshmp.etc.*
% =========================================================================
% Single model ground motion calculation:
@@ -54,11 +54,11 @@ input.z2p5 = NaN; % in km; NaN triggers default basin depth model
input.z1p0 = NaN; % in km; NaN triggers default basin depth model
% Specify a ground motion model. GMM identifiers:
-% http://usgs.github.io/nshmp-haz/javadoc/org/opensha2/gmm/Gmm.html
+% http://usgs.github.io/nshmp-haz/javadoc/gov/usgs/earthquake/nshmp/gmm/Gmm.html
gmm = 'ASK_14';
% Specify an intensity measure type (IMT). IMT identifiers:
-% http://usgs.github.io/nshmp-haz/javadoc/org/opensha2/gmm/Imt.html
+% http://usgs.github.io/nshmp-haz/javadoc/gov/usgs/earthquake/nshmp/gmm/Imt.html
imt = 'PGA';
% Do a calculation. The MatUtil.calc(gmm, imt, gmmInput) method returns an
diff --git a/lib/logging.properties b/lib/logging.properties
index 195bd79ca7a4627badbbe0eaa5ef5d22c9ddbca1..adba2283d7896962766f9b61efdfb6fda7f61fd5 100644
--- a/lib/logging.properties
+++ b/lib/logging.properties
@@ -38,12 +38,12 @@ java.util.logging.FileHandler.pattern = %h/java%u.log
java.util.logging.FileHandler.limit = 50000
java.util.logging.FileHandler.count = 1
#java.util.logging.FileHandler.formatter = java.util.logging.XMLFormatter
-java.util.logging.FileHandler.formatter = org.opensha2.internal.Logging$ConsoleFormatter
+java.util.logging.FileHandler.formatter = gov.usgs.earthquake.nshmp.internal.Logging$ConsoleFormatter
# Limit the message that are printed on the console to INFO and above.
java.util.logging.ConsoleHandler.level = INFO
#java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter
-java.util.logging.ConsoleHandler.formatter = org.opensha2.internal.Logging$ConsoleFormatter
+java.util.logging.ConsoleHandler.formatter = gov.usgs.earthquake.nshmp.internal.Logging$ConsoleFormatter
############################################################
@@ -51,11 +51,11 @@ java.util.logging.ConsoleHandler.formatter = org.opensha2.internal.Logging$Conso
# Provides extra control for each logger.
############################################################
-org.opensha2.eq.model.AreaParser.level = INFO
-org.opensha2.eq.model.ClusterParser.level = INFO
-org.opensha2.eq.model.FaultParser.level = INFO
-org.opensha2.eq.model.IndexedFaultParser.level = INFO
-org.opensha2.eq.model.GridParser.level = INFO
-org.opensha2.eq.model.InterfaceParser.level = INFO
-org.opensha2.eq.model.GmmParser.level = INFO
-org.opensha2.HazardCalc = INFO
+gov.usgs.earthquake.nshmp.eq.model.AreaParser.level = INFO
+gov.usgs.earthquake.nshmp.eq.model.ClusterParser.level = INFO
+gov.usgs.earthquake.nshmp.eq.model.FaultParser.level = INFO
+gov.usgs.earthquake.nshmp.eq.model.IndexedFaultParser.level = INFO
+gov.usgs.earthquake.nshmp.eq.model.GridParser.level = INFO
+gov.usgs.earthquake.nshmp.eq.model.InterfaceParser.level = INFO
+gov.usgs.earthquake.nshmp.eq.model.GmmParser.level = INFO
+gov.usgs.earthquake.nshmp.HazardCalc = INFO
diff --git a/src/org/opensha2/DeaggCalc.java b/src/gov/usgs/earthquake/nshmp/DeaggCalc.java
similarity index 91%
rename from src/org/opensha2/DeaggCalc.java
rename to src/gov/usgs/earthquake/nshmp/DeaggCalc.java
index 04523e393e1f0c592403bbe8b1db29e28fdbe45c..fce6f40bcea8d2d2d7054f7a627458a4bf125988 100644
--- a/src/org/opensha2/DeaggCalc.java
+++ b/src/gov/usgs/earthquake/nshmp/DeaggCalc.java
@@ -1,20 +1,8 @@
-package org.opensha2;
+package gov.usgs.earthquake.nshmp;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import static java.util.concurrent.Executors.newFixedThreadPool;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.calc.CalcConfig;
-import org.opensha2.calc.HazardCalcs;
-import org.opensha2.calc.Deaggregation;
-import org.opensha2.calc.Hazard;
-import org.opensha2.calc.HazardExport;
-import org.opensha2.calc.Site;
-import org.opensha2.calc.Sites;
-import org.opensha2.calc.ThreadCount;
-import org.opensha2.eq.model.HazardModel;
-import org.opensha2.internal.Logging;
-
import com.google.common.base.Optional;
import com.google.common.base.Throwables;
@@ -29,6 +17,17 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.logging.FileHandler;
import java.util.logging.Logger;
+import gov.usgs.earthquake.nshmp.calc.CalcConfig;
+import gov.usgs.earthquake.nshmp.calc.Deaggregation;
+import gov.usgs.earthquake.nshmp.calc.Hazard;
+import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
+import gov.usgs.earthquake.nshmp.calc.HazardExport;
+import gov.usgs.earthquake.nshmp.calc.Site;
+import gov.usgs.earthquake.nshmp.calc.Sites;
+import gov.usgs.earthquake.nshmp.calc.ThreadCount;
+import gov.usgs.earthquake.nshmp.eq.model.HazardModel;
+import gov.usgs.earthquake.nshmp.internal.Logging;
+
/**
* Deaggregate probabilisitic seismic hazard.
*
@@ -192,7 +191,7 @@ public class DeaggCalc {
private static final String PROGRAM = DeaggCalc.class.getSimpleName();
private static final String USAGE_COMMAND =
- "java -cp nshmp-haz.jar org.opensha2.DeaggCalc model sites returnPeriod [config]";
+ "java -cp nshmp-haz.jar gov.usgs.earthquake.nshmp.DeaggCalc model sites returnPeriod [config]";
private static final String USAGE_URL1 = "https://github.com/usgs/nshmp-haz/wiki";
private static final String USAGE_URL2 = "https://github.com/usgs/nshmp-haz/tree/master/etc";
private static final String SITE_STRING = "name,lon,lat[,vs30,vsInf[,z1p0,z2p5]]";
diff --git a/src/org/opensha2/HazardCalc.java b/src/gov/usgs/earthquake/nshmp/HazardCalc.java
similarity index 93%
rename from src/org/opensha2/HazardCalc.java
rename to src/gov/usgs/earthquake/nshmp/HazardCalc.java
index 104a270e24d3bb41acb2529f80bec88d28f228da..1190018e13baac1932fe32da9c96f77efae5a9e3 100644
--- a/src/org/opensha2/HazardCalc.java
+++ b/src/gov/usgs/earthquake/nshmp/HazardCalc.java
@@ -1,20 +1,8 @@
-package org.opensha2;
+package gov.usgs.earthquake.nshmp;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import static java.util.concurrent.Executors.newFixedThreadPool;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.calc.CalcConfig;
-import org.opensha2.calc.HazardCalcs;
-import org.opensha2.calc.Deaggregation;
-import org.opensha2.calc.Hazard;
-import org.opensha2.calc.HazardExport;
-import org.opensha2.calc.Site;
-import org.opensha2.calc.Sites;
-import org.opensha2.calc.ThreadCount;
-import org.opensha2.eq.model.HazardModel;
-import org.opensha2.internal.Logging;
-
import com.google.common.base.Optional;
import com.google.common.base.Throwables;
@@ -34,6 +22,17 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.logging.FileHandler;
import java.util.logging.Logger;
+import gov.usgs.earthquake.nshmp.calc.CalcConfig;
+import gov.usgs.earthquake.nshmp.calc.Deaggregation;
+import gov.usgs.earthquake.nshmp.calc.Hazard;
+import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
+import gov.usgs.earthquake.nshmp.calc.HazardExport;
+import gov.usgs.earthquake.nshmp.calc.Site;
+import gov.usgs.earthquake.nshmp.calc.Sites;
+import gov.usgs.earthquake.nshmp.calc.ThreadCount;
+import gov.usgs.earthquake.nshmp.eq.model.HazardModel;
+import gov.usgs.earthquake.nshmp.internal.Logging;
+
/**
* Compute probabilisitic seismic hazard from a {@link HazardModel}.
*
@@ -241,7 +240,7 @@ public class HazardCalc {
private static final String PROGRAM = HazardCalc.class.getSimpleName();
private static final String USAGE_COMMAND =
- "java -cp nshmp-haz.jar org.opensha2.HazardCalc model sites [config]";
+ "java -cp nshmp-haz.jar gov.usgs.earthquake.nshmp.HazardCalc model sites [config]";
private static final String USAGE_URL1 = "https://github.com/usgs/nshmp-haz/wiki";
private static final String USAGE_URL2 = "https://github.com/usgs/nshmp-haz/tree/master/etc";
private static final String SITE_STRING = "name,lon,lat[,vs30,vsInf[,z1p0,z2p5]]";
diff --git a/src/org/opensha2/RateCalc.java b/src/gov/usgs/earthquake/nshmp/RateCalc.java
similarity index 93%
rename from src/org/opensha2/RateCalc.java
rename to src/gov/usgs/earthquake/nshmp/RateCalc.java
index 1a1b744a62b65c494b5a83537feffe49fe242c55..6e1a7232b89914b9cc180566b3c155270b639c05 100644
--- a/src/org/opensha2/RateCalc.java
+++ b/src/gov/usgs/earthquake/nshmp/RateCalc.java
@@ -1,18 +1,8 @@
-package org.opensha2;
+package gov.usgs.earthquake.nshmp;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import static java.util.concurrent.Executors.newFixedThreadPool;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.calc.CalcConfig;
-import org.opensha2.calc.EqRate;
-import org.opensha2.calc.EqRateExport;
-import org.opensha2.calc.Site;
-import org.opensha2.calc.Sites;
-import org.opensha2.calc.ThreadCount;
-import org.opensha2.eq.model.HazardModel;
-import org.opensha2.internal.Logging;
-
import com.google.common.base.Optional;
import com.google.common.base.Throwables;
import com.google.common.util.concurrent.Futures;
@@ -34,6 +24,15 @@ import java.util.concurrent.ThreadPoolExecutor;
import java.util.logging.FileHandler;
import java.util.logging.Logger;
+import gov.usgs.earthquake.nshmp.calc.CalcConfig;
+import gov.usgs.earthquake.nshmp.calc.EqRate;
+import gov.usgs.earthquake.nshmp.calc.EqRateExport;
+import gov.usgs.earthquake.nshmp.calc.Site;
+import gov.usgs.earthquake.nshmp.calc.Sites;
+import gov.usgs.earthquake.nshmp.calc.ThreadCount;
+import gov.usgs.earthquake.nshmp.eq.model.HazardModel;
+import gov.usgs.earthquake.nshmp.internal.Logging;
+
/**
* Compute earthquake rates or Poisson probabilities from a {@link HazardModel}.
*
@@ -233,7 +232,7 @@ public class RateCalc {
private static final String PROGRAM = RateCalc.class.getSimpleName();
private static final String USAGE_COMMAND =
- "java -cp nshmp-haz.jar org.opensha2.RateCalc model sites [config]";
+ "java -cp nshmp-haz.jar gov.usgs.earthquake.nshmp.RateCalc model sites [config]";
private static final String USAGE_URL1 = "https://github.com/usgs/nshmp-haz/wiki";
private static final String USAGE_URL2 = "https://github.com/usgs/nshmp-haz/tree/master/etc";
private static final String SITE_STRING = "name,lon,lat";
diff --git a/src/org/opensha2/ResponseSpectra.java b/src/gov/usgs/earthquake/nshmp/ResponseSpectra.java
similarity index 96%
rename from src/org/opensha2/ResponseSpectra.java
rename to src/gov/usgs/earthquake/nshmp/ResponseSpectra.java
index 1b44bc8e73eceeea79f38e064c567b9c41317180..88459f7a945c7f83ff41727fd841ddd308030a28 100644
--- a/src/org/opensha2/ResponseSpectra.java
+++ b/src/gov/usgs/earthquake/nshmp/ResponseSpectra.java
@@ -1,13 +1,7 @@
-package org.opensha2;
+package gov.usgs.earthquake.nshmp;
import static com.google.common.base.StandardSystemProperty.LINE_SEPARATOR;
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.GmmInput;
-import org.opensha2.gmm.GroundMotionModel;
-import org.opensha2.gmm.Imt;
-import org.opensha2.gmm.ScalarGroundMotion;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Maps;
@@ -16,6 +10,12 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionModel;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.gmm.ScalarGroundMotion;
+
/**
* Entry point for computing deterministic response spectra.
*
@@ -246,6 +246,6 @@ public class ResponseSpectra {
"example: java -cp nshmp-haz.jar org.opensha.programs.DeterministicSpectra ASK_14 6.5 10.0 10.3 10.0 90.0 14.0 0.5 7.5 0.0 760.0 true NaN NaN" +
LINE_SEPARATOR.value() +
LINE_SEPARATOR.value() +
- " - For more details, see: http://usgs.github.io/nshmp-haz/docs/org/opensha2/programs/DeterministicSpectra.html";
+ " - For more details, see: http://usgs.github.io/nshmp-haz/docs/gov/usgs/earthquake/nshmp/programs/DeterministicSpectra.html";
}
diff --git a/src/org/opensha2/calc/AsyncList.java b/src/gov/usgs/earthquake/nshmp/calc/AsyncList.java
similarity index 97%
rename from src/org/opensha2/calc/AsyncList.java
rename to src/gov/usgs/earthquake/nshmp/calc/AsyncList.java
index 3c0c2d6df3f05ce80b43ef6ad13d77c914422322..cca99f0a4706a075029cdd8914a9760e57bd005d 100644
--- a/src/org/opensha2/calc/AsyncList.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/AsyncList.java
@@ -1,4 +1,4 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkNotNull;
diff --git a/src/org/opensha2/calc/CalcConfig.java b/src/gov/usgs/earthquake/nshmp/calc/CalcConfig.java
similarity index 97%
rename from src/org/opensha2/calc/CalcConfig.java
rename to src/gov/usgs/earthquake/nshmp/calc/CalcConfig.java
index 78ff9f5c1ddc976b49d417a9f0b4cad52ad41602..62d812a6beb6e02d58abf2226b4f4a0391bf5c5b 100644
--- a/src/org/opensha2/calc/CalcConfig.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/CalcConfig.java
@@ -1,4 +1,4 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.CaseFormat.LOWER_CAMEL;
import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
@@ -6,22 +6,14 @@ import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Strings.padEnd;
import static com.google.common.base.Strings.repeat;
+import static gov.usgs.earthquake.nshmp.data.XySequence.create;
+import static gov.usgs.earthquake.nshmp.data.XySequence.immutableCopyOf;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.enumsToString;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.LOG_INDENT;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.LOG_VALUE_COLUMN;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.opensha2.data.XySequence.create;
-import static org.opensha2.data.XySequence.immutableCopyOf;
-import static org.opensha2.internal.Parsing.enumsToString;
-import static org.opensha2.internal.TextUtils.LOG_INDENT;
-import static org.opensha2.internal.TextUtils.LOG_VALUE_COLUMN;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.data.Data;
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.model.SourceType;
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.GroundMotionModel;
-import org.opensha2.gmm.Imt;
-
import com.google.common.base.Optional;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -47,6 +39,14 @@ import java.util.Arrays;
import java.util.EnumSet;
import java.util.Map;
import java.util.Map.Entry;
+
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.model.SourceType;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionModel;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
import java.util.Set;
/**
@@ -1222,7 +1222,7 @@ public final class CalcConfig {
/**
* Set the IMTs for which results should be calculated.
*
- * @see org.opensha2.calc.CalcConfig.Hazard#imts
+ * @see gov.usgs.earthquake.nshmp.calc.CalcConfig.Hazard#imts
*/
public Builder imts(Set<Imt> imts) {
this.hazard.imts = checkNotNull(imts);
diff --git a/src/org/opensha2/calc/CalcFactory.java b/src/gov/usgs/earthquake/nshmp/calc/CalcFactory.java
similarity index 84%
rename from src/org/opensha2/calc/CalcFactory.java
rename to src/gov/usgs/earthquake/nshmp/calc/CalcFactory.java
index c2551f7c737a3a3aad749f1ed4d97a34e1f472d5..e806c4b2d1b6b0646ca3791726c6b78835b25c00 100644
--- a/src/org/opensha2/calc/CalcFactory.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/CalcFactory.java
@@ -1,23 +1,9 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.util.concurrent.Futures.allAsList;
import static com.google.common.util.concurrent.Futures.immediateFuture;
import static com.google.common.util.concurrent.Futures.transform;
-import org.opensha2.calc.Transforms.ClusterCurveConsolidator;
-import org.opensha2.calc.Transforms.ClusterToCurves;
-import org.opensha2.calc.Transforms.CurveConsolidator;
-import org.opensha2.calc.Transforms.CurveSetConsolidator;
-import org.opensha2.calc.Transforms.ParallelSystemToCurves;
-import org.opensha2.calc.Transforms.SourceToCurves;
-import org.opensha2.calc.Transforms.SystemToCurves;
-import org.opensha2.eq.model.ClusterSource;
-import org.opensha2.eq.model.ClusterSourceSet;
-import org.opensha2.eq.model.HazardModel;
-import org.opensha2.eq.model.Source;
-import org.opensha2.eq.model.SourceSet;
-import org.opensha2.eq.model.SystemSourceSet;
-
import com.google.common.util.concurrent.ListenableFuture;
import java.util.ArrayList;
@@ -25,6 +11,20 @@ import java.util.List;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Executor;
+import gov.usgs.earthquake.nshmp.calc.Transforms.ClusterCurveConsolidator;
+import gov.usgs.earthquake.nshmp.calc.Transforms.ClusterToCurves;
+import gov.usgs.earthquake.nshmp.calc.Transforms.CurveConsolidator;
+import gov.usgs.earthquake.nshmp.calc.Transforms.CurveSetConsolidator;
+import gov.usgs.earthquake.nshmp.calc.Transforms.ParallelSystemToCurves;
+import gov.usgs.earthquake.nshmp.calc.Transforms.SourceToCurves;
+import gov.usgs.earthquake.nshmp.calc.Transforms.SystemToCurves;
+import gov.usgs.earthquake.nshmp.eq.model.ClusterSource;
+import gov.usgs.earthquake.nshmp.eq.model.ClusterSourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.HazardModel;
+import gov.usgs.earthquake.nshmp.eq.model.Source;
+import gov.usgs.earthquake.nshmp.eq.model.SourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.SystemSourceSet;
+
/**
* Static utility methods for performing single-threaded and asynchronous hazard
* calculations via functions in {@link Transforms}.
diff --git a/src/org/opensha2/calc/ClusterCurves.java b/src/gov/usgs/earthquake/nshmp/calc/ClusterCurves.java
similarity index 89%
rename from src/org/opensha2/calc/ClusterCurves.java
rename to src/gov/usgs/earthquake/nshmp/calc/ClusterCurves.java
index 5d65b0a233238e84b27e5732ae506356509649d7..10dec96eaf19ee2ad18d4da7266f290ad3814503 100644
--- a/src/org/opensha2/calc/ClusterCurves.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/ClusterCurves.java
@@ -1,16 +1,15 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.XySequence.immutableCopyOf;
-
-import org.opensha2.data.XySequence;
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.Imt;
+import static gov.usgs.earthquake.nshmp.data.XySequence.immutableCopyOf;
import java.util.EnumMap;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
/**
* Container class for the combined hazard curves derived from the individual
* {@code Source}s in a {@code ClusterSource}, one for each
@@ -27,7 +26,7 @@ final class ClusterCurves {
private ClusterCurves(
ClusterGroundMotions clusterGroundMotions,
Map<Imt, Map<Gmm, XySequence>> curveMap) {
-
+
this.clusterGroundMotions = clusterGroundMotions;
this.curveMap = curveMap;
}
diff --git a/src/org/opensha2/calc/ClusterGroundMotions.java b/src/gov/usgs/earthquake/nshmp/calc/ClusterGroundMotions.java
similarity index 92%
rename from src/org/opensha2/calc/ClusterGroundMotions.java
rename to src/gov/usgs/earthquake/nshmp/calc/ClusterGroundMotions.java
index 2304e89b37c20d084b548d542a91d2936847c647..e29b9dfd9612b8ad7f786cdd8fa268a8b561fde8 100644
--- a/src/org/opensha2/calc/ClusterGroundMotions.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/ClusterGroundMotions.java
@@ -1,11 +1,11 @@
-package org.opensha2.calc;
-
-import org.opensha2.eq.model.ClusterSource;
+package gov.usgs.earthquake.nshmp.calc;
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.List;
+import gov.usgs.earthquake.nshmp.eq.model.ClusterSource;
+
/**
* Lightweight {@code List} wrapper of {@code HazardGroundMotions}s
* corresponding to the {@code FaultSource}s that make up a
diff --git a/src/org/opensha2/calc/ClusterInputs.java b/src/gov/usgs/earthquake/nshmp/calc/ClusterInputs.java
similarity index 92%
rename from src/org/opensha2/calc/ClusterInputs.java
rename to src/gov/usgs/earthquake/nshmp/calc/ClusterInputs.java
index e8ca565ca9ec5fb06f3de13a18c3ed99256f7064..9d7c564fe7e16c6c584cd13f84ee6b93aebcba61 100644
--- a/src/org/opensha2/calc/ClusterInputs.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/ClusterInputs.java
@@ -1,13 +1,13 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkNotNull;
-import org.opensha2.eq.model.ClusterSource;
-
import java.util.AbstractList;
import java.util.ArrayList;
import java.util.List;
+import gov.usgs.earthquake.nshmp.eq.model.ClusterSource;
+
/**
* Lightweight {@code List} wrapper of {@code HazardInput}s corresponding to the
* {@code FaultSource}s that make up a {@code ClusterSource}. This class
diff --git a/src/org/opensha2/calc/DataType.java b/src/gov/usgs/earthquake/nshmp/calc/DataType.java
similarity index 89%
rename from src/org/opensha2/calc/DataType.java
rename to src/gov/usgs/earthquake/nshmp/calc/DataType.java
index 17ec2607c28e765deebf5c6087f1da69922e9d78..73929b15f98869dbd15fef9acc274f8791f50a16 100644
--- a/src/org/opensha2/calc/DataType.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/DataType.java
@@ -1,7 +1,7 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
-import org.opensha2.eq.model.SourceType;
-import org.opensha2.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.eq.model.SourceType;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
/**
* Data type identifiers. These are used to specify the different types of
diff --git a/src/org/opensha2/calc/DeaggConfig.java b/src/gov/usgs/earthquake/nshmp/calc/DeaggConfig.java
similarity index 93%
rename from src/org/opensha2/calc/DeaggConfig.java
rename to src/gov/usgs/earthquake/nshmp/calc/DeaggConfig.java
index cace55983edf09db5eaa93a5d1dda982c3e539d8..3bf40f86b15878b1d0d7cdf23dc6f992c2b4cf68 100644
--- a/src/org/opensha2/calc/DeaggConfig.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/DeaggConfig.java
@@ -1,16 +1,16 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
-import static org.opensha2.internal.TextUtils.LOG_INDENT;
-
-import org.opensha2.calc.CalcConfig.Deagg.Bins;
-import org.opensha2.calc.DeaggExport.EpsilonBins;
-import org.opensha2.calc.DeaggExport.εBin;
-import org.opensha2.gmm.Imt;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.LOG_INDENT;
import com.google.common.collect.ImmutableList;
import java.util.List;
+import gov.usgs.earthquake.nshmp.calc.CalcConfig.Deagg.Bins;
+import gov.usgs.earthquake.nshmp.calc.DeaggExport.EpsilonBins;
+import gov.usgs.earthquake.nshmp.calc.DeaggExport.εBin;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
/**
* A deaggregation configuration container. This class provides a reusable
* builder that comes in handy when iterating over IMTs and only the return
@@ -159,7 +159,7 @@ final class DeaggConfig {
truncation);
}
}
-
+
static EpsilonBins createEpsilonBins(List<Double> εLevels, double εDelta) {
double εDeltaBy2 = εDelta / 2.0;
ImmutableList.Builder<εBin> bins = ImmutableList.builder();
@@ -171,5 +171,4 @@ final class DeaggConfig {
return new EpsilonBins(bins.build());
}
-
}
diff --git a/src/org/opensha2/calc/DeaggContributor.java b/src/gov/usgs/earthquake/nshmp/calc/DeaggContributor.java
similarity index 95%
rename from src/org/opensha2/calc/DeaggContributor.java
rename to src/gov/usgs/earthquake/nshmp/calc/DeaggContributor.java
index 297fd136a49fdf766423cccf367c0ec45f5e2a14..12d8ab014616dc8f2a43814fbcb38de108fac62e 100644
--- a/src/org/opensha2/calc/DeaggContributor.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/DeaggContributor.java
@@ -1,22 +1,8 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.eq.model.SourceType.SYSTEM;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.calc.DeaggExport.ContributionFilter;
-import org.opensha2.data.Data;
-import org.opensha2.data.IntervalArray;
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.model.ClusterSource;
-import org.opensha2.eq.model.Rupture;
-import org.opensha2.eq.model.Source;
-import org.opensha2.eq.model.SourceSet;
-import org.opensha2.eq.model.SourceType;
-import org.opensha2.geo.Location;
-import org.opensha2.internal.Parsing;
-import org.opensha2.util.Maths;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.SYSTEM;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
@@ -28,6 +14,19 @@ import java.util.Collection;
import java.util.Iterator;
import java.util.List;
+import gov.usgs.earthquake.nshmp.calc.DeaggExport.ContributionFilter;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.data.IntervalArray;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.model.ClusterSource;
+import gov.usgs.earthquake.nshmp.eq.model.Rupture;
+import gov.usgs.earthquake.nshmp.eq.model.Source;
+import gov.usgs.earthquake.nshmp.eq.model.SourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.SourceType;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Skeletal class and implementations used for contribution to hazard in a
* deaggregation. A contribution may be keyed to a {@code SourceSet}, an
@@ -721,10 +720,10 @@ abstract class DeaggContributor {
/* Use for SourceSets. */
static JsonContributor createMulti(
- String name,
- SourceType source,
+ String name,
+ SourceType source,
double contribution) {
-
+
JsonContributor jc = new JsonContributor();
jc.name = name;
jc.source = source.toString();
diff --git a/src/org/opensha2/calc/DeaggDataset.java b/src/gov/usgs/earthquake/nshmp/calc/DeaggDataset.java
similarity index 96%
rename from src/org/opensha2/calc/DeaggDataset.java
rename to src/gov/usgs/earthquake/nshmp/calc/DeaggDataset.java
index 2e552755aaa29d143f9bee6d482b9abc9baf5f16..671fe77f50376746b4190414c2fe4b1486e1608a 100644
--- a/src/org/opensha2/calc/DeaggDataset.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/DeaggDataset.java
@@ -1,20 +1,7 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.Data.checkInRange;
-
-import org.opensha2.calc.CalcConfig.Deagg.Bins;
-import org.opensha2.calc.DeaggContributor.ClusterContributor;
-import org.opensha2.calc.DeaggContributor.SourceContributor;
-import org.opensha2.calc.DeaggContributor.SourceSetContributor;
-import org.opensha2.calc.DeaggContributor.SystemContributor;
-import org.opensha2.data.IntervalArray;
-import org.opensha2.data.IntervalData;
-import org.opensha2.data.IntervalTable;
-import org.opensha2.data.IntervalVolume;
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.eq.model.Source;
+import static gov.usgs.earthquake.nshmp.data.Data.checkInRange;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
@@ -27,6 +14,18 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.calc.CalcConfig.Deagg.Bins;
+import gov.usgs.earthquake.nshmp.calc.DeaggContributor.ClusterContributor;
+import gov.usgs.earthquake.nshmp.calc.DeaggContributor.SourceContributor;
+import gov.usgs.earthquake.nshmp.calc.DeaggContributor.SourceSetContributor;
+import gov.usgs.earthquake.nshmp.calc.DeaggContributor.SystemContributor;
+import gov.usgs.earthquake.nshmp.data.IntervalArray;
+import gov.usgs.earthquake.nshmp.data.IntervalData;
+import gov.usgs.earthquake.nshmp.data.IntervalTable;
+import gov.usgs.earthquake.nshmp.data.IntervalVolume;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.eq.model.Source;
+
/**
* A deaggregation dataset class that provides a variety of builder flavors to
* create initial datasets for specific {@code SourceSet}s and {@code Gmm}s and
diff --git a/src/org/opensha2/calc/DeaggExport.java b/src/gov/usgs/earthquake/nshmp/calc/DeaggExport.java
similarity index 96%
rename from src/org/opensha2/calc/DeaggExport.java
rename to src/gov/usgs/earthquake/nshmp/calc/DeaggExport.java
index 7b7516b5ae8cd97d9b4701bc8112dd7272afd1ea..095e3d622335ba44792539c13c4c920344c01ba1 100644
--- a/src/org/opensha2/calc/DeaggExport.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/DeaggExport.java
@@ -1,22 +1,10 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
+import static gov.usgs.earthquake.nshmp.calc.HazardExport.WRITE;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import static java.lang.Math.exp;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.opensha2.calc.HazardExport.WRITE;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.calc.CalcConfig.Deagg.Bins;
-import org.opensha2.calc.DeaggContributor.JsonContributor;
-import org.opensha2.calc.DeaggContributor.SourceSetContributor;
-import org.opensha2.calc.DeaggContributor.SystemContributor;
-import org.opensha2.data.Data;
-import org.opensha2.eq.model.SourceType;
-import org.opensha2.gmm.Imt;
-import org.opensha2.internal.Parsing;
-import org.opensha2.internal.Parsing.Delimiter;
-import org.opensha2.util.Maths;
-
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.base.Strings;
@@ -35,6 +23,17 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import gov.usgs.earthquake.nshmp.calc.CalcConfig.Deagg.Bins;
+import gov.usgs.earthquake.nshmp.calc.DeaggContributor.JsonContributor;
+import gov.usgs.earthquake.nshmp.calc.DeaggContributor.SourceSetContributor;
+import gov.usgs.earthquake.nshmp.calc.DeaggContributor.SystemContributor;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.eq.model.SourceType;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing.Delimiter;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Deaggregation dataset exporter. This class handles String/Text and JSON
* output of DeaggDatasets. JSON output is supported through the serialization
@@ -354,8 +353,8 @@ final class DeaggExport {
/* custom imt formatting */
Imt imt = dc.imt;
- String imlLabel = (imt.isSA() ? imt.period() + " s SA": imt.name()) + " ground motion";
-
+ String imlLabel = (imt.isSA() ? imt.period() + " s SA" : imt.name()) + " ground motion";
+
ImmutableList.Builder<SummaryElement> summaryElements = ImmutableList.builder();
summaryElements.add(
diff --git a/src/org/opensha2/calc/Deaggregation.java b/src/gov/usgs/earthquake/nshmp/calc/Deaggregation.java
similarity index 95%
rename from src/org/opensha2/calc/Deaggregation.java
rename to src/gov/usgs/earthquake/nshmp/calc/Deaggregation.java
index 73951d857719d9c4e1e77db83a1b5246faa51bb2..5eba28f13e9d88daa4d229185e83b6ebbdad266e 100644
--- a/src/org/opensha2/calc/Deaggregation.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/Deaggregation.java
@@ -1,13 +1,8 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
-import static org.opensha2.calc.DeaggDataset.SOURCE_CONSOLIDATOR;
-import static org.opensha2.calc.DeaggDataset.SOURCE_SET_CONSOLIDATOR;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.data.Interpolator;
-import org.opensha2.data.XySequence;
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.Imt;
+import static gov.usgs.earthquake.nshmp.calc.DeaggDataset.SOURCE_CONSOLIDATOR;
+import static gov.usgs.earthquake.nshmp.calc.DeaggDataset.SOURCE_SET_CONSOLIDATOR;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import com.google.common.collect.ListMultimap;
import com.google.common.collect.Maps;
@@ -19,6 +14,11 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import gov.usgs.earthquake.nshmp.data.Interpolator;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
/**
* Hazard deaggregation. Given a {@link Hazard} result, this class will
* deaggregate the results at all spectral periods supplied in the result at an
diff --git a/src/org/opensha2/calc/Deaggregator.java b/src/gov/usgs/earthquake/nshmp/calc/Deaggregator.java
similarity index 92%
rename from src/org/opensha2/calc/Deaggregator.java
rename to src/gov/usgs/earthquake/nshmp/calc/Deaggregator.java
index fe8caf2a5e240d1ca09499e3f66f4fa479a30547..c0157b79ad8a1e06e0e70efc989a5876772b8563 100644
--- a/src/org/opensha2/calc/Deaggregator.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/Deaggregator.java
@@ -1,26 +1,6 @@
-package org.opensha2.calc;
-
-import static org.opensha2.calc.DeaggDataset.SOURCE_CONSOLIDATOR;
-
-import org.opensha2.calc.DeaggContributor.ClusterContributor;
-import org.opensha2.calc.DeaggContributor.SectionSource;
-import org.opensha2.calc.DeaggContributor.SourceContributor;
-import org.opensha2.calc.DeaggContributor.SourceSetContributor;
-import org.opensha2.calc.DeaggContributor.SystemContributor;
-import org.opensha2.data.Indexing;
-import org.opensha2.data.IntervalArray;
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.model.ClusterSource;
-import org.opensha2.eq.model.GmmSet;
-import org.opensha2.eq.model.Source;
-import org.opensha2.eq.model.SourceSet;
-import org.opensha2.eq.model.SystemSourceSet;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.Locations;
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.Imt;
-import org.opensha2.gmm.ScalarGroundMotion;
-import org.opensha2.util.Maths;
+package gov.usgs.earthquake.nshmp.calc;
+
+import static gov.usgs.earthquake.nshmp.calc.DeaggDataset.SOURCE_CONSOLIDATOR;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableMap;
@@ -39,6 +19,27 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+
+import gov.usgs.earthquake.nshmp.calc.DeaggContributor.ClusterContributor;
+import gov.usgs.earthquake.nshmp.calc.DeaggContributor.SectionSource;
+import gov.usgs.earthquake.nshmp.calc.DeaggContributor.SourceContributor;
+import gov.usgs.earthquake.nshmp.calc.DeaggContributor.SourceSetContributor;
+import gov.usgs.earthquake.nshmp.calc.DeaggContributor.SystemContributor;
+import gov.usgs.earthquake.nshmp.data.Indexing;
+import gov.usgs.earthquake.nshmp.data.IntervalArray;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.model.ClusterSource;
+import gov.usgs.earthquake.nshmp.eq.model.GmmSet;
+import gov.usgs.earthquake.nshmp.eq.model.Source;
+import gov.usgs.earthquake.nshmp.eq.model.SourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.SystemSourceSet;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.gmm.ScalarGroundMotion;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
import java.util.Set;
/**
@@ -351,8 +352,8 @@ final class Deaggregator {
double azimuth = Locations.azimuth(site.location, location);
/*
- * Init sectionMfds, create system contributors for section and attach
- * to parent.
+ * Init sectionMfds, create system contributors for section and attach to
+ * parent.
*/
Map<Gmm, SystemContributor.Builder> contributors = new EnumMap<>(Gmm.class);
for (Gmm gmm : gmmKeys) {
diff --git a/src/org/opensha2/calc/DistributionFormat.java b/src/gov/usgs/earthquake/nshmp/calc/DistributionFormat.java
similarity index 78%
rename from src/org/opensha2/calc/DistributionFormat.java
rename to src/gov/usgs/earthquake/nshmp/calc/DistributionFormat.java
index 9c61b59db05c8345be8711238cea5b5e00edab35..2a1bcc4e4d846c9a4075bb963cb646fa4ec22b8f 100644
--- a/src/org/opensha2/calc/DistributionFormat.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/DistributionFormat.java
@@ -1,4 +1,4 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
/**
* Distribution format.
@@ -10,5 +10,5 @@ public enum DistributionFormat {
INCREMENTAL,
CUMULATIVE;
-
+
}
diff --git a/src/org/opensha2/calc/EqRate.java b/src/gov/usgs/earthquake/nshmp/calc/EqRate.java
similarity index 91%
rename from src/org/opensha2/calc/EqRate.java
rename to src/gov/usgs/earthquake/nshmp/calc/EqRate.java
index 5978bfc0e5de40a9f467f16bf3c285d995d1c610..915f356fc60f1b67625d0b939783718428d7ad8d 100644
--- a/src/org/opensha2/calc/EqRate.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/EqRate.java
@@ -1,24 +1,7 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkArgument;
-import org.opensha2.calc.CalcConfig.Rate.Bins;
-import org.opensha2.data.IntervalArray;
-import org.opensha2.data.IntervalArray.Builder;
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.model.ClusterSource;
-import org.opensha2.eq.model.ClusterSourceSet;
-import org.opensha2.eq.model.Distance;
-import org.opensha2.eq.model.HazardModel;
-import org.opensha2.eq.model.Rupture;
-import org.opensha2.eq.model.Source;
-import org.opensha2.eq.model.SourceSet;
-import org.opensha2.eq.model.SourceType;
-import org.opensha2.eq.model.SystemSourceSet;
-import org.opensha2.geo.Location;
-import org.opensha2.mfd.Mfds;
-import org.opensha2.util.Maths;
-
import com.google.common.base.Converter;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
@@ -28,6 +11,23 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.concurrent.Callable;
+import gov.usgs.earthquake.nshmp.calc.CalcConfig.Rate.Bins;
+import gov.usgs.earthquake.nshmp.data.IntervalArray;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.data.IntervalArray.Builder;
+import gov.usgs.earthquake.nshmp.eq.model.ClusterSource;
+import gov.usgs.earthquake.nshmp.eq.model.ClusterSourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.Distance;
+import gov.usgs.earthquake.nshmp.eq.model.HazardModel;
+import gov.usgs.earthquake.nshmp.eq.model.Rupture;
+import gov.usgs.earthquake.nshmp.eq.model.Source;
+import gov.usgs.earthquake.nshmp.eq.model.SourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.SourceType;
+import gov.usgs.earthquake.nshmp.eq.model.SystemSourceSet;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* General purpose earthquake rate and probability data container. This class
* makes no distinction between incremental or cumulative MFDs, or whether
diff --git a/src/org/opensha2/calc/EqRateExport.java b/src/gov/usgs/earthquake/nshmp/calc/EqRateExport.java
similarity index 96%
rename from src/org/opensha2/calc/EqRateExport.java
rename to src/gov/usgs/earthquake/nshmp/calc/EqRateExport.java
index a5f21db9ac7a62a12edb1815d0c738c4be5d33ef..8eeffe96994fc06cf346b5dd0f0ce26ed828a16d 100644
--- a/src/org/opensha2/calc/EqRateExport.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/EqRateExport.java
@@ -1,14 +1,8 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkState;
import static java.nio.charset.StandardCharsets.US_ASCII;
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.model.SourceType;
-import org.opensha2.geo.Location;
-import org.opensha2.internal.Parsing;
-import org.opensha2.internal.Parsing.Delimiter;
-
import com.google.common.base.Function;
import com.google.common.base.Stopwatch;
import com.google.common.collect.FluentIterable;
@@ -29,6 +23,12 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.logging.Logger;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.model.SourceType;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing.Delimiter;
+
/**
* Earthquake rate and probability exporter.
*
@@ -38,7 +38,7 @@ public final class EqRateExport {
private static final String RATE_FORMAT = "%.8g";
private static final String PROB_FORMAT = "%.2f";
-
+
private final Logger log;
private final Path dir;
private final String valueFormat;
@@ -57,10 +57,10 @@ public final class EqRateExport {
private final List<EqRate> rates;
private EqRateExport(CalcConfig config, Sites sites, Logger log) throws IOException {
-
+
// whether or not rates or probabilities have been calculated
boolean rates = config.rate.valueFormat == ValueFormat.ANNUAL_RATE;
-
+
this.log = log;
this.dir = HazardExport.createOutputDir(updateOutDir(config.output.directory, rates));
this.valueFormat = rates ? RATE_FORMAT : PROB_FORMAT;
diff --git a/src/org/opensha2/calc/ExceedanceModel.java b/src/gov/usgs/earthquake/nshmp/calc/ExceedanceModel.java
similarity index 96%
rename from src/org/opensha2/calc/ExceedanceModel.java
rename to src/gov/usgs/earthquake/nshmp/calc/ExceedanceModel.java
index 94e517de125903d5deec4cd01487f0e16e9c8ee4..1f233f1c1151ff5f4449e053fb50bccce36ff84b 100644
--- a/src/org/opensha2/calc/ExceedanceModel.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/ExceedanceModel.java
@@ -1,21 +1,20 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkArgument;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGV;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P75;
import static java.lang.Double.isNaN;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.Imt.PGV;
-import static org.opensha2.gmm.Imt.SA0P75;
-
-import org.opensha2.data.XyPoint;
-import org.opensha2.data.XySequence;
-import org.opensha2.gmm.Imt;
-import org.opensha2.gmm.MultiScalarGroundMotion;
-import org.opensha2.gmm.ScalarGroundMotion;
-import org.opensha2.util.Maths;
-
import java.util.List;
+import gov.usgs.earthquake.nshmp.data.XyPoint;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.gmm.MultiScalarGroundMotion;
+import gov.usgs.earthquake.nshmp.gmm.ScalarGroundMotion;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Uncertainty models govern how the values of a complementary cumulative normal
* distribution (or probability of exceedence) are computed given a mean,
diff --git a/src/org/opensha2/calc/GroundMotions.java b/src/gov/usgs/earthquake/nshmp/calc/GroundMotions.java
similarity index 95%
rename from src/org/opensha2/calc/GroundMotions.java
rename to src/gov/usgs/earthquake/nshmp/calc/GroundMotions.java
index f236c941762ef4985d5773ee916b2cec51b292d6..4603337cb8b872d37b7aeb43e90ece9f2fa7b35a 100644
--- a/src/org/opensha2/calc/GroundMotions.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/GroundMotions.java
@@ -1,12 +1,8 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.Imt;
-import org.opensha2.gmm.ScalarGroundMotion;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import com.google.common.collect.Maps;
@@ -14,6 +10,11 @@ import java.util.ArrayList;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.gmm.ScalarGroundMotion;
+
import java.util.Set;
/**
@@ -35,7 +36,7 @@ final class GroundMotions {
private GroundMotions(
InputList inputs,
Map<Imt, Map<Gmm, List<ScalarGroundMotion>>> gmMap) {
-
+
this.inputs = inputs;
this.gmMap = gmMap;
}
@@ -146,7 +147,7 @@ final class GroundMotions {
private static int addValues(
Map<Imt, Map<Gmm, List<ScalarGroundMotion>>> sgmTargetMap,
Map<Imt, Map<Gmm, List<ScalarGroundMotion>>> sgmValueMap) {
-
+
int setCount = 0;
for (Entry<Imt, Map<Gmm, List<ScalarGroundMotion>>> imtEntry : sgmTargetMap.entrySet()) {
Imt imt = imtEntry.getKey();
@@ -161,5 +162,5 @@ final class GroundMotions {
return setCount;
}
}
-
+
}
diff --git a/src/org/opensha2/calc/Hazard.java b/src/gov/usgs/earthquake/nshmp/calc/Hazard.java
similarity index 92%
rename from src/org/opensha2/calc/Hazard.java
rename to src/gov/usgs/earthquake/nshmp/calc/Hazard.java
index 5dec620eb59d8d41e4102b2d27c668c0e757cde2..67b753f820883aae5b85ef3328151bfcedb6af80 100644
--- a/src/org/opensha2/calc/Hazard.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/Hazard.java
@@ -1,18 +1,9 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.XySequence.emptyCopyOf;
-
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.model.GridSourceSet;
-import org.opensha2.eq.model.HazardModel;
-import org.opensha2.eq.model.Source;
-import org.opensha2.eq.model.SourceSet;
-import org.opensha2.eq.model.SourceType;
-import org.opensha2.gmm.Imt;
+import static gov.usgs.earthquake.nshmp.data.XySequence.emptyCopyOf;
import com.google.common.base.StandardSystemProperty;
import com.google.common.collect.ImmutableSetMultimap;
@@ -23,6 +14,14 @@ import java.util.EnumMap;
import java.util.Map;
import java.util.Map.Entry;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.model.GridSourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.HazardModel;
+import gov.usgs.earthquake.nshmp.eq.model.Source;
+import gov.usgs.earthquake.nshmp.eq.model.SourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.SourceType;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
/**
* The result of a hazard calculation. This container class is public for
* reference by external packages but is not directly modifiable, nor its fields
@@ -106,8 +105,8 @@ public final class Hazard {
/**
* Combine hazard from multiple independent models. The hazard object returned
- * by this method will only specify a parent 'model' if varargs only
- * included one model.
+ * by this method will only specify a parent 'model' if varargs only included
+ * one model.
*
* <p><b>Note:</b> When combining hazard results, the combined result inherits
* the {@link CalcConfig} from the first model supplied in varargs. This may
diff --git a/src/org/opensha2/calc/HazardCalcs.java b/src/gov/usgs/earthquake/nshmp/calc/HazardCalcs.java
similarity index 91%
rename from src/org/opensha2/calc/HazardCalcs.java
rename to src/gov/usgs/earthquake/nshmp/calc/HazardCalcs.java
index 0675c85e93bc8fd141098a054173e4f6ff673dbf..d4c7212ae507607e4bd53fdd978a191b3549dbc8 100644
--- a/src/org/opensha2/calc/HazardCalcs.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/HazardCalcs.java
@@ -1,24 +1,15 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.util.concurrent.Futures.allAsList;
import static com.google.common.util.concurrent.Futures.immediateFuture;
import static com.google.common.util.concurrent.Futures.transform;
-
-import static org.opensha2.calc.CalcFactory.clustersToCurves;
-import static org.opensha2.calc.CalcFactory.sourcesToCurves;
-import static org.opensha2.calc.CalcFactory.systemToCurves;
-import static org.opensha2.calc.CalcFactory.toHazardResult;
-import static org.opensha2.data.Data.checkInRange;
-import static org.opensha2.eq.model.PointSourceType.FIXED_STRIKE;
-
-import org.opensha2.calc.Transforms.SourceToInputs;
-import org.opensha2.eq.model.ClusterSourceSet;
-import org.opensha2.eq.model.GridSourceSet;
-import org.opensha2.eq.model.HazardModel;
-import org.opensha2.eq.model.Source;
-import org.opensha2.eq.model.SourceSet;
-import org.opensha2.eq.model.SystemSourceSet;
+import static gov.usgs.earthquake.nshmp.calc.CalcFactory.clustersToCurves;
+import static gov.usgs.earthquake.nshmp.calc.CalcFactory.sourcesToCurves;
+import static gov.usgs.earthquake.nshmp.calc.CalcFactory.systemToCurves;
+import static gov.usgs.earthquake.nshmp.calc.CalcFactory.toHazardResult;
+import static gov.usgs.earthquake.nshmp.data.Data.checkInRange;
+import static gov.usgs.earthquake.nshmp.eq.model.PointSourceType.FIXED_STRIKE;
import com.google.common.base.Function;
import com.google.common.base.Optional;
@@ -32,6 +23,14 @@ import java.util.concurrent.Executor;
import java.util.logging.Level;
import java.util.logging.Logger;
+import gov.usgs.earthquake.nshmp.calc.Transforms.SourceToInputs;
+import gov.usgs.earthquake.nshmp.eq.model.ClusterSourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.GridSourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.HazardModel;
+import gov.usgs.earthquake.nshmp.eq.model.Source;
+import gov.usgs.earthquake.nshmp.eq.model.SourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.SystemSourceSet;
+
/**
* Static probabilistic seismic hazard analysis calculators.
*
diff --git a/src/org/opensha2/calc/HazardCurveSet.java b/src/gov/usgs/earthquake/nshmp/calc/HazardCurveSet.java
similarity index 90%
rename from src/org/opensha2/calc/HazardCurveSet.java
rename to src/gov/usgs/earthquake/nshmp/calc/HazardCurveSet.java
index d3c3f313674781a1aabbd3284e3b5d8a53c4febd..5fcb398900da3fe32b346234bfdbf21b110afa6d 100644
--- a/src/org/opensha2/calc/HazardCurveSet.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/HazardCurveSet.java
@@ -1,24 +1,24 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.XySequence.copyOf;
-import static org.opensha2.data.XySequence.emptyCopyOf;
-import static org.opensha2.data.XySequence.immutableCopyOf;
-
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.model.Source;
-import org.opensha2.eq.model.SourceSet;
-import org.opensha2.eq.model.SourceType;
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.Imt;
+import static gov.usgs.earthquake.nshmp.data.XySequence.copyOf;
+import static gov.usgs.earthquake.nshmp.data.XySequence.emptyCopyOf;
+import static gov.usgs.earthquake.nshmp.data.XySequence.immutableCopyOf;
import java.util.ArrayList;
import java.util.EnumMap;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.model.Source;
+import gov.usgs.earthquake.nshmp.eq.model.SourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.SourceType;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
import java.util.Set;
/**
@@ -59,7 +59,7 @@ final class HazardCurveSet {
final Map<Imt, List<Map<Gmm, XySequence>>> clusterCurveLists;
final Map<Imt, Map<Gmm, XySequence>> curveMap;
final Map<Imt, XySequence> totalCurves;
-
+
// TODO separate references by what is needed for hazard vs deagg
// deagg of cluster and system types requires us to hold onto some
// objects created when generating hazard curves
@@ -150,7 +150,7 @@ final class HazardCurveSet {
if (cluster) {
List<Map<Gmm, XySequence>> clusterCurveList = new ArrayList<>();
clusterCurveLists.put(imt, clusterCurveList);
-
+
}
}
totalCurves = new EnumMap<>(Imt.class);
@@ -186,14 +186,14 @@ final class HazardCurveSet {
Map<Gmm, XySequence> curveMapBuild = curveMap.get(imt);
/*
- * Retain references to the total curve for each cluster source
- * for deaggregation in clusterCurveLists. These lists of maps by
- * GMM will contain only those curves for the GMMs approprate for
- * the source-site distance. When deaggreagting, the same distance
- * cutoff will be considered so retrieval of curves from the maps
- * should never thrwo an NPE.
+ * Retain references to the total curve for each cluster source for
+ * deaggregation in clusterCurveLists. These lists of maps by GMM will
+ * contain only those curves for the GMMs approprate for the source-site
+ * distance. When deaggreagting, the same distance cutoff will be
+ * considered so retrieval of curves from the maps should never thrwo an
+ * NPE.
*/
-
+
Map<Gmm, XySequence> clusterCurves = new EnumMap<>(Gmm.class);
// loop Gmms based on what's supported at this distance
for (Gmm gmm : gmmWeightMap.keySet()) {
diff --git a/src/org/opensha2/calc/HazardCurves.java b/src/gov/usgs/earthquake/nshmp/calc/HazardCurves.java
similarity index 92%
rename from src/org/opensha2/calc/HazardCurves.java
rename to src/gov/usgs/earthquake/nshmp/calc/HazardCurves.java
index fa84f1e592aaf32bc6f77a589a1b4edd56e0579e..fb8362bea5c4cd7fba4a6f2a2092201007004142 100644
--- a/src/org/opensha2/calc/HazardCurves.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/HazardCurves.java
@@ -1,13 +1,8 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.XySequence.copyOf;
-import static org.opensha2.data.XySequence.immutableCopyOf;
-
-import org.opensha2.data.XySequence;
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.Imt;
+import static gov.usgs.earthquake.nshmp.data.XySequence.copyOf;
+import static gov.usgs.earthquake.nshmp.data.XySequence.immutableCopyOf;
import com.google.common.base.Function;
import com.google.common.collect.FluentIterable;
@@ -18,6 +13,10 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
/**
* Container class for the combined hazard curves derived from the
* {@code Rupture}s in an individual {@code Source}, one for each
diff --git a/src/org/opensha2/calc/HazardExport.java b/src/gov/usgs/earthquake/nshmp/calc/HazardExport.java
similarity index 97%
rename from src/org/opensha2/calc/HazardExport.java
rename to src/gov/usgs/earthquake/nshmp/calc/HazardExport.java
index 4f080ab8f49d4929d8ed4f486a7da6d1feb9eb7b..52bc1b12a9b1eefa5f57daa091f3929d41986e2b 100644
--- a/src/org/opensha2/calc/HazardExport.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/HazardExport.java
@@ -1,26 +1,11 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.data.XySequence.emptyCopyOf;
import static java.nio.ByteOrder.LITTLE_ENDIAN;
import static java.nio.charset.StandardCharsets.US_ASCII;
-import static org.opensha2.data.XySequence.emptyCopyOf;
-
-import org.opensha2.calc.Deaggregation.ImtDeagg;
-import org.opensha2.calc.HazardExport.Metadata.Builder;
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.model.Source;
-import org.opensha2.eq.model.SourceSet;
-import org.opensha2.eq.model.SourceType;
-import org.opensha2.geo.Bounds;
-import org.opensha2.geo.Location;
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.Imt;
-import org.opensha2.internal.Parsing;
-import org.opensha2.internal.Parsing.Delimiter;
-import org.opensha2.mfd.Mfds;
-
import com.google.common.base.Function;
import com.google.common.base.Functions;
import com.google.common.base.Optional;
@@ -50,6 +35,20 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.logging.Logger;
+import gov.usgs.earthquake.nshmp.calc.Deaggregation.ImtDeagg;
+import gov.usgs.earthquake.nshmp.calc.HazardExport.Metadata.Builder;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.model.Source;
+import gov.usgs.earthquake.nshmp.eq.model.SourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.SourceType;
+import gov.usgs.earthquake.nshmp.geo.Bounds;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing.Delimiter;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+
/**
* Hazard calculation result exporter.
*
diff --git a/src/org/opensha2/calc/HazardInput.java b/src/gov/usgs/earthquake/nshmp/calc/HazardInput.java
similarity index 79%
rename from src/org/opensha2/calc/HazardInput.java
rename to src/gov/usgs/earthquake/nshmp/calc/HazardInput.java
index 928f0102d1ab3cf0283026dde82820b9f315020a..c082af28eafa0b9cf3ef3ca8e691f0813b706495 100644
--- a/src/org/opensha2/calc/HazardInput.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/HazardInput.java
@@ -1,8 +1,8 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
-import org.opensha2.eq.model.Rupture;
-import org.opensha2.gmm.GmmInput;
-import org.opensha2.gmm.GroundMotionModel;
+import gov.usgs.earthquake.nshmp.eq.model.Rupture;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionModel;
/**
* A {@link GroundMotionModel} input that carries {@link Rupture} rate
diff --git a/src/org/opensha2/calc/InputList.java b/src/gov/usgs/earthquake/nshmp/calc/InputList.java
similarity index 95%
rename from src/org/opensha2/calc/InputList.java
rename to src/gov/usgs/earthquake/nshmp/calc/InputList.java
index 82185d4a826c6ea7b7967f69ce11637558c6d511..1b5b96272856817a301c85d06fbf4eb2957e9dc7 100644
--- a/src/org/opensha2/calc/InputList.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/InputList.java
@@ -1,6 +1,6 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
-import static org.opensha2.internal.TextUtils.NEWLINE;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
diff --git a/src/org/opensha2/calc/ReturnPeriod.java b/src/gov/usgs/earthquake/nshmp/calc/ReturnPeriod.java
similarity index 96%
rename from src/org/opensha2/calc/ReturnPeriod.java
rename to src/gov/usgs/earthquake/nshmp/calc/ReturnPeriod.java
index e8189c4a0038b04a3499c7645f75f3c5723ca71c..3edbaac33ec49547082f39ee4f2ceb78d1ef3bda 100644
--- a/src/org/opensha2/calc/ReturnPeriod.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/ReturnPeriod.java
@@ -1,9 +1,9 @@
-package org.opensha2.calc;
-
-import org.opensha2.mfd.Mfds;
+package gov.usgs.earthquake.nshmp.calc;
import com.google.common.base.MoreObjects;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+
/**
* Identifiers of common return periods, also referred to in PSHA as
* probabilities of exceedance.
diff --git a/src/org/opensha2/calc/Site.java b/src/gov/usgs/earthquake/nshmp/calc/Site.java
similarity index 96%
rename from src/org/opensha2/calc/Site.java
rename to src/gov/usgs/earthquake/nshmp/calc/Site.java
index b6f4223e6832e129f15bddb701f110856541a5ba..f923a94355bb52a8fd8a0a74945e2e9dec21cce4 100644
--- a/src/org/opensha2/calc/Site.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/Site.java
@@ -1,16 +1,9 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.Data.checkInRange;
-import static org.opensha2.internal.GeoJson.validateProperty;
-
-import org.opensha2.geo.Location;
-import org.opensha2.gmm.GroundMotionModel;
-import org.opensha2.internal.GeoJson;
-import org.opensha2.util.Named;
-import org.opensha2.util.NamedLocation;
+import static gov.usgs.earthquake.nshmp.data.Data.checkInRange;
+import static gov.usgs.earthquake.nshmp.internal.GeoJson.validateProperty;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
@@ -24,6 +17,12 @@ import com.google.gson.JsonObject;
import java.lang.reflect.Type;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionModel;
+import gov.usgs.earthquake.nshmp.internal.GeoJson;
+import gov.usgs.earthquake.nshmp.util.Named;
+import gov.usgs.earthquake.nshmp.util.NamedLocation;
+
/**
* Site characteristics container. Take note of default values; the minimum
* information required to create a {@code Site} is its location. Not all
diff --git a/src/org/opensha2/calc/Sites.java b/src/gov/usgs/earthquake/nshmp/calc/Sites.java
similarity index 94%
rename from src/org/opensha2/calc/Sites.java
rename to src/gov/usgs/earthquake/nshmp/calc/Sites.java
index 3c02d9e796de32786c628e421d7e41a8c06a8e1e..9b3231be4e5113294d765333b4fda29ed8599029 100644
--- a/src/org/opensha2/calc/Sites.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/Sites.java
@@ -1,27 +1,15 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.geo.BorderType.MERCATOR_LINEAR;
+import static gov.usgs.earthquake.nshmp.internal.GeoJson.validateProperty;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.splitToList;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.LOG_INDENT;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NULL;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.opensha2.geo.BorderType.MERCATOR_LINEAR;
-import static org.opensha2.internal.GeoJson.validateProperty;
-import static org.opensha2.internal.Parsing.splitToList;
-import static org.opensha2.internal.TextUtils.LOG_INDENT;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-import static org.opensha2.internal.TextUtils.NULL;
-
-import org.opensha2.calc.Site.Builder;
-import org.opensha2.geo.Bounds;
-import org.opensha2.geo.GriddedRegion;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-import org.opensha2.geo.Region;
-import org.opensha2.geo.Regions;
-import org.opensha2.internal.GeoJson;
-import org.opensha2.internal.Parsing;
-import org.opensha2.internal.Parsing.Delimiter;
-
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -44,6 +32,17 @@ import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
+import gov.usgs.earthquake.nshmp.calc.Site.Builder;
+import gov.usgs.earthquake.nshmp.geo.Bounds;
+import gov.usgs.earthquake.nshmp.geo.GriddedRegion;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.Region;
+import gov.usgs.earthquake.nshmp.geo.Regions;
+import gov.usgs.earthquake.nshmp.internal.GeoJson;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing.Delimiter;
+
/**
* Iterable {@code Site} container. Factory methods are supplied to creating
* instances from different input formats.
@@ -232,7 +231,7 @@ public abstract class Sites implements Iterable<Site> {
* The number of {@code Site}s {@code this} contains.
*/
public abstract int size();
-
+
/**
* An optional {@code Bounds} that is used to specify rectangular map extents,
* which may differ from the range spanned by the sites in this. Presently
@@ -241,7 +240,7 @@ public abstract class Sites implements Iterable<Site> {
* {@code == true}.
*/
public abstract Optional<Bounds> mapBounds();
-
+
/**
* An optional spacing value that reflects the spacing of sites within an
* attendant {@link #mapBounds()}.
@@ -264,7 +263,7 @@ public abstract class Sites implements Iterable<Site> {
public int size() {
return delegate.size();
}
-
+
@Override
public Optional<Bounds> mapBounds() {
return Optional.absent();
@@ -319,7 +318,7 @@ public abstract class Sites implements Iterable<Site> {
public int size() {
return region.size();
}
-
+
@Override
public Optional<Bounds> mapBounds() {
return bounds;
diff --git a/src/org/opensha2/calc/SourceInputList.java b/src/gov/usgs/earthquake/nshmp/calc/SourceInputList.java
similarity index 85%
rename from src/org/opensha2/calc/SourceInputList.java
rename to src/gov/usgs/earthquake/nshmp/calc/SourceInputList.java
index a338d9fa272dc90a501af833d9b4af1fd5574c3f..e4c493ac20840412a927a61d49145a4f4db89c1f 100644
--- a/src/org/opensha2/calc/SourceInputList.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/SourceInputList.java
@@ -1,8 +1,8 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkNotNull;
-import org.opensha2.eq.model.Source;
+import gov.usgs.earthquake.nshmp.eq.model.Source;
/**
* A {@code List} of {@code HazardInput}s that contains a reference to the
diff --git a/src/org/opensha2/calc/SystemInputList.java b/src/gov/usgs/earthquake/nshmp/calc/SystemInputList.java
similarity index 94%
rename from src/org/opensha2/calc/SystemInputList.java
rename to src/gov/usgs/earthquake/nshmp/calc/SystemInputList.java
index 3b03ca99e5888dd4b60d23cffdd5f602b6d49ae8..44313c6e6a8228fcde7db2f2a86c479f05365237 100644
--- a/src/org/opensha2/calc/SystemInputList.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/SystemInputList.java
@@ -1,14 +1,14 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.base.Preconditions.checkNotNull;
-import org.opensha2.eq.model.SystemSourceSet;
-
import java.util.ArrayList;
import java.util.BitSet;
import java.util.List;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.eq.model.SystemSourceSet;
+
/**
* A {@code List} of {@code HazardInput}s that contains a reference to the
* parent {@code SystemSourceSet} from which the inputs were derived. This
diff --git a/src/org/opensha2/calc/ThreadCount.java b/src/gov/usgs/earthquake/nshmp/calc/ThreadCount.java
similarity index 97%
rename from src/org/opensha2/calc/ThreadCount.java
rename to src/gov/usgs/earthquake/nshmp/calc/ThreadCount.java
index 59075d22e795110f2506f02f54a733f4fc057f65..ead2afbc9029d42ede0e5cd0047b3f07cb94b258 100644
--- a/src/org/opensha2/calc/ThreadCount.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/ThreadCount.java
@@ -1,4 +1,4 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import com.google.common.util.concurrent.MoreExecutors;
diff --git a/src/org/opensha2/calc/Transforms.java b/src/gov/usgs/earthquake/nshmp/calc/Transforms.java
similarity index 95%
rename from src/org/opensha2/calc/Transforms.java
rename to src/gov/usgs/earthquake/nshmp/calc/Transforms.java
index 9b21c2a32845d9ff0ac86bb94c873c04a0e4b546..bfc5519cf063cedb05d2ef91db9a7202d0f4d217 100644
--- a/src/org/opensha2/calc/Transforms.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/Transforms.java
@@ -1,31 +1,10 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
import static com.google.common.util.concurrent.Futures.allAsList;
import static com.google.common.util.concurrent.Futures.getUnchecked;
import static com.google.common.util.concurrent.Futures.immediateFuture;
import static com.google.common.util.concurrent.Futures.transform;
-
-import static org.opensha2.gmm.Gmm.instances;
-
-import org.opensha2.calc.ClusterCurves.Builder;
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.eq.fault.surface.RuptureSurface;
-import org.opensha2.eq.model.ClusterSource;
-import org.opensha2.eq.model.ClusterSourceSet;
-import org.opensha2.eq.model.Distance;
-import org.opensha2.eq.model.FaultSource;
-import org.opensha2.eq.model.GmmSet;
-import org.opensha2.eq.model.HazardModel;
-import org.opensha2.eq.model.Rupture;
-import org.opensha2.eq.model.Source;
-import org.opensha2.eq.model.SourceSet;
-import org.opensha2.eq.model.SystemSourceSet;
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.GmmInput;
-import org.opensha2.gmm.GroundMotionModel;
-import org.opensha2.gmm.Imt;
-import org.opensha2.gmm.ScalarGroundMotion;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.instances;
import com.google.common.base.Function;
import com.google.common.collect.ImmutableList;
@@ -38,6 +17,26 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.Executor;
+import gov.usgs.earthquake.nshmp.calc.ClusterCurves.Builder;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureSurface;
+import gov.usgs.earthquake.nshmp.eq.model.ClusterSource;
+import gov.usgs.earthquake.nshmp.eq.model.ClusterSourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.Distance;
+import gov.usgs.earthquake.nshmp.eq.model.FaultSource;
+import gov.usgs.earthquake.nshmp.eq.model.GmmSet;
+import gov.usgs.earthquake.nshmp.eq.model.HazardModel;
+import gov.usgs.earthquake.nshmp.eq.model.Rupture;
+import gov.usgs.earthquake.nshmp.eq.model.Source;
+import gov.usgs.earthquake.nshmp.eq.model.SourceSet;
+import gov.usgs.earthquake.nshmp.eq.model.SystemSourceSet;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionModel;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.gmm.ScalarGroundMotion;
+
/**
* Data transform {@link Function}s. These are called exclusively from
* {@link CalcFactory}.
diff --git a/src/org/opensha2/calc/ValueFormat.java b/src/gov/usgs/earthquake/nshmp/calc/ValueFormat.java
similarity index 75%
rename from src/org/opensha2/calc/ValueFormat.java
rename to src/gov/usgs/earthquake/nshmp/calc/ValueFormat.java
index 31d06922bfd88c99f7a4a7921905c019db88647c..e8fc7bf50ac7c49c79bebba10f154bcdd3fb0211 100644
--- a/src/org/opensha2/calc/ValueFormat.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/ValueFormat.java
@@ -1,6 +1,6 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
-import org.opensha2.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
/**
* Hazard curve value types.
@@ -14,7 +14,7 @@ public enum ValueFormat {
/** Poisson probability. */
POISSON_PROBABILITY;
-
+
@Override
public String toString() {
return Parsing.enumLabelWithSpaces(this, true);
diff --git a/src/org/opensha2/calc/Vs30.java b/src/gov/usgs/earthquake/nshmp/calc/Vs30.java
similarity index 96%
rename from src/org/opensha2/calc/Vs30.java
rename to src/gov/usgs/earthquake/nshmp/calc/Vs30.java
index 45b7561cde9d01a09b270c947b4c9f00d1f74a4c..549a544434f7c506319f3dc800756c01d9f40b07 100644
--- a/src/org/opensha2/calc/Vs30.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/Vs30.java
@@ -1,4 +1,4 @@
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
/**
* Identifiers for commonly used values of Vs30. These correspond to the NEHERP
diff --git a/src/org/opensha2/calc/package-info.java b/src/gov/usgs/earthquake/nshmp/calc/package-info.java
similarity index 56%
rename from src/org/opensha2/calc/package-info.java
rename to src/gov/usgs/earthquake/nshmp/calc/package-info.java
index 33ac89dbac9116ab9b59d49fd12cdd5be313837b..dd818d28c5c012b53e3d2aba6abea57e1dd74cce 100644
--- a/src/org/opensha2/calc/package-info.java
+++ b/src/gov/usgs/earthquake/nshmp/calc/package-info.java
@@ -1,4 +1,4 @@
/**
* Hazard calculation classes and utilties.
*/
-package org.opensha2.calc;
+package gov.usgs.earthquake.nshmp.calc;
diff --git a/src/org/opensha2/data/Data.java b/src/gov/usgs/earthquake/nshmp/data/Data.java
similarity index 99%
rename from src/org/opensha2/data/Data.java
rename to src/gov/usgs/earthquake/nshmp/data/Data.java
index 8a074a39f692db264feba23f3c24162468394ad7..2826c273e7dc36c09af4031646cb8f73213db93e 100644
--- a/src/org/opensha2/data/Data.java
+++ b/src/gov/usgs/earthquake/nshmp/data/Data.java
@@ -1,11 +1,8 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.util.Maths;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import com.google.common.base.Function;
import com.google.common.base.Strings;
@@ -22,6 +19,8 @@ import java.util.Collection;
import java.util.List;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Utilities for operating on {@code double}-valued data.
*
@@ -1448,16 +1447,16 @@ public final class Data {
// }
static int firstNonZeroIndex(double... data) {
- for (int i=0; i<data.length; i++) {
+ for (int i = 0; i < data.length; i++) {
if (data[i] != 0.0) {
return i;
}
}
return -1;
}
-
+
static int lastNonZeroIndex(double... data) {
- for (int i=data.length-1; i>=0; i--) {
+ for (int i = data.length - 1; i >= 0; i--) {
if (data[i] != 0.0) {
return i;
}
diff --git a/src/org/opensha2/data/DataArray.java b/src/gov/usgs/earthquake/nshmp/data/DataArray.java
similarity index 98%
rename from src/org/opensha2/data/DataArray.java
rename to src/gov/usgs/earthquake/nshmp/data/DataArray.java
index 494ac3709c098aef408c7002e3347238b59643aa..01dc9761e44a4bf3a990c2437948e8cf7df344eb 100644
--- a/src/org/opensha2/data/DataArray.java
+++ b/src/gov/usgs/earthquake/nshmp/data/DataArray.java
@@ -1,4 +1,4 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static com.google.common.base.Preconditions.checkArgument;
diff --git a/src/org/opensha2/data/ImmutableXySequence.java b/src/gov/usgs/earthquake/nshmp/data/ImmutableXySequence.java
similarity index 98%
rename from src/org/opensha2/data/ImmutableXySequence.java
rename to src/gov/usgs/earthquake/nshmp/data/ImmutableXySequence.java
index f3d8f96a49bec9ff31c429cb8973e44874e89ab2..188ad3592dd611ce02805021b83bd69244ea88c5 100644
--- a/src/org/opensha2/data/ImmutableXySequence.java
+++ b/src/gov/usgs/earthquake/nshmp/data/ImmutableXySequence.java
@@ -1,4 +1,4 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkElementIndex;
@@ -66,7 +66,7 @@ class ImmutableXySequence extends XySequence {
public final boolean isClear() {
return Data.areZeroValued(ys);
}
-
+
@Override
public final XySequence trim() {
checkState(!this.isClear(), "XySequence.trim() not permitted for 'clear' sequences");
diff --git a/src/org/opensha2/data/Indexing.java b/src/gov/usgs/earthquake/nshmp/data/Indexing.java
similarity index 98%
rename from src/org/opensha2/data/Indexing.java
rename to src/gov/usgs/earthquake/nshmp/data/Indexing.java
index 996fcf9a920adf28f69878df2c107eedf03a7426..a5b842f955923101f904b917bb4d02464786b7e7 100644
--- a/src/org/opensha2/data/Indexing.java
+++ b/src/gov/usgs/earthquake/nshmp/data/Indexing.java
@@ -1,9 +1,8 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkElementIndex;
-
-import static org.opensha2.data.Data.checkSize;
+import static gov.usgs.earthquake.nshmp.data.Data.checkSize;
import com.google.common.primitives.Ints;
diff --git a/src/org/opensha2/data/Interpolate.java b/src/gov/usgs/earthquake/nshmp/data/Interpolate.java
similarity index 99%
rename from src/org/opensha2/data/Interpolate.java
rename to src/gov/usgs/earthquake/nshmp/data/Interpolate.java
index 350bd950e0b2135752df3cfde048b9a5d3cc609b..5246d8ea94c3beb1b2e4c83cf3ef089bafae4130 100644
--- a/src/org/opensha2/data/Interpolate.java
+++ b/src/gov/usgs/earthquake/nshmp/data/Interpolate.java
@@ -1,4 +1,4 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static java.lang.Math.exp;
import static java.lang.Math.log;
diff --git a/src/org/opensha2/data/Interpolator.java b/src/gov/usgs/earthquake/nshmp/data/Interpolator.java
similarity index 99%
rename from src/org/opensha2/data/Interpolator.java
rename to src/gov/usgs/earthquake/nshmp/data/Interpolator.java
index 1f5096e736261a657146aa651045c062ba34b046..2c89a32cb4dbd32fa1314415ee8ec47069df97bc 100644
--- a/src/org/opensha2/data/Interpolator.java
+++ b/src/gov/usgs/earthquake/nshmp/data/Interpolator.java
@@ -1,4 +1,4 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static java.lang.Math.exp;
import static java.lang.Math.log;
diff --git a/src/org/opensha2/data/IntervalArray.java b/src/gov/usgs/earthquake/nshmp/data/IntervalArray.java
similarity index 96%
rename from src/org/opensha2/data/IntervalArray.java
rename to src/gov/usgs/earthquake/nshmp/data/IntervalArray.java
index 46e1aacb2a5e109a24f42543c8d9280f65ebd9bf..63ddda01b3d2a3ddfcde60194ba916d253b5f9bd 100644
--- a/src/org/opensha2/data/IntervalArray.java
+++ b/src/gov/usgs/earthquake/nshmp/data/IntervalArray.java
@@ -1,22 +1,21 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkElementIndex;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.IntervalData.checkDataState;
-import static org.opensha2.data.IntervalData.indexOf;
-import static org.opensha2.data.IntervalData.keys;
-
-import org.opensha2.data.IntervalData.AbstractArray;
-import org.opensha2.data.IntervalData.DefaultArray;
+import static gov.usgs.earthquake.nshmp.data.IntervalData.checkDataState;
+import static gov.usgs.earthquake.nshmp.data.IntervalData.indexOf;
+import static gov.usgs.earthquake.nshmp.data.IntervalData.keys;
import com.google.common.primitives.Doubles;
import java.util.Arrays;
import java.util.List;
+import gov.usgs.earthquake.nshmp.data.IntervalData.AbstractArray;
+import gov.usgs.earthquake.nshmp.data.IntervalData.DefaultArray;
+
/**
* An array of immutable, double-valued data that is arranged according to
* increasing and uniformly spaced double-valued keys. Interval arrays are used
diff --git a/src/org/opensha2/data/IntervalData.java b/src/gov/usgs/earthquake/nshmp/data/IntervalData.java
similarity index 98%
rename from src/org/opensha2/data/IntervalData.java
rename to src/gov/usgs/earthquake/nshmp/data/IntervalData.java
index f2d46100c1c03e863dcb01e69087ecd6c5798a89..5c5e2c8083e36f2e91414b2b0123102622f874f4 100644
--- a/src/org/opensha2/data/IntervalData.java
+++ b/src/gov/usgs/earthquake/nshmp/data/IntervalData.java
@@ -1,18 +1,17 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static com.google.common.base.Preconditions.checkElementIndex;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.primitives.Doubles.asList;
+import static gov.usgs.earthquake.nshmp.data.Data.checkDelta;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import static java.util.Collections.unmodifiableList;
-import static org.opensha2.data.Data.checkDelta;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.internal.Parsing;
-
import java.util.Collection;
import java.util.List;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+
/**
* Static utilities for working with and concrete implementations of 1-, 2- and
* 3-dimensional interval data containers.
@@ -219,7 +218,7 @@ public final class IntervalData {
int iColumn = indexOf(columnMin, columnΔ, columnValue, columns.length);
return get(iRow, iColumn);
}
-
+
@Override
public XySequence row(double rowValue) {
int rowIndex = indexOf(rowMin, rowΔ, rowValue, rows.length);
@@ -365,7 +364,7 @@ public final class IntervalData {
int iLevel = indexOf(levelMin, levelΔ, levelValue, levels.length);
return get(iRow, iColumn, iLevel);
}
-
+
@Override
public XySequence column(double rowValue, double columnValue) {
int iRow = indexOf(rowMin, rowΔ, rowValue, rows.length);
diff --git a/src/org/opensha2/data/IntervalTable.java b/src/gov/usgs/earthquake/nshmp/data/IntervalTable.java
similarity index 97%
rename from src/org/opensha2/data/IntervalTable.java
rename to src/gov/usgs/earthquake/nshmp/data/IntervalTable.java
index 805750e67656d129c5e2dcad9a143a90e9e9cf19..a94b27ba2c63abe9ddf41b1aceb9767a5d5966ae 100644
--- a/src/org/opensha2/data/IntervalTable.java
+++ b/src/gov/usgs/earthquake/nshmp/data/IntervalTable.java
@@ -1,22 +1,21 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkElementIndex;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.IntervalData.checkDataState;
-import static org.opensha2.data.IntervalData.indexOf;
-import static org.opensha2.data.IntervalData.keys;
-
-import org.opensha2.data.IntervalData.AbstractTable;
-import org.opensha2.data.IntervalData.DefaultTable;
+import static gov.usgs.earthquake.nshmp.data.IntervalData.checkDataState;
+import static gov.usgs.earthquake.nshmp.data.IntervalData.indexOf;
+import static gov.usgs.earthquake.nshmp.data.IntervalData.keys;
import com.google.common.primitives.Doubles;
import java.util.Arrays;
import java.util.List;
+import gov.usgs.earthquake.nshmp.data.IntervalData.AbstractTable;
+import gov.usgs.earthquake.nshmp.data.IntervalData.DefaultTable;
+
/**
* A 2-dimensional table of immutable, double-valued data that is arranged
* according to increasing and uniformly spaced double-valued keys. Interval
diff --git a/src/org/opensha2/data/IntervalVolume.java b/src/gov/usgs/earthquake/nshmp/data/IntervalVolume.java
similarity index 97%
rename from src/org/opensha2/data/IntervalVolume.java
rename to src/gov/usgs/earthquake/nshmp/data/IntervalVolume.java
index 936229d42b28d4c08bb4432595f87dee848f876e..fb58fc9ebb66751adb8fd4146e0327d042009706 100644
--- a/src/org/opensha2/data/IntervalVolume.java
+++ b/src/gov/usgs/earthquake/nshmp/data/IntervalVolume.java
@@ -1,19 +1,18 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.IntervalData.checkDataState;
-import static org.opensha2.data.IntervalData.indexOf;
-import static org.opensha2.data.IntervalData.keys;
-
-import org.opensha2.data.IntervalData.AbstractVolume;
-import org.opensha2.data.IntervalData.DefaultVolume;
+import static gov.usgs.earthquake.nshmp.data.IntervalData.checkDataState;
+import static gov.usgs.earthquake.nshmp.data.IntervalData.indexOf;
+import static gov.usgs.earthquake.nshmp.data.IntervalData.keys;
import java.util.Arrays;
import java.util.List;
+import gov.usgs.earthquake.nshmp.data.IntervalData.AbstractVolume;
+import gov.usgs.earthquake.nshmp.data.IntervalData.DefaultVolume;
+
/**
* A 3-dimensional volume of immutable, double-valued data that is arranged
* according to increasing and uniformly spaced double-valued keys. Data volumes
diff --git a/src/org/opensha2/data/MutableXySequence.java b/src/gov/usgs/earthquake/nshmp/data/MutableXySequence.java
similarity index 97%
rename from src/org/opensha2/data/MutableXySequence.java
rename to src/gov/usgs/earthquake/nshmp/data/MutableXySequence.java
index 182be789ff0a8f085c3df058d6a493c085e3ad6c..d86431f5b65cb4ee74483c4cf0c9d919e831fdb0 100644
--- a/src/org/opensha2/data/MutableXySequence.java
+++ b/src/gov/usgs/earthquake/nshmp/data/MutableXySequence.java
@@ -1,4 +1,4 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static com.google.common.base.Preconditions.checkElementIndex;
diff --git a/src/org/opensha2/data/XyPoint.java b/src/gov/usgs/earthquake/nshmp/data/XyPoint.java
similarity index 93%
rename from src/org/opensha2/data/XyPoint.java
rename to src/gov/usgs/earthquake/nshmp/data/XyPoint.java
index 6b6a9d56a4a4bb9377c18cd2a9927bb33cf60736..0bd3f0fd89f49c8ab220c804a117adc2e16d070d 100644
--- a/src/org/opensha2/data/XyPoint.java
+++ b/src/gov/usgs/earthquake/nshmp/data/XyPoint.java
@@ -1,4 +1,4 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
/**
* Wrapper interface for xy-value data pairs. Implementations that permit
diff --git a/src/org/opensha2/data/XySequence.java b/src/gov/usgs/earthquake/nshmp/data/XySequence.java
similarity index 98%
rename from src/org/opensha2/data/XySequence.java
rename to src/gov/usgs/earthquake/nshmp/data/XySequence.java
index 0ed827b989f1418b89f77eace7118ce5b9229785..74c4bb65c4fc98d4b8ad48411cfd8dc49a79e885 100644
--- a/src/org/opensha2/data/XySequence.java
+++ b/src/gov/usgs/earthquake/nshmp/data/XySequence.java
@@ -1,10 +1,9 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-
-import static org.opensha2.data.Data.areMonotonic;
-import static org.opensha2.internal.TextUtils.NEWLINE;
+import static gov.usgs.earthquake.nshmp.data.Data.areMonotonic;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
diff --git a/src/org/opensha2/data/package-info.java b/src/gov/usgs/earthquake/nshmp/data/package-info.java
similarity index 50%
rename from src/org/opensha2/data/package-info.java
rename to src/gov/usgs/earthquake/nshmp/data/package-info.java
index b382637656b5523b4b1f6bcc08ef6225b6de1802..ec3b973e5a0e7dababa0fa9fb9fe179c93da62ca 100644
--- a/src/org/opensha2/data/package-info.java
+++ b/src/gov/usgs/earthquake/nshmp/data/package-info.java
@@ -1,4 +1,4 @@
/**
* Double-valued data utilities.
*/
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
diff --git a/src/org/opensha2/eq/Earthquakes.java b/src/gov/usgs/earthquake/nshmp/eq/Earthquakes.java
similarity index 97%
rename from src/org/opensha2/eq/Earthquakes.java
rename to src/gov/usgs/earthquake/nshmp/eq/Earthquakes.java
index cfd1e434a585b0c628857a4d652f4755d40dad2b..35a9204a4fd408e6db6d18baacbb3bc22eb58d02 100644
--- a/src/org/opensha2/eq/Earthquakes.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/Earthquakes.java
@@ -1,6 +1,6 @@
-package org.opensha2.eq;
+package gov.usgs.earthquake.nshmp.eq;
-import static org.opensha2.data.Data.checkInRange;
+import static gov.usgs.earthquake.nshmp.data.Data.checkInRange;
import com.google.common.collect.Range;
@@ -16,7 +16,7 @@ import com.google.common.collect.Range;
public final class Earthquakes {
private Earthquakes() {}
-
+
/*
* TODO possibly adjust Faults.CRUSTAL_DEPTH_RANGE CB14 restricts to 20 km and
* the PEER database is pretty comprehensive. Perhaps implement active and
@@ -42,8 +42,8 @@ public final class Earthquakes {
public static final Range<Double> SLAB_DEPTH_RANGE = Range.closed(20.0, 700.0);
/**
- * Supported earthquake magnitudes: {@code [-2.0..9.7]}. This range of
- * values is not bound to any particular magnitude scale.
+ * Supported earthquake magnitudes: {@code [-2.0..9.7]}. This range of values
+ * is not bound to any particular magnitude scale.
*/
public static final Range<Double> MAG_RANGE = Range.closed(-2.0, 9.7);
diff --git a/src/org/opensha2/eq/TectonicSetting.java b/src/gov/usgs/earthquake/nshmp/eq/TectonicSetting.java
similarity index 86%
rename from src/org/opensha2/eq/TectonicSetting.java
rename to src/gov/usgs/earthquake/nshmp/eq/TectonicSetting.java
index 1e72e25ef556656ee3f7e4172314bf5d2bb9ee71..9d6f66e79a5466e261c430149f3d679694df045b 100644
--- a/src/org/opensha2/eq/TectonicSetting.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/TectonicSetting.java
@@ -1,6 +1,6 @@
-package org.opensha2.eq;
+package gov.usgs.earthquake.nshmp.eq;
-import org.opensha2.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
/**
* Tectonic setting identifier.
diff --git a/src/org/opensha2/eq/fault/Faults.java b/src/gov/usgs/earthquake/nshmp/eq/fault/Faults.java
similarity index 96%
rename from src/org/opensha2/eq/fault/Faults.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/Faults.java
index 13e9063300ef4d699a2210c11e126f5dfa98fab0..3e036b65f8518f22cbadf17cef8cf7464bfb312e 100644
--- a/src/org/opensha2/eq/fault/Faults.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/Faults.java
@@ -1,19 +1,12 @@
-package org.opensha2.eq.fault;
+package gov.usgs.earthquake.nshmp.eq.fault;
import static com.google.common.base.Preconditions.checkArgument;
-
-import static org.opensha2.data.Data.checkInRange;
-import static org.opensha2.geo.Locations.azimuth;
-import static org.opensha2.geo.Locations.azimuthRad;
-import static org.opensha2.geo.Locations.horzDistance;
-import static org.opensha2.geo.Locations.linearDistanceFast;
-import static org.opensha2.geo.Locations.location;
-
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-import org.opensha2.geo.LocationVector;
-import org.opensha2.geo.Locations;
-import org.opensha2.util.Maths;
+import static gov.usgs.earthquake.nshmp.data.Data.checkInRange;
+import static gov.usgs.earthquake.nshmp.geo.Locations.azimuth;
+import static gov.usgs.earthquake.nshmp.geo.Locations.azimuthRad;
+import static gov.usgs.earthquake.nshmp.geo.Locations.horzDistance;
+import static gov.usgs.earthquake.nshmp.geo.Locations.linearDistanceFast;
+import static gov.usgs.earthquake.nshmp.geo.Locations.location;
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
@@ -22,6 +15,12 @@ import com.google.common.collect.Range;
import java.util.ArrayList;
import java.util.List;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.LocationVector;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Constants and utility methods pertaining to faults.
*
diff --git a/src/org/opensha2/eq/fault/FocalMech.java b/src/gov/usgs/earthquake/nshmp/eq/fault/FocalMech.java
similarity index 92%
rename from src/org/opensha2/eq/fault/FocalMech.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/FocalMech.java
index 7a78e90b91a81fe971b87757e3709f2ef4f4eb8a..291a88d8abafae0bb0b19f5bdb501022805fe3e1 100644
--- a/src/org/opensha2/eq/fault/FocalMech.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/FocalMech.java
@@ -1,6 +1,6 @@
-package org.opensha2.eq.fault;
+package gov.usgs.earthquake.nshmp.eq.fault;
-import org.opensha2.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
/**
* Generalized identifier for different focal mechanism types.
diff --git a/src/gov/usgs/earthquake/nshmp/eq/fault/package-info.java b/src/gov/usgs/earthquake/nshmp/eq/fault/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..cda8f582d366d6124b26017369c2bd583a4a5d16
--- /dev/null
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Fault representations.
+ */
+package gov.usgs.earthquake.nshmp.eq.fault;
diff --git a/src/org/opensha2/eq/fault/surface/AbstractGriddedSurface.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/AbstractGriddedSurface.java
similarity index 97%
rename from src/org/opensha2/eq/fault/surface/AbstractGriddedSurface.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/AbstractGriddedSurface.java
index c90a15629f987d4f897df4cd8ac56f0d709d5773..9bd236f53aac983aceeedb8b844ab5d09ef201fe 100644
--- a/src/org/opensha2/eq/fault/surface/AbstractGriddedSurface.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/AbstractGriddedSurface.java
@@ -1,13 +1,13 @@
-package org.opensha2.eq.fault.surface;
-
-import org.opensha2.eq.model.Distance;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import com.google.common.collect.Lists;
import java.util.List;
+import gov.usgs.earthquake.nshmp.eq.model.Distance;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+
/**
* <b>Title:</b> GriddedSurface<p> <b>Description:</b>
*
diff --git a/src/org/opensha2/eq/fault/surface/ApproxGriddedSurface.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/ApproxGriddedSurface.java
similarity index 98%
rename from src/org/opensha2/eq/fault/surface/ApproxGriddedSurface.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/ApproxGriddedSurface.java
index 9d727be91abc71e01ed43e2623674cd92d644e42..e69861b35ec7b553f8aa7986a8c2dd1dc4297f42 100644
--- a/src/org/opensha2/eq/fault/surface/ApproxGriddedSurface.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/ApproxGriddedSurface.java
@@ -1,17 +1,17 @@
-package org.opensha2.eq.fault.surface;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-import org.opensha2.geo.LocationVector;
-import org.opensha2.geo.Locations;
-import org.opensha2.util.Maths;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import java.util.List;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.LocationVector;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* A {@code GriddedSurface} defined by an upper and lower trace whose spacing is
* scaled to the be as close to a desired target spacing as possible over the
diff --git a/src/org/opensha2/eq/fault/surface/Container2D.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/Container2D.java
similarity index 98%
rename from src/org/opensha2/eq/fault/surface/Container2D.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/Container2D.java
index 9e81936aef6b4de921679d6597453923143c4454..c554f951b4da81dba6e66ab954196e8ab3a1d71e 100644
--- a/src/org/opensha2/eq/fault/surface/Container2D.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/Container2D.java
@@ -1,9 +1,9 @@
-package org.opensha2.eq.fault.surface;
-
-import org.opensha2.util.Named;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import java.util.ListIterator;
+import gov.usgs.earthquake.nshmp.util.Named;
+
/**
* <b>Title:</b> Container2DAPI<p>
*
diff --git a/src/org/opensha2/eq/fault/surface/Container2DImpl.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/Container2DImpl.java
similarity index 99%
rename from src/org/opensha2/eq/fault/surface/Container2DImpl.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/Container2DImpl.java
index 847ac2c0cd8074a18613692faf993ee648daf1c5..bacc9169058496cdc08a368333a1f039f494ab99 100644
--- a/src/org/opensha2/eq/fault/surface/Container2DImpl.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/Container2DImpl.java
@@ -1,4 +1,4 @@
-package org.opensha2.eq.fault.surface;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import static com.google.common.base.Preconditions.checkArgument;
diff --git a/src/org/opensha2/eq/fault/surface/ContainerSubset2D.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/ContainerSubset2D.java
similarity index 99%
rename from src/org/opensha2/eq/fault/surface/ContainerSubset2D.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/ContainerSubset2D.java
index 4c7520047766ad159328a7b5e6012b3a71db7698..43c1d47e1edac09b29e8065bf91722450a701afd 100644
--- a/src/org/opensha2/eq/fault/surface/ContainerSubset2D.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/ContainerSubset2D.java
@@ -1,4 +1,4 @@
-package org.opensha2.eq.fault.surface;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import java.util.Iterator;
import java.util.ListIterator;
diff --git a/src/org/opensha2/eq/fault/surface/DefaultGriddedSurface.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/DefaultGriddedSurface.java
similarity index 94%
rename from src/org/opensha2/eq/fault/surface/DefaultGriddedSurface.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/DefaultGriddedSurface.java
index 4f49ae6d604dcc5d3bc84980515636e78d76bc48..46cbb1c4eb874554f083815422e662236f0eeec6 100644
--- a/src/org/opensha2/eq/fault/surface/DefaultGriddedSurface.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/DefaultGriddedSurface.java
@@ -1,27 +1,19 @@
-package org.opensha2.eq.fault.surface;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.data.Data.checkInRange;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkCrustalDepth;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkInterfaceWidth;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkDip;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkStrike;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkTrace;
+import static gov.usgs.earthquake.nshmp.geo.LocationVector.createWithPlunge;
+import static gov.usgs.earthquake.nshmp.geo.Locations.linearDistanceFast;
+import static gov.usgs.earthquake.nshmp.geo.Locations.location;
import static java.lang.Math.cos;
import static java.lang.Math.sin;
import static java.math.RoundingMode.HALF_UP;
-import static org.opensha2.data.Data.checkInRange;
-import static org.opensha2.eq.Earthquakes.checkCrustalDepth;
-import static org.opensha2.eq.Earthquakes.checkInterfaceWidth;
-import static org.opensha2.eq.fault.Faults.checkDip;
-import static org.opensha2.eq.fault.Faults.checkStrike;
-import static org.opensha2.eq.fault.Faults.checkTrace;
-import static org.opensha2.geo.LocationVector.createWithPlunge;
-import static org.opensha2.geo.Locations.linearDistanceFast;
-import static org.opensha2.geo.Locations.location;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-import org.opensha2.geo.LocationVector;
-import org.opensha2.geo.Locations;
-import org.opensha2.util.Maths;
-
import com.google.common.collect.Lists;
import com.google.common.collect.Range;
import com.google.common.math.DoubleMath;
@@ -29,6 +21,13 @@ import com.google.common.math.DoubleMath;
import java.util.Iterator;
import java.util.List;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.LocationVector;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Default {@link GriddedSurface} implementation. Gridded surfaces are
* constructed by evenly discretizing a fault trace and projecting that trace
diff --git a/src/org/opensha2/eq/fault/surface/GriddedFaultSurface.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/GriddedFaultSurface.java
similarity index 86%
rename from src/org/opensha2/eq/fault/surface/GriddedFaultSurface.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/GriddedFaultSurface.java
index 13f212aced880dbd70038bab235acd40b3403819..613ad2b6064e292538990291f2fcb1aacca7e773 100644
--- a/src/org/opensha2/eq/fault/surface/GriddedFaultSurface.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/GriddedFaultSurface.java
@@ -1,21 +1,20 @@
-package org.opensha2.eq.fault.surface;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.Data.checkInRange;
-import static org.opensha2.eq.Earthquakes.checkCrustalDepth;
-import static org.opensha2.eq.Earthquakes.checkInterfaceWidth;
-import static org.opensha2.eq.fault.Faults.checkDip;
-import static org.opensha2.eq.fault.Faults.checkStrike;
-import static org.opensha2.eq.fault.Faults.checkTrace;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.geo.LocationGrid;
-import org.opensha2.geo.LocationList;
-import org.opensha2.util.Maths;
+import static gov.usgs.earthquake.nshmp.data.Data.checkInRange;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkCrustalDepth;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkInterfaceWidth;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkDip;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkStrike;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkTrace;
import com.google.common.collect.Range;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.geo.LocationGrid;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Add comments here
*
diff --git a/src/org/opensha2/eq/fault/surface/GriddedSubsetSurface.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/GriddedSubsetSurface.java
similarity index 97%
rename from src/org/opensha2/eq/fault/surface/GriddedSubsetSurface.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/GriddedSubsetSurface.java
index 16bc612bdf9d97e95796dabef85381f9b9b487fe..0e84b87aa781d17191783421787d258e48343b0b 100644
--- a/src/org/opensha2/eq/fault/surface/GriddedSubsetSurface.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/GriddedSubsetSurface.java
@@ -1,15 +1,15 @@
-package org.opensha2.eq.fault.surface;
-
-import org.opensha2.eq.model.Distance;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-import org.opensha2.geo.Locations;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import java.util.List;
+import gov.usgs.earthquake.nshmp.eq.model.Distance;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+
/**
* <b>Title:</b> GriddedSubsetSurface<p>
*
diff --git a/src/org/opensha2/eq/fault/surface/GriddedSurface.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/GriddedSurface.java
similarity index 95%
rename from src/org/opensha2/eq/fault/surface/GriddedSurface.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/GriddedSurface.java
index 72dbfd69e681c6e6f8148eaba751bb92f302d633..3d7129085591217c897821a08552b35ccadf2914 100644
--- a/src/org/opensha2/eq/fault/surface/GriddedSurface.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/GriddedSurface.java
@@ -1,7 +1,7 @@
-package org.opensha2.eq.fault.surface;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
public interface GriddedSurface extends Container2D<Location>, RuptureSurface {
diff --git a/src/org/opensha2/eq/fault/surface/RuptureFloating.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/RuptureFloating.java
similarity index 97%
rename from src/org/opensha2/eq/fault/surface/RuptureFloating.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/RuptureFloating.java
index c0dae8337e8f5c8dbae5f4f206b8c90a98c5b6e9..da902cbfaf4d2cb7b950ae2bfbb10de866e88506 100644
--- a/src/org/opensha2/eq/fault/surface/RuptureFloating.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/RuptureFloating.java
@@ -1,14 +1,7 @@
-package org.opensha2.eq.fault.surface;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import static java.lang.Math.sin;
-import org.opensha2.data.Data;
-import org.opensha2.data.Interpolate;
-import org.opensha2.eq.fault.surface.RuptureScaling.Dimensions;
-import org.opensha2.eq.model.Rupture;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-
import com.google.common.collect.Range;
import java.util.ArrayList;
@@ -17,6 +10,13 @@ import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.data.Interpolate;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling.Dimensions;
+import gov.usgs.earthquake.nshmp.eq.model.Rupture;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+
/**
* Rupture floating models for gridded surfaces. Each provides the means to
* create an immutable {@code List} of {@link Rupture}s from a
diff --git a/src/org/opensha2/eq/fault/surface/RuptureScaling.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/RuptureScaling.java
similarity index 97%
rename from src/org/opensha2/eq/fault/surface/RuptureScaling.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/RuptureScaling.java
index c49cc2f91dd25140a9dc8d2645818ae575a27c59..1627136f96aae431b8114fb207ca46742b5e16b5 100644
--- a/src/org/opensha2/eq/fault/surface/RuptureScaling.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/RuptureScaling.java
@@ -1,4 +1,4 @@
-package org.opensha2.eq.fault.surface;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import static com.google.common.io.Resources.getResource;
import static com.google.common.io.Resources.readLines;
@@ -10,17 +10,17 @@ import static java.lang.Math.round;
import static java.lang.Math.sqrt;
import static java.nio.charset.StandardCharsets.UTF_8;
-import org.opensha2.internal.Logging;
-import org.opensha2.internal.Parsing;
-import org.opensha2.mfd.IncrementalMfd;
-import org.opensha2.mfd.Mfds;
-
import java.io.IOException;
import java.net.URL;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.internal.Logging;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+
/**
* Identifiers for different rupture dimension scaling models. Most are rooted
* in specific magnitude scaling relationships, with this class providing more
@@ -304,10 +304,10 @@ public enum RuptureScaling {
return r;
}
int mIndex = min((int) round((m - RJB_M_MIN) / RJB_M_DELTA), RJB_M_MAX_INDEX);
- int rIndex = min(RJB_R_MAX_INDEX, (int) floor(r));
+ int rIndex = min(RJB_R_MAX_INDEX, (int) floor(r));
return rjb[mIndex][rIndex];
}
-
+
/**
* Return the dimensions of a magnitude-dependent and width-constrained
* rupture.
diff --git a/src/org/opensha2/eq/fault/surface/RuptureSurface.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/RuptureSurface.java
similarity index 90%
rename from src/org/opensha2/eq/fault/surface/RuptureSurface.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/RuptureSurface.java
index 33d4d0e20d80cad7c040f287dc8839a3270f7e2f..3ff58c03de131a853854fbcdf458602509d237dd 100644
--- a/src/org/opensha2/eq/fault/surface/RuptureSurface.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/RuptureSurface.java
@@ -1,7 +1,7 @@
-package org.opensha2.eq.fault.surface;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
-import org.opensha2.eq.model.Distance;
-import org.opensha2.geo.Location;
+import gov.usgs.earthquake.nshmp.eq.model.Distance;
+import gov.usgs.earthquake.nshmp.geo.Location;
/**
* A parameterization of an earthquake rupture surface.
diff --git a/src/org/opensha2/eq/fault/surface/Surfaces.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/Surfaces.java
similarity index 93%
rename from src/org/opensha2/eq/fault/surface/Surfaces.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/Surfaces.java
index 419852fa9c0a1010c9f084652dcc27966e383218..facd3804ef7285550a9409e4ffb0f472f5e3a234 100644
--- a/src/org/opensha2/eq/fault/surface/Surfaces.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/Surfaces.java
@@ -1,11 +1,11 @@
-package org.opensha2.eq.fault.surface;
-
-import org.opensha2.geo.Location;
-import org.opensha2.geo.Locations;
-import org.opensha2.geo.Region;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import java.util.Iterator;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.geo.Region;
+
/**
* Add comments here
*
diff --git a/src/org/opensha2/eq/fault/surface/Window2D.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/Window2D.java
similarity index 99%
rename from src/org/opensha2/eq/fault/surface/Window2D.java
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/Window2D.java
index 66d78a8bcb22a871cd4e89827af20613e490cf17..2c9896697d1bfec118948bb6062f346ed9e5a505 100644
--- a/src/org/opensha2/eq/fault/surface/Window2D.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/Window2D.java
@@ -1,4 +1,4 @@
-package org.opensha2.eq.fault.surface;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
/**
* <b>Title:</b> Window2D<p>
diff --git a/src/org/opensha2/eq/fault/surface/etc/rjb_geomatrix.dat b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/etc/rjb_geomatrix.dat
similarity index 100%
rename from src/org/opensha2/eq/fault/surface/etc/rjb_geomatrix.dat
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/etc/rjb_geomatrix.dat
diff --git a/src/org/opensha2/eq/fault/surface/etc/rjb_somerville.dat b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/etc/rjb_somerville.dat
similarity index 100%
rename from src/org/opensha2/eq/fault/surface/etc/rjb_somerville.dat
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/etc/rjb_somerville.dat
diff --git a/src/org/opensha2/eq/fault/surface/etc/rjb_wc94length.dat b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/etc/rjb_wc94length.dat
similarity index 100%
rename from src/org/opensha2/eq/fault/surface/etc/rjb_wc94length.dat
rename to src/gov/usgs/earthquake/nshmp/eq/fault/surface/etc/rjb_wc94length.dat
diff --git a/src/gov/usgs/earthquake/nshmp/eq/fault/surface/package-info.java b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..46fadb8ff98f226355ebb4d22a53e108663b0133
--- /dev/null
+++ b/src/gov/usgs/earthquake/nshmp/eq/fault/surface/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Fault surfaces.
+ */
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
diff --git a/src/org/opensha2/eq/model/AbstractSourceSet.java b/src/gov/usgs/earthquake/nshmp/eq/model/AbstractSourceSet.java
similarity index 92%
rename from src/org/opensha2/eq/model/AbstractSourceSet.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/AbstractSourceSet.java
index 53c4e2c7a498ee042545bada9794118115487ea8..67683ef44ed65026edb276bbe9cda8c6139be8ae 100644
--- a/src/org/opensha2/eq/model/AbstractSourceSet.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/AbstractSourceSet.java
@@ -1,18 +1,17 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Strings.padEnd;
-
-import static org.opensha2.data.Data.checkWeight;
-import static org.opensha2.internal.TextUtils.validateName;
-
-import org.opensha2.geo.Location;
+import static gov.usgs.earthquake.nshmp.data.Data.checkWeight;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.validateName;
import com.google.common.base.Predicate;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.Ordering;
+import gov.usgs.earthquake.nshmp.geo.Location;
+
/**
* Skeletal {@code SourceSet} implementation.
*
diff --git a/src/org/opensha2/eq/model/AreaParser.java b/src/gov/usgs/earthquake/nshmp/eq/model/AreaParser.java
similarity index 83%
rename from src/org/opensha2/eq/model/AreaParser.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/AreaParser.java
index 70f3dff3dc6c316614491e2673ab4ca70a53c513..e617efa4958f1f9faace47df14982ef826005361 100644
--- a/src/org/opensha2/eq/model/AreaParser.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/AreaParser.java
@@ -1,35 +1,25 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.AREA;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readDouble;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readEnum;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readInt;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readString;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.stringToEnumWeightMap;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.stringToValueValueWeightMap;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.FOCAL_MECH_MAP;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.ID;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.MAG_DEPTH_MAP;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.MAX_DEPTH;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.NAME;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.RUPTURE_SCALING;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.STRIKE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.TYPE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.WEIGHT;
import static java.util.logging.Level.FINE;
-import static org.opensha2.eq.model.SourceType.AREA;
-import static org.opensha2.internal.Parsing.readDouble;
-import static org.opensha2.internal.Parsing.readEnum;
-import static org.opensha2.internal.Parsing.readInt;
-import static org.opensha2.internal.Parsing.readString;
-import static org.opensha2.internal.Parsing.stringToEnumWeightMap;
-import static org.opensha2.internal.Parsing.stringToValueValueWeightMap;
-import static org.opensha2.internal.SourceAttribute.FOCAL_MECH_MAP;
-import static org.opensha2.internal.SourceAttribute.ID;
-import static org.opensha2.internal.SourceAttribute.MAG_DEPTH_MAP;
-import static org.opensha2.internal.SourceAttribute.MAX_DEPTH;
-import static org.opensha2.internal.SourceAttribute.NAME;
-import static org.opensha2.internal.SourceAttribute.RUPTURE_SCALING;
-import static org.opensha2.internal.SourceAttribute.STRIKE;
-import static org.opensha2.internal.SourceAttribute.TYPE;
-import static org.opensha2.internal.SourceAttribute.WEIGHT;
-
-import org.opensha2.data.Data;
-import org.opensha2.eq.fault.FocalMech;
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.geo.LocationList;
-import org.opensha2.internal.SourceElement;
-import org.opensha2.mfd.IncrementalMfd;
-import org.opensha2.mfd.MfdType;
-import org.opensha2.mfd.Mfds;
-
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -44,6 +34,15 @@ import java.util.logging.Logger;
import javax.xml.parsers.SAXParser;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.eq.fault.FocalMech;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.internal.SourceElement;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+import gov.usgs.earthquake.nshmp.mfd.MfdType;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+
/*
* Non-validating area source parser. SAX parser 'Attributes' are stateful and
* cannot be stored. This class is not thread safe.
diff --git a/src/org/opensha2/eq/model/AreaSource.java b/src/gov/usgs/earthquake/nshmp/eq/model/AreaSource.java
similarity index 92%
rename from src/org/opensha2/eq/model/AreaSource.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/AreaSource.java
index 15aa2d64297c438677fde321ea52d69497612857..698d5a7cf7eadb771c5c7d2b0302fc619bd75e3f 100644
--- a/src/org/opensha2/eq/model/AreaSource.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/AreaSource.java
@@ -1,31 +1,18 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkStrike;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.NORMAL;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.REVERSE;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.STRIKE_SLIP;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.AREA;
+import static gov.usgs.earthquake.nshmp.geo.BorderType.MERCATOR_LINEAR;
+import static gov.usgs.earthquake.nshmp.geo.GriddedRegion.ANCHOR_0_0;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.validateName;
import static java.lang.Math.ceil;
-import static org.opensha2.eq.fault.Faults.checkStrike;
-import static org.opensha2.eq.fault.FocalMech.NORMAL;
-import static org.opensha2.eq.fault.FocalMech.REVERSE;
-import static org.opensha2.eq.fault.FocalMech.STRIKE_SLIP;
-import static org.opensha2.eq.model.SourceType.AREA;
-import static org.opensha2.geo.BorderType.MERCATOR_LINEAR;
-import static org.opensha2.geo.GriddedRegion.ANCHOR_0_0;
-import static org.opensha2.internal.TextUtils.validateName;
-
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.fault.FocalMech;
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.eq.model.PointSource.DepthModel;
-import org.opensha2.geo.GriddedRegion;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-import org.opensha2.geo.Locations;
-import org.opensha2.geo.Regions;
-import org.opensha2.mfd.IncrementalMfd;
-import org.opensha2.mfd.Mfds;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -35,6 +22,18 @@ import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.fault.FocalMech;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.eq.model.PointSource.DepthModel;
+import gov.usgs.earthquake.nshmp.geo.GriddedRegion;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.geo.Regions;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+
/**
* Area source representation. An {@code AreaSource} represents a region over
* which there is a equal likelihood of earthquake occurrence, as specified by a
diff --git a/src/org/opensha2/eq/model/AreaSourceSet.java b/src/gov/usgs/earthquake/nshmp/eq/model/AreaSourceSet.java
similarity index 89%
rename from src/org/opensha2/eq/model/AreaSourceSet.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/AreaSourceSet.java
index 98121001c23bca15abb91230a6a7aaf66b52d339..b52712f5c655aa2abe3901376d0d47370cdfd2a3 100644
--- a/src/org/opensha2/eq/model/AreaSourceSet.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/AreaSourceSet.java
@@ -1,14 +1,10 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.Data.checkWeight;
-import static org.opensha2.eq.model.SourceType.AREA;
-import static org.opensha2.internal.TextUtils.validateName;
-
-import org.opensha2.geo.Location;
-import org.opensha2.geo.Locations;
+import static gov.usgs.earthquake.nshmp.data.Data.checkWeight;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.AREA;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.validateName;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableMap;
@@ -18,6 +14,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+
/**
* A container class for related {@link AreaSource}s.
*
diff --git a/src/org/opensha2/eq/model/ClusterParser.java b/src/gov/usgs/earthquake/nshmp/eq/model/ClusterParser.java
similarity index 85%
rename from src/org/opensha2/eq/model/ClusterParser.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/ClusterParser.java
index 77a318ee88cf65866879757bf370e5d2a6608dd1..064d456b8a139305a1c2b402c02b735a0dd19386 100644
--- a/src/org/opensha2/eq/model/ClusterParser.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/ClusterParser.java
@@ -1,33 +1,25 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readDouble;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readEnum;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readInt;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readString;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.DEPTH;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.DIP;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.ID;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.M;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.NAME;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.RAKE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.RATE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.RUPTURE_SCALING;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.TYPE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.WEIGHT;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.WIDTH;
import static java.util.logging.Level.FINE;
import static java.util.logging.Level.FINEST;
-import static org.opensha2.internal.Parsing.readDouble;
-import static org.opensha2.internal.Parsing.readEnum;
-import static org.opensha2.internal.Parsing.readInt;
-import static org.opensha2.internal.Parsing.readString;
-import static org.opensha2.internal.SourceAttribute.DEPTH;
-import static org.opensha2.internal.SourceAttribute.DIP;
-import static org.opensha2.internal.SourceAttribute.ID;
-import static org.opensha2.internal.SourceAttribute.M;
-import static org.opensha2.internal.SourceAttribute.NAME;
-import static org.opensha2.internal.SourceAttribute.RAKE;
-import static org.opensha2.internal.SourceAttribute.RATE;
-import static org.opensha2.internal.SourceAttribute.RUPTURE_SCALING;
-import static org.opensha2.internal.SourceAttribute.TYPE;
-import static org.opensha2.internal.SourceAttribute.WEIGHT;
-import static org.opensha2.internal.SourceAttribute.WIDTH;
-
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.geo.LocationList;
-import org.opensha2.internal.SourceElement;
-import org.opensha2.mfd.IncrementalMfd;
-import org.opensha2.mfd.MfdType;
-import org.opensha2.mfd.Mfds;
-
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -42,6 +34,13 @@ import java.util.logging.Logger;
import javax.xml.parsers.SAXParser;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.internal.SourceElement;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+import gov.usgs.earthquake.nshmp.mfd.MfdType;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+
/*
* Non-validating cluster source parser. SAX parser 'Attributes' are stateful
* and cannot be stored. This class is not thread safe.
diff --git a/src/org/opensha2/eq/model/ClusterSource.java b/src/gov/usgs/earthquake/nshmp/eq/model/ClusterSource.java
similarity index 93%
rename from src/org/opensha2/eq/model/ClusterSource.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/ClusterSource.java
index 78a5d084cf58e8ebf086dc77109ffd5fe45f191a..d25a8f230bf27867999b8c38a4226baac7b5939c 100644
--- a/src/org/opensha2/eq/model/ClusterSource.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/ClusterSource.java
@@ -1,16 +1,9 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.StandardSystemProperty.LINE_SEPARATOR;
-
-import static org.opensha2.eq.model.SourceType.CLUSTER;
-
-import org.opensha2.data.XySequence;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-import org.opensha2.geo.Locations;
-import org.opensha2.mfd.IncrementalMfd;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.CLUSTER;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -19,6 +12,12 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+
/**
* Cluster source representation. Each cluster source wraps a
* {@code FaultSourceSet} containing one or more fault representations that
diff --git a/src/org/opensha2/eq/model/ClusterSourceSet.java b/src/gov/usgs/earthquake/nshmp/eq/model/ClusterSourceSet.java
similarity index 94%
rename from src/org/opensha2/eq/model/ClusterSourceSet.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/ClusterSourceSet.java
index 6effc6eb96a7c3f3451da5e0975315a05850d7bf..f60e73efa9064d104382f3e1e74d3d2cc99ef8fd 100644
--- a/src/org/opensha2/eq/model/ClusterSourceSet.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/ClusterSourceSet.java
@@ -1,11 +1,8 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.eq.model.SourceType.CLUSTER;
-
-import org.opensha2.geo.Location;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.CLUSTER;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableListMultimap;
@@ -16,6 +13,8 @@ import com.google.common.collect.Lists;
import java.util.Iterator;
import java.util.List;
+import gov.usgs.earthquake.nshmp.geo.Location;
+
/**
* Container class for related {@link ClusterSource}s.
*
diff --git a/src/org/opensha2/eq/model/Distance.java b/src/gov/usgs/earthquake/nshmp/eq/model/Distance.java
similarity index 94%
rename from src/org/opensha2/eq/model/Distance.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/Distance.java
index 14b8300f0fb5d514eb3c7b8a62dffb7c577514f3..e32f894e82f4bd16a5afb123e5c7a5629ee9db20 100644
--- a/src/org/opensha2/eq/model/Distance.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/Distance.java
@@ -1,25 +1,24 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.geo.Locations.distanceToLineFast;
-import static org.opensha2.geo.Locations.distanceToSegmentFast;
-import static org.opensha2.geo.Locations.horzDistanceFast;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.eq.fault.surface.GriddedSurface;
-import org.opensha2.geo.BorderType;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-import org.opensha2.geo.LocationVector;
-import org.opensha2.geo.Locations;
-import org.opensha2.geo.Region;
-import org.opensha2.geo.Regions;
+import static gov.usgs.earthquake.nshmp.geo.Locations.distanceToLineFast;
+import static gov.usgs.earthquake.nshmp.geo.Locations.distanceToSegmentFast;
+import static gov.usgs.earthquake.nshmp.geo.Locations.horzDistanceFast;
import java.awt.geom.Area;
import java.awt.geom.Path2D;
import java.util.Iterator;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.GriddedSurface;
+import gov.usgs.earthquake.nshmp.geo.BorderType;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.LocationVector;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.geo.Region;
+import gov.usgs.earthquake.nshmp.geo.Regions;
+
/**
* Distance value wrapper.
*
diff --git a/src/org/opensha2/eq/model/FaultParser.java b/src/gov/usgs/earthquake/nshmp/eq/model/FaultParser.java
similarity index 89%
rename from src/org/opensha2/eq/model/FaultParser.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/FaultParser.java
index 612ca6decebe884f0aedc28e8b6dab9671256ee8..0c03299a4bf7924143535addb3f2a089a586cbd7 100644
--- a/src/org/opensha2/eq/model/FaultParser.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/FaultParser.java
@@ -1,37 +1,24 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readDouble;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readEnum;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readInt;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readString;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.toMap;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.DEPTH;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.DIP;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.ID;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.NAME;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.RAKE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.RUPTURE_SCALING;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.TYPE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.WEIGHT;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.WIDTH;
import static java.util.logging.Level.FINE;
import static java.util.logging.Level.FINEST;
-import static org.opensha2.internal.Parsing.readDouble;
-import static org.opensha2.internal.Parsing.readEnum;
-import static org.opensha2.internal.Parsing.readInt;
-import static org.opensha2.internal.Parsing.readString;
-import static org.opensha2.internal.Parsing.toMap;
-import static org.opensha2.internal.SourceAttribute.DEPTH;
-import static org.opensha2.internal.SourceAttribute.DIP;
-import static org.opensha2.internal.SourceAttribute.ID;
-import static org.opensha2.internal.SourceAttribute.NAME;
-import static org.opensha2.internal.SourceAttribute.RAKE;
-import static org.opensha2.internal.SourceAttribute.RUPTURE_SCALING;
-import static org.opensha2.internal.SourceAttribute.TYPE;
-import static org.opensha2.internal.SourceAttribute.WEIGHT;
-import static org.opensha2.internal.SourceAttribute.WIDTH;
-
-import org.opensha2.data.Data;
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.eq.model.MfdHelper.GR_Data;
-import org.opensha2.eq.model.MfdHelper.IncrData;
-import org.opensha2.eq.model.MfdHelper.SingleData;
-import org.opensha2.geo.LocationList;
-import org.opensha2.internal.SourceElement;
-import org.opensha2.mfd.IncrementalMfd;
-import org.opensha2.mfd.MfdType;
-import org.opensha2.mfd.Mfds;
-
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -49,6 +36,18 @@ import java.util.logging.Logger;
import javax.xml.parsers.SAXParser;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.eq.model.MfdHelper.GR_Data;
+import gov.usgs.earthquake.nshmp.eq.model.MfdHelper.IncrData;
+import gov.usgs.earthquake.nshmp.eq.model.MfdHelper.SingleData;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.internal.SourceElement;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+import gov.usgs.earthquake.nshmp.mfd.MfdType;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+
/*
* Non-validating fault source parser. SAX parser 'Attributes' are stateful and
* cannot be stored. This class is not thread safe.
diff --git a/src/org/opensha2/eq/model/FaultSource.java b/src/gov/usgs/earthquake/nshmp/eq/model/FaultSource.java
similarity index 88%
rename from src/org/opensha2/eq/model/FaultSource.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/FaultSource.java
index 16b6f1376be99850d46f6ed779f79124946079dd..538b0c855015341e769ae508011ae309d58cc4fe 100644
--- a/src/org/opensha2/eq/model/FaultSource.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/FaultSource.java
@@ -1,27 +1,16 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.Data.checkInRange;
-import static org.opensha2.eq.Earthquakes.checkCrustalDepth;
-import static org.opensha2.eq.Earthquakes.checkCrustalWidth;
-import static org.opensha2.eq.fault.Faults.checkDip;
-import static org.opensha2.eq.fault.Faults.checkRake;
-import static org.opensha2.eq.fault.Faults.checkTrace;
-import static org.opensha2.eq.model.SourceType.FAULT;
-import static org.opensha2.internal.TextUtils.validateName;
-
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.fault.surface.DefaultGriddedSurface;
-import org.opensha2.eq.fault.surface.GriddedSurface;
-import org.opensha2.eq.fault.surface.RuptureFloating;
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-import org.opensha2.geo.Locations;
-import org.opensha2.mfd.IncrementalMfd;
+import static gov.usgs.earthquake.nshmp.data.Data.checkInRange;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkCrustalDepth;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkCrustalWidth;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkDip;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkRake;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkTrace;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.FAULT;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.validateName;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -32,6 +21,16 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.DefaultGriddedSurface;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.GriddedSurface;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureFloating;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+
/**
* Fault source representation. This class wraps a model of a fault geometry and
* a list of magnitude frequency distributions that characterize how the fault
diff --git a/src/org/opensha2/eq/model/FaultSourceSet.java b/src/gov/usgs/earthquake/nshmp/eq/model/FaultSourceSet.java
similarity index 93%
rename from src/org/opensha2/eq/model/FaultSourceSet.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/FaultSourceSet.java
index 07152c679dc36595910c6b5de5401ec19ff1dfe4..82016b306b8547ab148f516bc3f9b587bd31cd14 100644
--- a/src/org/opensha2/eq/model/FaultSourceSet.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/FaultSourceSet.java
@@ -1,12 +1,8 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.eq.model.SourceType.FAULT;
-
-import org.opensha2.geo.Location;
-import org.opensha2.geo.Locations;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.FAULT;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableListMultimap;
@@ -16,6 +12,9 @@ import com.google.common.collect.Lists;
import java.util.Iterator;
import java.util.List;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+
/**
* Container class for related {@link FaultSource}s.
*
diff --git a/src/org/opensha2/eq/model/GmmParser.java b/src/gov/usgs/earthquake/nshmp/eq/model/GmmParser.java
similarity index 86%
rename from src/org/opensha2/eq/model/GmmParser.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/GmmParser.java
index 009e3cf93c7f8dc7cb19fbaca5b3ffa4f2459f01..eeb6e53e9f3f47cf04bf8711cab6729321facde9 100644
--- a/src/org/opensha2/eq/model/GmmParser.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/GmmParser.java
@@ -1,21 +1,17 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.gmm.GmmAttribute.ID;
+import static gov.usgs.earthquake.nshmp.gmm.GmmAttribute.MAX_DISTANCE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmAttribute.VALUES;
+import static gov.usgs.earthquake.nshmp.gmm.GmmAttribute.WEIGHT;
+import static gov.usgs.earthquake.nshmp.gmm.GmmAttribute.WEIGHTS;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readDouble;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readDoubleArray;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readEnum;
import static java.util.logging.Level.FINE;
-import static org.opensha2.gmm.GmmAttribute.ID;
-import static org.opensha2.gmm.GmmAttribute.MAX_DISTANCE;
-import static org.opensha2.gmm.GmmAttribute.VALUES;
-import static org.opensha2.gmm.GmmAttribute.WEIGHT;
-import static org.opensha2.gmm.GmmAttribute.WEIGHTS;
-import static org.opensha2.internal.Parsing.readDouble;
-import static org.opensha2.internal.Parsing.readDoubleArray;
-import static org.opensha2.internal.Parsing.readEnum;
-
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.GmmElement;
-
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -33,6 +29,9 @@ import java.util.logging.Logger;
import javax.xml.parsers.SAXParser;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.GmmElement;
+
/*
* Non-validating gmm.xml parser. SAX parser 'Attributes' are stateful and
* cannot be stored. This class is not thread safe.
diff --git a/src/org/opensha2/eq/model/GmmSet.java b/src/gov/usgs/earthquake/nshmp/eq/model/GmmSet.java
similarity index 96%
rename from src/org/opensha2/eq/model/GmmSet.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/GmmSet.java
index ec0f20b923885f4f3718783dbcecaa9359cf48a3..0dc15ffb1216817595096296b26705b9083ac2fb 100644
--- a/src/org/opensha2/eq/model/GmmSet.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/GmmSet.java
@@ -1,15 +1,10 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.Data.checkInRange;
-import static org.opensha2.data.Data.checkWeights;
-
-import org.opensha2.data.Data;
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.GroundMotionModel;
+import static gov.usgs.earthquake.nshmp.data.Data.checkInRange;
+import static gov.usgs.earthquake.nshmp.data.Data.checkWeights;
import com.google.common.collect.Maps;
import com.google.common.collect.Range;
@@ -18,6 +13,10 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionModel;
+
/**
* Wrapper class for {@link GroundMotionModel}s associated with a
* {@link SourceSet}. In addition to carrying {@code Map}s of
@@ -58,7 +57,7 @@ public final class GmmSet {
double maxDistHi,
double[] epiValues,
double[] epiWeights) {
-
+
this.weightMapLo = weightMapLo;
this.maxDistLo = maxDistLo;
this.weightMapHi = weightMapHi;
diff --git a/src/org/opensha2/eq/model/GridParser.java b/src/gov/usgs/earthquake/nshmp/eq/model/GridParser.java
similarity index 86%
rename from src/org/opensha2/eq/model/GridParser.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/GridParser.java
index 8281f4bc2683f789a3ba56cd3ad64fc4f2a87f84..32c89e7c7fc8d11f1028c7cc641fb57191275717 100644
--- a/src/org/opensha2/eq/model/GridParser.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/GridParser.java
@@ -1,41 +1,25 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.GRID;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readDouble;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readEnum;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readInt;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readString;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.stringToEnumWeightMap;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.stringToValueValueWeightMap;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.FOCAL_MECH_MAP;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.ID;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.MAG_DEPTH_MAP;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.MAX_DEPTH;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.NAME;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.RUPTURE_SCALING;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.STRIKE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.TYPE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.WEIGHT;
import static java.util.logging.Level.FINE;
-import static org.opensha2.eq.model.SourceType.GRID;
-import static org.opensha2.internal.Parsing.readDouble;
-import static org.opensha2.internal.Parsing.readEnum;
-import static org.opensha2.internal.Parsing.readInt;
-import static org.opensha2.internal.Parsing.readString;
-import static org.opensha2.internal.Parsing.stringToEnumWeightMap;
-import static org.opensha2.internal.Parsing.stringToValueValueWeightMap;
-import static org.opensha2.internal.SourceAttribute.FOCAL_MECH_MAP;
-import static org.opensha2.internal.SourceAttribute.ID;
-import static org.opensha2.internal.SourceAttribute.MAG_DEPTH_MAP;
-import static org.opensha2.internal.SourceAttribute.MAX_DEPTH;
-import static org.opensha2.internal.SourceAttribute.NAME;
-import static org.opensha2.internal.SourceAttribute.RUPTURE_SCALING;
-import static org.opensha2.internal.SourceAttribute.STRIKE;
-import static org.opensha2.internal.SourceAttribute.TYPE;
-import static org.opensha2.internal.SourceAttribute.WEIGHT;
-
-import org.opensha2.data.Data;
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.eq.fault.FocalMech;
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.eq.model.MfdHelper.GR_Data;
-import org.opensha2.eq.model.MfdHelper.IncrData;
-import org.opensha2.eq.model.MfdHelper.SingleData;
-import org.opensha2.eq.model.MfdHelper.TaperData;
-import org.opensha2.geo.Location;
-import org.opensha2.internal.SourceElement;
-import org.opensha2.mfd.IncrementalMfd;
-import org.opensha2.mfd.MfdType;
-import org.opensha2.mfd.Mfds;
-
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -53,6 +37,21 @@ import java.util.logging.Logger;
import javax.xml.parsers.SAXParser;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.eq.fault.FocalMech;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.eq.model.MfdHelper.GR_Data;
+import gov.usgs.earthquake.nshmp.eq.model.MfdHelper.IncrData;
+import gov.usgs.earthquake.nshmp.eq.model.MfdHelper.SingleData;
+import gov.usgs.earthquake.nshmp.eq.model.MfdHelper.TaperData;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.internal.SourceElement;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+import gov.usgs.earthquake.nshmp.mfd.MfdType;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+
/*
* Non-validating grid source parser. SAX parser 'Attributes' are stateful and
* cannot be stored. This class is not thread safe.
diff --git a/src/org/opensha2/eq/model/GridSourceSet.java b/src/gov/usgs/earthquake/nshmp/eq/model/GridSourceSet.java
similarity index 95%
rename from src/org/opensha2/eq/model/GridSourceSet.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/GridSourceSet.java
index 98aabde7cc6f33da6ec6a23c378f3dfc5480cc34..41a9ce7c605a215696507079ea42a3b8dcd35d9a 100644
--- a/src/org/opensha2/eq/model/GridSourceSet.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/GridSourceSet.java
@@ -1,29 +1,17 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.eq.Earthquakes.checkCrustalDepth;
-import static org.opensha2.eq.Earthquakes.checkMagnitude;
-import static org.opensha2.eq.Earthquakes.checkSlabDepth;
-import static org.opensha2.eq.fault.Faults.checkStrike;
-import static org.opensha2.eq.fault.FocalMech.NORMAL;
-import static org.opensha2.eq.fault.FocalMech.REVERSE;
-import static org.opensha2.eq.fault.FocalMech.STRIKE_SLIP;
-import static org.opensha2.eq.model.PointSourceType.FIXED_STRIKE;
-import static org.opensha2.eq.model.SourceType.GRID;
-
-import org.opensha2.data.Data;
-import org.opensha2.data.IntervalTable;
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.eq.fault.FocalMech;
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.eq.model.PointSource.DepthModel;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.Locations;
-import org.opensha2.mfd.IncrementalMfd;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkCrustalDepth;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkMagnitude;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkSlabDepth;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkStrike;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.NORMAL;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.REVERSE;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.STRIKE_SLIP;
+import static gov.usgs.earthquake.nshmp.eq.model.PointSourceType.FIXED_STRIKE;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.GRID;
import com.google.common.base.Function;
import com.google.common.base.Predicate;
@@ -37,6 +25,17 @@ import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.data.IntervalTable;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.eq.fault.FocalMech;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.eq.model.PointSource.DepthModel;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+
/**
* A container class for related, evenly-spaced {@link PointSource}s with
* varying magnitudes and/or rates derived from an {@link IncrementalMfd} at
diff --git a/src/org/opensha2/eq/model/HazardModel.java b/src/gov/usgs/earthquake/nshmp/eq/model/HazardModel.java
similarity index 94%
rename from src/org/opensha2/eq/model/HazardModel.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/HazardModel.java
index d54f9459c1ee2a4ffb3b215fab27801b4a57dbbe..62dbd267d9f33e7b95adea03e10e551a226b5178 100644
--- a/src/org/opensha2/eq/model/HazardModel.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/HazardModel.java
@@ -1,14 +1,9 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.internal.TextUtils.NEWLINE;
-import static org.opensha2.internal.TextUtils.validateName;
-
-import org.opensha2.calc.CalcConfig;
-import org.opensha2.gmm.GroundMotionModel;
-import org.opensha2.util.Named;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.validateName;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSetMultimap;
@@ -18,6 +13,10 @@ import java.nio.file.Path;
import java.util.Iterator;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.calc.CalcConfig;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionModel;
+import gov.usgs.earthquake.nshmp.util.Named;
+
/**
* A {@code HazardModel} is the top-level wrapper for earthquake {@link Source}
* definitions and attendant {@link GroundMotionModel}s used in probabilisitic
diff --git a/src/org/opensha2/eq/model/InterfaceParser.java b/src/gov/usgs/earthquake/nshmp/eq/model/InterfaceParser.java
similarity index 86%
rename from src/org/opensha2/eq/model/InterfaceParser.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/InterfaceParser.java
index c0a0bfb310e96333ea6d49b12bf83cdb6ea2f720..56275d61bdb5918e09efff9758435be98d31ce75 100644
--- a/src/org/opensha2/eq/model/InterfaceParser.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/InterfaceParser.java
@@ -1,32 +1,22 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readDouble;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readEnum;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readInt;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readString;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.DEPTH;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.DIP;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.ID;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.NAME;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.RAKE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.RUPTURE_SCALING;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.WEIGHT;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.WIDTH;
import static java.util.logging.Level.FINE;
import static java.util.logging.Level.FINEST;
-import static org.opensha2.internal.Parsing.readDouble;
-import static org.opensha2.internal.Parsing.readEnum;
-import static org.opensha2.internal.Parsing.readInt;
-import static org.opensha2.internal.Parsing.readString;
-import static org.opensha2.internal.SourceAttribute.DEPTH;
-import static org.opensha2.internal.SourceAttribute.DIP;
-import static org.opensha2.internal.SourceAttribute.ID;
-import static org.opensha2.internal.SourceAttribute.NAME;
-import static org.opensha2.internal.SourceAttribute.RAKE;
-import static org.opensha2.internal.SourceAttribute.RUPTURE_SCALING;
-import static org.opensha2.internal.SourceAttribute.WEIGHT;
-import static org.opensha2.internal.SourceAttribute.WIDTH;
-
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.eq.model.MfdHelper.GR_Data;
-import org.opensha2.eq.model.MfdHelper.SingleData;
-import org.opensha2.geo.LocationList;
-import org.opensha2.internal.SourceElement;
-import org.opensha2.mfd.IncrementalMfd;
-import org.opensha2.mfd.MfdType;
-import org.opensha2.mfd.Mfds;
-
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
import org.xml.sax.SAXException;
@@ -41,6 +31,15 @@ import java.util.logging.Logger;
import javax.xml.parsers.SAXParser;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.eq.model.MfdHelper.GR_Data;
+import gov.usgs.earthquake.nshmp.eq.model.MfdHelper.SingleData;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.internal.SourceElement;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+import gov.usgs.earthquake.nshmp.mfd.MfdType;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+
/*
* Non-validating subduction source parser. SAX parser 'Attributes' are stateful
* and cannot be stored. This class is not thread safe.
diff --git a/src/org/opensha2/eq/model/InterfaceSource.java b/src/gov/usgs/earthquake/nshmp/eq/model/InterfaceSource.java
similarity index 85%
rename from src/org/opensha2/eq/model/InterfaceSource.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/InterfaceSource.java
index c2fe8ded71d22572f6e70d3a5b4b736c7f170695..3aea8596f08f7f548581eb99c11591dd525a952e 100644
--- a/src/org/opensha2/eq/model/InterfaceSource.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/InterfaceSource.java
@@ -1,27 +1,26 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.StandardSystemProperty.LINE_SEPARATOR;
-
-import static org.opensha2.eq.Earthquakes.checkInterfaceDepth;
-import static org.opensha2.eq.Earthquakes.checkInterfaceWidth;
-import static org.opensha2.eq.fault.Faults.checkTrace;
-import static org.opensha2.eq.model.SourceType.INTERFACE;
-
-import org.opensha2.eq.fault.surface.ApproxGriddedSurface;
-import org.opensha2.eq.fault.surface.DefaultGriddedSurface;
-import org.opensha2.eq.fault.surface.GriddedSurface;
-import org.opensha2.eq.fault.surface.RuptureFloating;
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-import org.opensha2.geo.Locations;
-import org.opensha2.mfd.IncrementalMfd;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkInterfaceDepth;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkInterfaceWidth;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkTrace;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.INTERFACE;
import com.google.common.collect.ImmutableList;
import java.util.List;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.ApproxGriddedSurface;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.DefaultGriddedSurface;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.GriddedSurface;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureFloating;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+
/**
* Subduction source representation. This class wraps a model of a subduction
* interface geometry and a list of magnitude frequency distributions that
diff --git a/src/org/opensha2/eq/model/InterfaceSourceSet.java b/src/gov/usgs/earthquake/nshmp/eq/model/InterfaceSourceSet.java
similarity index 92%
rename from src/org/opensha2/eq/model/InterfaceSourceSet.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/InterfaceSourceSet.java
index 82129c874f23098e5d37603dd823eb9f0f09aee3..5e59e67c9102bd198fff26639c5e2fb269bf2b1a 100644
--- a/src/org/opensha2/eq/model/InterfaceSourceSet.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/InterfaceSourceSet.java
@@ -1,12 +1,8 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.eq.model.SourceType.INTERFACE;
-
-import org.opensha2.geo.Location;
-import org.opensha2.geo.Locations;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.INTERFACE;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableMap;
@@ -16,6 +12,9 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+
/**
* Container class for groups of related {@link InterfaceSource}s.
*
diff --git a/src/org/opensha2/eq/model/Loader.java b/src/gov/usgs/earthquake/nshmp/eq/model/Loader.java
similarity index 97%
rename from src/org/opensha2/eq/model/Loader.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/Loader.java
index e012c28a7d5d3292610438b219284ee386d9e0b5..44ad6188adc62bcd1f85bdbdf5bb8c807280e48e 100644
--- a/src/org/opensha2/eq/model/Loader.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/Loader.java
@@ -1,18 +1,14 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.StandardSystemProperty.LINE_SEPARATOR;
+import static gov.usgs.earthquake.nshmp.eq.model.SystemParser.GRIDSOURCE_FILENAME;
+import static gov.usgs.earthquake.nshmp.eq.model.SystemParser.RUPTURES_FILENAME;
+import static gov.usgs.earthquake.nshmp.eq.model.SystemParser.SECTIONS_FILENAME;
import static java.nio.file.Files.newDirectoryStream;
import static java.util.logging.Level.SEVERE;
-import static org.opensha2.eq.model.SystemParser.GRIDSOURCE_FILENAME;
-import static org.opensha2.eq.model.SystemParser.RUPTURES_FILENAME;
-import static org.opensha2.eq.model.SystemParser.SECTIONS_FILENAME;
-
-import org.opensha2.calc.CalcConfig;
-import org.opensha2.eq.model.HazardModel.Builder;
-
import org.xml.sax.SAXException;
import org.xml.sax.SAXParseException;
@@ -41,6 +37,9 @@ import javax.xml.parsers.ParserConfigurationException;
import javax.xml.parsers.SAXParser;
import javax.xml.parsers.SAXParserFactory;
+import gov.usgs.earthquake.nshmp.calc.CalcConfig;
+import gov.usgs.earthquake.nshmp.eq.model.HazardModel.Builder;
+
/**
* {@code HazardModel} loader. This class takes care of extensive checked
* exceptions required when initializing a {@code HazardModel} and will exit the
diff --git a/src/org/opensha2/eq/model/MagUncertainty.java b/src/gov/usgs/earthquake/nshmp/eq/model/MagUncertainty.java
similarity index 85%
rename from src/org/opensha2/eq/model/MagUncertainty.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/MagUncertainty.java
index 904ea732925489c2b282afa77a405bd112081e01..288695b65a4add6b5dc3f0749bedafd989ae2166 100644
--- a/src/org/opensha2/eq/model/MagUncertainty.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/MagUncertainty.java
@@ -1,28 +1,27 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.StandardSystemProperty.LINE_SEPARATOR;
-
-import static org.opensha2.internal.Parsing.addAttribute;
-import static org.opensha2.internal.Parsing.addElement;
-import static org.opensha2.internal.Parsing.toDoubleArray;
-import static org.opensha2.internal.SourceAttribute.COUNT;
-import static org.opensha2.internal.SourceAttribute.CUTOFF;
-import static org.opensha2.internal.SourceAttribute.DELTAS;
-import static org.opensha2.internal.SourceAttribute.MO_BALANCE;
-import static org.opensha2.internal.SourceAttribute.SIGMA;
-import static org.opensha2.internal.SourceAttribute.WEIGHTS;
-import static org.opensha2.internal.SourceElement.ALEATORY;
-import static org.opensha2.internal.SourceElement.EPISTEMIC;
-import static org.opensha2.internal.SourceElement.MAG_UNCERTAINTY;
-
-import org.opensha2.eq.Earthquakes;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.addAttribute;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.addElement;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.toDoubleArray;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.COUNT;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.CUTOFF;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.DELTAS;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.MO_BALANCE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.SIGMA;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.WEIGHTS;
+import static gov.usgs.earthquake.nshmp.internal.SourceElement.ALEATORY;
+import static gov.usgs.earthquake.nshmp.internal.SourceElement.EPISTEMIC;
+import static gov.usgs.earthquake.nshmp.internal.SourceElement.MAG_UNCERTAINTY;
import org.w3c.dom.Element;
import java.util.Arrays;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+
/**
* Wrapper class for magnitude uncertainty data. Uncertainty flags are
* initialized based on input data, however, due to quirky nshmp rules, they may
diff --git a/src/org/opensha2/eq/model/MfdHelper.java b/src/gov/usgs/earthquake/nshmp/eq/model/MfdHelper.java
similarity index 90%
rename from src/org/opensha2/eq/model/MfdHelper.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/MfdHelper.java
index f2700010fdb21d393762a4ab1f18b42bcf064f2d..9d344d21a8364ee645ba4b5d01823a6b9c7af41b 100644
--- a/src/org/opensha2/eq/model/MfdHelper.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/MfdHelper.java
@@ -1,26 +1,22 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.internal.Parsing.readBoolean;
-import static org.opensha2.internal.Parsing.readDouble;
-import static org.opensha2.internal.Parsing.readString;
-import static org.opensha2.internal.Parsing.toDoubleArray;
-import static org.opensha2.internal.SourceAttribute.A;
-import static org.opensha2.internal.SourceAttribute.B;
-import static org.opensha2.internal.SourceAttribute.C_MAG;
-import static org.opensha2.internal.SourceAttribute.D_MAG;
-import static org.opensha2.internal.SourceAttribute.FLOATS;
-import static org.opensha2.internal.SourceAttribute.M;
-import static org.opensha2.internal.SourceAttribute.MAGS;
-import static org.opensha2.internal.SourceAttribute.M_MAX;
-import static org.opensha2.internal.SourceAttribute.M_MIN;
-import static org.opensha2.internal.SourceAttribute.RATE;
-import static org.opensha2.internal.SourceAttribute.RATES;
-import static org.opensha2.internal.SourceAttribute.WEIGHT;
-
-import org.opensha2.internal.SourceAttribute;
-import org.opensha2.mfd.MfdType;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readBoolean;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readDouble;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readString;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.toDoubleArray;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.A;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.B;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.C_MAG;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.D_MAG;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.FLOATS;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.M;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.MAGS;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.M_MAX;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.M_MIN;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.RATE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.RATES;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.WEIGHT;
import org.xml.sax.Attributes;
@@ -31,6 +27,9 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import gov.usgs.earthquake.nshmp.internal.SourceAttribute;
+import gov.usgs.earthquake.nshmp.mfd.MfdType;
+
/*
* MFD data handler class. Stores default data and creates copies with
* overridden (non-default) fields. This class ensures that all required
diff --git a/src/org/opensha2/eq/model/ModelConfig.java b/src/gov/usgs/earthquake/nshmp/eq/model/ModelConfig.java
similarity index 94%
rename from src/org/opensha2/eq/model/ModelConfig.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/ModelConfig.java
index c14e66d3fc8891859405c5b192eb8b3086e2bac6..71036b412d2bac1ad5c18b1c898047195ebe1bdf 100644
--- a/src/org/opensha2/eq/model/ModelConfig.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/ModelConfig.java
@@ -1,18 +1,14 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.CaseFormat.LOWER_CAMEL;
import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Strings.padEnd;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.LOG_INDENT;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.LOG_VALUE_COLUMN;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.opensha2.internal.TextUtils.LOG_INDENT;
-import static org.opensha2.internal.TextUtils.LOG_VALUE_COLUMN;
-
-import org.opensha2.eq.fault.surface.RuptureFloating;
-import org.opensha2.eq.model.AreaSource.GridScaling;
-
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.JsonElement;
@@ -23,6 +19,9 @@ import java.io.Reader;
import java.nio.file.Files;
import java.nio.file.Path;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureFloating;
+import gov.usgs.earthquake.nshmp.eq.model.AreaSource.GridScaling;
+
/**
* Model and calculation configuration class. No defaults; 'config.json' must be
* supplied with model.
diff --git a/src/org/opensha2/eq/model/PointSource.java b/src/gov/usgs/earthquake/nshmp/eq/model/PointSource.java
similarity index 94%
rename from src/org/opensha2/eq/model/PointSource.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/PointSource.java
index ce735914be22bde239bc5d619d56d682aa4c48a1..e85d04fd322f5846dc6a892b543fbe6cfd5e7240 100644
--- a/src/org/opensha2/eq/model/PointSource.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/PointSource.java
@@ -1,20 +1,11 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.NORMAL;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.REVERSE;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.STRIKE_SLIP;
+import static gov.usgs.earthquake.nshmp.util.Maths.hypot;
import static java.lang.Math.ceil;
-import static org.opensha2.eq.fault.FocalMech.NORMAL;
-import static org.opensha2.eq.fault.FocalMech.REVERSE;
-import static org.opensha2.eq.fault.FocalMech.STRIKE_SLIP;
-import static org.opensha2.util.Maths.hypot;
-
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.fault.FocalMech;
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.eq.fault.surface.RuptureSurface;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.Locations;
-import org.opensha2.util.Maths;
-
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
import com.google.common.primitives.Doubles;
@@ -25,6 +16,14 @@ import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.fault.FocalMech;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureSurface;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Point-source earthquake {@code Source} supplies the simplest possible
* representation of point-source {@code Rupture}s. When iterating, a
@@ -98,8 +97,9 @@ class PointSource implements Source {
public String name() {
return "PointSource: " + formatLocation(loc);
}
-
+
static final String FORMAT = "%.3f, %.3f";
+
static String formatLocation(Location loc) {
return String.format(FORMAT, loc.lon(), loc.lat());
}
diff --git a/src/org/opensha2/eq/model/PointSourceFinite.java b/src/gov/usgs/earthquake/nshmp/eq/model/PointSourceFinite.java
similarity index 92%
rename from src/org/opensha2/eq/model/PointSourceFinite.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/PointSourceFinite.java
index fd7b21bce1965e42ad6b71d70ea2186cce8633be..17f802d065a10375456730649684ce5ef9184a56 100644
--- a/src/org/opensha2/eq/model/PointSourceFinite.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/PointSourceFinite.java
@@ -1,26 +1,25 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.NORMAL;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.REVERSE;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.STRIKE_SLIP;
+import static gov.usgs.earthquake.nshmp.util.Maths.hypot;
import static java.lang.Math.ceil;
import static java.lang.Math.cos;
import static java.lang.Math.min;
import static java.lang.Math.sin;
import static java.lang.Math.tan;
-import static org.opensha2.eq.fault.FocalMech.NORMAL;
-import static org.opensha2.eq.fault.FocalMech.REVERSE;
-import static org.opensha2.eq.fault.FocalMech.STRIKE_SLIP;
-import static org.opensha2.util.Maths.hypot;
-
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.fault.FocalMech;
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.Locations;
-import org.opensha2.util.Maths;
-
import java.util.Iterator;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.fault.FocalMech;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Point-source earthquake implementation in which all magnitudes are
* represented as finite faults and any normal or reverse sources are
diff --git a/src/org/opensha2/eq/model/PointSourceFixedStrike.java b/src/gov/usgs/earthquake/nshmp/eq/model/PointSourceFixedStrike.java
similarity index 92%
rename from src/org/opensha2/eq/model/PointSourceFixedStrike.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/PointSourceFixedStrike.java
index 18f16066ac3d825c1c8d63b030db71cbf954b9e9..c222addb4b342c19f9ea89162ee2a55a692e36fb 100644
--- a/src/org/opensha2/eq/model/PointSourceFixedStrike.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/PointSourceFixedStrike.java
@@ -1,29 +1,28 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
+import static gov.usgs.earthquake.nshmp.eq.fault.FocalMech.STRIKE_SLIP;
+import static gov.usgs.earthquake.nshmp.util.Maths.hypot;
import static java.lang.Math.cos;
import static java.lang.Math.min;
import static java.lang.Math.sin;
import static java.lang.Math.sqrt;
import static java.lang.Math.tan;
-import static org.opensha2.eq.fault.FocalMech.STRIKE_SLIP;
-import static org.opensha2.util.Maths.hypot;
-
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.eq.fault.FocalMech;
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.eq.fault.surface.RuptureScaling.Dimensions;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationVector;
-import org.opensha2.geo.Locations;
-import org.opensha2.util.Maths;
-
import com.google.common.math.DoubleMath;
import java.util.Iterator;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.eq.fault.FocalMech;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling.Dimensions;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationVector;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Fixed-strike point-source earthquake implementation. As with parent class,
* all magnitudes are represented as finite faults and any normal or reverse
diff --git a/src/org/opensha2/eq/model/PointSourceType.java b/src/gov/usgs/earthquake/nshmp/eq/model/PointSourceType.java
similarity index 79%
rename from src/org/opensha2/eq/model/PointSourceType.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/PointSourceType.java
index ed97d15999d7ba42d4a0841d723e5f6253d0af3c..9b9a4cd62ca8bc47e323607011e6faa9064200a7 100644
--- a/src/org/opensha2/eq/model/PointSourceType.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/PointSourceType.java
@@ -1,4 +1,4 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
/**
* Point source implementation identifier.
diff --git a/src/org/opensha2/eq/model/PointSources.java b/src/gov/usgs/earthquake/nshmp/eq/model/PointSources.java
similarity index 91%
rename from src/org/opensha2/eq/model/PointSources.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/PointSources.java
index 058d78d77c69684194d25cb5759f05ace44f7773..b6a2f6281d3098c5271b245e3d43fd45c1596f08 100644
--- a/src/org/opensha2/eq/model/PointSources.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/PointSources.java
@@ -1,16 +1,4 @@
-package org.opensha2.eq.model;
-
-import org.opensha2.calc.HazardCalcs;
-import org.opensha2.calc.InputList;
-import org.opensha2.calc.Site;
-import org.opensha2.data.IntervalData;
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.fault.FocalMech;
-import org.opensha2.eq.fault.surface.RuptureScaling;
-import org.opensha2.eq.model.PointSource.DepthModel;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.Locations;
-import org.opensha2.internal.Parsing;
+package gov.usgs.earthquake.nshmp.eq.model;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
@@ -20,6 +8,18 @@ import java.util.List;
import java.util.Map;
import java.util.NavigableMap;
+import gov.usgs.earthquake.nshmp.calc.HazardCalcs;
+import gov.usgs.earthquake.nshmp.calc.InputList;
+import gov.usgs.earthquake.nshmp.calc.Site;
+import gov.usgs.earthquake.nshmp.data.IntervalData;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.fault.FocalMech;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureScaling;
+import gov.usgs.earthquake.nshmp.eq.model.PointSource.DepthModel;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+
/**
* Factory class for generating lists of {@code GmmInput}s for point sources.
*
@@ -57,7 +57,7 @@ public class PointSources {
rupScaling,
magDepthMap,
maxDepth);
-
+
return HazardCalcs.sourceToInputs(site).apply(source);
}
@@ -91,7 +91,7 @@ public class PointSources {
rupScaling,
magDepthMap,
maxDepth);
-
+
List<InputList> inputsList = new ArrayList<>();
for (Site site : sites) {
InputList inputs = HazardCalcs.sourceToInputs(site).apply(source);
@@ -116,13 +116,13 @@ public class PointSources {
Source source = pointSource(
sourceType,
- PointSourceType.FINITE,
- loc,
- mfd,
- mechWtMap,
+ PointSourceType.FINITE,
+ loc,
+ mfd,
+ mechWtMap,
grid.rupScaling,
grid.depthModel);
-
+
return finiteInputs(sites, source);
}
diff --git a/src/org/opensha2/eq/model/Rupture.java b/src/gov/usgs/earthquake/nshmp/eq/model/Rupture.java
similarity index 91%
rename from src/org/opensha2/eq/model/Rupture.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/Rupture.java
index d6cf115bee03941fa27483e6b8489556d455823a..96894b115c8e5c9f92cab14d9817a82308c6aa3b 100644
--- a/src/org/opensha2/eq/model/Rupture.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/Rupture.java
@@ -1,14 +1,14 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
-import static org.opensha2.eq.fault.Faults.checkRake;
-
-import org.opensha2.eq.fault.surface.RuptureSurface;
-import org.opensha2.geo.Location;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkRake;
import com.google.common.collect.ImmutableMap;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.RuptureSurface;
+import gov.usgs.earthquake.nshmp.geo.Location;
+
/**
* A {@code Rupture} is a proxy for an actual earthquake and encapsulates all
* the source information required by a ground motion model (Gmm).
diff --git a/src/org/opensha2/eq/model/SlabParser.java b/src/gov/usgs/earthquake/nshmp/eq/model/SlabParser.java
similarity index 86%
rename from src/org/opensha2/eq/model/SlabParser.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/SlabParser.java
index dc85907625e53c412b8dc209c2ed6a806f04f1a2..a11fc4a24557d5d71b2278c69b3971c14eaa4938 100644
--- a/src/org/opensha2/eq/model/SlabParser.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/SlabParser.java
@@ -1,6 +1,6 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
-import static org.opensha2.eq.model.SourceType.SLAB;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.SLAB;
import org.xml.sax.SAXException;
diff --git a/src/org/opensha2/eq/model/SlabSourceSet.java b/src/gov/usgs/earthquake/nshmp/eq/model/SlabSourceSet.java
similarity index 91%
rename from src/org/opensha2/eq/model/SlabSourceSet.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/SlabSourceSet.java
index 7e4bd01df69cc028c215d08e2c968a9baad3c0b2..e19b35748e067eb5323b6c2ec7499b2e6977c4be 100644
--- a/src/org/opensha2/eq/model/SlabSourceSet.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/SlabSourceSet.java
@@ -1,13 +1,13 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
-import static org.opensha2.eq.model.SourceType.SLAB;
-
-import org.opensha2.geo.Location;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.SLAB;
import com.google.common.base.Predicate;
import java.util.Iterator;
+import gov.usgs.earthquake.nshmp.geo.Location;
+
/**
* Container class for related, evenly-spaced subduction slab sources. Class
* decorates a {@link GridSourceSet}.
diff --git a/src/org/opensha2/eq/model/Source.java b/src/gov/usgs/earthquake/nshmp/eq/model/Source.java
similarity index 78%
rename from src/org/opensha2/eq/model/Source.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/Source.java
index d56454aee5c6ebe3d7fd73bd1590ca810244d72c..2308335b9e5f004439b44a7ec6033e62dca35795 100644
--- a/src/org/opensha2/eq/model/Source.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/Source.java
@@ -1,12 +1,12 @@
-package org.opensha2.eq.model;
-
-import org.opensha2.data.XySequence;
-import org.opensha2.geo.Location;
-import org.opensha2.mfd.IncrementalMfd;
-import org.opensha2.util.Named;
+package gov.usgs.earthquake.nshmp.eq.model;
import java.util.List;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+import gov.usgs.earthquake.nshmp.util.Named;
+
/**
* An earthquake {@code Source}; usually some physical or pseudo-representation
* of a fault and associated {@link IncrementalMfd}s governing the size and rate
@@ -25,7 +25,7 @@ public interface Source extends Named, Iterable<Rupture> {
* A numeric identifier for this {@code Source}.
*/
int id();
-
+
/**
* The {@code SourceType} identifier.
*/
@@ -42,5 +42,5 @@ public interface Source extends Named, Iterable<Rupture> {
* The MFDs that define earthquake rates for this source.
*/
List<XySequence> mfds();
-
+
}
diff --git a/src/org/opensha2/eq/model/SourceSet.java b/src/gov/usgs/earthquake/nshmp/eq/model/SourceSet.java
similarity index 91%
rename from src/org/opensha2/eq/model/SourceSet.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/SourceSet.java
index b145e5b671db712d93300b031c742b9ae7d67839..2461a1c73bc6a4e54ec540608487dc3578839ff7 100644
--- a/src/org/opensha2/eq/model/SourceSet.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/SourceSet.java
@@ -1,11 +1,11 @@
-package org.opensha2.eq.model;
-
-import org.opensha2.geo.Location;
-import org.opensha2.gmm.GroundMotionModel;
-import org.opensha2.util.Named;
+package gov.usgs.earthquake.nshmp.eq.model;
import com.google.common.base.Predicate;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionModel;
+import gov.usgs.earthquake.nshmp.util.Named;
+
/**
* Wrapper class for groups of {@link Source}s of similar {@link SourceType}.
* The use of the word 'Set' in the class name implies the {@code Source}s in a
diff --git a/src/org/opensha2/eq/model/SourceType.java b/src/gov/usgs/earthquake/nshmp/eq/model/SourceType.java
similarity index 97%
rename from src/org/opensha2/eq/model/SourceType.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/SourceType.java
index 5d07a8a38cf3de056c4bc2ecfbe4d65e5f701d53..69038ac3a458fd316dc54249b6f02d7544d9d2a3 100644
--- a/src/org/opensha2/eq/model/SourceType.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/SourceType.java
@@ -1,4 +1,4 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.CaseFormat.UPPER_CAMEL;
import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
diff --git a/src/org/opensha2/eq/model/SystemParser.java b/src/gov/usgs/earthquake/nshmp/eq/model/SystemParser.java
similarity index 81%
rename from src/org/opensha2/eq/model/SystemParser.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/SystemParser.java
index 879537fa2e97a49a8c48724de071c63d7166fcc0..5260543fdbf3c3eb0bce759838bc7d62eb11d94e 100644
--- a/src/org/opensha2/eq/model/SystemParser.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/SystemParser.java
@@ -1,33 +1,25 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.internal.Parsing.rangeStringToIntList;
-import static org.opensha2.internal.Parsing.readDouble;
-import static org.opensha2.internal.Parsing.readEnum;
-import static org.opensha2.internal.Parsing.readInt;
-import static org.opensha2.internal.Parsing.readString;
-import static org.opensha2.internal.SourceAttribute.DEPTH;
-import static org.opensha2.internal.SourceAttribute.DIP;
-import static org.opensha2.internal.SourceAttribute.ID;
-import static org.opensha2.internal.SourceAttribute.INDICES;
-import static org.opensha2.internal.SourceAttribute.NAME;
-import static org.opensha2.internal.SourceAttribute.RAKE;
-import static org.opensha2.internal.SourceAttribute.TYPE;
-import static org.opensha2.internal.SourceAttribute.WEIGHT;
-import static org.opensha2.internal.SourceAttribute.WIDTH;
-import static org.opensha2.mfd.MfdType.GR;
-import static org.opensha2.mfd.MfdType.GR_TAPER;
-import static org.opensha2.mfd.MfdType.INCR;
-import static org.opensha2.mfd.MfdType.SINGLE;
-
-import org.opensha2.eq.fault.surface.GriddedSurface;
-import org.opensha2.eq.model.MfdHelper.SingleData;
-import org.opensha2.internal.SourceElement;
-import org.opensha2.mfd.IncrementalMfd;
-import org.opensha2.mfd.MfdType;
-import org.opensha2.mfd.Mfds;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.rangeStringToIntList;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readDouble;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readEnum;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readInt;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readString;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.DEPTH;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.DIP;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.ID;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.INDICES;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.NAME;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.RAKE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.TYPE;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.WEIGHT;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.WIDTH;
+import static gov.usgs.earthquake.nshmp.mfd.MfdType.GR;
+import static gov.usgs.earthquake.nshmp.mfd.MfdType.GR_TAPER;
+import static gov.usgs.earthquake.nshmp.mfd.MfdType.INCR;
+import static gov.usgs.earthquake.nshmp.mfd.MfdType.SINGLE;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
@@ -44,6 +36,13 @@ import java.util.logging.Logger;
import javax.xml.parsers.SAXParser;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.GriddedSurface;
+import gov.usgs.earthquake.nshmp.eq.model.MfdHelper.SingleData;
+import gov.usgs.earthquake.nshmp.internal.SourceElement;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+import gov.usgs.earthquake.nshmp.mfd.MfdType;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+
/*
* Non-validating indexed fault source parser. SAX parser 'Attributes' are
* stateful and cannot be stored. This class is not thread safe.
diff --git a/src/org/opensha2/eq/model/SystemSectionParser.java b/src/gov/usgs/earthquake/nshmp/eq/model/SystemSectionParser.java
similarity index 82%
rename from src/org/opensha2/eq/model/SystemSectionParser.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/SystemSectionParser.java
index 4befb5dc1c3fdb86bb0c7672c948f985c5f9a28e..39523acf0bbc8503d863a61feadd53641e36b08a 100644
--- a/src/org/opensha2/eq/model/SystemSectionParser.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/SystemSectionParser.java
@@ -1,23 +1,17 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.eq.model.SystemParser.SECTIONS_FILENAME;
-import static org.opensha2.internal.Parsing.readDouble;
-import static org.opensha2.internal.Parsing.readString;
-import static org.opensha2.internal.SourceAttribute.ASEIS;
-import static org.opensha2.internal.SourceAttribute.DEPTH;
-import static org.opensha2.internal.SourceAttribute.DIP;
-import static org.opensha2.internal.SourceAttribute.DIP_DIR;
-import static org.opensha2.internal.SourceAttribute.INDEX;
-import static org.opensha2.internal.SourceAttribute.LOWER_DEPTH;
-import static org.opensha2.internal.SourceAttribute.NAME;
-
-import org.opensha2.eq.fault.surface.DefaultGriddedSurface;
-import org.opensha2.eq.fault.surface.GriddedSurface;
-import org.opensha2.geo.LocationList;
-import org.opensha2.internal.SourceElement;
+import static gov.usgs.earthquake.nshmp.eq.model.SystemParser.SECTIONS_FILENAME;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readDouble;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.readString;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.ASEIS;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.DEPTH;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.DIP;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.DIP_DIR;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.INDEX;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.LOWER_DEPTH;
+import static gov.usgs.earthquake.nshmp.internal.SourceAttribute.NAME;
import org.xml.sax.Attributes;
import org.xml.sax.Locator;
@@ -34,6 +28,11 @@ import java.util.logging.Logger;
import javax.xml.parsers.SAXParser;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.DefaultGriddedSurface;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.GriddedSurface;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.internal.SourceElement;
+
/*
* Non-validating indexed fault section parser. SAX parser 'Attributes' are
* stateful and cannot be stored. This class is not thread safe. The List
@@ -113,7 +112,7 @@ class SystemSectionParser extends DefaultHandler {
* NOTE: currently, section indices are ordered ascending from zero; if
* this were to change we'd need agregate a list of indices as well.
*/
-
+
case SECTION:
surfaceBuilder = DefaultGriddedSurface.builder();
String sectionName = readString(NAME, atts);
@@ -185,11 +184,11 @@ class SystemSectionParser extends DefaultHandler {
public void setDocumentLocator(Locator locator) {
this.locator = locator;
}
-
+
/*
* TODO for consistency during development we have kept the original (long)
- * UCERF3 section names in fault_sections.xml but it might make sense down
- * the road to update the source file rather thna clean the name here.
+ * UCERF3 section names in fault_sections.xml but it might make sense down the
+ * road to update the source file rather thna clean the name here.
*/
private static String cleanName(String name) {
return name.replace(" 2011 CFM", "").replace(", Subsection ", " [") + "]";
diff --git a/src/org/opensha2/eq/model/SystemSourceSet.java b/src/gov/usgs/earthquake/nshmp/eq/model/SystemSourceSet.java
similarity index 95%
rename from src/org/opensha2/eq/model/SystemSourceSet.java
rename to src/gov/usgs/earthquake/nshmp/eq/model/SystemSourceSet.java
index 478cc0eba558f227fd11b12c03622da31348cfaa..7ff3cd53d964abbe3953ba2523aa3d92601776e8 100644
--- a/src/org/opensha2/eq/model/SystemSourceSet.java
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/SystemSourceSet.java
@@ -1,29 +1,17 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkCrustalDepth;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkCrustalWidth;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkMagnitude;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkDip;
+import static gov.usgs.earthquake.nshmp.eq.fault.Faults.checkRake;
+import static gov.usgs.earthquake.nshmp.eq.model.SourceType.SYSTEM;
+import static gov.usgs.earthquake.nshmp.geo.Locations.horzDistanceFast;
import static java.lang.Math.min;
-import static org.opensha2.eq.Earthquakes.checkCrustalDepth;
-import static org.opensha2.eq.Earthquakes.checkCrustalWidth;
-import static org.opensha2.eq.Earthquakes.checkMagnitude;
-import static org.opensha2.eq.fault.Faults.checkDip;
-import static org.opensha2.eq.fault.Faults.checkRake;
-import static org.opensha2.eq.model.SourceType.SYSTEM;
-import static org.opensha2.geo.Locations.horzDistanceFast;
-
-import org.opensha2.calc.HazardInput;
-import org.opensha2.calc.InputList;
-import org.opensha2.calc.Site;
-import org.opensha2.calc.SystemInputList;
-import org.opensha2.data.Indexing;
-import org.opensha2.data.IntervalArray;
-import org.opensha2.data.XySequence;
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.eq.fault.surface.GriddedSurface;
-import org.opensha2.geo.Location;
-
import com.google.common.base.Function;
import com.google.common.base.Predicate;
import com.google.common.collect.ImmutableMap;
@@ -37,6 +25,17 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.calc.HazardInput;
+import gov.usgs.earthquake.nshmp.calc.InputList;
+import gov.usgs.earthquake.nshmp.calc.Site;
+import gov.usgs.earthquake.nshmp.calc.SystemInputList;
+import gov.usgs.earthquake.nshmp.data.Indexing;
+import gov.usgs.earthquake.nshmp.data.IntervalArray;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.GriddedSurface;
+import gov.usgs.earthquake.nshmp.geo.Location;
+
/**
* Wrapper class for related {@link SystemSource}s.
*
diff --git a/src/gov/usgs/earthquake/nshmp/eq/model/package-info.java b/src/gov/usgs/earthquake/nshmp/eq/model/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..c0ecdf8e8a572316049f8eca71356044a0748497
--- /dev/null
+++ b/src/gov/usgs/earthquake/nshmp/eq/model/package-info.java
@@ -0,0 +1,5 @@
+/**
+ * Earthquake {@link gov.usgs.earthquake.nshmp.eq.model.Source} and
+ * {@link gov.usgs.earthquake.nshmp.eq.model.HazardModel} representations.
+ */
+package gov.usgs.earthquake.nshmp.eq.model;
diff --git a/src/gov/usgs/earthquake/nshmp/eq/package-info.java b/src/gov/usgs/earthquake/nshmp/eq/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..d87cd44fbb8e635d4cb6ddeceb0bccff8abbaa6a
--- /dev/null
+++ b/src/gov/usgs/earthquake/nshmp/eq/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Earthquake source models.
+ */
+package gov.usgs.earthquake.nshmp.eq;
diff --git a/src/org/opensha2/etc/GmmParams.java b/src/gov/usgs/earthquake/nshmp/etc/GmmParams.java
similarity index 89%
rename from src/org/opensha2/etc/GmmParams.java
rename to src/gov/usgs/earthquake/nshmp/etc/GmmParams.java
index ea3f0857b99030442d7750b469c1d6672aa1c2f0..1bf78215682ff0582cb34fdf0a95a9f721b18390 100644
--- a/src/org/opensha2/etc/GmmParams.java
+++ b/src/gov/usgs/earthquake/nshmp/etc/GmmParams.java
@@ -1,4 +1,4 @@
-package org.opensha2.etc;
+package gov.usgs.earthquake.nshmp.etc;
@SuppressWarnings("javadoc")
public class GmmParams {
diff --git a/src/org/opensha2/etc/HazMat.java b/src/gov/usgs/earthquake/nshmp/etc/HazMat.java
similarity index 99%
rename from src/org/opensha2/etc/HazMat.java
rename to src/gov/usgs/earthquake/nshmp/etc/HazMat.java
index 4d061bc2fbe2cfa076dbfbd718dab16ed4177887..fd90e2a05ab79f53caf292442e1ef4b13f83fc58 100644
--- a/src/org/opensha2/etc/HazMat.java
+++ b/src/gov/usgs/earthquake/nshmp/etc/HazMat.java
@@ -1,4 +1,4 @@
-package org.opensha2.etc;
+package gov.usgs.earthquake.nshmp.etc;
import java.lang.reflect.Method;
import java.net.URL;
diff --git a/src/org/opensha2/etc/HazMatImpl.java b/src/gov/usgs/earthquake/nshmp/etc/HazMatImpl.java
similarity index 90%
rename from src/org/opensha2/etc/HazMatImpl.java
rename to src/gov/usgs/earthquake/nshmp/etc/HazMatImpl.java
index 4afc59a8823479dfc8ad24383dd17c70c4b9c900..4e94f2005448339bd55d3f957f4b78ad38720932 100644
--- a/src/org/opensha2/etc/HazMatImpl.java
+++ b/src/gov/usgs/earthquake/nshmp/etc/HazMatImpl.java
@@ -1,12 +1,12 @@
-package org.opensha2.etc;
-
-import org.opensha2.gmm.Gmm;
-import org.opensha2.gmm.GmmInput;
-import org.opensha2.gmm.Imt;
-import org.opensha2.gmm.ScalarGroundMotion;
+package gov.usgs.earthquake.nshmp.etc;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.gmm.ScalarGroundMotion;
+
@SuppressWarnings("javadoc")
public class HazMatImpl {
diff --git a/src/org/opensha2/etc/HazMatSpectrum.java b/src/gov/usgs/earthquake/nshmp/etc/HazMatSpectrum.java
similarity index 83%
rename from src/org/opensha2/etc/HazMatSpectrum.java
rename to src/gov/usgs/earthquake/nshmp/etc/HazMatSpectrum.java
index 0b93d011e2fca84496395a00fc0ab9bc59eb2c16..e647fce142223a769a59a8c201f1bf0a1b90e6cf 100644
--- a/src/org/opensha2/etc/HazMatSpectrum.java
+++ b/src/gov/usgs/earthquake/nshmp/etc/HazMatSpectrum.java
@@ -1,6 +1,6 @@
-package org.opensha2.etc;
+package gov.usgs.earthquake.nshmp.etc;
-import static org.opensha2.internal.TextUtils.NEWLINE;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import java.util.Arrays;
@@ -10,7 +10,7 @@ public class HazMatSpectrum {
public double[] periods;
public double[] means;
public double[] sigmas;
-
+
@Override
public String toString() {
return new StringBuilder("HazMatSpectrum: ")
diff --git a/src/org/opensha2/etc/ParentLastURLClassLoader.java b/src/gov/usgs/earthquake/nshmp/etc/ParentLastURLClassLoader.java
similarity index 98%
rename from src/org/opensha2/etc/ParentLastURLClassLoader.java
rename to src/gov/usgs/earthquake/nshmp/etc/ParentLastURLClassLoader.java
index 4e4feebc10becfc6b24a63bee427dec2debe3e63..91cc441601b33dbafb7971eb809b5aff8b72bb9c 100644
--- a/src/org/opensha2/etc/ParentLastURLClassLoader.java
+++ b/src/gov/usgs/earthquake/nshmp/etc/ParentLastURLClassLoader.java
@@ -1,4 +1,4 @@
-package org.opensha2.etc;
+package gov.usgs.earthquake.nshmp.etc;
import java.net.URL;
import java.net.URLClassLoader;
diff --git a/src/org/opensha2/function/AbstractDiscretizedFunc.java b/src/gov/usgs/earthquake/nshmp/function/AbstractDiscretizedFunc.java
similarity index 99%
rename from src/org/opensha2/function/AbstractDiscretizedFunc.java
rename to src/gov/usgs/earthquake/nshmp/function/AbstractDiscretizedFunc.java
index 41a81163077ab66a0cab46981cacaae4aee58c23..09afc0112a5d93f9f592e0f2208011a409529205 100644
--- a/src/org/opensha2/function/AbstractDiscretizedFunc.java
+++ b/src/gov/usgs/earthquake/nshmp/function/AbstractDiscretizedFunc.java
@@ -1,4 +1,4 @@
-package org.opensha2.function;
+package gov.usgs.earthquake.nshmp.function;
import static com.google.common.base.Preconditions.checkArgument;
diff --git a/src/org/opensha2/function/AbstractXY_DataSet.java b/src/gov/usgs/earthquake/nshmp/function/AbstractXY_DataSet.java
similarity index 99%
rename from src/org/opensha2/function/AbstractXY_DataSet.java
rename to src/gov/usgs/earthquake/nshmp/function/AbstractXY_DataSet.java
index 2ccc264f8582415f5bd4360a3a2fd5b3b843b6c2..1379a6bdff5a50973034430edc12e04308a2bb6e 100644
--- a/src/org/opensha2/function/AbstractXY_DataSet.java
+++ b/src/gov/usgs/earthquake/nshmp/function/AbstractXY_DataSet.java
@@ -1,4 +1,4 @@
-package org.opensha2.function;
+package gov.usgs.earthquake.nshmp.function;
import java.awt.geom.Point2D;
import java.util.AbstractList;
diff --git a/src/org/opensha2/function/ArbitrarilyDiscretizedFunc.java b/src/gov/usgs/earthquake/nshmp/function/ArbitrarilyDiscretizedFunc.java
similarity index 99%
rename from src/org/opensha2/function/ArbitrarilyDiscretizedFunc.java
rename to src/gov/usgs/earthquake/nshmp/function/ArbitrarilyDiscretizedFunc.java
index e874800ed57cc2d3ce589d374b1384b734169f17..07cf9bfe7a1f0c0e74ec3f4704609ff450e6706a 100644
--- a/src/org/opensha2/function/ArbitrarilyDiscretizedFunc.java
+++ b/src/gov/usgs/earthquake/nshmp/function/ArbitrarilyDiscretizedFunc.java
@@ -1,4 +1,4 @@
-package org.opensha2.function;
+package gov.usgs.earthquake.nshmp.function;
import static com.google.common.base.Preconditions.checkArgument;
diff --git a/src/org/opensha2/function/DiscretizedFunc.java b/src/gov/usgs/earthquake/nshmp/function/DiscretizedFunc.java
similarity index 99%
rename from src/org/opensha2/function/DiscretizedFunc.java
rename to src/gov/usgs/earthquake/nshmp/function/DiscretizedFunc.java
index e3a276f6eccdac1404f817438062b382682c45ab..795c4b22edc9210a24081ba22b3e8977b2498820 100644
--- a/src/org/opensha2/function/DiscretizedFunc.java
+++ b/src/gov/usgs/earthquake/nshmp/function/DiscretizedFunc.java
@@ -1,4 +1,4 @@
-package org.opensha2.function;
+package gov.usgs.earthquake.nshmp.function;
import java.awt.geom.Point2D;
diff --git a/src/org/opensha2/function/EvenlyDiscretizedFunc.java b/src/gov/usgs/earthquake/nshmp/function/EvenlyDiscretizedFunc.java
similarity index 99%
rename from src/org/opensha2/function/EvenlyDiscretizedFunc.java
rename to src/gov/usgs/earthquake/nshmp/function/EvenlyDiscretizedFunc.java
index b6ebabdb2d76134b5ad20ab6215103d6f3ed3b76..1a9da0a5b007c4efedc032ea83ce7b1569c2e324 100644
--- a/src/org/opensha2/function/EvenlyDiscretizedFunc.java
+++ b/src/gov/usgs/earthquake/nshmp/function/EvenlyDiscretizedFunc.java
@@ -1,4 +1,4 @@
-package org.opensha2.function;
+package gov.usgs.earthquake.nshmp.function;
import static com.google.common.base.Preconditions.checkArgument;
diff --git a/src/org/opensha2/function/Point2DComparator.java b/src/gov/usgs/earthquake/nshmp/function/Point2DComparator.java
similarity index 95%
rename from src/org/opensha2/function/Point2DComparator.java
rename to src/gov/usgs/earthquake/nshmp/function/Point2DComparator.java
index 94b234b03d14a1dc1082a8a0206fe1f434991920..a761979835581fca2697b84d6fdecda6a1a7713c 100644
--- a/src/org/opensha2/function/Point2DComparator.java
+++ b/src/gov/usgs/earthquake/nshmp/function/Point2DComparator.java
@@ -1,4 +1,4 @@
-package org.opensha2.function;
+package gov.usgs.earthquake.nshmp.function;
import java.awt.geom.Point2D;
import java.util.Comparator;
diff --git a/src/org/opensha2/function/Point2DToleranceComparator.java b/src/gov/usgs/earthquake/nshmp/function/Point2DToleranceComparator.java
similarity index 99%
rename from src/org/opensha2/function/Point2DToleranceComparator.java
rename to src/gov/usgs/earthquake/nshmp/function/Point2DToleranceComparator.java
index 4dd014a7f6b9a3274fe74ca4fac87bd8780b157b..cd710c6ff2f2378e64ddb099f136d26f301f0702 100644
--- a/src/org/opensha2/function/Point2DToleranceComparator.java
+++ b/src/gov/usgs/earthquake/nshmp/function/Point2DToleranceComparator.java
@@ -1,4 +1,4 @@
-package org.opensha2.function;
+package gov.usgs.earthquake.nshmp.function;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
diff --git a/src/org/opensha2/function/Point2DToleranceSortedArrayList.java b/src/gov/usgs/earthquake/nshmp/function/Point2DToleranceSortedArrayList.java
similarity index 93%
rename from src/org/opensha2/function/Point2DToleranceSortedArrayList.java
rename to src/gov/usgs/earthquake/nshmp/function/Point2DToleranceSortedArrayList.java
index ebc8ed62582606c7ad12078b44de88f480d555a4..2899984a9ce39c76950aa532fbc30fb9ea376d6f 100644
--- a/src/org/opensha2/function/Point2DToleranceSortedArrayList.java
+++ b/src/gov/usgs/earthquake/nshmp/function/Point2DToleranceSortedArrayList.java
@@ -1,4 +1,4 @@
-package org.opensha2.function;
+package gov.usgs.earthquake.nshmp.function;
import java.awt.geom.Point2D;
import java.util.ArrayList;
diff --git a/src/org/opensha2/function/Point2DToleranceSortedList.java b/src/gov/usgs/earthquake/nshmp/function/Point2DToleranceSortedList.java
similarity index 89%
rename from src/org/opensha2/function/Point2DToleranceSortedList.java
rename to src/gov/usgs/earthquake/nshmp/function/Point2DToleranceSortedList.java
index d6aef6c914244f3602563a4cf734f2e21f186424..0b0a9a9c16e2ee11fcc80dca811a6f508a794377 100644
--- a/src/org/opensha2/function/Point2DToleranceSortedList.java
+++ b/src/gov/usgs/earthquake/nshmp/function/Point2DToleranceSortedList.java
@@ -1,4 +1,4 @@
-package org.opensha2.function;
+package gov.usgs.earthquake.nshmp.function;
import java.awt.geom.Point2D;
import java.util.Collection;
diff --git a/src/org/opensha2/function/XY_DataSet.java b/src/gov/usgs/earthquake/nshmp/function/XY_DataSet.java
similarity index 98%
rename from src/org/opensha2/function/XY_DataSet.java
rename to src/gov/usgs/earthquake/nshmp/function/XY_DataSet.java
index b198ce66437c8f803d15dd3992e1d7d97f6903d9..6b272893030271ba067be347b243ab7741ba0cb2 100644
--- a/src/org/opensha2/function/XY_DataSet.java
+++ b/src/gov/usgs/earthquake/nshmp/function/XY_DataSet.java
@@ -1,12 +1,12 @@
-package org.opensha2.function;
-
-import org.opensha2.util.Named;
+package gov.usgs.earthquake.nshmp.function;
import java.awt.geom.Point2D;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.util.Named;
+
/**
* A wrapper for 2D double-valued data that provides access to data points via
* {@link Point2D}s.
diff --git a/src/gov/usgs/earthquake/nshmp/function/package-info.java b/src/gov/usgs/earthquake/nshmp/function/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..96459d09fb8ced5fc7d248207a036dd0ad0c486d
--- /dev/null
+++ b/src/gov/usgs/earthquake/nshmp/function/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * <i>Slated for deprecation.</i>
+ */
+package gov.usgs.earthquake.nshmp.function;
diff --git a/src/org/opensha2/gcim/ImCorrelation.java b/src/gov/usgs/earthquake/nshmp/gcim/ImCorrelation.java
similarity index 96%
rename from src/org/opensha2/gcim/ImCorrelation.java
rename to src/gov/usgs/earthquake/nshmp/gcim/ImCorrelation.java
index ad07943713080366d2f5a68b61170addd43f0815..61d850920960d3689418452d56630b18c4eb00c4 100644
--- a/src/org/opensha2/gcim/ImCorrelation.java
+++ b/src/gov/usgs/earthquake/nshmp/gcim/ImCorrelation.java
@@ -1,4 +1,4 @@
-package org.opensha2.gcim;
+package gov.usgs.earthquake.nshmp.gcim;
import static com.google.common.base.Preconditions.checkArgument;
import static java.lang.Math.PI;
@@ -9,7 +9,7 @@ import static java.lang.Math.max;
import static java.lang.Math.min;
import static java.lang.Math.sqrt;
-import org.opensha2.gmm.Imt;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
/**
* Add comments here
diff --git a/src/org/opensha2/geo/BorderType.java b/src/gov/usgs/earthquake/nshmp/geo/BorderType.java
similarity index 95%
rename from src/org/opensha2/geo/BorderType.java
rename to src/gov/usgs/earthquake/nshmp/geo/BorderType.java
index 2b33f3f10a98ab5360970afe3161eecbd9c3138b..6769b5fc52b4916f75ae3256f202841155f1286a 100644
--- a/src/org/opensha2/geo/BorderType.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/BorderType.java
@@ -1,4 +1,4 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
/**
* A {@code BorderType} specifies how lines connecting two points on the earth's
diff --git a/src/org/opensha2/geo/Bounds.java b/src/gov/usgs/earthquake/nshmp/geo/Bounds.java
similarity index 98%
rename from src/org/opensha2/geo/Bounds.java
rename to src/gov/usgs/earthquake/nshmp/geo/Bounds.java
index 3d65c842755b5288d43443597fc7a137a7a0cd9e..6cefdcb14594ffdd7fdecebd888d1fcda2fc4a17 100644
--- a/src/org/opensha2/geo/Bounds.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/Bounds.java
@@ -1,4 +1,4 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
import java.util.Arrays;
import java.util.Objects;
diff --git a/src/org/opensha2/geo/Coordinates.java b/src/gov/usgs/earthquake/nshmp/geo/Coordinates.java
similarity index 97%
rename from src/org/opensha2/geo/Coordinates.java
rename to src/gov/usgs/earthquake/nshmp/geo/Coordinates.java
index 51f5389e1ba4f04ae345ee512354aa9af04b1476..6d1119738b6f538552db0a09733f9cf03c6e15d1 100644
--- a/src/org/opensha2/geo/Coordinates.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/Coordinates.java
@@ -1,11 +1,11 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
-import static org.opensha2.data.Data.checkInRange;
-
-import org.opensha2.util.Maths;
+import static gov.usgs.earthquake.nshmp.data.Data.checkInRange;
import com.google.common.collect.Range;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Constants and utility methods pertaining to geographic coordinates.
*
diff --git a/src/org/opensha2/geo/Direction.java b/src/gov/usgs/earthquake/nshmp/geo/Direction.java
similarity index 94%
rename from src/org/opensha2/geo/Direction.java
rename to src/gov/usgs/earthquake/nshmp/geo/Direction.java
index c42e0d23862b1a6ede2e02cb228f196d088568ec..deccc5bcc345b0bd9ea1c9e53d20056a57ac3a6c 100644
--- a/src/org/opensha2/geo/Direction.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/Direction.java
@@ -1,7 +1,7 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
-import org.opensha2.internal.Parsing;
-import org.opensha2.util.Maths;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.util.Maths;
/**
* Identifiers for basic geographic directions.
diff --git a/src/org/opensha2/geo/GriddedRegion.java b/src/gov/usgs/earthquake/nshmp/geo/GriddedRegion.java
similarity index 99%
rename from src/org/opensha2/geo/GriddedRegion.java
rename to src/gov/usgs/earthquake/nshmp/geo/GriddedRegion.java
index 12a8906d9f623d167fa3ed99f067413c29bd169c..dad1892c725e111eee381f71d666de2cf7399666 100644
--- a/src/org/opensha2/geo/GriddedRegion.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/GriddedRegion.java
@@ -1,10 +1,8 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import org.opensha2.util.Maths;
-
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
import com.google.common.collect.Range;
@@ -16,6 +14,8 @@ import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* <img style="padding: 30px 40px; float: right;" src="
* {@docRoot}/resources/gridded_regions_border.jpg"/>A {@code GriddedRegion} is
diff --git a/src/org/opensha2/geo/Location.java b/src/gov/usgs/earthquake/nshmp/geo/Location.java
similarity index 93%
rename from src/org/opensha2/geo/Location.java
rename to src/gov/usgs/earthquake/nshmp/geo/Location.java
index a049fb87356b08b186adeab80bd0082f59e51ed8..1ef0a85191ac4d16d652f42475973bcbfebbdd68 100644
--- a/src/org/opensha2/geo/Location.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/Location.java
@@ -1,14 +1,9 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
import static com.google.common.base.Preconditions.checkNotNull;
-
-import static org.opensha2.eq.Earthquakes.checkDepth;
-import static org.opensha2.geo.Coordinates.checkLatitude;
-import static org.opensha2.geo.Coordinates.checkLongitude;
-
-import org.opensha2.internal.Parsing;
-import org.opensha2.internal.Parsing.Delimiter;
-import org.opensha2.util.Maths;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.checkDepth;
+import static gov.usgs.earthquake.nshmp.geo.Coordinates.checkLatitude;
+import static gov.usgs.earthquake.nshmp.geo.Coordinates.checkLongitude;
import com.google.common.base.Converter;
import com.google.common.collect.FluentIterable;
@@ -17,6 +12,10 @@ import com.google.common.primitives.Doubles;
import java.util.List;
import java.util.Objects;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing.Delimiter;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* A {@code Location} represents a point with reference to the earth's
* ellipsoid. It is expressed in terms of latitude, longitude, and depth. As in
diff --git a/src/org/opensha2/geo/LocationGrid.java b/src/gov/usgs/earthquake/nshmp/geo/LocationGrid.java
similarity index 99%
rename from src/org/opensha2/geo/LocationGrid.java
rename to src/gov/usgs/earthquake/nshmp/geo/LocationGrid.java
index f80280820133514b9e04a09cce8c34ca455a5de1..0d76b3ee07f0a062c80a6859981a4d7053814b06 100644
--- a/src/org/opensha2/geo/LocationGrid.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/LocationGrid.java
@@ -1,12 +1,11 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkElementIndex;
import static com.google.common.base.Preconditions.checkPositionIndex;
import static com.google.common.base.Preconditions.checkState;
import static com.google.common.base.Strings.padStart;
-
-import static org.opensha2.internal.TextUtils.NEWLINE;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import com.google.common.collect.ArrayTable;
import com.google.common.collect.ContiguousSet;
diff --git a/src/org/opensha2/geo/LocationList.java b/src/gov/usgs/earthquake/nshmp/geo/LocationList.java
similarity index 98%
rename from src/org/opensha2/geo/LocationList.java
rename to src/gov/usgs/earthquake/nshmp/geo/LocationList.java
index eb968bd5936b9ff989af02f15c007b578d432c0c..f5f9738bcd955d578103cb8a722440e68b666232 100644
--- a/src/org/opensha2/geo/LocationList.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/LocationList.java
@@ -1,13 +1,9 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.internal.Parsing;
-import org.opensha2.internal.Parsing.Delimiter;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
@@ -21,6 +17,9 @@ import com.google.common.primitives.Doubles;
import java.util.Iterator;
import java.util.List;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing.Delimiter;
+
/**
* An immutable, ordered collection of {@link Location}s.
*
diff --git a/src/org/opensha2/geo/LocationVector.java b/src/gov/usgs/earthquake/nshmp/geo/LocationVector.java
similarity index 94%
rename from src/org/opensha2/geo/LocationVector.java
rename to src/gov/usgs/earthquake/nshmp/geo/LocationVector.java
index 45425b790ccb30632724ec03ac9812c20d0a2f55..89a6c844d3758b55b56c294e3ce76e12efc5b922 100644
--- a/src/org/opensha2/geo/LocationVector.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/LocationVector.java
@@ -1,10 +1,10 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
-import static org.opensha2.geo.Locations.azimuthRad;
-import static org.opensha2.geo.Locations.horzDistance;
-import static org.opensha2.geo.Locations.vertDistance;
+import static gov.usgs.earthquake.nshmp.geo.Locations.azimuthRad;
+import static gov.usgs.earthquake.nshmp.geo.Locations.horzDistance;
+import static gov.usgs.earthquake.nshmp.geo.Locations.vertDistance;
-import org.opensha2.util.Maths;
+import gov.usgs.earthquake.nshmp.util.Maths;
/**
* This class encapsulates information describing a vector between two
diff --git a/src/org/opensha2/geo/Locations.java b/src/gov/usgs/earthquake/nshmp/geo/Locations.java
similarity index 98%
rename from src/org/opensha2/geo/Locations.java
rename to src/gov/usgs/earthquake/nshmp/geo/Locations.java
index a11f60db1b6148eccdbf6135bbdaded67f920a63..472d9fa5b4706ad46c8f5aa73277e330df0034a6 100644
--- a/src/org/opensha2/geo/Locations.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/Locations.java
@@ -1,7 +1,12 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.math.DoubleMath.fuzzyEquals;
+import static gov.usgs.earthquake.nshmp.geo.Coordinates.EARTH_RADIUS_MEAN;
+import static gov.usgs.earthquake.nshmp.geo.Coordinates.LAT_RANGE;
+import static gov.usgs.earthquake.nshmp.geo.Coordinates.LON_RANGE;
+import static gov.usgs.earthquake.nshmp.geo.Coordinates.degreesLatPerKm;
+import static gov.usgs.earthquake.nshmp.geo.Coordinates.degreesLonPerKm;
import static java.lang.Math.PI;
import static java.lang.Math.abs;
import static java.lang.Math.acos;
@@ -13,20 +18,14 @@ import static java.lang.Math.min;
import static java.lang.Math.sin;
import static java.lang.Math.sqrt;
-import static org.opensha2.geo.Coordinates.EARTH_RADIUS_MEAN;
-import static org.opensha2.geo.Coordinates.LAT_RANGE;
-import static org.opensha2.geo.Coordinates.LON_RANGE;
-import static org.opensha2.geo.Coordinates.degreesLatPerKm;
-import static org.opensha2.geo.Coordinates.degreesLonPerKm;
-
-import org.opensha2.util.Maths;
-
import com.google.common.base.Predicate;
import java.awt.geom.Line2D;
import java.awt.geom.Path2D;
import java.awt.geom.Rectangle2D;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Static utility methods to operate on geographic {@code Location} data.
*
diff --git a/src/org/opensha2/geo/Region.java b/src/gov/usgs/earthquake/nshmp/geo/Region.java
similarity index 98%
rename from src/org/opensha2/geo/Region.java
rename to src/gov/usgs/earthquake/nshmp/geo/Region.java
index 775f2bd41375e587e38f9d227592b0dc68054617..dfdf3ff33526e7e788baff0b30af9fc7076e4585 100644
--- a/src/org/opensha2/geo/Region.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/Region.java
@@ -1,14 +1,9 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-
-import static org.opensha2.geo.BorderType.GREAT_CIRCLE;
-import static org.opensha2.geo.BorderType.MERCATOR_LINEAR;
-
-import org.opensha2.data.Data;
-import org.opensha2.util.Maths;
-import org.opensha2.util.Named;
+import static gov.usgs.earthquake.nshmp.geo.BorderType.GREAT_CIRCLE;
+import static gov.usgs.earthquake.nshmp.geo.BorderType.MERCATOR_LINEAR;
import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
@@ -23,6 +18,10 @@ import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.util.Maths;
+import gov.usgs.earthquake.nshmp.util.Named;
+
/**
* A {@code Region} is a polygonal area on the surface of the earth. The
* vertices comprising the border of each {@code Region} are stored internally
diff --git a/src/org/opensha2/geo/RegionUtils.java b/src/gov/usgs/earthquake/nshmp/geo/RegionUtils.java
similarity index 99%
rename from src/org/opensha2/geo/RegionUtils.java
rename to src/gov/usgs/earthquake/nshmp/geo/RegionUtils.java
index f1a7bdbaf210cb5ce37e6d5b45581ba843d43569..ee13b8af68f40220b36d3c3b701236e0b42d8439 100644
--- a/src/org/opensha2/geo/RegionUtils.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/RegionUtils.java
@@ -1,6 +1,4 @@
-package org.opensha2.geo;
-
-import org.opensha2.eq.fault.surface.GriddedSurface;
+package gov.usgs.earthquake.nshmp.geo;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -23,6 +21,8 @@ import javax.xml.transform.TransformerFactory;
import javax.xml.transform.dom.DOMSource;
import javax.xml.transform.stream.StreamResult;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.GriddedSurface;
+
/**
* Region export utilities.
*
diff --git a/src/org/opensha2/geo/Regions.java b/src/gov/usgs/earthquake/nshmp/geo/Regions.java
similarity index 99%
rename from src/org/opensha2/geo/Regions.java
rename to src/gov/usgs/earthquake/nshmp/geo/Regions.java
index 5fae351f705f88d0803cb6468ae4148d443cfde6..0b81efc96df515f93626bc5acfc1601e77dd2a3e 100644
--- a/src/org/opensha2/geo/Regions.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/Regions.java
@@ -1,8 +1,7 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
import static com.google.common.base.Preconditions.checkNotNull;
-
-import static org.opensha2.geo.BorderType.MERCATOR_LINEAR;
+import static gov.usgs.earthquake.nshmp.geo.BorderType.MERCATOR_LINEAR;
import java.awt.Shape;
diff --git a/src/org/opensha2/geo/package-info.java b/src/gov/usgs/earthquake/nshmp/geo/package-info.java
similarity index 60%
rename from src/org/opensha2/geo/package-info.java
rename to src/gov/usgs/earthquake/nshmp/geo/package-info.java
index 3612f38e420205a2f42212a9a2f64535adbecb65..f894fe4e63ff1b496821b2823fa160a04cdad1a0 100644
--- a/src/org/opensha2/geo/package-info.java
+++ b/src/gov/usgs/earthquake/nshmp/geo/package-info.java
@@ -7,13 +7,13 @@
* <p>Note that while the objects and methods of this package produce reliable
* results for most regions of the globe, situations may arise in which users
* encounter unexpected behaviour and results. For instance, the 'fast'
- * algorithms in {@link org.opensha2.geo.Locations} (e.g.
- * {@link org.opensha2.geo.Locations#horzDistanceFast(Location, Location)}) will
- * not produce accurate results when used in close proximity to the poles or
- * when locations span the antimeridian (the -180° +180° transition). In such
+ * algorithms in {@link gov.usgs.earthquake.nshmp.geo.Locations} (e.g.
+ * {@link gov.usgs.earthquake.nshmp.geo.Locations#horzDistanceFast(Location, Location)}
+ * ) will not produce accurate results when used in close proximity to the poles
+ * or when locations span the antimeridian (the -180° +180° transition). In such
* cases, users should consider substituting slower, but more accurate
* algorithms. In the latter case, one could alternatively opt to use locations
* referenced to 0° to 360° instead. Exceptional behavior is well documented in
- * the {@link org.opensha2.geo.Locations} class.
+ * the {@link gov.usgs.earthquake.nshmp.geo.Locations} class.
*/
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
diff --git a/src/org/opensha2/gmm/AbrahamsonEtAl_2014.java b/src/gov/usgs/earthquake/nshmp/gmm/AbrahamsonEtAl_2014.java
similarity index 92%
rename from src/org/opensha2/gmm/AbrahamsonEtAl_2014.java
rename to src/gov/usgs/earthquake/nshmp/gmm/AbrahamsonEtAl_2014.java
index c48020975d8fc0280f76009090c4c6b883bd5db2..aee9d1164ef87933a345de99e58552fbaecd3f16 100644
--- a/src/org/opensha2/gmm/AbrahamsonEtAl_2014.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/AbrahamsonEtAl_2014.java
@@ -1,31 +1,30 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.NORMAL;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.DIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VSINF;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.WIDTH;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.Z1P0;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
import static java.lang.Math.cos;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.pow;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.FaultStyle.NORMAL;
-import static org.opensha2.gmm.GmmInput.Field.DIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.VSINF;
-import static org.opensha2.gmm.GmmInput.Field.WIDTH;
-import static org.opensha2.gmm.GmmInput.Field.Z1P0;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-
-import org.opensha2.data.Interpolate;
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-import org.opensha2.util.Maths;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.data.Interpolate;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Implementation of the Abrahamson, Silva & Kamai (2014) next generation ground
* motion model for active crustal regions developed as part of <a
diff --git a/src/org/opensha2/gmm/AbrahamsonSilva_1997.java b/src/gov/usgs/earthquake/nshmp/gmm/AbrahamsonSilva_1997.java
similarity index 89%
rename from src/org/opensha2/gmm/AbrahamsonSilva_1997.java
rename to src/gov/usgs/earthquake/nshmp/gmm/AbrahamsonSilva_1997.java
index c11c1c69ee104ee8b859eb064247f00cf82846b2..8ed2060b20a6405ce27a6eb9bf48c204256ef3f8 100755
--- a/src/org/opensha2/gmm/AbrahamsonSilva_1997.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/AbrahamsonSilva_1997.java
@@ -1,22 +1,21 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.DIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
import static java.lang.Math.log;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.GmmInput.Field.DIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the Abrahamson & Silva (1997) ground motion model for
* shallow earthquakes in active continental crust. In keeping with prior NSHMP
diff --git a/src/org/opensha2/gmm/AtkinsonBoore_2003.java b/src/gov/usgs/earthquake/nshmp/gmm/AtkinsonBoore_2003.java
similarity index 94%
rename from src/org/opensha2/gmm/AtkinsonBoore_2003.java
rename to src/gov/usgs/earthquake/nshmp/gmm/AtkinsonBoore_2003.java
index 8d2956fb22fde9cf0ca3218c8b3941383ff0fdc5..f682b94bd6a07eb70748da60353e9bda1952ed2a 100644
--- a/src/org/opensha2/gmm/AtkinsonBoore_2003.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/AtkinsonBoore_2003.java
@@ -1,23 +1,22 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.BASE_10_TO_E;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.LN_G_CM_TO_M;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
import static java.lang.Math.log10;
import static java.lang.Math.pow;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-import static org.opensha2.gmm.GmmUtils.BASE_10_TO_E;
-import static org.opensha2.gmm.GmmUtils.LN_G_CM_TO_M;
-import static org.opensha2.gmm.Imt.PGA;
-
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Abstract implementation of the subduction ground motion model by Atkinson &
* Boore (2003). This implementation matches that used in the 2008 USGS NSHM.
diff --git a/src/org/opensha2/gmm/AtkinsonBoore_2006.java b/src/gov/usgs/earthquake/nshmp/gmm/AtkinsonBoore_2006.java
similarity index 94%
rename from src/org/opensha2/gmm/AtkinsonBoore_2006.java
rename to src/gov/usgs/earthquake/nshmp/gmm/AtkinsonBoore_2006.java
index b780c5440111b1bd80ec85a748d3c87a09e7380b..21033c3313ee303a3b00b7c3155616174485bd4f 100644
--- a/src/org/opensha2/gmm/AtkinsonBoore_2006.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/AtkinsonBoore_2006.java
@@ -1,25 +1,24 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static com.google.common.base.Preconditions.checkArgument;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.BASE_10_TO_E;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.MagConverter.NONE;
+import static gov.usgs.earthquake.nshmp.gmm.SiteClass.SOFT_ROCK;
import static java.lang.Math.log;
import static java.lang.Math.log10;
import static java.lang.Math.max;
import static java.lang.Math.min;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmUtils.BASE_10_TO_E;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.MagConverter.NONE;
-import static org.opensha2.gmm.SiteClass.SOFT_ROCK;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Abstract implementation of the ground motion model for stable continental
* regions by Atkinson & Boore (2006). This implementation matches that used in
diff --git a/src/org/opensha2/gmm/AtkinsonBoore_2006p.java b/src/gov/usgs/earthquake/nshmp/gmm/AtkinsonBoore_2006p.java
similarity index 83%
rename from src/org/opensha2/gmm/AtkinsonBoore_2006p.java
rename to src/gov/usgs/earthquake/nshmp/gmm/AtkinsonBoore_2006p.java
index c783a39fb3e7290697c999c7e714bdb53fec633c..242972f3890323b88fa32c477d6f92e4c920888b 100644
--- a/src/org/opensha2/gmm/AtkinsonBoore_2006p.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/AtkinsonBoore_2006p.java
@@ -1,16 +1,16 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmUtils.BASE_10_TO_E;
-import static org.opensha2.gmm.GmmUtils.atkinsonTableValue;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-import org.opensha2.gmm.GroundMotionTables.GroundMotionTable;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.BASE_10_TO_E;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.atkinsonTableValue;
import com.google.common.collect.Range;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionTables.GroundMotionTable;
+
/**
* Modified form of the relationship for the Central and Eastern US by Atkinson
* & Boore (2006). This implementation matches that used in the 2014 USGS NSHMP,
diff --git a/src/org/opensha2/gmm/AtkinsonMacias_2009.java b/src/gov/usgs/earthquake/nshmp/gmm/AtkinsonMacias_2009.java
similarity index 84%
rename from src/org/opensha2/gmm/AtkinsonMacias_2009.java
rename to src/gov/usgs/earthquake/nshmp/gmm/AtkinsonMacias_2009.java
index fcb3bc926c0e8422f808a376298f70ce5c471b30..cfec610ff83318bf054c466e38c3765339060c25 100644
--- a/src/org/opensha2/gmm/AtkinsonMacias_2009.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/AtkinsonMacias_2009.java
@@ -1,21 +1,20 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.BASE_10_TO_E;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.LN_G_CM_TO_M;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.util.Maths.hypot;
import static java.lang.Math.log10;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmUtils.BASE_10_TO_E;
-import static org.opensha2.gmm.GmmUtils.LN_G_CM_TO_M;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.util.Maths.hypot;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the subduction interface ground motion model by Atkinson &
* Macias (2009). This implementation matches that used in the 2014 USGS NSHMP.
@@ -42,11 +41,10 @@ import java.util.Map;
* @see Gmm#AM_09_INTER
*/
public final class AtkinsonMacias_2009 implements GroundMotionModel {
-
+
/*
- * TODO 0.75s interpolated period coefficients added that should
- * be removed if a viable on-the-fly interpolation algorithm is
- * added.
+ * TODO 0.75s interpolated period coefficients added that should be removed if
+ * a viable on-the-fly interpolation algorithm is added.
*/
static final String NAME = "Atkinson & Macias (2009): Interface";
diff --git a/src/org/opensha2/gmm/Atkinson_2008p.java b/src/gov/usgs/earthquake/nshmp/gmm/Atkinson_2008p.java
similarity index 82%
rename from src/org/opensha2/gmm/Atkinson_2008p.java
rename to src/gov/usgs/earthquake/nshmp/gmm/Atkinson_2008p.java
index ea0f923d2deae752efb5b592a2ae34eaa6400109..6d590735529f0a35af3db5fe7b9076a34fd797f0 100644
--- a/src/org/opensha2/gmm/Atkinson_2008p.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/Atkinson_2008p.java
@@ -1,16 +1,16 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmUtils.BASE_10_TO_E;
-import static org.opensha2.gmm.GmmUtils.atkinsonTableValue;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-import org.opensha2.gmm.GroundMotionTables.GroundMotionTable;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.BASE_10_TO_E;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.atkinsonTableValue;
import com.google.common.collect.Range;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionTables.GroundMotionTable;
+
/**
* Modified form of the relationship for the Central and Eastern US by Atkinson
* (2008). This implementation matches that used in the 2014 USGS NSHMP and uses
diff --git a/src/org/opensha2/gmm/Atkinson_2010.java b/src/gov/usgs/earthquake/nshmp/gmm/Atkinson_2010.java
similarity index 79%
rename from src/org/opensha2/gmm/Atkinson_2010.java
rename to src/gov/usgs/earthquake/nshmp/gmm/Atkinson_2010.java
index e755451e69d397312245d8c8f23610283d7f2012..19719e673de3168b114b80616411b149b127349f 100644
--- a/src/org/opensha2/gmm/Atkinson_2010.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/Atkinson_2010.java
@@ -1,24 +1,23 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.DIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.WIDTH;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.BASE_10_TO_E;
import static java.lang.Math.log10;
import static java.lang.Math.max;
import static java.lang.Math.min;
-import static org.opensha2.gmm.GmmInput.Field.DIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.WIDTH;
-import static org.opensha2.gmm.GmmUtils.BASE_10_TO_E;
-
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.annotations.Beta;
import com.google.common.collect.Range;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the ground motion model by Atkinson (2010) for shallow and
* deep earthquake in Hawaii. This model applies a Hawaii specific correction
@@ -62,7 +61,7 @@ public final class Atkinson_2010 implements GroundMotionModel {
private final GroundMotionModel delegate;
private final double log10freq;
-
+
Atkinson_2010(final Imt imt) {
delegate = Gmm.BA_08.instance(imt);
log10freq = log10(imt.frequency());
@@ -73,7 +72,7 @@ public final class Atkinson_2010 implements GroundMotionModel {
double μ = delegate.calc(in).mean() + hiTerm(in.rJB, in.zTop);
return DefaultScalarGroundMotion.create(μ, σ);
}
-
+
private double hiTerm(double rJB, double zTop) {
double x1 = min(-0.18 + 0.17 * log10freq, 0.0);
double x0 = 0.2;
diff --git a/src/org/opensha2/gmm/Atkinson_2015.java b/src/gov/usgs/earthquake/nshmp/gmm/Atkinson_2015.java
similarity index 86%
rename from src/org/opensha2/gmm/Atkinson_2015.java
rename to src/gov/usgs/earthquake/nshmp/gmm/Atkinson_2015.java
index bcb32d7fa855c870b284969e0d331d32fd10dee4..dfa9e5d7ee846c63fd578755840db05eca6679e9 100644
--- a/src/org/opensha2/gmm/Atkinson_2015.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/Atkinson_2015.java
@@ -1,23 +1,22 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.BASE_10_TO_E;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.LN_G_CM_TO_M;
import static java.lang.Math.log10;
import static java.lang.Math.max;
import static java.lang.Math.pow;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmUtils.BASE_10_TO_E;
-import static org.opensha2.gmm.GmmUtils.LN_G_CM_TO_M;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.annotations.Beta;
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the ground motion model by Atkinson (2015) for induced
* seismicity.
diff --git a/src/org/opensha2/gmm/BcHydro_2012.java b/src/gov/usgs/earthquake/nshmp/gmm/BcHydro_2012.java
similarity index 92%
rename from src/org/opensha2/gmm/BcHydro_2012.java
rename to src/gov/usgs/earthquake/nshmp/gmm/BcHydro_2012.java
index c9e44e4381d0b5a0f323458cdb844ae3af8209ca..5d96e2b6b18af52299a6a8ee0cdf0c4b21a25cf8 100644
--- a/src/org/opensha2/gmm/BcHydro_2012.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/BcHydro_2012.java
@@ -1,23 +1,22 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.min;
import static java.lang.Math.pow;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-import static org.opensha2.gmm.Imt.PGA;
-
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Abstract implementation of the subduction ground motion model created for BC
* Hydro, Canada, by Addo, Abrahamson, & Youngs (2012). This implementation
diff --git a/src/org/opensha2/gmm/BooreAtkinsonSiteAmp.java b/src/gov/usgs/earthquake/nshmp/gmm/BooreAtkinsonSiteAmp.java
similarity index 99%
rename from src/org/opensha2/gmm/BooreAtkinsonSiteAmp.java
rename to src/gov/usgs/earthquake/nshmp/gmm/BooreAtkinsonSiteAmp.java
index 81bfc1c85d2977dc5d086d88b9a32e47fdbf15dd..a28a573aefc136e937201b4d6f83e83de2e1357d 100644
--- a/src/org/opensha2/gmm/BooreAtkinsonSiteAmp.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/BooreAtkinsonSiteAmp.java
@@ -1,4 +1,4 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static java.lang.Math.log;
diff --git a/src/org/opensha2/gmm/BooreAtkinson_2008.java b/src/gov/usgs/earthquake/nshmp/gmm/BooreAtkinson_2008.java
similarity index 87%
rename from src/org/opensha2/gmm/BooreAtkinson_2008.java
rename to src/gov/usgs/earthquake/nshmp/gmm/BooreAtkinson_2008.java
index 8b4ca2850917cfa322a600d384e734eb04aae52c..f5234a35140f44db57f62150c969189476b293e9 100644
--- a/src/org/opensha2/gmm/BooreAtkinson_2008.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/BooreAtkinson_2008.java
@@ -1,28 +1,27 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.NORMAL;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.STRIKE_SLIP;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.UNKNOWN;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.DIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.WIDTH;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
import static java.lang.Math.exp;
import static java.lang.Math.log;
-import static org.opensha2.gmm.FaultStyle.NORMAL;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.FaultStyle.STRIKE_SLIP;
-import static org.opensha2.gmm.FaultStyle.UNKNOWN;
-import static org.opensha2.gmm.GmmInput.Field.DIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.WIDTH;
-import static org.opensha2.gmm.Imt.PGA;
-
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the Boore & Atkinson (2008) next generation attenuation
* relationship for active crustal regions developed as part of <a
diff --git a/src/org/opensha2/gmm/BooreEtAl_1997.java b/src/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_1997.java
similarity index 85%
rename from src/org/opensha2/gmm/BooreEtAl_1997.java
rename to src/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_1997.java
index fa0b453d18550b3801562089fa48c1708f822c50..b9ebba069e1c5f6a3c64ded773d760d99a970782 100644
--- a/src/org/opensha2/gmm/BooreEtAl_1997.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_1997.java
@@ -1,22 +1,21 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.STRIKE_SLIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
import static java.lang.Math.log;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.FaultStyle.STRIKE_SLIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the Boore, Joyner & Fumal (1997) ground motion model for
* shallow earthquakes in active continental crust. In keeping with prior NSHMP
diff --git a/src/org/opensha2/gmm/BooreEtAl_2014.java b/src/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java
similarity index 91%
rename from src/org/opensha2/gmm/BooreEtAl_2014.java
rename to src/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java
index 1285785c97eebbf31b76dd3858cf4eaaa9470dab..c295f363c9e6157ee7dc770c8b48567db3081404 100644
--- a/src/org/opensha2/gmm/BooreEtAl_2014.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/BooreEtAl_2014.java
@@ -1,28 +1,27 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.NORMAL;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.STRIKE_SLIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.Z1P0;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.min;
import static java.lang.Math.pow;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.FaultStyle.NORMAL;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.FaultStyle.STRIKE_SLIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.Z1P0;
-import static org.opensha2.gmm.Imt.PGA;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the Boore, Stewart, Seyhan, & Atkinson (2014) next
* generation ground motion model for active crustal regions developed as part
diff --git a/src/org/opensha2/gmm/CampbellBozorgnia_2003.java b/src/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2003.java
similarity index 90%
rename from src/org/opensha2/gmm/CampbellBozorgnia_2003.java
rename to src/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2003.java
index d41e1ce03e8bb529f0201c32a7a169514e416a63..a4bab39897891e82be17147aedd3ec1e570948c5 100755
--- a/src/org/opensha2/gmm/CampbellBozorgnia_2003.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2003.java
@@ -1,24 +1,23 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.UNKNOWN;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.max;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.FaultStyle.UNKNOWN;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the Campbell & Bozorgnia (2003) ground motion model for
* shallow earthquakes in active continental crust. In keeping with prior NSHMP
diff --git a/src/org/opensha2/gmm/CampbellBozorgnia_2008.java b/src/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2008.java
similarity index 88%
rename from src/org/opensha2/gmm/CampbellBozorgnia_2008.java
rename to src/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2008.java
index 9da08e2d14281ef26ffecdb6ca852fadf523ecd7..403f457f24d236168b84d50dd1a8ff9cb9bb61ee 100644
--- a/src/org/opensha2/gmm/CampbellBozorgnia_2008.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2008.java
@@ -1,34 +1,33 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.NORMAL;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.DIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.Z2P5;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P01;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P25;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.max;
import static java.lang.Math.pow;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.FaultStyle.NORMAL;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.GmmInput.Field.DIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.Z2P5;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.Imt.SA0P01;
-import static org.opensha2.gmm.Imt.SA0P25;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.EnumSet;
import java.util.Map;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the Campbell & Bozorgnia (2008) next generation attenuation
* for active crustal regions relationship developed as part of <a
diff --git a/src/org/opensha2/gmm/CampbellBozorgnia_2014.java b/src/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2014.java
similarity index 91%
rename from src/org/opensha2/gmm/CampbellBozorgnia_2014.java
rename to src/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2014.java
index 1865db1b5fa146387ff51a3c90dbc1a15e3170a7..8e7f1fed31530fbf083706a37447586aba8ee268 100644
--- a/src/org/opensha2/gmm/CampbellBozorgnia_2014.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/CampbellBozorgnia_2014.java
@@ -1,5 +1,17 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.NORMAL;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.DIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.WIDTH;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.Z2P5;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZHYP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P01;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P25;
import static java.lang.Math.cos;
import static java.lang.Math.exp;
import static java.lang.Math.log;
@@ -7,30 +19,17 @@ import static java.lang.Math.max;
import static java.lang.Math.pow;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.FaultStyle.NORMAL;
-import static org.opensha2.gmm.GmmInput.Field.DIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.WIDTH;
-import static org.opensha2.gmm.GmmInput.Field.Z2P5;
-import static org.opensha2.gmm.GmmInput.Field.ZHYP;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.Imt.SA0P01;
-import static org.opensha2.gmm.Imt.SA0P25;
-
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-import org.opensha2.util.Maths;
-
import com.google.common.collect.Range;
import java.util.EnumSet;
import java.util.Map;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Implementation of the Campbell & Bozorgnia (2014) next generation ground
* motion model for active crustal regions developed as part of <a
diff --git a/src/org/opensha2/gmm/Campbell_1997.java b/src/gov/usgs/earthquake/nshmp/gmm/Campbell_1997.java
similarity index 85%
rename from src/org/opensha2/gmm/Campbell_1997.java
rename to src/gov/usgs/earthquake/nshmp/gmm/Campbell_1997.java
index 9bf6178a2a3663654fc1a7766e1417373c696496..e8a583baac0e4f2a586e137c486e06335458f466 100644
--- a/src/org/opensha2/gmm/Campbell_1997.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/Campbell_1997.java
@@ -1,27 +1,26 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.NORMAL;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.STRIKE_SLIP;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.UNKNOWN;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.max;
import static java.lang.Math.sqrt;
import static java.lang.Math.tanh;
-import static org.opensha2.gmm.FaultStyle.NORMAL;
-import static org.opensha2.gmm.FaultStyle.STRIKE_SLIP;
-import static org.opensha2.gmm.FaultStyle.UNKNOWN;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.Imt.PGA;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the Campbell (1997) ground motion model for worldwide
* earthquakes in active tectonic regions. In keeping with prior NSHMP
@@ -144,10 +143,10 @@ public class Campbell_1997 implements GroundMotionModel {
final double rSeis,
final double μPga) {
- return μPga + c.c1 +
- c.c2 * tanh(c.c3 * (Mw - 4.7)) +
- (c.c4 + (c.c5 * Mw)) * rSeis +
- (0.5 * c.c6) +
+ return μPga + c.c1 +
+ c.c2 * tanh(c.c3 * (Mw - 4.7)) +
+ (c.c4 + (c.c5 * Mw)) * rSeis +
+ (0.5 * c.c6) +
c.c7 * tanh(c.c8);
}
diff --git a/src/org/opensha2/gmm/Campbell_2003.java b/src/gov/usgs/earthquake/nshmp/gmm/Campbell_2003.java
similarity index 90%
rename from src/org/opensha2/gmm/Campbell_2003.java
rename to src/gov/usgs/earthquake/nshmp/gmm/Campbell_2003.java
index b93137c4e6219963cdf170bb3c94d764cfe17713..36675b3d3d05a95ad1e675abd68738b6c44aab39 100644
--- a/src/org/opensha2/gmm/Campbell_2003.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/Campbell_2003.java
@@ -1,21 +1,20 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.MagConverter.NONE;
+import static gov.usgs.earthquake.nshmp.gmm.SiteClass.HARD_ROCK;
import static java.lang.Math.log;
import static java.lang.Math.pow;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.MagConverter.NONE;
-import static org.opensha2.gmm.SiteClass.HARD_ROCK;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the hybrid ground motion model for stable continental
* regions by Campbell (2003). This implementation matches that used in the 2008
diff --git a/src/org/opensha2/gmm/CeusMb.java b/src/gov/usgs/earthquake/nshmp/gmm/CeusMb.java
similarity index 95%
rename from src/org/opensha2/gmm/CeusMb.java
rename to src/gov/usgs/earthquake/nshmp/gmm/CeusMb.java
index dbe35326a508a87669b32501f25f1d7fb483b20f..648574f00a5b84f20d2e414b77e8d28c103239f9 100644
--- a/src/org/opensha2/gmm/CeusMb.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/CeusMb.java
@@ -1,7 +1,7 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import static org.opensha2.gmm.MagConverter.MB_TO_MW_ATKIN_BOORE;
-import static org.opensha2.gmm.MagConverter.MB_TO_MW_JOHNSTON;
+import static gov.usgs.earthquake.nshmp.gmm.MagConverter.MB_TO_MW_ATKIN_BOORE;
+import static gov.usgs.earthquake.nshmp.gmm.MagConverter.MB_TO_MW_JOHNSTON;
/**
* Wrapper class for CEUS Gmm flavors that do magnitude conversions from
diff --git a/src/org/opensha2/gmm/ChiouYoungs_2008.java b/src/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2008.java
similarity index 90%
rename from src/org/opensha2/gmm/ChiouYoungs_2008.java
rename to src/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2008.java
index f4cdc903752f08513fbe6ff9e4ae599d8f251e93..0cfcc10cda3cf7616b24cb027083fc1affe06a77 100644
--- a/src/org/opensha2/gmm/ChiouYoungs_2008.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2008.java
@@ -1,5 +1,13 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.NORMAL;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.DIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.Z1P0;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
import static java.lang.Math.abs;
import static java.lang.Math.cos;
import static java.lang.Math.cosh;
@@ -11,23 +19,14 @@ import static java.lang.Math.pow;
import static java.lang.Math.sqrt;
import static java.lang.Math.tanh;
-import static org.opensha2.gmm.FaultStyle.NORMAL;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.GmmInput.Field.DIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.Z1P0;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-import org.opensha2.util.Maths;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Implementation of the Chiou & Youngs (2008) next generation attenuation
* relationship for active crustal regions developed as part of <a
diff --git a/src/org/opensha2/gmm/ChiouYoungs_2014.java b/src/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2014.java
similarity index 92%
rename from src/org/opensha2/gmm/ChiouYoungs_2014.java
rename to src/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2014.java
index 3a7f67065a81d0d634943cf0cf31446045980f86..0b7eb907ea21f2d38ed351c62c7e166b62563976 100644
--- a/src/org/opensha2/gmm/ChiouYoungs_2014.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/ChiouYoungs_2014.java
@@ -1,5 +1,13 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.NORMAL;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.DIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.Z1P0;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
import static java.lang.Math.cos;
import static java.lang.Math.cosh;
import static java.lang.Math.exp;
@@ -10,23 +18,14 @@ import static java.lang.Math.pow;
import static java.lang.Math.sqrt;
import static java.lang.Math.tanh;
-import static org.opensha2.gmm.FaultStyle.NORMAL;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.GmmInput.Field.DIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.Z1P0;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-import org.opensha2.util.Maths;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Implementation of the Chiou & Youngs (2014) next generation attenuation
* relationship for active crustal regions developed as part of <a
diff --git a/src/org/opensha2/gmm/CoefficientContainer.java b/src/gov/usgs/earthquake/nshmp/gmm/CoefficientContainer.java
similarity index 95%
rename from src/org/opensha2/gmm/CoefficientContainer.java
rename to src/gov/usgs/earthquake/nshmp/gmm/CoefficientContainer.java
index 9e59451c16ea3b5a8a88e9cc12865a25c1d5e9a2..bdce40e6844a8c6e8d534824419619910f1baea8 100644
--- a/src/org/opensha2/gmm/CoefficientContainer.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/CoefficientContainer.java
@@ -1,11 +1,8 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static com.google.common.base.Preconditions.checkNotNull;
import static java.nio.charset.StandardCharsets.UTF_8;
-import org.opensha2.internal.Parsing;
-import org.opensha2.internal.Parsing.Delimiter;
-
import com.google.common.collect.ArrayTable;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableTable;
@@ -22,6 +19,9 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing.Delimiter;
+
/**
* Class loads and manages {@code GroundMotionModel} coefficients.
*
diff --git a/src/org/opensha2/gmm/ConvertsMag.java b/src/gov/usgs/earthquake/nshmp/gmm/ConvertsMag.java
similarity index 95%
rename from src/org/opensha2/gmm/ConvertsMag.java
rename to src/gov/usgs/earthquake/nshmp/gmm/ConvertsMag.java
index 14946f885134eefb3b1bea70370487d5d6dbc3dd..9e9d39fd093e49024113780c324f860d8932e071 100644
--- a/src/org/opensha2/gmm/ConvertsMag.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/ConvertsMag.java
@@ -1,4 +1,4 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
/**
* Implemented by ground motion models (GMMs) that perform a magnitude
diff --git a/src/org/opensha2/gmm/DefaultScalarGroundMotion.java b/src/gov/usgs/earthquake/nshmp/gmm/DefaultScalarGroundMotion.java
similarity index 96%
rename from src/org/opensha2/gmm/DefaultScalarGroundMotion.java
rename to src/gov/usgs/earthquake/nshmp/gmm/DefaultScalarGroundMotion.java
index 63b3d6f640153045556c630b28a820ae78fceb92..2750f05df1a8132c7899007ba424d809785f666a 100644
--- a/src/org/opensha2/gmm/DefaultScalarGroundMotion.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/DefaultScalarGroundMotion.java
@@ -1,4 +1,4 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
/**
* Default wrapper for ground motion prediction equation (GMPE) results.
diff --git a/src/org/opensha2/gmm/FaultStyle.java b/src/gov/usgs/earthquake/nshmp/gmm/FaultStyle.java
similarity index 84%
rename from src/org/opensha2/gmm/FaultStyle.java
rename to src/gov/usgs/earthquake/nshmp/gmm/FaultStyle.java
index 7701bd79d7d79cbbf0870fe8320943a6bc5092df..27690e32b62e329d1b111484f02257b83e84f4be 100644
--- a/src/org/opensha2/gmm/FaultStyle.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/FaultStyle.java
@@ -1,6 +1,6 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import org.opensha2.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
/**
* Style-of-faulting identifier.
diff --git a/src/org/opensha2/gmm/FrankelEtAl_1996.java b/src/gov/usgs/earthquake/nshmp/gmm/FrankelEtAl_1996.java
similarity index 78%
rename from src/org/opensha2/gmm/FrankelEtAl_1996.java
rename to src/gov/usgs/earthquake/nshmp/gmm/FrankelEtAl_1996.java
index 842e4148d449f440a5acb3b414f9d47451dfe5b5..af09a337507283ed525b7eb970dd0985079f9441 100644
--- a/src/org/opensha2/gmm/FrankelEtAl_1996.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/FrankelEtAl_1996.java
@@ -1,18 +1,18 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmUtils.BASE_10_TO_E;
-import static org.opensha2.gmm.MagConverter.NONE;
-import static org.opensha2.gmm.SiteClass.HARD_ROCK;
-import static org.opensha2.gmm.SiteClass.SOFT_ROCK;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-import org.opensha2.gmm.GroundMotionTables.GroundMotionTable;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.BASE_10_TO_E;
+import static gov.usgs.earthquake.nshmp.gmm.MagConverter.NONE;
+import static gov.usgs.earthquake.nshmp.gmm.SiteClass.HARD_ROCK;
+import static gov.usgs.earthquake.nshmp.gmm.SiteClass.SOFT_ROCK;
import com.google.common.collect.Range;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionTables.GroundMotionTable;
+
/**
* Implementation of the Frankel et al. (1996) ground motion model for stable
* continental regions. This implementation matches that used in the 2008 USGS
diff --git a/src/org/opensha2/gmm/Gmm.java b/src/gov/usgs/earthquake/nshmp/gmm/Gmm.java
similarity index 97%
rename from src/org/opensha2/gmm/Gmm.java
rename to src/gov/usgs/earthquake/nshmp/gmm/Gmm.java
index 3016489bd6cf4e9a676bddc101f024fd8b66c9b8..2e97bb53f64dc0565b5adc4cf6a8a7a407f68bbd 100644
--- a/src/org/opensha2/gmm/Gmm.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/Gmm.java
@@ -1,22 +1,8 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
-import org.opensha2.gmm.CeusMb.AtkinsonBoore_2006_140bar_AB;
-import org.opensha2.gmm.CeusMb.AtkinsonBoore_2006_140bar_J;
-import org.opensha2.gmm.CeusMb.AtkinsonBoore_2006_200bar_AB;
-import org.opensha2.gmm.CeusMb.AtkinsonBoore_2006_200bar_J;
-import org.opensha2.gmm.CeusMb.Campbell_2003_AB;
-import org.opensha2.gmm.CeusMb.Campbell_2003_J;
-import org.opensha2.gmm.CeusMb.FrankelEtAl_1996_AB;
-import org.opensha2.gmm.CeusMb.FrankelEtAl_1996_J;
-import org.opensha2.gmm.CeusMb.SilvaEtAl_2002_AB;
-import org.opensha2.gmm.CeusMb.SilvaEtAl_2002_J;
-import org.opensha2.gmm.CeusMb.TavakoliPezeshk_2005_AB;
-import org.opensha2.gmm.CeusMb.TavakoliPezeshk_2005_J;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.base.Predicate;
import com.google.common.cache.CacheBuilder;
import com.google.common.cache.CacheLoader;
@@ -34,6 +20,20 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.gmm.CeusMb.AtkinsonBoore_2006_140bar_AB;
+import gov.usgs.earthquake.nshmp.gmm.CeusMb.AtkinsonBoore_2006_140bar_J;
+import gov.usgs.earthquake.nshmp.gmm.CeusMb.AtkinsonBoore_2006_200bar_AB;
+import gov.usgs.earthquake.nshmp.gmm.CeusMb.AtkinsonBoore_2006_200bar_J;
+import gov.usgs.earthquake.nshmp.gmm.CeusMb.Campbell_2003_AB;
+import gov.usgs.earthquake.nshmp.gmm.CeusMb.Campbell_2003_J;
+import gov.usgs.earthquake.nshmp.gmm.CeusMb.FrankelEtAl_1996_AB;
+import gov.usgs.earthquake.nshmp.gmm.CeusMb.FrankelEtAl_1996_J;
+import gov.usgs.earthquake.nshmp.gmm.CeusMb.SilvaEtAl_2002_AB;
+import gov.usgs.earthquake.nshmp.gmm.CeusMb.SilvaEtAl_2002_J;
+import gov.usgs.earthquake.nshmp.gmm.CeusMb.TavakoliPezeshk_2005_AB;
+import gov.usgs.earthquake.nshmp.gmm.CeusMb.TavakoliPezeshk_2005_J;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* {@link GroundMotionModel} (Gmm) identifiers. Use these to generate
* {@link Imt}-specific instances via {@link Gmm#instance(Imt)} and related
@@ -453,7 +453,7 @@ public enum Gmm {
Atkinson_2015.NAME,
Atkinson_2015.COEFFS,
Atkinson_2015.CONSTRAINTS),
-
+
/** @see GraizerKalkan_2015 */
GK_15(
GraizerKalkan_2015.class,
diff --git a/src/org/opensha2/gmm/GmmAttribute.java b/src/gov/usgs/earthquake/nshmp/gmm/GmmAttribute.java
similarity index 96%
rename from src/org/opensha2/gmm/GmmAttribute.java
rename to src/gov/usgs/earthquake/nshmp/gmm/GmmAttribute.java
index 217cbf2cd38907962e6ab8e73808e46f786df463..d0b8f22670fc73ce4a915cf87993cc3df35160ca 100644
--- a/src/org/opensha2/gmm/GmmAttribute.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/GmmAttribute.java
@@ -1,4 +1,4 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static com.google.common.base.CaseFormat.LOWER_CAMEL;
import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
diff --git a/src/org/opensha2/gmm/GmmElement.java b/src/gov/usgs/earthquake/nshmp/gmm/GmmElement.java
similarity index 96%
rename from src/org/opensha2/gmm/GmmElement.java
rename to src/gov/usgs/earthquake/nshmp/gmm/GmmElement.java
index 63f889e6eff6d4801339a8b21300a303658173e7..d26c9a69acf4606926fa38cb9ee8aedf45964f85 100644
--- a/src/org/opensha2/gmm/GmmElement.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/GmmElement.java
@@ -1,4 +1,4 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static com.google.common.base.CaseFormat.UPPER_CAMEL;
import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
diff --git a/src/org/opensha2/gmm/GmmInput.java b/src/gov/usgs/earthquake/nshmp/gmm/GmmInput.java
similarity index 94%
rename from src/org/opensha2/gmm/GmmInput.java
rename to src/gov/usgs/earthquake/nshmp/gmm/GmmInput.java
index 18fc9c549dfa12afec543cc5fb7fdef1e0a4846a..cecc26b2fabe46b4ce8702c2c58bfccdbc5d3060 100644
--- a/src/org/opensha2/gmm/GmmInput.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/GmmInput.java
@@ -1,30 +1,23 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.DIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RX;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VSINF;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.WIDTH;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.Z1P0;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.Z2P5;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZHYP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import static java.lang.Double.NaN;
-import static org.opensha2.gmm.GmmInput.Field.DIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.RX;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.VSINF;
-import static org.opensha2.gmm.GmmInput.Field.WIDTH;
-import static org.opensha2.gmm.GmmInput.Field.Z1P0;
-import static org.opensha2.gmm.GmmInput.Field.Z2P5;
-import static org.opensha2.gmm.GmmInput.Field.ZHYP;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.calc.Site;
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.eq.model.Distance;
-import org.opensha2.eq.model.Rupture;
-
import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
@@ -35,6 +28,13 @@ import java.util.EnumMap;
import java.util.EnumSet;
import java.util.Map;
import java.util.Map.Entry;
+
+import gov.usgs.earthquake.nshmp.calc.Site;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.eq.model.Distance;
+import gov.usgs.earthquake.nshmp.eq.model.Rupture;
+
import java.util.Set;
/**
@@ -540,7 +540,7 @@ public class GmmInput {
.add(Z2P5.toString(), z2p5)
.toString();
}
-
+
/**
* The constraints associated with each {@code GmmInput} field. All methods
* return an {@link Optional} whose {@link Optional#isPresent()} method will
diff --git a/src/org/opensha2/gmm/GmmUtils.java b/src/gov/usgs/earthquake/nshmp/gmm/GmmUtils.java
similarity index 92%
rename from src/org/opensha2/gmm/GmmUtils.java
rename to src/gov/usgs/earthquake/nshmp/gmm/GmmUtils.java
index 1afeabe3fbe66c4a424eb9f47d6de0d4c59fea26..9e9d73c99a51605b3c14c0fb5ea0eaa5e2056e20 100644
--- a/src/org/opensha2/gmm/GmmUtils.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/GmmUtils.java
@@ -1,21 +1,16 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static com.google.common.base.Preconditions.checkArgument;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.NORMAL;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.STRIKE_SLIP;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.UNKNOWN;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P02;
+import static gov.usgs.earthquake.nshmp.gmm.SiteClass.HARD_ROCK;
+import static gov.usgs.earthquake.nshmp.gmm.SiteClass.SOFT_ROCK;
import static java.lang.Math.log;
-import static org.opensha2.gmm.FaultStyle.NORMAL;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.FaultStyle.STRIKE_SLIP;
-import static org.opensha2.gmm.FaultStyle.UNKNOWN;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.Imt.SA0P02;
-import static org.opensha2.gmm.SiteClass.HARD_ROCK;
-import static org.opensha2.gmm.SiteClass.SOFT_ROCK;
-
-import org.opensha2.gmm.GroundMotionTables.GroundMotionTable;
-import org.opensha2.internal.Parsing;
-import org.opensha2.internal.Parsing.Delimiter;
-
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -25,6 +20,10 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionTables.GroundMotionTable;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing.Delimiter;
+
/**
* Ground motion model (Gmm) utilities.
* @author Peter Powers
@@ -76,7 +75,8 @@ public final class GmmUtils {
private static String datPath = "etc/";
// private static String rjbDatPath = datPath + "rjbmean.dat"; // relocated
- private static String rjbDatPath = "/org/opensha2/eq/fault/surface/etc/rjb_wc94length.dat";
+ private static String rjbDatPath =
+ "/gov/usgs/earthquake/nshmp/eq/fault/surface/etc/rjb_wc94length.dat";
private static String cbhwDatPath = datPath + "avghw_cb.dat";
private static String cyhwDatPath = datPath + "avghw_cy.dat";
diff --git a/src/org/opensha2/gmm/GraizerKalkan_2015.java b/src/gov/usgs/earthquake/nshmp/gmm/GraizerKalkan_2015.java
similarity index 93%
rename from src/org/opensha2/gmm/GraizerKalkan_2015.java
rename to src/gov/usgs/earthquake/nshmp/gmm/GraizerKalkan_2015.java
index 2fc58576ca9e75fcb540b135b300ead62bd21b8e..df90cd160260577a6c68fc758cf37835aa0ad710 100644
--- a/src/org/opensha2/gmm/GraizerKalkan_2015.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/GraizerKalkan_2015.java
@@ -1,5 +1,10 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
import static java.lang.Math.abs;
import static java.lang.Math.atan;
import static java.lang.Math.cos;
@@ -9,19 +14,13 @@ import static java.lang.Math.max;
import static java.lang.Math.pow;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-
-import org.opensha2.data.Interpolator;
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.annotations.Beta;
import com.google.common.collect.Range;
+import gov.usgs.earthquake.nshmp.data.Interpolator;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the updated Graizer & Kalkan (2015, 2016) ground motion
* model. The model computes spectral accelerations as a continuous function of
diff --git a/src/org/opensha2/gmm/GroundMotionModel.java b/src/gov/usgs/earthquake/nshmp/gmm/GroundMotionModel.java
similarity index 96%
rename from src/org/opensha2/gmm/GroundMotionModel.java
rename to src/gov/usgs/earthquake/nshmp/gmm/GroundMotionModel.java
index 554417b5983a68d7a73b5bd822dfe6d30247326f..b6c45537e60265fc78b7e05efd76c15d81548f9e 100644
--- a/src/org/opensha2/gmm/GroundMotionModel.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/GroundMotionModel.java
@@ -1,4 +1,4 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
/**
* Interface implemented by all ground motion models (GMMs); these are also
diff --git a/src/org/opensha2/gmm/GroundMotionTables.java b/src/gov/usgs/earthquake/nshmp/gmm/GroundMotionTables.java
similarity index 96%
rename from src/org/opensha2/gmm/GroundMotionTables.java
rename to src/gov/usgs/earthquake/nshmp/gmm/GroundMotionTables.java
index db1f6fa7e7e552d9ba1af5b314ca4c331956bab2..46516b2ab0853a128bfab375a5ba077d32602f66 100644
--- a/src/org/opensha2/gmm/GroundMotionTables.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/GroundMotionTables.java
@@ -1,24 +1,18 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static com.google.common.io.Resources.getResource;
import static com.google.common.io.Resources.readLines;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGV;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P03;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P3;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA3P0;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.splitToDoubleList;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.splitToList;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import static java.lang.Math.log10;
import static java.nio.charset.StandardCharsets.UTF_8;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.Imt.PGV;
-import static org.opensha2.gmm.Imt.SA0P03;
-import static org.opensha2.gmm.Imt.SA0P3;
-import static org.opensha2.gmm.Imt.SA3P0;
-import static org.opensha2.internal.Parsing.splitToDoubleList;
-import static org.opensha2.internal.Parsing.splitToList;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.data.Data;
-import org.opensha2.gmm.GroundMotionTables.GroundMotionTable.Position;
-import org.opensha2.internal.Parsing;
-import org.opensha2.internal.Parsing.Delimiter;
-
import com.google.common.base.Enums;
import com.google.common.base.Function;
import com.google.common.collect.FluentIterable;
@@ -41,6 +35,11 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.logging.Logger;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionTables.GroundMotionTable.Position;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing.Delimiter;
+
/**
* Utility class to load and fetch {@code GroundMotionModel} lookup tables.
*
diff --git a/src/org/opensha2/gmm/Idriss_2014.java b/src/gov/usgs/earthquake/nshmp/gmm/Idriss_2014.java
similarity index 86%
rename from src/org/opensha2/gmm/Idriss_2014.java
rename to src/gov/usgs/earthquake/nshmp/gmm/Idriss_2014.java
index 29f2ebed03ce84c0b4e9533b755a0d2bc9eaef2a..4a8a1228b96d75da68f18125268cf0b14838ff53 100644
--- a/src/org/opensha2/gmm/Idriss_2014.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/Idriss_2014.java
@@ -1,23 +1,22 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.DIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.Z1P0;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
import static java.lang.Math.log;
import static java.lang.Math.min;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.GmmInput.Field.DIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.Z1P0;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the Idriss (2014) next generation ground motion model for
* active crustal regions developed as part of <a
diff --git a/src/org/opensha2/gmm/Imt.java b/src/gov/usgs/earthquake/nshmp/gmm/Imt.java
similarity index 99%
rename from src/org/opensha2/gmm/Imt.java
rename to src/gov/usgs/earthquake/nshmp/gmm/Imt.java
index d20bf04a38e7c99ee0468e5799e1a882894c8ce3..f2cf38c92bcd8e4a6aaa244c6d56a6c8556fc50c 100644
--- a/src/org/opensha2/gmm/Imt.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/Imt.java
@@ -1,4 +1,4 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static com.google.common.math.DoubleMath.fuzzyEquals;
diff --git a/src/org/opensha2/gmm/MagConverter.java b/src/gov/usgs/earthquake/nshmp/gmm/MagConverter.java
similarity index 97%
rename from src/org/opensha2/gmm/MagConverter.java
rename to src/gov/usgs/earthquake/nshmp/gmm/MagConverter.java
index 9947b5eb13ac63b97963086c6e2840e43c3b7c69..6c5e4d48cf5579128043ef846ff052cfb2735e4c 100644
--- a/src/org/opensha2/gmm/MagConverter.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/MagConverter.java
@@ -1,4 +1,4 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
/**
* Magnitude conversion identifiers. At present these are only used in some
diff --git a/src/org/opensha2/gmm/McVerryEtAl_2000.java b/src/gov/usgs/earthquake/nshmp/gmm/McVerryEtAl_2000.java
similarity index 92%
rename from src/org/opensha2/gmm/McVerryEtAl_2000.java
rename to src/gov/usgs/earthquake/nshmp/gmm/McVerryEtAl_2000.java
index 01c490ac3cfac818f91ba951d1629c07d8eca1fc..599a2439d41264c1a8fdc4e28dc9daa3ddfd38ee 100644
--- a/src/org/opensha2/gmm/McVerryEtAl_2000.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/McVerryEtAl_2000.java
@@ -1,33 +1,32 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.eq.TectonicSetting.ACTIVE_SHALLOW_CRUST;
+import static gov.usgs.earthquake.nshmp.eq.TectonicSetting.SUBDUCTION_INTERFACE;
+import static gov.usgs.earthquake.nshmp.eq.TectonicSetting.VOLCANIC;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.NORMAL;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE_OBLIQUE;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.STRIKE_SLIP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZHYP;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.sqrt;
-import static org.opensha2.eq.TectonicSetting.ACTIVE_SHALLOW_CRUST;
-import static org.opensha2.eq.TectonicSetting.SUBDUCTION_INTERFACE;
-import static org.opensha2.eq.TectonicSetting.VOLCANIC;
-import static org.opensha2.gmm.FaultStyle.NORMAL;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.FaultStyle.REVERSE_OBLIQUE;
-import static org.opensha2.gmm.FaultStyle.STRIKE_SLIP;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.ZHYP;
-import static org.opensha2.gmm.Imt.PGA;
-
-import org.opensha2.eq.TectonicSetting;
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.TectonicSetting;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Abstract implementation of the ground motion model by McVerry et al. (2000).
*
@@ -57,8 +56,7 @@ import java.util.Map;
* <p><b>Reference:</b> McVerry, G.H., Zhao, J.X., Abrahamson, N.A., and
* Somerville, P.G., 2000, New Zealand acceleration response spectrum
* attenuation relations for crustal and subduction zone earthquakes: Bulletin
- * of the New Zealand Society of Earthquake Engineering, v. 39, n. 4, p.
- * 1-58.
+ * of the New Zealand Society of Earthquake Engineering, v. 39, n. 4, p. 1-58.
*
* <p><b>Component:</b> Model supports geometric mean or maximum of two
* horizontal components; only concrete implementations of max-horizontal
diff --git a/src/org/opensha2/gmm/MultiScalarGroundMotion.java b/src/gov/usgs/earthquake/nshmp/gmm/MultiScalarGroundMotion.java
similarity index 94%
rename from src/org/opensha2/gmm/MultiScalarGroundMotion.java
rename to src/gov/usgs/earthquake/nshmp/gmm/MultiScalarGroundMotion.java
index dbafc6f423350ef12194c844e44bb22935ca3022..e94af070bfd267d89cda4fa65b6fa28f39160180 100644
--- a/src/org/opensha2/gmm/MultiScalarGroundMotion.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/MultiScalarGroundMotion.java
@@ -1,9 +1,9 @@
-package org.opensha2.gmm;
-
-import org.opensha2.data.Data;
+package gov.usgs.earthquake.nshmp.gmm;
import java.util.Arrays;
+import gov.usgs.earthquake.nshmp.data.Data;
+
/**
* Extension to {@code ScalarGroundMotion} heirarchy added in support of
* NGA-East. The {@link #mean} method of this class returns the weighted mean of
@@ -18,7 +18,7 @@ public class MultiScalarGroundMotion extends DefaultScalarGroundMotion {
// TODO array exposure is dangerous and should be changed in favor of
// immutable lists; this is agood candidate for immutable DataArrays
-
+
// TODO can we avoid instanceof tests in exceedance/probabilityModle enums
private final double[] means;
diff --git a/src/org/opensha2/gmm/MunsonThurber_1997.java b/src/gov/usgs/earthquake/nshmp/gmm/MunsonThurber_1997.java
similarity index 81%
rename from src/org/opensha2/gmm/MunsonThurber_1997.java
rename to src/gov/usgs/earthquake/nshmp/gmm/MunsonThurber_1997.java
index 2366ea6b912e6c095de6c434f5aed657168147ef..265494bff0c98d360c0604c6f97480791c288507 100644
--- a/src/org/opensha2/gmm/MunsonThurber_1997.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/MunsonThurber_1997.java
@@ -1,17 +1,16 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.BASE_10_TO_E;
import static java.lang.Math.log10;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmUtils.BASE_10_TO_E;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the Munson & Thurber (1997) ground motion model for
* horizontal peak ground acceleration (PGA) for the island of Hawaii. In
@@ -23,10 +22,10 @@ import com.google.common.collect.Range;
* Vs30 = 650 m/s of the lava site velocity (C. Thurber, personal comm., 1998).
*
* <p><b>Note:</b> This GMM is only valid for PGA and 0.2 seconds. 0.2 is
- * supported through the linear scaling of log PGA ground motion. Also,
- * for larger magnitudes (M > 7), an additional magnitude term derived from
- * Boore, Joyner, and Fumal 1993) is applied. See also the 1998 Hawaii NSHM
- * <a href="http://earthquake.usgs.gov/hazards/products/hi/1998/documentation/">
+ * supported through the linear scaling of log PGA ground motion. Also, for
+ * larger magnitudes (M > 7), an additional magnitude term derived from Boore,
+ * Joyner, and Fumal 1993) is applied. See also the 1998 Hawaii NSHM <a
+ * href="http://earthquake.usgs.gov/hazards/products/hi/1998/documentation/">
* documentation</a>.
*
* <p><b>Note:</b> Direct instantiation of {@code GroundMotionModel}s is
@@ -84,11 +83,11 @@ public final class MunsonThurber_1997 implements GroundMotionModel {
double μBase10 = B0 + magTerm(Mw) + (B2 * r) - log10(r);
return μBase10 * BASE_10_TO_E;
}
-
+
private static double magTerm(double Mw) {
if (Mw <= 7.0) {
return B1 * (Mw - 6.0);
- } else if (Mw <=7.7) {
+ } else if (Mw <= 7.7) {
return B1 + B1_BJF * (Mw - 7.0);
} else {
return B1 + B1_BJF * 0.7;
diff --git a/src/org/opensha2/gmm/NgaEastUsgs_2017.java b/src/gov/usgs/earthquake/nshmp/gmm/NgaEastUsgs_2017.java
similarity index 95%
rename from src/org/opensha2/gmm/NgaEastUsgs_2017.java
rename to src/gov/usgs/earthquake/nshmp/gmm/NgaEastUsgs_2017.java
index 21e8787507f4ff9ff9cc4c09a0f9964c34283f7c..4514473204addceec002b6e9e7cc31ee3ff93d54 100644
--- a/src/org/opensha2/gmm/NgaEastUsgs_2017.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/NgaEastUsgs_2017.java
@@ -1,17 +1,8 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-
-import org.opensha2.calc.ExceedanceModel;
-import org.opensha2.data.Data;
-import org.opensha2.data.Indexing;
-import org.opensha2.data.Interpolator;
-import org.opensha2.gmm.GmmInput.Constraints;
-import org.opensha2.gmm.GroundMotionTables.GroundMotionTable;
-import org.opensha2.gmm.GroundMotionTables.GroundMotionTable.Position;
-import org.opensha2.util.Maths;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
import com.google.common.annotations.Beta;
import com.google.common.collect.Range;
@@ -19,6 +10,15 @@ import com.google.common.primitives.Ints;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.calc.ExceedanceModel;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.data.Indexing;
+import gov.usgs.earthquake.nshmp.data.Interpolator;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionTables.GroundMotionTable;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionTables.GroundMotionTable.Position;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Implementation of the PEER NGA-East ground motion model. This is a custom
* version of the model developed specifically for USGS applications. It is a
diff --git a/src/org/opensha2/gmm/PezeshkEtAl_2011.java b/src/gov/usgs/earthquake/nshmp/gmm/PezeshkEtAl_2011.java
similarity index 84%
rename from src/org/opensha2/gmm/PezeshkEtAl_2011.java
rename to src/gov/usgs/earthquake/nshmp/gmm/PezeshkEtAl_2011.java
index 0dfd5567d851ec691c5a180c8193d16bc4738218..e5827dc8dd62e0f03e9f3f5fe0d942e5d15110b3 100644
--- a/src/org/opensha2/gmm/PezeshkEtAl_2011.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/PezeshkEtAl_2011.java
@@ -1,18 +1,18 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmUtils.BASE_10_TO_E;
-import static org.opensha2.gmm.GmmUtils.atkinsonTableValue;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-import org.opensha2.gmm.GroundMotionTables.GroundMotionTable;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.BASE_10_TO_E;
+import static gov.usgs.earthquake.nshmp.gmm.GmmUtils.atkinsonTableValue;
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionTables.GroundMotionTable;
+
/**
* Implementation of the Pezeshk, Zandieh, & Tavakoli (2011) ground motion model
* for stable continental regions. This implementation matches that used in the
diff --git a/src/org/opensha2/gmm/SadighEtAl_1997.java b/src/gov/usgs/earthquake/nshmp/gmm/SadighEtAl_1997.java
similarity index 88%
rename from src/org/opensha2/gmm/SadighEtAl_1997.java
rename to src/gov/usgs/earthquake/nshmp/gmm/SadighEtAl_1997.java
index a781e44432d49ae1e1e56d58fd3fc4173d9d00c4..b9fa3100dc58f8ba5ae68948c3b9c6a556d35598 100644
--- a/src/org/opensha2/gmm/SadighEtAl_1997.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/SadighEtAl_1997.java
@@ -1,24 +1,23 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RAKE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.max;
import static java.lang.Math.min;
import static java.lang.Math.pow;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RAKE;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-
-import org.opensha2.eq.fault.Faults;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the ground motion model for shallow crustal earthquakes by
* Sadigh et al. (1997). This implementation supports soil and rock sites, the
@@ -115,7 +114,7 @@ public class SadighEtAl_1997 implements GroundMotionModel {
/* Modified to saturate above Mw=8.5 */
double Mw = min(in.Mw, 8.5);
-
+
if (in.vs30 > VS30_CUT) {
/* Rock */
Coefficients c = Mw <= 6.5 ? coeffs_bc_lo : coeffs_bc_hi;
@@ -141,10 +140,10 @@ public class SadighEtAl_1997 implements GroundMotionModel {
double lnY =
c.c1r +
- c.c2 * Mw +
- c.c3 * pow(M_CUT - Mw, 2.5) +
- c.c4 * log(rRup + exp(c.c5 + c.c6r * Mw)) +
- c.c7 * log(rRup + 2);
+ c.c2 * Mw +
+ c.c3 * pow(M_CUT - Mw, 2.5) +
+ c.c4 * log(rRup + exp(c.c5 + c.c6r * Mw)) +
+ c.c7 * log(rRup + 2);
/* Scale reverse amplitudes by 1.2; 0.18232 = ln(1.2) */
return (style == REVERSE) ? lnY + 0.18232 : lnY;
@@ -156,9 +155,9 @@ public class SadighEtAl_1997 implements GroundMotionModel {
double c1 = (style == REVERSE) ? c.c1r : c.c1ss;
double c6 = (style == REVERSE) ? c.c6r : c.c6ss;
- return c1 +
- c.c2 * Mw -
- c.c3 * log(rRup + c.c4 * exp(c.c5 * Mw)) +
+ return c1 +
+ c.c2 * Mw -
+ c.c3 * log(rRup + c.c4 * exp(c.c5 * Mw)) +
c6 +
c.c7 * pow(M_CUT - Mw, 2.5);
}
diff --git a/src/org/opensha2/gmm/ScalarGroundMotion.java b/src/gov/usgs/earthquake/nshmp/gmm/ScalarGroundMotion.java
similarity index 90%
rename from src/org/opensha2/gmm/ScalarGroundMotion.java
rename to src/gov/usgs/earthquake/nshmp/gmm/ScalarGroundMotion.java
index 56e00998b9a89e6379e8c79b84111f29f19d6330..b32c47ba3bb6a1f39c5d29d951ca3ea913c18c98 100644
--- a/src/org/opensha2/gmm/ScalarGroundMotion.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/ScalarGroundMotion.java
@@ -1,4 +1,4 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
/**
* Ground motion model (Gmm) result container.
diff --git a/src/org/opensha2/gmm/SilvaEtAl_2002.java b/src/gov/usgs/earthquake/nshmp/gmm/SilvaEtAl_2002.java
similarity index 89%
rename from src/org/opensha2/gmm/SilvaEtAl_2002.java
rename to src/gov/usgs/earthquake/nshmp/gmm/SilvaEtAl_2002.java
index 580ce302daf7d1e9fac27fcdc20af0a4d7952e18..9fb1d334cc7429acb5f0ddb75da90a4e835fee49 100644
--- a/src/org/opensha2/gmm/SilvaEtAl_2002.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/SilvaEtAl_2002.java
@@ -1,19 +1,18 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.MagConverter.NONE;
+import static gov.usgs.earthquake.nshmp.gmm.SiteClass.HARD_ROCK;
import static java.lang.Math.exp;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.MagConverter.NONE;
-import static org.opensha2.gmm.SiteClass.HARD_ROCK;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the Silva et al. (2002) ground motion model for stable
* continental regions. This implementation matches that used in the 2008 USGS
diff --git a/src/org/opensha2/gmm/SiteClass.java b/src/gov/usgs/earthquake/nshmp/gmm/SiteClass.java
similarity index 66%
rename from src/org/opensha2/gmm/SiteClass.java
rename to src/gov/usgs/earthquake/nshmp/gmm/SiteClass.java
index 9af2a8db5ecb2ce210125ba51525d9f500e0cdc8..40a2236137c0d715432c5d0e142bf142f6bd0957 100644
--- a/src/org/opensha2/gmm/SiteClass.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/SiteClass.java
@@ -1,4 +1,4 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
/**
* @author Peter Powers
diff --git a/src/org/opensha2/gmm/SomervilleEtAl_2001.java b/src/gov/usgs/earthquake/nshmp/gmm/SomervilleEtAl_2001.java
similarity index 88%
rename from src/org/opensha2/gmm/SomervilleEtAl_2001.java
rename to src/gov/usgs/earthquake/nshmp/gmm/SomervilleEtAl_2001.java
index dc3e59bca18f9987f8e1ba5d44aa15abc664b8ed..1c7654e7973c4ca8abcf3a0b3d5c878180b6ad6b 100644
--- a/src/org/opensha2/gmm/SomervilleEtAl_2001.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/SomervilleEtAl_2001.java
@@ -1,19 +1,18 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.SiteClass.HARD_ROCK;
+import static gov.usgs.earthquake.nshmp.util.Maths.hypot;
import static java.lang.Math.log;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.SiteClass.HARD_ROCK;
-import static org.opensha2.util.Maths.hypot;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the hard rock ground motion model for the Central and
* Eastern US by Somerville et al. (2001). This implementation matches that used
diff --git a/src/org/opensha2/gmm/TavakoliPezeshk_2005.java b/src/gov/usgs/earthquake/nshmp/gmm/TavakoliPezeshk_2005.java
similarity index 94%
rename from src/org/opensha2/gmm/TavakoliPezeshk_2005.java
rename to src/gov/usgs/earthquake/nshmp/gmm/TavakoliPezeshk_2005.java
index 66127e1c20baba9a8f027c58e82ca2f880b5f457..9a51de81d80ab32a73831f9af64cd4166b201989 100644
--- a/src/org/opensha2/gmm/TavakoliPezeshk_2005.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/TavakoliPezeshk_2005.java
@@ -1,20 +1,19 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.MagConverter.NONE;
import static java.lang.Math.log;
import static java.lang.Math.pow;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.MagConverter.NONE;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the Tavakoli & Pezeshk (2005) ground motion model for
* stable continental regions. This implementation matches that used in the 2008
diff --git a/src/org/opensha2/gmm/ToroEtAl_1997.java b/src/gov/usgs/earthquake/nshmp/gmm/ToroEtAl_1997.java
similarity index 91%
rename from src/org/opensha2/gmm/ToroEtAl_1997.java
rename to src/gov/usgs/earthquake/nshmp/gmm/ToroEtAl_1997.java
index 2da316c9bd69c80c9e096dad3286c4b2ce6c30d6..03f87e275654aef6941d31efbc72e07fff98429c 100644
--- a/src/org/opensha2/gmm/ToroEtAl_1997.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/ToroEtAl_1997.java
@@ -1,22 +1,21 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RJB;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.MagConverter.MB_TO_MW_ATKIN_BOORE;
+import static gov.usgs.earthquake.nshmp.gmm.MagConverter.MB_TO_MW_JOHNSTON;
+import static gov.usgs.earthquake.nshmp.gmm.SiteClass.HARD_ROCK;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RJB;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.MagConverter.MB_TO_MW_ATKIN_BOORE;
-import static org.opensha2.gmm.MagConverter.MB_TO_MW_JOHNSTON;
-import static org.opensha2.gmm.SiteClass.HARD_ROCK;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the Toro et al. (1997) ground motion model for stable
* continental regions with 2002 updates. This implementation matches that used
diff --git a/src/org/opensha2/gmm/WongEtAl_2015.java b/src/gov/usgs/earthquake/nshmp/gmm/WongEtAl_2015.java
similarity index 87%
rename from src/org/opensha2/gmm/WongEtAl_2015.java
rename to src/gov/usgs/earthquake/nshmp/gmm/WongEtAl_2015.java
index db5b095210e6eab43755c77f9c3b009e2eba900d..d4cfdba7e2ffb34c1d4b1994117902cbee81ebab 100644
--- a/src/org/opensha2/gmm/WongEtAl_2015.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/WongEtAl_2015.java
@@ -1,21 +1,20 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.max;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.annotations.Beta;
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Implementation of the ground motion model by Wong et al. (2015) for deep
* event (>20 km) on the Big Island, Hawaii.
@@ -50,7 +49,7 @@ public final class WongEtAl_2015 implements GroundMotionModel {
.build();
private static final double R_MIN = 20.0;
-
+
static final CoefficientContainer COEFFS = new CoefficientContainer("Wong15.csv");
private static final class Coefficients {
diff --git a/src/org/opensha2/gmm/YoungsEtAl_1997.java b/src/gov/usgs/earthquake/nshmp/gmm/YoungsEtAl_1997.java
similarity index 93%
rename from src/org/opensha2/gmm/YoungsEtAl_1997.java
rename to src/gov/usgs/earthquake/nshmp/gmm/YoungsEtAl_1997.java
index 5aeb5f7abfd077ef7d53cec0e1210535fad0d920..3e88d9f6a1dfd80d04d6b213d8e713191973f04a 100644
--- a/src/org/opensha2/gmm/YoungsEtAl_1997.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/YoungsEtAl_1997.java
@@ -1,23 +1,22 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.min;
import static java.lang.Math.pow;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-import static org.opensha2.gmm.Imt.PGA;
-
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Abstract implementation of the subduction ground motion model by Youngs et
* al. (1997). This implementation matches that used in the 2008 USGS NSHMP
diff --git a/src/org/opensha2/gmm/ZhaoEtAl_2006.java b/src/gov/usgs/earthquake/nshmp/gmm/ZhaoEtAl_2006.java
similarity index 93%
rename from src/org/opensha2/gmm/ZhaoEtAl_2006.java
rename to src/gov/usgs/earthquake/nshmp/gmm/ZhaoEtAl_2006.java
index a5d862580122ce578517a94f45af682820388477..976094ef8fed360f25d73a0093ab2f16bc85c946 100644
--- a/src/org/opensha2/gmm/ZhaoEtAl_2006.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/ZhaoEtAl_2006.java
@@ -1,22 +1,21 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.min;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Abstract implementation of the subduction ground motion model by Zhao et al.
* (2006). This implementation matches that used in the USGS NSHM.
diff --git a/src/org/opensha2/gmm/ZhaoEtAl_2016.java b/src/gov/usgs/earthquake/nshmp/gmm/ZhaoEtAl_2016.java
similarity index 97%
rename from src/org/opensha2/gmm/ZhaoEtAl_2016.java
rename to src/gov/usgs/earthquake/nshmp/gmm/ZhaoEtAl_2016.java
index 76f424d9060910cfe4423f0a8ed6be1f54c55afe..cd91483793ee98a48016d2eba7f0239b9617bc08 100644
--- a/src/org/opensha2/gmm/ZhaoEtAl_2016.java
+++ b/src/gov/usgs/earthquake/nshmp/gmm/ZhaoEtAl_2016.java
@@ -1,21 +1,16 @@
-package org.opensha2.gmm;
-
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.NORMAL;
+import static gov.usgs.earthquake.nshmp.gmm.FaultStyle.REVERSE;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.MW;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.RRUP;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.VS30;
+import static gov.usgs.earthquake.nshmp.gmm.GmmInput.Field.ZTOP;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.min;
import static java.lang.Math.sqrt;
-import static org.opensha2.gmm.FaultStyle.NORMAL;
-import static org.opensha2.gmm.FaultStyle.REVERSE;
-import static org.opensha2.gmm.GmmInput.Field.MW;
-import static org.opensha2.gmm.GmmInput.Field.RRUP;
-import static org.opensha2.gmm.GmmInput.Field.VS30;
-import static org.opensha2.gmm.GmmInput.Field.ZTOP;
-
-import org.opensha2.data.Interpolator;
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.gmm.GmmInput.Constraints;
-
import com.google.common.annotations.Beta;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
@@ -23,6 +18,10 @@ import com.google.common.collect.Range;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.data.Interpolator;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput.Constraints;
+
/**
* Abstract implementation of the shallow crustal, upper mantle, subduction
* interface, and subduction slab ground motion models by Zhao et al. (2016).
diff --git a/src/org/opensha2/gmm/coeffs/A08P.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/A08P.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/A08P.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/A08P.csv
diff --git a/src/org/opensha2/gmm/coeffs/AB03_cascadia_interface.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB03_cascadia_interface.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/AB03_cascadia_interface.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB03_cascadia_interface.csv
diff --git a/src/org/opensha2/gmm/coeffs/AB03_cascadia_slab.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB03_cascadia_slab.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/AB03_cascadia_slab.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB03_cascadia_slab.csv
diff --git a/src/org/opensha2/gmm/coeffs/AB03_global_interface.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB03_global_interface.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/AB03_global_interface.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB03_global_interface.csv
diff --git a/src/org/opensha2/gmm/coeffs/AB03_global_slab.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB03_global_slab.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/AB03_global_slab.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB03_global_slab.csv
diff --git a/src/org/opensha2/gmm/coeffs/AB06A.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB06A.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/AB06A.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB06A.csv
diff --git a/src/org/opensha2/gmm/coeffs/AB06BC.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB06BC.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/AB06BC.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB06BC.csv
diff --git a/src/org/opensha2/gmm/coeffs/AB06P.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB06P.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/AB06P.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/AB06P.csv
diff --git a/src/org/opensha2/gmm/coeffs/ABsiteAmp.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/ABsiteAmp.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/ABsiteAmp.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/ABsiteAmp.csv
diff --git a/src/org/opensha2/gmm/coeffs/AM09.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/AM09.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/AM09.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/AM09.csv
diff --git a/src/org/opensha2/gmm/coeffs/AS97.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/AS97.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/AS97.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/AS97.csv
diff --git a/src/org/opensha2/gmm/coeffs/ASK14.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/ASK14.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/ASK14.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/ASK14.csv
diff --git a/src/org/opensha2/gmm/coeffs/Atkinson10.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Atkinson10.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Atkinson10.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Atkinson10.csv
diff --git a/src/org/opensha2/gmm/coeffs/Atkinson15.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Atkinson15.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Atkinson15.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Atkinson15.csv
diff --git a/src/org/opensha2/gmm/coeffs/BA08.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/BA08.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/BA08.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/BA08.csv
diff --git a/src/org/opensha2/gmm/coeffs/BCHydro12.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/BCHydro12.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/BCHydro12.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/BCHydro12.csv
diff --git a/src/org/opensha2/gmm/coeffs/BJF97.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/BJF97.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/BJF97.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/BJF97.csv
diff --git a/src/org/opensha2/gmm/coeffs/BSSA14.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/BSSA14.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/BSSA14.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/BSSA14.csv
diff --git a/src/org/opensha2/gmm/coeffs/CB03.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/CB03.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/CB03.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/CB03.csv
diff --git a/src/org/opensha2/gmm/coeffs/CB08.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/CB08.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/CB08.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/CB08.csv
diff --git a/src/org/opensha2/gmm/coeffs/CB14.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/CB14.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/CB14.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/CB14.csv
diff --git a/src/org/opensha2/gmm/coeffs/CY08.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/CY08.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/CY08.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/CY08.csv
diff --git a/src/org/opensha2/gmm/coeffs/CY14.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/CY14.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/CY14.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/CY14.csv
diff --git a/src/org/opensha2/gmm/coeffs/Campbell03.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Campbell03.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Campbell03.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Campbell03.csv
diff --git a/src/org/opensha2/gmm/coeffs/Campbell97.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Campbell97.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Campbell97.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Campbell97.csv
diff --git a/src/org/opensha2/gmm/coeffs/Frankel96.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Frankel96.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Frankel96.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Frankel96.csv
diff --git a/src/org/opensha2/gmm/coeffs/GK15.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/GK15.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/GK15.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/GK15.csv
diff --git a/src/org/opensha2/gmm/coeffs/Idriss14.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Idriss14.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Idriss14.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Idriss14.csv
diff --git a/src/org/opensha2/gmm/coeffs/MT97.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/MT97.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/MT97.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/MT97.csv
diff --git a/src/org/opensha2/gmm/coeffs/McVerry00_gm.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/McVerry00_gm.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/McVerry00_gm.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/McVerry00_gm.csv
diff --git a/src/org/opensha2/gmm/coeffs/McVerry00_mh.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/McVerry00_mh.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/McVerry00_mh.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/McVerry00_mh.csv
diff --git a/src/org/opensha2/gmm/coeffs/P11.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/P11.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/P11.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/P11.csv
diff --git a/src/org/opensha2/gmm/coeffs/Sadigh97_BChi.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Sadigh97_BChi.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Sadigh97_BChi.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Sadigh97_BChi.csv
diff --git a/src/org/opensha2/gmm/coeffs/Sadigh97_BClo.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Sadigh97_BClo.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Sadigh97_BClo.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Sadigh97_BClo.csv
diff --git a/src/org/opensha2/gmm/coeffs/Sadigh97_Dhi.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Sadigh97_Dhi.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Sadigh97_Dhi.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Sadigh97_Dhi.csv
diff --git a/src/org/opensha2/gmm/coeffs/Sadigh97_Dlo.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Sadigh97_Dlo.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Sadigh97_Dlo.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Sadigh97_Dlo.csv
diff --git a/src/org/opensha2/gmm/coeffs/Silva02.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Silva02.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Silva02.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Silva02.csv
diff --git a/src/org/opensha2/gmm/coeffs/Somerville01.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Somerville01.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Somerville01.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Somerville01.csv
diff --git a/src/org/opensha2/gmm/coeffs/TP05.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/TP05.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/TP05.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/TP05.csv
diff --git a/src/org/opensha2/gmm/coeffs/Toro97Mb.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Toro97Mb.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Toro97Mb.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Toro97Mb.csv
diff --git a/src/org/opensha2/gmm/coeffs/Toro97Mw.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Toro97Mw.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Toro97Mw.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Toro97Mw.csv
diff --git a/src/org/opensha2/gmm/coeffs/Wong15.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Wong15.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Wong15.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Wong15.csv
diff --git a/src/org/opensha2/gmm/coeffs/Youngs97.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Youngs97.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Youngs97.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Youngs97.csv
diff --git a/src/org/opensha2/gmm/coeffs/Zhao06.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Zhao06.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Zhao06.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Zhao06.csv
diff --git a/src/org/opensha2/gmm/coeffs/Zhao16_crust.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Zhao16_crust.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Zhao16_crust.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Zhao16_crust.csv
diff --git a/src/org/opensha2/gmm/coeffs/Zhao16_interface.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Zhao16_interface.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Zhao16_interface.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Zhao16_interface.csv
diff --git a/src/org/opensha2/gmm/coeffs/Zhao16_siteamp.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Zhao16_siteamp.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Zhao16_siteamp.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Zhao16_siteamp.csv
diff --git a/src/org/opensha2/gmm/coeffs/Zhao16_slab.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/Zhao16_slab.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/Zhao16_slab.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/Zhao16_slab.csv
diff --git a/src/org/opensha2/gmm/coeffs/nga-east-usgs-sigma-hi.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/nga-east-usgs-sigma-hi.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/nga-east-usgs-sigma-hi.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/nga-east-usgs-sigma-hi.csv
diff --git a/src/org/opensha2/gmm/coeffs/nga-east-usgs-sigma-lo.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/nga-east-usgs-sigma-lo.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/nga-east-usgs-sigma-lo.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/nga-east-usgs-sigma-lo.csv
diff --git a/src/org/opensha2/gmm/coeffs/nga-east-usgs-sigma-mid.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/nga-east-usgs-sigma-mid.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/nga-east-usgs-sigma-mid.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/nga-east-usgs-sigma-mid.csv
diff --git a/src/org/opensha2/gmm/coeffs/nga-east-usgs-sigma-total.csv b/src/gov/usgs/earthquake/nshmp/gmm/coeffs/nga-east-usgs-sigma-total.csv
similarity index 100%
rename from src/org/opensha2/gmm/coeffs/nga-east-usgs-sigma-total.csv
rename to src/gov/usgs/earthquake/nshmp/gmm/coeffs/nga-east-usgs-sigma-total.csv
diff --git a/src/org/opensha2/gmm/etc/avghw_cb.dat b/src/gov/usgs/earthquake/nshmp/gmm/etc/avghw_cb.dat
similarity index 100%
rename from src/org/opensha2/gmm/etc/avghw_cb.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/etc/avghw_cb.dat
diff --git a/src/org/opensha2/gmm/etc/avghw_cy.dat b/src/gov/usgs/earthquake/nshmp/gmm/etc/avghw_cy.dat
similarity index 100%
rename from src/org/opensha2/gmm/etc/avghw_cy.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/etc/avghw_cy.dat
diff --git a/src/gov/usgs/earthquake/nshmp/gmm/package-info.java b/src/gov/usgs/earthquake/nshmp/gmm/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..d3bdd5c7ff89d5bcbaf4e75eeefd1ffc2f09d6b4
--- /dev/null
+++ b/src/gov/usgs/earthquake/nshmp/gmm/package-info.java
@@ -0,0 +1,14 @@
+/**
+ * Implementations of all
+ * {@link gov.usgs.earthquake.nshmp.gmm.GroundMotionModel}s used in the 2008 and
+ * 2014 USGS National Seismic Hazard Models.
+ *
+ * <p>Most of the model implementations in this package may not be instantiated
+ * directly. Rather, instances of each are/should be obtained via
+ * {@link gov.usgs.earthquake.nshmp.gmm.Gmm#instance(Imt)}. The various models
+ * are exposed publicly for the sake of documentation. In many cases, the public
+ * implementations are {@code abstract}, and there are a variety of model
+ * flavors that are available via the {@link gov.usgs.earthquake.nshmp.gmm.Gmm}
+ * enum.
+ */
+package gov.usgs.earthquake.nshmp.gmm;
diff --git a/src/org/opensha2/gmm/tables/A08revA_Rjb.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/A08revA_Rjb.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/A08revA_Rjb.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/A08revA_Rjb.dat
diff --git a/src/org/opensha2/gmm/tables/AB06revA_Rcd.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/AB06revA_Rcd.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/AB06revA_Rcd.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/AB06revA_Rcd.dat
diff --git a/src/org/opensha2/gmm/tables/P11A_Rcd.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/P11A_Rcd.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/P11A_Rcd.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/P11A_Rcd.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-1CCSP.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-1CCSP.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-1CCSP.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-1CCSP.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-1CVSP.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-1CVSP.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-1CVSP.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-1CVSP.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-2CCSP.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-2CCSP.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-2CCSP.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-2CCSP.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-2CVSP.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-2CVSP.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-2CVSP.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-2CVSP.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-B_a04.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-B_a04.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-B_a04.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-B_a04.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-B_ab14.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-B_ab14.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-B_ab14.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-B_ab14.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-B_ab95.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-B_ab95.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-B_ab95.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-B_ab95.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-B_bca10d.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-B_bca10d.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-B_bca10d.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-B_bca10d.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-B_bs11.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-B_bs11.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-B_bs11.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-B_bs11.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-B_sgd02.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-B_sgd02.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-B_sgd02.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-B_sgd02.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-Frankel.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-Frankel.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-Frankel.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-Frankel.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-Graizer.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-Graizer.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-Graizer.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-Graizer.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-HA15.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-HA15.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-HA15.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-HA15.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-PEER_EX.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-PEER_EX.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-PEER_EX.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-PEER_EX.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-PEER_GP.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-PEER_GP.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-PEER_GP.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-PEER_GP.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-PZCT15_M1SS.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-PZCT15_M1SS.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-PZCT15_M1SS.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-PZCT15_M1SS.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-PZCT15_M2ES.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-PZCT15_M2ES.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-PZCT15_M2ES.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-PZCT15_M2ES.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-SP15.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-SP15.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-SP15.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-SP15.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-YA15.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-YA15.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-YA15.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-YA15.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-1.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-1.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-1.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-1.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-10.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-10.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-10.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-10.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-11.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-11.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-11.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-11.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-12.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-12.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-12.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-12.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-13.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-13.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-13.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-13.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-2.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-2.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-2.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-2.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-3.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-3.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-3.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-3.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-4.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-4.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-4.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-4.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-5.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-5.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-5.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-5.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-6.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-6.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-6.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-6.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-7.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-7.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-7.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-7.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-8.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-8.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-8.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-8.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-9.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-9.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-9.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-9.dat
diff --git a/src/org/opensha2/gmm/tables/nga-east-usgs-weights.dat b/src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-weights.dat
similarity index 100%
rename from src/org/opensha2/gmm/tables/nga-east-usgs-weights.dat
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/nga-east-usgs-weights.dat
diff --git a/src/org/opensha2/gmm/tables/pgak006.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/pgak006.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/pgak006.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/pgak006.tbl
diff --git a/src/org/opensha2/gmm/tables/pgak01l.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/pgak01l.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/pgak01l.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/pgak01l.tbl
diff --git a/src/org/opensha2/gmm/tables/t0p1k006.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/t0p1k006.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/t0p1k006.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/t0p1k006.tbl
diff --git a/src/org/opensha2/gmm/tables/t0p1k01l.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/t0p1k01l.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/t0p1k01l.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/t0p1k01l.tbl
diff --git a/src/org/opensha2/gmm/tables/t0p2k006.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/t0p2k006.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/t0p2k006.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/t0p2k006.tbl
diff --git a/src/org/opensha2/gmm/tables/t0p2k01l.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/t0p2k01l.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/t0p2k01l.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/t0p2k01l.tbl
diff --git a/src/org/opensha2/gmm/tables/t0p3k006.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/t0p3k006.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/t0p3k006.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/t0p3k006.tbl
diff --git a/src/org/opensha2/gmm/tables/t0p3k01l.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/t0p3k01l.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/t0p3k01l.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/t0p3k01l.tbl
diff --git a/src/org/opensha2/gmm/tables/t0p5k006.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/t0p5k006.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/t0p5k006.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/t0p5k006.tbl
diff --git a/src/org/opensha2/gmm/tables/t0p5k01l.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/t0p5k01l.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/t0p5k01l.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/t0p5k01l.tbl
diff --git a/src/org/opensha2/gmm/tables/t1p0k006.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/t1p0k006.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/t1p0k006.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/t1p0k006.tbl
diff --git a/src/org/opensha2/gmm/tables/t1p0k01l.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/t1p0k01l.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/t1p0k01l.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/t1p0k01l.tbl
diff --git a/src/org/opensha2/gmm/tables/t2p0k006.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/t2p0k006.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/t2p0k006.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/t2p0k006.tbl
diff --git a/src/org/opensha2/gmm/tables/t2p0k01l.tbl b/src/gov/usgs/earthquake/nshmp/gmm/tables/t2p0k01l.tbl
similarity index 100%
rename from src/org/opensha2/gmm/tables/t2p0k01l.tbl
rename to src/gov/usgs/earthquake/nshmp/gmm/tables/t2p0k01l.tbl
diff --git a/src/org/opensha2/internal/BinaryCurves.java b/src/gov/usgs/earthquake/nshmp/internal/BinaryCurves.java
similarity index 97%
rename from src/org/opensha2/internal/BinaryCurves.java
rename to src/gov/usgs/earthquake/nshmp/internal/BinaryCurves.java
index d29736d4b577ebe0c5bd9a5fe865ce38ab1ffd56..27bbcfa77eb08904debdf6dc39db0e2630d9256d 100644
--- a/src/org/opensha2/internal/BinaryCurves.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/BinaryCurves.java
@@ -1,17 +1,10 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
import static com.google.common.base.Preconditions.checkArgument;
import static java.nio.ByteOrder.LITTLE_ENDIAN;
import static java.nio.charset.StandardCharsets.US_ASCII;
import static java.nio.file.StandardOpenOption.WRITE;
-import org.opensha2.geo.Bounds;
-import org.opensha2.geo.GriddedRegion;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.Regions;
-import org.opensha2.gmm.Imt;
-import org.opensha2.util.Maths;
-
import com.google.common.base.Charsets;
import com.google.common.base.Strings;
import com.google.common.collect.Lists;
@@ -30,6 +23,13 @@ import java.nio.file.Path;
import java.sql.Timestamp;
import java.util.List;
+import gov.usgs.earthquake.nshmp.geo.Bounds;
+import gov.usgs.earthquake.nshmp.geo.GriddedRegion;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.Regions;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
@Deprecated
class BinaryCurves {
@@ -321,7 +321,7 @@ class BinaryCurves {
double vs30 = 760.0;
double basinDepth = 2.0;
double spacing = 0.1;
-
+
// TODO replace with Bounds??
double lonMin = 0;
double lonMax = 0;
@@ -330,7 +330,6 @@ class BinaryCurves {
}
-
private static final int MAX_IML_COUNT = 20;
private static final int HEADER_OFFSET = 1664; // bytes
private static final int INFO_LINE_SIZE = 128; // chars
@@ -346,20 +345,18 @@ class BinaryCurves {
private final int curveCount;
private final FileChannel channel;
-
public Writer(Path path, Metadata meta) throws IOException {
checkArgument(meta.imls.length <= MAX_IML_COUNT);
this.path = path;
this.meta = meta;
this.curveCount = curveCount(meta);
this.channel = FileChannel.open(path, WRITE);
-
- //init with 0's
-// int
+
+ // init with 0's
+ // int
this.channel.write(createHeader());
this.channel.write(ByteBuffer.allocate(curveCount * MAX_IML_COUNT));
}
-
/* Header occupies 1664 bytes total */
private ByteBuffer createHeader() {
@@ -400,13 +397,13 @@ class BinaryCurves {
return buf;
}
-
+
private static int curveCount(Metadata m) {
int lonDim = (int) Math.rint((m.lonMax - m.lonMin) / m.spacing + 1);
int latDim = (int) Math.rint((m.latMax - m.latMin) / m.spacing + 1);
return lonDim * latDim;
}
-
+
/*
* Compute the target position of a curve in a binary file. NSHMP binary
* files index ascending in longitude, but descending in latitude.
diff --git a/src/org/opensha2/internal/CurveContainer.java b/src/gov/usgs/earthquake/nshmp/internal/CurveContainer.java
similarity index 98%
rename from src/org/opensha2/internal/CurveContainer.java
rename to src/gov/usgs/earthquake/nshmp/internal/CurveContainer.java
index a8d872ab342df00ecbbd2803c14690867f368496..70c3bda715ad8cdf8b38a7ea19a6d89be77fd515 100644
--- a/src/org/opensha2/internal/CurveContainer.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/CurveContainer.java
@@ -1,14 +1,7 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
import static com.google.common.base.Preconditions.checkArgument;
-import org.opensha2.data.Data;
-import org.opensha2.data.XySequence;
-import org.opensha2.geo.GriddedRegion;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.Regions;
-import org.opensha2.util.Maths;
-
import com.google.common.base.CharMatcher;
import com.google.common.base.Charsets;
import com.google.common.base.Preconditions;
@@ -30,6 +23,13 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.geo.GriddedRegion;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.Regions;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
/**
* Class for storing and accessing grids of hazard curves. These can be NSHMP
* national scale datasets such as those available here:
diff --git a/src/org/opensha2/internal/CybershakeSite.java b/src/gov/usgs/earthquake/nshmp/internal/CybershakeSite.java
similarity index 97%
rename from src/org/opensha2/internal/CybershakeSite.java
rename to src/gov/usgs/earthquake/nshmp/internal/CybershakeSite.java
index 44327d9c764df9748fa4dcce40d86c962d7bcd6f..d8e7edc7c01a9815edff84d808f2d13b5b8b954f 100644
--- a/src/org/opensha2/internal/CybershakeSite.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/CybershakeSite.java
@@ -1,7 +1,7 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
-import org.opensha2.geo.Location;
-import org.opensha2.util.NamedLocation;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.util.NamedLocation;
/**
* Cybershake UGMS sites.
diff --git a/src/org/opensha2/internal/GeoJson.java b/src/gov/usgs/earthquake/nshmp/internal/GeoJson.java
similarity index 95%
rename from src/org/opensha2/internal/GeoJson.java
rename to src/gov/usgs/earthquake/nshmp/internal/GeoJson.java
index dded186a954890d122ac847f04a5b3c28bc3029c..a5d190256323df4d2b67985e02202e5137e0ca97 100644
--- a/src/org/opensha2/internal/GeoJson.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/GeoJson.java
@@ -1,12 +1,7 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.util.Maths.round;
-
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-import org.opensha2.util.NamedLocation;
+import static gov.usgs.earthquake.nshmp.util.Maths.round;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
@@ -18,6 +13,10 @@ import com.google.gson.annotations.SerializedName;
import java.util.List;
import java.util.Objects;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.util.NamedLocation;
+
/**
* GeoJSON serialization keys, values, and utilities.
*
diff --git a/src/org/opensha2/internal/Logging.java b/src/gov/usgs/earthquake/nshmp/internal/Logging.java
similarity index 98%
rename from src/org/opensha2/internal/Logging.java
rename to src/gov/usgs/earthquake/nshmp/internal/Logging.java
index ffc52ef1413bf29f5ecaad84c1aefa7d70ec467a..8a70eb942d7b93ac047f8999a3917508e1eacac6 100644
--- a/src/org/opensha2/internal/Logging.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/Logging.java
@@ -1,4 +1,4 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
import static com.google.common.base.StandardSystemProperty.LINE_SEPARATOR;
import static java.util.logging.Level.SEVERE;
diff --git a/src/org/opensha2/internal/NshmpPolygon.java b/src/gov/usgs/earthquake/nshmp/internal/NshmpPolygon.java
similarity index 98%
rename from src/org/opensha2/internal/NshmpPolygon.java
rename to src/gov/usgs/earthquake/nshmp/internal/NshmpPolygon.java
index d85602ca16bcd33395c9d00f6390698781c40784..d0c9d668c2dedb6a305ddf94e43d393fad9c8f12 100644
--- a/src/org/opensha2/internal/NshmpPolygon.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/NshmpPolygon.java
@@ -1,6 +1,6 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
-import org.opensha2.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
/**
* Geographic polygons commonly used by the NSHMP.
@@ -13,7 +13,7 @@ public enum NshmpPolygon {
CEUS_CLIP(Data.CEUS_CLIP, "Central & Eastern US Map Extents"),
WUS_CLIP(Data.WUS_CLIP, "Western US Map Extents"),
AK_CLIP(Data.AK_CLIP, "Alaska Map Extents"),
-
+
CONTERMINOUS_US(Data.CONTERMINOUS, "Conterminous US"),
LA_BASIN(Data.WG_07_LA, "Los Angeles Basin – WGCEP 2007"),
diff --git a/src/org/opensha2/internal/NshmpSite.java b/src/gov/usgs/earthquake/nshmp/internal/NshmpSite.java
similarity index 98%
rename from src/org/opensha2/internal/NshmpSite.java
rename to src/gov/usgs/earthquake/nshmp/internal/NshmpSite.java
index 6bedd5b81f4df3d3aa77b437c3fa3d9a834a51ed..e398b100988945362a794819532c8a0e9c49c385 100644
--- a/src/org/opensha2/internal/NshmpSite.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/NshmpSite.java
@@ -1,7 +1,4 @@
-package org.opensha2.internal;
-
-import org.opensha2.geo.Location;
-import org.opensha2.util.NamedLocation;
+package gov.usgs.earthquake.nshmp.internal;
import com.google.common.base.Predicate;
import com.google.common.collect.ComparisonChain;
@@ -11,6 +8,9 @@ import com.google.common.collect.Sets;
import java.util.Comparator;
import java.util.EnumSet;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.util.NamedLocation;
+
/**
* Locations that are used for NSHMP hazard comparisons.
*
@@ -258,7 +258,7 @@ public enum NshmpSite implements NamedLocation {
String label = Parsing.enumLabelWithSpaces(this, true);
if (label.startsWith("Mc")) {
StringBuilder sb = new StringBuilder(label);
- sb.setCharAt(2, Character.toUpperCase(sb.charAt(2)));
+ sb.setCharAt(2, Character.toUpperCase(sb.charAt(2)));
label = sb.toString();
}
int stripIndex = label.lastIndexOf(' ');
diff --git a/src/org/opensha2/internal/NshmpSiteFiles.java b/src/gov/usgs/earthquake/nshmp/internal/NshmpSiteFiles.java
similarity index 90%
rename from src/org/opensha2/internal/NshmpSiteFiles.java
rename to src/gov/usgs/earthquake/nshmp/internal/NshmpSiteFiles.java
index dd86de395946fff6a34d01a0164452f78c5dee54..f26707c04749f2f80c5a094481aff3acfbb583c5 100644
--- a/src/org/opensha2/internal/NshmpSiteFiles.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/NshmpSiteFiles.java
@@ -1,28 +1,19 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
import static com.google.common.base.Strings.padEnd;
import static com.google.common.base.Strings.padStart;
-
-import static org.opensha2.internal.NshmpPolygon.AK_CLIP;
-import static org.opensha2.internal.NshmpPolygon.CEUS_CLIP;
-import static org.opensha2.internal.NshmpPolygon.CONTERMINOUS_US;
-import static org.opensha2.internal.NshmpPolygon.CYBERSHAKE;
-import static org.opensha2.internal.NshmpPolygon.LA_BASIN;
-import static org.opensha2.internal.NshmpPolygon.NEW_MADRID;
-import static org.opensha2.internal.NshmpPolygon.PUGET;
-import static org.opensha2.internal.NshmpPolygon.SF_BAY;
-import static org.opensha2.internal.NshmpPolygon.UCERF3_NSHM14;
-import static org.opensha2.internal.NshmpPolygon.UCERF3_RELM;
-import static org.opensha2.internal.NshmpPolygon.WASATCH;
-import static org.opensha2.internal.NshmpPolygon.WUS_CLIP;
-
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-import org.opensha2.internal.GeoJson.Feature;
-import org.opensha2.internal.GeoJson.FeatureCollection;
-import org.opensha2.internal.GeoJson.PointProperties;
-import org.opensha2.util.Maths;
-import org.opensha2.util.NamedLocation;
+import static gov.usgs.earthquake.nshmp.internal.NshmpPolygon.AK_CLIP;
+import static gov.usgs.earthquake.nshmp.internal.NshmpPolygon.CEUS_CLIP;
+import static gov.usgs.earthquake.nshmp.internal.NshmpPolygon.CONTERMINOUS_US;
+import static gov.usgs.earthquake.nshmp.internal.NshmpPolygon.CYBERSHAKE;
+import static gov.usgs.earthquake.nshmp.internal.NshmpPolygon.LA_BASIN;
+import static gov.usgs.earthquake.nshmp.internal.NshmpPolygon.NEW_MADRID;
+import static gov.usgs.earthquake.nshmp.internal.NshmpPolygon.PUGET;
+import static gov.usgs.earthquake.nshmp.internal.NshmpPolygon.SF_BAY;
+import static gov.usgs.earthquake.nshmp.internal.NshmpPolygon.UCERF3_NSHM14;
+import static gov.usgs.earthquake.nshmp.internal.NshmpPolygon.UCERF3_RELM;
+import static gov.usgs.earthquake.nshmp.internal.NshmpPolygon.WASATCH;
+import static gov.usgs.earthquake.nshmp.internal.NshmpPolygon.WUS_CLIP;
import com.google.common.base.Function;
import com.google.common.base.Functions;
@@ -47,6 +38,14 @@ import java.util.EnumSet;
import java.util.List;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.internal.GeoJson.Feature;
+import gov.usgs.earthquake.nshmp.internal.GeoJson.FeatureCollection;
+import gov.usgs.earthquake.nshmp.internal.GeoJson.PointProperties;
+import gov.usgs.earthquake.nshmp.util.Maths;
+import gov.usgs.earthquake.nshmp.util.NamedLocation;
+
/**
* Methods for exporting nshmp site data as CSV and GeoJSON.
*
@@ -69,7 +68,7 @@ final class NshmpSiteFiles {
writeSites("nureg", EnumSet.allOf(NuregSite.class), DEC3_FMT);
writeCybershakeSites("cybershake", EnumSet.allOf(CybershakeSite.class));
- writeNshmpPolys();
+ writeNshmpPolys();
// writeNshmpSummaryPoly();
// writeNshmpSites_0p1();
}
@@ -90,7 +89,7 @@ final class NshmpSiteFiles {
Path wusOut = EXPORT_DIR.resolve("map-wus.geojson");
LocationList wusBounds = WUS_CLIP.coordinates();
writePolyJson(wusOut, "NSHMP Western US", usCoords, 0.1, wusBounds);
-
+
// TODO AK needs to be updated with proper clipping region as above
// currently just mercator rectangle
writePolyJson(
@@ -99,7 +98,7 @@ final class NshmpSiteFiles {
AK_CLIP.coordinates(),
0.1,
null);
-
+
writePolyJson(
EXPORT_DIR.resolve("map-la-basin.geojson"),
LA_BASIN.toString(),
diff --git a/src/org/opensha2/internal/NuregSite.java b/src/gov/usgs/earthquake/nshmp/internal/NuregSite.java
similarity index 88%
rename from src/org/opensha2/internal/NuregSite.java
rename to src/gov/usgs/earthquake/nshmp/internal/NuregSite.java
index 3652ce723f56214ab5dfd4469a71d1b893f832c8..2ce023f8a41e422093297c64933708cf7764243e 100644
--- a/src/org/opensha2/internal/NuregSite.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/NuregSite.java
@@ -1,7 +1,7 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
-import org.opensha2.geo.Location;
-import org.opensha2.util.NamedLocation;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.util.NamedLocation;
/**
* CEUS-SSCn NRC NUREG demonstration sites. Most are also present in
diff --git a/src/org/opensha2/internal/Parsing.java b/src/gov/usgs/earthquake/nshmp/internal/Parsing.java
similarity index 99%
rename from src/org/opensha2/internal/Parsing.java
rename to src/gov/usgs/earthquake/nshmp/internal/Parsing.java
index 57a31332e8c0f7f0d6d21d32b10b745eaedf1cce..f0d3403683d2e5677fb649681266dcf6a3d43cf3 100644
--- a/src/org/opensha2/internal/Parsing.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/Parsing.java
@@ -1,13 +1,9 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-
-import static org.opensha2.data.Data.checkWeights;
-
-import org.opensha2.data.Data;
-import org.opensha2.data.Indexing;
+import static gov.usgs.earthquake.nshmp.data.Data.checkWeights;
import org.w3c.dom.Comment;
import org.w3c.dom.Element;
@@ -43,6 +39,10 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.data.Indexing;
+
import java.util.NavigableMap;
/**
diff --git a/src/org/opensha2/internal/SourceAttribute.java b/src/gov/usgs/earthquake/nshmp/internal/SourceAttribute.java
similarity index 97%
rename from src/org/opensha2/internal/SourceAttribute.java
rename to src/gov/usgs/earthquake/nshmp/internal/SourceAttribute.java
index d744ddb0376c9aaea0a1eee56fb19e114aba71d6..9f2d7f0c8ed189fd5b0ecaf8fc6ad8b0758b1f66 100644
--- a/src/org/opensha2/internal/SourceAttribute.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/SourceAttribute.java
@@ -1,4 +1,4 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
import static com.google.common.base.CaseFormat.LOWER_CAMEL;
import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
diff --git a/src/org/opensha2/internal/SourceElement.java b/src/gov/usgs/earthquake/nshmp/internal/SourceElement.java
similarity index 97%
rename from src/org/opensha2/internal/SourceElement.java
rename to src/gov/usgs/earthquake/nshmp/internal/SourceElement.java
index eab1dc8363c69bc9aa110e487f6d7568fa855a8d..91cf27dfc95469b9ada9bfa2f6e3b9dc8b5bcd3b 100644
--- a/src/org/opensha2/internal/SourceElement.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/SourceElement.java
@@ -1,4 +1,4 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
import static com.google.common.base.CaseFormat.UPPER_CAMEL;
import static com.google.common.base.CaseFormat.UPPER_UNDERSCORE;
diff --git a/src/org/opensha2/internal/TextUtils.java b/src/gov/usgs/earthquake/nshmp/internal/TextUtils.java
similarity index 96%
rename from src/org/opensha2/internal/TextUtils.java
rename to src/gov/usgs/earthquake/nshmp/internal/TextUtils.java
index f42a1bfc0a750b9fd95dcd383a80585ca258b596..0fd5594f84537d14a567aa1eccb4ef79b754b797 100644
--- a/src/org/opensha2/internal/TextUtils.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/TextUtils.java
@@ -1,4 +1,4 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
import static com.google.common.base.Preconditions.checkArgument;
diff --git a/src/org/opensha2/internal/UsRegion.java b/src/gov/usgs/earthquake/nshmp/internal/UsRegion.java
similarity index 98%
rename from src/org/opensha2/internal/UsRegion.java
rename to src/gov/usgs/earthquake/nshmp/internal/UsRegion.java
index 34ad304b5f3a017b512f5711fdf4f647a49040e2..808dd995cb9fd01c63a1fe06eefc68c532bf619d 100644
--- a/src/org/opensha2/internal/UsRegion.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/UsRegion.java
@@ -1,4 +1,4 @@
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
import java.util.EnumSet;
import java.util.Set;
diff --git a/src/org/opensha2/internal/package-info.java b/src/gov/usgs/earthquake/nshmp/internal/package-info.java
similarity index 57%
rename from src/org/opensha2/internal/package-info.java
rename to src/gov/usgs/earthquake/nshmp/internal/package-info.java
index e796958daf4ddb4feb53b91672ea7f8914f97147..17d4cfc819e1e68153a6e6ae57789fd11c44918e 100644
--- a/src/org/opensha2/internal/package-info.java
+++ b/src/gov/usgs/earthquake/nshmp/internal/package-info.java
@@ -1,4 +1,4 @@
/**
* Internal helper classes that are not documented.
*/
-package org.opensha2.internal;
+package gov.usgs.earthquake.nshmp.internal;
diff --git a/src/org/opensha2/mfd/GaussianMfd.java b/src/gov/usgs/earthquake/nshmp/mfd/GaussianMfd.java
similarity index 99%
rename from src/org/opensha2/mfd/GaussianMfd.java
rename to src/gov/usgs/earthquake/nshmp/mfd/GaussianMfd.java
index c7b2734353af8569a98387256f233f0ce8952082..08cd52eaaaffd884f2bbe8a3ae8329d3e1c69230 100644
--- a/src/org/opensha2/mfd/GaussianMfd.java
+++ b/src/gov/usgs/earthquake/nshmp/mfd/GaussianMfd.java
@@ -1,4 +1,4 @@
-package org.opensha2.mfd;
+package gov.usgs.earthquake.nshmp.mfd;
import java.awt.geom.Point2D;
diff --git a/src/org/opensha2/mfd/GutenbergRichterMfd.java b/src/gov/usgs/earthquake/nshmp/mfd/GutenbergRichterMfd.java
similarity index 98%
rename from src/org/opensha2/mfd/GutenbergRichterMfd.java
rename to src/gov/usgs/earthquake/nshmp/mfd/GutenbergRichterMfd.java
index 0a4e38b3d324e80728894e022d003be76180247e..6b7e26664d035e2a4cf7bd06b1fbc896e8982996 100644
--- a/src/org/opensha2/mfd/GutenbergRichterMfd.java
+++ b/src/gov/usgs/earthquake/nshmp/mfd/GutenbergRichterMfd.java
@@ -1,9 +1,9 @@
-package org.opensha2.mfd;
+package gov.usgs.earthquake.nshmp.mfd;
import static com.google.common.base.Preconditions.checkArgument;
/**
- * <p>Title: GutenbergRichterMfd.java <p>Description: This is a truncated
+ * <p>Title: GutenbergRichterMfd.java <p>Description: This is a truncated
* incremental Gutenberg-Richter distribution. Note that magLower and magUpper
* must exactly equal one of the descrete x-axis values.
*
diff --git a/src/org/opensha2/mfd/IncrementalMfd.java b/src/gov/usgs/earthquake/nshmp/mfd/IncrementalMfd.java
similarity index 98%
rename from src/org/opensha2/mfd/IncrementalMfd.java
rename to src/gov/usgs/earthquake/nshmp/mfd/IncrementalMfd.java
index 6e9f35be3fc51a4b73ecf68bc404a44c8fb031b7..c7947fd3362e5f77e08fed8e3dc1914ee9346bfb 100644
--- a/src/org/opensha2/mfd/IncrementalMfd.java
+++ b/src/gov/usgs/earthquake/nshmp/mfd/IncrementalMfd.java
@@ -1,7 +1,7 @@
-package org.opensha2.mfd;
+package gov.usgs.earthquake.nshmp.mfd;
-import org.opensha2.eq.Earthquakes;
-import org.opensha2.function.EvenlyDiscretizedFunc;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+import gov.usgs.earthquake.nshmp.function.EvenlyDiscretizedFunc;
/**
* Base implementation for magnitude-frequency distributions (MFDs) that give
diff --git a/src/org/opensha2/mfd/MfdType.java b/src/gov/usgs/earthquake/nshmp/mfd/MfdType.java
similarity index 90%
rename from src/org/opensha2/mfd/MfdType.java
rename to src/gov/usgs/earthquake/nshmp/mfd/MfdType.java
index 494452c717d4b875eadb8483cd7a53918972f9d3..df0df51b31ed23da4e845121d31fee1c9acd47f2 100644
--- a/src/org/opensha2/mfd/MfdType.java
+++ b/src/gov/usgs/earthquake/nshmp/mfd/MfdType.java
@@ -1,4 +1,4 @@
-package org.opensha2.mfd;
+package gov.usgs.earthquake.nshmp.mfd;
/**
* Magnitude-frequency distribution (MFD) type identifier.
diff --git a/src/org/opensha2/mfd/Mfds.java b/src/gov/usgs/earthquake/nshmp/mfd/Mfds.java
similarity index 98%
rename from src/org/opensha2/mfd/Mfds.java
rename to src/gov/usgs/earthquake/nshmp/mfd/Mfds.java
index ad15cf7ed07f2dc484b006173b0c5951e2e3edbc..654a8d2c23efd7f6b0346f6dec9b4e8b8e3c641d 100644
--- a/src/org/opensha2/mfd/Mfds.java
+++ b/src/gov/usgs/earthquake/nshmp/mfd/Mfds.java
@@ -1,17 +1,13 @@
-package org.opensha2.mfd;
+package gov.usgs.earthquake.nshmp.mfd;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
+import static gov.usgs.earthquake.nshmp.data.Data.checkInRange;
+import static gov.usgs.earthquake.nshmp.eq.Earthquakes.magToMoment;
import static java.lang.Math.exp;
import static java.lang.Math.log;
import static java.lang.Math.pow;
-import static org.opensha2.data.Data.checkInRange;
-import static org.opensha2.eq.Earthquakes.magToMoment;
-
-import org.opensha2.data.Data;
-import org.opensha2.data.XySequence;
-
import com.google.common.base.Converter;
import com.google.common.collect.Range;
import com.google.common.primitives.Doubles;
@@ -19,6 +15,9 @@ import com.google.common.primitives.Doubles;
import java.util.ArrayList;
import java.util.List;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+
/**
* Factory and utility methods for working with magnitude frequency
* distributions (Mfds).
diff --git a/src/org/opensha2/mfd/YC_1985_CharMfd.java b/src/gov/usgs/earthquake/nshmp/mfd/YC_1985_CharMfd.java
similarity index 98%
rename from src/org/opensha2/mfd/YC_1985_CharMfd.java
rename to src/gov/usgs/earthquake/nshmp/mfd/YC_1985_CharMfd.java
index 9759a91ea225eccd4de29019c1197cd1130a1052..138c4911a48ac7fd01209083f2b05a837fccc9b2 100644
--- a/src/org/opensha2/mfd/YC_1985_CharMfd.java
+++ b/src/gov/usgs/earthquake/nshmp/mfd/YC_1985_CharMfd.java
@@ -1,11 +1,11 @@
-package org.opensha2.mfd;
+package gov.usgs.earthquake.nshmp.mfd;
import static com.google.common.base.Preconditions.checkArgument;
import java.awt.geom.Point2D;
/**
- * <p>Title: YC_1985_CharMfd.java
+ * <p>Title: YC_1985_CharMfd.java
*
* <p>Description: This is the "characteristic" magnitude-frequency distribution
* defined by Youngs and Coppersmith (1985, Bull. Seism. Soc. Am., 939-964). The
@@ -14,7 +14,7 @@ import java.awt.geom.Point2D;
* Gutenberg-Richter part at (magPrime-deltaMagPrime). See their figure 10 for a
* graphical explanation of these parameters. Note that magLower, magUpper,
* magPrime, magUpper-deltaMagChar, and magPrime-deltaMagPrime must all be
- * exactly equal one of the descrete x-axis points.
+ * exactly equal one of the descrete x-axis points.
*
* @author Edward H. Field Date: Sept. 26, 2002
* @version 1.0
diff --git a/src/org/opensha2/mfd/package-info.java b/src/gov/usgs/earthquake/nshmp/mfd/package-info.java
similarity index 65%
rename from src/org/opensha2/mfd/package-info.java
rename to src/gov/usgs/earthquake/nshmp/mfd/package-info.java
index e62fbe994bc9176b546288153d41824905e42f60..47866c46f0723adb1f0a1f368469efe416d91aaa 100644
--- a/src/org/opensha2/mfd/package-info.java
+++ b/src/gov/usgs/earthquake/nshmp/mfd/package-info.java
@@ -1,4 +1,4 @@
/**
* Magnitude frequency distribution (MFDs) classes and utilties.
*/
-package org.opensha2.mfd;
+package gov.usgs.earthquake.nshmp.mfd;
diff --git a/src/org/opensha2/package-info.java b/src/gov/usgs/earthquake/nshmp/package-info.java
similarity index 71%
rename from src/org/opensha2/package-info.java
rename to src/gov/usgs/earthquake/nshmp/package-info.java
index b02e9c685f0d194828ae7a67b8331609608ad6fd..8b3a8acf7856ebbbd793cac9654ce30a8cd0d441 100644
--- a/src/org/opensha2/package-info.java
+++ b/src/gov/usgs/earthquake/nshmp/package-info.java
@@ -1,4 +1,4 @@
/**
* Entry points for conducting probabilisitic seismic hazard analyses (PSHA).
*/
-package org.opensha2;
+package gov.usgs.earthquake.nshmp;
diff --git a/src/org/opensha2/util/Maths.java b/src/gov/usgs/earthquake/nshmp/util/Maths.java
similarity index 99%
rename from src/org/opensha2/util/Maths.java
rename to src/gov/usgs/earthquake/nshmp/util/Maths.java
index cbf643338a63118de270a9cc97b32074eefac2aa..c626ff5e1611b2cca1e754dc202c43640bc6f162 100644
--- a/src/org/opensha2/util/Maths.java
+++ b/src/gov/usgs/earthquake/nshmp/util/Maths.java
@@ -1,4 +1,4 @@
-package org.opensha2.util;
+package gov.usgs.earthquake.nshmp.util;
import com.google.common.base.Converter;
diff --git a/src/org/opensha2/util/Named.java b/src/gov/usgs/earthquake/nshmp/util/Named.java
similarity index 91%
rename from src/org/opensha2/util/Named.java
rename to src/gov/usgs/earthquake/nshmp/util/Named.java
index a9adc910dde58171f7bb6c25b79fba282a654d8f..524cab7cbb2101b4e3c8ced6e6d210943e8e8cb8 100644
--- a/src/org/opensha2/util/Named.java
+++ b/src/gov/usgs/earthquake/nshmp/util/Named.java
@@ -1,4 +1,4 @@
-package org.opensha2.util;
+package gov.usgs.earthquake.nshmp.util;
/**
* Interface indicating an object has a name, usually prettified for display and
diff --git a/src/org/opensha2/util/NamedLocation.java b/src/gov/usgs/earthquake/nshmp/util/NamedLocation.java
similarity index 87%
rename from src/org/opensha2/util/NamedLocation.java
rename to src/gov/usgs/earthquake/nshmp/util/NamedLocation.java
index 2d3699c1ebbc6cbad0bde64e0b238da6f6ac9285..c2856ebc824d49f88648c6079ac716852fcb7cc7 100644
--- a/src/org/opensha2/util/NamedLocation.java
+++ b/src/gov/usgs/earthquake/nshmp/util/NamedLocation.java
@@ -1,6 +1,6 @@
-package org.opensha2.util;
+package gov.usgs.earthquake.nshmp.util;
-import org.opensha2.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.Location;
/**
* Marker interface for {@code enum}s of {@link Location}s. This interface is
diff --git a/src/gov/usgs/earthquake/nshmp/util/package-info.java b/src/gov/usgs/earthquake/nshmp/util/package-info.java
new file mode 100644
index 0000000000000000000000000000000000000000..a3c073237549b01d0488ec26fdb0c85790549bc1
--- /dev/null
+++ b/src/gov/usgs/earthquake/nshmp/util/package-info.java
@@ -0,0 +1,4 @@
+/**
+ * Miscellaneous utilties.
+ */
+package gov.usgs.earthquake.nshmp.util;
diff --git a/src/org/opensha2/eq/fault/package-info.java b/src/org/opensha2/eq/fault/package-info.java
deleted file mode 100644
index cbe435522c61c7a5ea0809faad8f5ca278f60fab..0000000000000000000000000000000000000000
--- a/src/org/opensha2/eq/fault/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Fault representations.
- */
-package org.opensha2.eq.fault;
diff --git a/src/org/opensha2/eq/fault/surface/package-info.java b/src/org/opensha2/eq/fault/surface/package-info.java
deleted file mode 100644
index e591afb9cf657d368424b720577fd3c5133d1506..0000000000000000000000000000000000000000
--- a/src/org/opensha2/eq/fault/surface/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Fault surfaces.
- */
-package org.opensha2.eq.fault.surface;
diff --git a/src/org/opensha2/eq/model/package-info.java b/src/org/opensha2/eq/model/package-info.java
deleted file mode 100644
index 427a42ae3e8a2b8466b171eb4b6181b809eec87c..0000000000000000000000000000000000000000
--- a/src/org/opensha2/eq/model/package-info.java
+++ /dev/null
@@ -1,5 +0,0 @@
-/**
- * Earthquake {@link org.opensha2.eq.model.Source} and
- * {@link org.opensha2.eq.model.HazardModel} representations.
- */
-package org.opensha2.eq.model;
diff --git a/src/org/opensha2/eq/package-info.java b/src/org/opensha2/eq/package-info.java
deleted file mode 100644
index 6a1d9e81dcf58e99515ba6922d027036616ba259..0000000000000000000000000000000000000000
--- a/src/org/opensha2/eq/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Earthquake source models.
- */
-package org.opensha2.eq;
diff --git a/src/org/opensha2/function/package-info.java b/src/org/opensha2/function/package-info.java
deleted file mode 100644
index 90fa6756cd86748c6856676e8303f949927b0a06..0000000000000000000000000000000000000000
--- a/src/org/opensha2/function/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * <i>Slated for deprecation.</i>
- */
-package org.opensha2.function;
diff --git a/src/org/opensha2/gmm/package-info.java b/src/org/opensha2/gmm/package-info.java
deleted file mode 100644
index c91c8f9ea2f47169c4c7cb39e199ca3cc9d19220..0000000000000000000000000000000000000000
--- a/src/org/opensha2/gmm/package-info.java
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * Implementations of all {@link org.opensha2.gmm.GroundMotionModel}s used in
- * the 2008 and 2014 USGS National Seismic Hazard Models.
- *
- * <p>Most of the model implementations in this package may not be instantiated
- * directly. Rather, instances of each are/should be obtained via
- * {@link org.opensha2.gmm.Gmm#instance(Imt)}. The various models are exposed
- * publicly for the sake of documentation. In many cases, the public
- * implementations are {@code abstract}, and there are a variety of model
- * flavors that are available via the {@link org.opensha2.gmm.Gmm} enum.
- */
-package org.opensha2.gmm;
diff --git a/src/org/opensha2/util/package-info.java b/src/org/opensha2/util/package-info.java
deleted file mode 100644
index dcf62d7421a6b0ca4bf21ed823207cead894eaf8..0000000000000000000000000000000000000000
--- a/src/org/opensha2/util/package-info.java
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * Miscellaneous utilties.
- */
-package org.opensha2.util;
diff --git a/test/etc/SequenceBenchmark.java b/test/etc/SequenceBenchmark.java
index fb2b0b84843625bbf2c3c179695e18c9d27c2306..c485c38bf6a0bd67cc95cee24cc967d3bf566f9a 100644
--- a/test/etc/SequenceBenchmark.java
+++ b/test/etc/SequenceBenchmark.java
@@ -1,12 +1,12 @@
package etc;
-import org.opensha2.data.XySequence;
-import org.opensha2.function.ArbitrarilyDiscretizedFunc;
-import org.opensha2.function.DiscretizedFunc;
-import org.opensha2.function.EvenlyDiscretizedFunc;
-
import com.google.common.base.Stopwatch;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+import gov.usgs.earthquake.nshmp.function.ArbitrarilyDiscretizedFunc;
+import gov.usgs.earthquake.nshmp.function.DiscretizedFunc;
+import gov.usgs.earthquake.nshmp.function.EvenlyDiscretizedFunc;
+
/**
* Quick, possibly naive, benchmark of ArbitrarilyDiscretizedFunction,
* EvenlyDiscretizedFunction, and XySequence. XySequence is generally faster and
diff --git a/test/org/opensha2/data/DataArrayTests.java b/test/gov/usgs/earthquake/nshmp/data/DataArrayTests.java
similarity index 88%
rename from test/org/opensha2/data/DataArrayTests.java
rename to test/gov/usgs/earthquake/nshmp/data/DataArrayTests.java
index a0e15c936b74acc3bf9f625c2c7bf1aa09798c78..8cbbdd4a3e3310bbaceb20d4b1b2ce435b465b2c 100644
--- a/test/org/opensha2/data/DataArrayTests.java
+++ b/test/gov/usgs/earthquake/nshmp/data/DataArrayTests.java
@@ -1,11 +1,13 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static org.junit.Assert.*;
-//import org.opensha2.data.DataArray.Builder;
+//import gov.usgs.earthquake.nshmp.data.DataArray.Builder;
import org.junit.Test;
+import gov.usgs.earthquake.nshmp.data.DataArray;
+
public class DataArrayTests {
@Test
diff --git a/test/org/opensha2/data/DataTests.java b/test/gov/usgs/earthquake/nshmp/data/DataTests.java
similarity index 99%
rename from test/org/opensha2/data/DataTests.java
rename to test/gov/usgs/earthquake/nshmp/data/DataTests.java
index 11fc5df799e33bfd11b7227b468c8dee080994be..525cb36153c5ea96c727afb33f020cbbbb95a14a 100644
--- a/test/org/opensha2/data/DataTests.java
+++ b/test/gov/usgs/earthquake/nshmp/data/DataTests.java
@@ -1,4 +1,4 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -7,8 +7,6 @@ import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
-import org.opensha2.gmm.Imt;
-
import org.junit.Test;
import com.google.common.base.Function;
@@ -22,6 +20,9 @@ import java.util.EnumMap;
import java.util.List;
import java.util.Map;
+import gov.usgs.earthquake.nshmp.data.Data;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
@SuppressWarnings("javadoc")
public final class DataTests {
diff --git a/test/org/opensha2/data/ImmutableXySequenceTests.java b/test/gov/usgs/earthquake/nshmp/data/ImmutableXySequenceTests.java
similarity index 81%
rename from test/org/opensha2/data/ImmutableXySequenceTests.java
rename to test/gov/usgs/earthquake/nshmp/data/ImmutableXySequenceTests.java
index fc8e3ce039c67297d11c44b2cbc3c9b6254159fb..ed57deabaa61952a9aa8efc77289ef7dc9abe50b 100644
--- a/test/org/opensha2/data/ImmutableXySequenceTests.java
+++ b/test/gov/usgs/earthquake/nshmp/data/ImmutableXySequenceTests.java
@@ -1,9 +1,11 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static org.junit.Assert.*;
import org.junit.Test;
+import gov.usgs.earthquake.nshmp.data.XySequence;
+
/**
* Add comments here
*
diff --git a/test/org/opensha2/data/IndexingTests.java b/test/gov/usgs/earthquake/nshmp/data/IndexingTests.java
similarity index 97%
rename from test/org/opensha2/data/IndexingTests.java
rename to test/gov/usgs/earthquake/nshmp/data/IndexingTests.java
index 66f27f279bac8aeeed2b276d52b8ce64949a5bbb..cacedcdd1b2ec756744124749eb2efe906808951 100644
--- a/test/org/opensha2/data/IndexingTests.java
+++ b/test/gov/usgs/earthquake/nshmp/data/IndexingTests.java
@@ -1,4 +1,4 @@
-package org.opensha2.data;
+package gov.usgs.earthquake.nshmp.data;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -11,6 +11,8 @@ import com.google.common.primitives.Ints;
import java.util.BitSet;
import java.util.List;
+import gov.usgs.earthquake.nshmp.data.Indexing;
+
@SuppressWarnings("javadoc")
public final class IndexingTests {
diff --git a/test/org/opensha2/eq/EarthquakesTests.java b/test/gov/usgs/earthquake/nshmp/eq/EarthquakesTests.java
similarity index 97%
rename from test/org/opensha2/eq/EarthquakesTests.java
rename to test/gov/usgs/earthquake/nshmp/eq/EarthquakesTests.java
index 7dbf3bcfef2391aaf2ba61d5663a03607c57c6aa..6023b300177d93058cc741c37fa55fd02fceedb4 100644
--- a/test/org/opensha2/eq/EarthquakesTests.java
+++ b/test/gov/usgs/earthquake/nshmp/eq/EarthquakesTests.java
@@ -1,9 +1,11 @@
-package org.opensha2.eq;
+package gov.usgs.earthquake.nshmp.eq;
import static org.junit.Assert.assertEquals;
import org.junit.Test;
+import gov.usgs.earthquake.nshmp.eq.Earthquakes;
+
@SuppressWarnings("javadoc")
public final class EarthquakesTests {
diff --git a/test/org/opensha2/eq/fault/FaultsTests.java b/test/gov/usgs/earthquake/nshmp/eq/fault/FaultsTests.java
similarity index 89%
rename from test/org/opensha2/eq/fault/FaultsTests.java
rename to test/gov/usgs/earthquake/nshmp/eq/fault/FaultsTests.java
index 9872e89fa106dd308e3a5011cca4cbd4b67488ae..1964302d5aef0777abae5ef2678acb0edceb4590 100644
--- a/test/org/opensha2/eq/fault/FaultsTests.java
+++ b/test/gov/usgs/earthquake/nshmp/eq/fault/FaultsTests.java
@@ -1,13 +1,14 @@
-package org.opensha2.eq.fault;
+package gov.usgs.earthquake.nshmp.eq.fault;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertSame;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-
import org.junit.Test;
+import gov.usgs.earthquake.nshmp.eq.fault.Faults;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+
@SuppressWarnings("javadoc")
public final class FaultsTests {
diff --git a/test/org/opensha2/eq/fault/surface/DefaultGriddedSurfaceTest.java b/test/gov/usgs/earthquake/nshmp/eq/fault/surface/DefaultGriddedSurfaceTest.java
similarity index 78%
rename from test/org/opensha2/eq/fault/surface/DefaultGriddedSurfaceTest.java
rename to test/gov/usgs/earthquake/nshmp/eq/fault/surface/DefaultGriddedSurfaceTest.java
index 2f6b61fa325cbe65d36420212452b6ef74d99640..48ce874e017a50cb85218e40ee65931458329d9f 100644
--- a/test/org/opensha2/eq/fault/surface/DefaultGriddedSurfaceTest.java
+++ b/test/gov/usgs/earthquake/nshmp/eq/fault/surface/DefaultGriddedSurfaceTest.java
@@ -1,12 +1,13 @@
-package org.opensha2.eq.fault.surface;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import static org.junit.Assert.assertEquals;
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
-
import org.junit.Test;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.DefaultGriddedSurface;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+
@SuppressWarnings("javadoc")
public class DefaultGriddedSurfaceTest {
diff --git a/test/org/opensha2/eq/fault/surface/RuptureFloatingTest.java b/test/gov/usgs/earthquake/nshmp/eq/fault/surface/RuptureFloatingTest.java
similarity index 84%
rename from test/org/opensha2/eq/fault/surface/RuptureFloatingTest.java
rename to test/gov/usgs/earthquake/nshmp/eq/fault/surface/RuptureFloatingTest.java
index a00c7f248b2d1671f6bb66228fe34c2c19ffcf5d..6cb78405f9017880d06f8db2d25df094da8dd02f 100644
--- a/test/org/opensha2/eq/fault/surface/RuptureFloatingTest.java
+++ b/test/gov/usgs/earthquake/nshmp/eq/fault/surface/RuptureFloatingTest.java
@@ -1,11 +1,12 @@
-package org.opensha2.eq.fault.surface;
-
-import org.opensha2.geo.Location;
-import org.opensha2.geo.LocationList;
+package gov.usgs.earthquake.nshmp.eq.fault.surface;
import org.junit.BeforeClass;
import org.junit.Test;
+import gov.usgs.earthquake.nshmp.eq.fault.surface.DefaultGriddedSurface;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+
public class RuptureFloatingTest {
@BeforeClass
diff --git a/test/org/opensha2/eq/model/LoaderTests.java b/test/gov/usgs/earthquake/nshmp/eq/model/LoaderTests.java
similarity index 96%
rename from test/org/opensha2/eq/model/LoaderTests.java
rename to test/gov/usgs/earthquake/nshmp/eq/model/LoaderTests.java
index 4e3c5d80ff863898eba817e423b08ac62215d219..0594dedd984dd9258f0983d142dab065ee2d4dda 100644
--- a/test/org/opensha2/eq/model/LoaderTests.java
+++ b/test/gov/usgs/earthquake/nshmp/eq/model/LoaderTests.java
@@ -1,4 +1,4 @@
-package org.opensha2.eq.model;
+package gov.usgs.earthquake.nshmp.eq.model;
import org.junit.Rule;
import org.junit.Test;
@@ -10,6 +10,8 @@ import java.net.URL;
import java.net.URLDecoder;
import java.nio.file.Paths;
+import gov.usgs.earthquake.nshmp.eq.model.Loader;
+
@SuppressWarnings("javadoc")
public class LoaderTests {
diff --git a/test/org/opensha2/eq/model/data/bad[name].zip b/test/gov/usgs/earthquake/nshmp/eq/model/data/bad[name].zip
similarity index 100%
rename from test/org/opensha2/eq/model/data/bad[name].zip
rename to test/gov/usgs/earthquake/nshmp/eq/model/data/bad[name].zip
diff --git a/test/org/opensha2/eq/model/data/empty.zip b/test/gov/usgs/earthquake/nshmp/eq/model/data/empty.zip
similarity index 100%
rename from test/org/opensha2/eq/model/data/empty.zip
rename to test/gov/usgs/earthquake/nshmp/eq/model/data/empty.zip
diff --git a/test/org/opensha2/eq/model/peer/PeerTest.java b/test/gov/usgs/earthquake/nshmp/eq/model/peer/PeerTest.java
similarity index 92%
rename from test/org/opensha2/eq/model/peer/PeerTest.java
rename to test/gov/usgs/earthquake/nshmp/eq/model/peer/PeerTest.java
index 1c1d30e0b1e020e9010ad03fb16a500cb8fc8d57..381baf94d9c7e0ad2bc216517ed87bee60c4e7c8 100644
--- a/test/org/opensha2/eq/model/peer/PeerTest.java
+++ b/test/gov/usgs/earthquake/nshmp/eq/model/peer/PeerTest.java
@@ -1,24 +1,13 @@
-package org.opensha2.eq.model.peer;
+package gov.usgs.earthquake.nshmp.eq.model.peer;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkState;
+import static gov.usgs.earthquake.nshmp.internal.Parsing.Delimiter.COMMA;
import static java.lang.Math.abs;
import static java.nio.charset.StandardCharsets.UTF_8;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertTrue;
-import static org.opensha2.internal.Parsing.Delimiter.COMMA;
-
-import org.opensha2.HazardCalc;
-import org.opensha2.calc.CalcConfig;
-import org.opensha2.calc.Hazard;
-import org.opensha2.calc.Site;
-import org.opensha2.calc.Sites;
-import org.opensha2.eq.model.HazardModel;
-import org.opensha2.gmm.Imt;
-import org.opensha2.internal.Parsing;
-import org.opensha2.mfd.Mfds;
-
import org.junit.Ignore;
import org.junit.Test;
@@ -37,6 +26,16 @@ import java.util.List;
import java.util.Map;
import java.util.concurrent.Executor;
+import gov.usgs.earthquake.nshmp.HazardCalc;
+import gov.usgs.earthquake.nshmp.calc.CalcConfig;
+import gov.usgs.earthquake.nshmp.calc.Hazard;
+import gov.usgs.earthquake.nshmp.calc.Site;
+import gov.usgs.earthquake.nshmp.calc.Sites;
+import gov.usgs.earthquake.nshmp.eq.model.HazardModel;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+
@SuppressWarnings("javadoc")
@Ignore("Parameterized Use Only")
public class PeerTest {
diff --git a/test/org/opensha2/eq/model/peer/PeerTests.java b/test/gov/usgs/earthquake/nshmp/eq/model/peer/PeerTests.java
similarity index 99%
rename from test/org/opensha2/eq/model/peer/PeerTests.java
rename to test/gov/usgs/earthquake/nshmp/eq/model/peer/PeerTests.java
index 7c64215b0b6e04cc0d92f99681f6ec23a991be4a..5383f76e97e066f4412811ba3762a309e3446863 100644
--- a/test/org/opensha2/eq/model/peer/PeerTests.java
+++ b/test/gov/usgs/earthquake/nshmp/eq/model/peer/PeerTests.java
@@ -1,7 +1,4 @@
-package org.opensha2.eq.model.peer;
-
-import org.opensha2.calc.Site;
-import org.opensha2.eq.model.HazardModel;
+package gov.usgs.earthquake.nshmp.eq.model.peer;
import org.junit.Ignore;
import org.junit.experimental.runners.Enclosed;
@@ -12,6 +9,9 @@ import org.junit.runners.Parameterized.Parameters;
import java.io.IOException;
import java.util.Collection;
+import gov.usgs.earthquake.nshmp.calc.Site;
+import gov.usgs.earthquake.nshmp.eq.model.HazardModel;
+
@SuppressWarnings("javadoc")
@RunWith(Enclosed.class)
public class PeerTests {
diff --git a/test/org/opensha2/geo/BoundsTest.java b/test/gov/usgs/earthquake/nshmp/geo/BoundsTest.java
similarity index 93%
rename from test/org/opensha2/geo/BoundsTest.java
rename to test/gov/usgs/earthquake/nshmp/geo/BoundsTest.java
index 116abbb7fdb01b234bad78471478c677223d6203..38a8a41488d7bdf0efb9ea325fb429ef2b12aa14 100644
--- a/test/org/opensha2/geo/BoundsTest.java
+++ b/test/gov/usgs/earthquake/nshmp/geo/BoundsTest.java
@@ -1,4 +1,4 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
@@ -7,6 +7,10 @@ import static org.junit.Assert.assertSame;
import org.junit.Test;
+import gov.usgs.earthquake.nshmp.geo.Bounds;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+
@SuppressWarnings("javadoc")
public class BoundsTest {
diff --git a/test/org/opensha2/geo/LocationListTest.java b/test/gov/usgs/earthquake/nshmp/geo/LocationListTest.java
similarity index 96%
rename from test/org/opensha2/geo/LocationListTest.java
rename to test/gov/usgs/earthquake/nshmp/geo/LocationListTest.java
index 0f9d074a3e396d51c85a82a4fc5c4ff503d9e296..ef28caed9de650ce2d94474263f5270ee00d7d19 100644
--- a/test/org/opensha2/geo/LocationListTest.java
+++ b/test/gov/usgs/earthquake/nshmp/geo/LocationListTest.java
@@ -1,16 +1,12 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
+import static gov.usgs.earthquake.nshmp.internal.TextUtils.NEWLINE;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThat;
-import static org.opensha2.internal.TextUtils.NEWLINE;
-
-import org.opensha2.geo.LocationList.RegularLocationList;
-import org.opensha2.util.Maths;
-
import org.hamcrest.CoreMatchers;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -20,6 +16,13 @@ import com.google.common.collect.Lists;
import java.util.List;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationGrid;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.LocationVector;
+import gov.usgs.earthquake.nshmp.geo.LocationList.RegularLocationList;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
@SuppressWarnings("javadoc")
public class LocationListTest {
diff --git a/test/org/opensha2/geo/LocationTest.java b/test/gov/usgs/earthquake/nshmp/geo/LocationTest.java
similarity index 96%
rename from test/org/opensha2/geo/LocationTest.java
rename to test/gov/usgs/earthquake/nshmp/geo/LocationTest.java
index 5a1b12bbe6a6dc8c2285be1d4980d2c86d4be34f..46d2f257d38c059756cb20ab2965844dd3700a1d 100644
--- a/test/org/opensha2/geo/LocationTest.java
+++ b/test/gov/usgs/earthquake/nshmp/geo/LocationTest.java
@@ -1,11 +1,9 @@
-package org.opensha2.geo;
+package gov.usgs.earthquake.nshmp.geo;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertTrue;
-import org.opensha2.util.Maths;
-
import org.junit.Before;
import org.junit.Test;
@@ -14,6 +12,9 @@ import com.google.common.collect.Lists;
import java.util.Collections;
import java.util.List;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
@SuppressWarnings("javadoc")
public class LocationTest {
diff --git a/test/org/opensha2/geo/LocationsTest.java b/test/gov/usgs/earthquake/nshmp/geo/LocationsTest.java
similarity index 97%
rename from test/org/opensha2/geo/LocationsTest.java
rename to test/gov/usgs/earthquake/nshmp/geo/LocationsTest.java
index ce775da43dabbcabebccb757d69e6a300e2d7544..607569f74cd2604a78ef6646d583d27a74e482b2 100644
--- a/test/org/opensha2/geo/LocationsTest.java
+++ b/test/gov/usgs/earthquake/nshmp/geo/LocationsTest.java
@@ -1,29 +1,25 @@
-package org.opensha2.geo;
-
+package gov.usgs.earthquake.nshmp.geo;
+
+import static gov.usgs.earthquake.nshmp.geo.Coordinates.EARTH_RADIUS_MEAN;
+import static gov.usgs.earthquake.nshmp.geo.Locations.angle;
+import static gov.usgs.earthquake.nshmp.geo.Locations.areSimilar;
+import static gov.usgs.earthquake.nshmp.geo.Locations.azimuth;
+import static gov.usgs.earthquake.nshmp.geo.Locations.azimuthRad;
+import static gov.usgs.earthquake.nshmp.geo.Locations.bounds;
+import static gov.usgs.earthquake.nshmp.geo.Locations.distanceToLine;
+import static gov.usgs.earthquake.nshmp.geo.Locations.distanceToLineFast;
+import static gov.usgs.earthquake.nshmp.geo.Locations.distanceToSegment;
+import static gov.usgs.earthquake.nshmp.geo.Locations.distanceToSegmentFast;
+import static gov.usgs.earthquake.nshmp.geo.Locations.horzDistance;
+import static gov.usgs.earthquake.nshmp.geo.Locations.horzDistanceFast;
+import static gov.usgs.earthquake.nshmp.geo.Locations.isPole;
+import static gov.usgs.earthquake.nshmp.geo.Locations.linearDistance;
+import static gov.usgs.earthquake.nshmp.geo.Locations.linearDistanceFast;
+import static gov.usgs.earthquake.nshmp.geo.Locations.location;
+import static gov.usgs.earthquake.nshmp.geo.Locations.vertDistance;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import static org.opensha2.geo.Coordinates.EARTH_RADIUS_MEAN;
-import static org.opensha2.geo.Locations.angle;
-import static org.opensha2.geo.Locations.areSimilar;
-import static org.opensha2.geo.Locations.azimuth;
-import static org.opensha2.geo.Locations.azimuthRad;
-import static org.opensha2.geo.Locations.bounds;
-import static org.opensha2.geo.Locations.distanceToLine;
-import static org.opensha2.geo.Locations.distanceToLineFast;
-import static org.opensha2.geo.Locations.distanceToSegment;
-import static org.opensha2.geo.Locations.distanceToSegmentFast;
-import static org.opensha2.geo.Locations.horzDistance;
-import static org.opensha2.geo.Locations.horzDistanceFast;
-import static org.opensha2.geo.Locations.isPole;
-import static org.opensha2.geo.Locations.linearDistance;
-import static org.opensha2.geo.Locations.linearDistanceFast;
-import static org.opensha2.geo.Locations.location;
-import static org.opensha2.geo.Locations.vertDistance;
-
-import org.opensha2.eq.model.Distance;
-import org.opensha2.util.Maths;
-
import org.junit.Test;
import com.google.common.collect.Lists;
@@ -31,6 +27,14 @@ import com.google.common.collect.Lists;
import java.util.List;
import java.util.Random;
+import gov.usgs.earthquake.nshmp.eq.model.Distance;
+import gov.usgs.earthquake.nshmp.geo.Bounds;
+import gov.usgs.earthquake.nshmp.geo.Location;
+import gov.usgs.earthquake.nshmp.geo.LocationList;
+import gov.usgs.earthquake.nshmp.geo.LocationVector;
+import gov.usgs.earthquake.nshmp.geo.Locations;
+import gov.usgs.earthquake.nshmp.util.Maths;
+
@SuppressWarnings("javadoc")
public class LocationsTest {
diff --git a/test/org/opensha2/gmm/CeusHardRock.java b/test/gov/usgs/earthquake/nshmp/gmm/CeusHardRock.java
similarity index 72%
rename from test/org/opensha2/gmm/CeusHardRock.java
rename to test/gov/usgs/earthquake/nshmp/gmm/CeusHardRock.java
index cbf0ab417cf62dfe3b857e3a8bbe466314675c33..03067d685bdf10e31b00b447f57d07a749403cc5 100644
--- a/test/org/opensha2/gmm/CeusHardRock.java
+++ b/test/gov/usgs/earthquake/nshmp/gmm/CeusHardRock.java
@@ -1,11 +1,11 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import static org.opensha2.gmm.Gmm.AB_06_PRIME;
-import static org.opensha2.gmm.Gmm.TORO_97_MB;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.Imt.SA0P2;
-import static org.opensha2.gmm.Imt.SA1P0;
-import static org.opensha2.gmm.Imt.SA2P0;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.AB_06_PRIME;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.TORO_97_MB;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P2;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA1P0;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA2P0;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -16,6 +16,9 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
@SuppressWarnings("javadoc")
@RunWith(Parameterized.class)
public class CeusHardRock extends GmmTest {
diff --git a/test/org/opensha2/gmm/CeusSoftRock.java b/test/gov/usgs/earthquake/nshmp/gmm/CeusSoftRock.java
similarity index 72%
rename from test/org/opensha2/gmm/CeusSoftRock.java
rename to test/gov/usgs/earthquake/nshmp/gmm/CeusSoftRock.java
index 8118a9476bd09a74b56d0d57e0f0f56f6ed66382..de952bc93fe8b3e0801f52bcdc1177685ab08a5d 100644
--- a/test/org/opensha2/gmm/CeusSoftRock.java
+++ b/test/gov/usgs/earthquake/nshmp/gmm/CeusSoftRock.java
@@ -1,11 +1,11 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import static org.opensha2.gmm.Gmm.AB_06_PRIME;
-import static org.opensha2.gmm.Gmm.TORO_97_MB;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.Imt.SA0P2;
-import static org.opensha2.gmm.Imt.SA1P0;
-import static org.opensha2.gmm.Imt.SA2P0;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.AB_06_PRIME;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.TORO_97_MB;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P2;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA1P0;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA2P0;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -16,6 +16,9 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
@SuppressWarnings("javadoc")
@RunWith(Parameterized.class)
public class CeusSoftRock extends GmmTest {
diff --git a/test/org/opensha2/gmm/GmmTest.java b/test/gov/usgs/earthquake/nshmp/gmm/GmmTest.java
similarity index 91%
rename from test/org/opensha2/gmm/GmmTest.java
rename to test/gov/usgs/earthquake/nshmp/gmm/GmmTest.java
index 54a2725e55005472e3492528f1fc9566d6f82133..0b32b72cfa0b171ee0e973aeb4777acf20c1c170 100644
--- a/test/org/opensha2/gmm/GmmTest.java
+++ b/test/gov/usgs/earthquake/nshmp/gmm/GmmTest.java
@@ -1,10 +1,7 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static org.junit.Assert.assertEquals;
-import org.opensha2.internal.Parsing;
-import org.opensha2.internal.Parsing.Delimiter;
-
import org.junit.Ignore;
import org.junit.Test;
@@ -24,6 +21,14 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.GmmInput;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionModel;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.gmm.ScalarGroundMotion;
+import gov.usgs.earthquake.nshmp.internal.Parsing;
+import gov.usgs.earthquake.nshmp.internal.Parsing.Delimiter;
+
@SuppressWarnings("javadoc")
@Ignore("Parameterized Use Only")
public class GmmTest {
diff --git a/test/org/opensha2/gmm/GroundMotionTableTests.java b/test/gov/usgs/earthquake/nshmp/gmm/GroundMotionTableTests.java
similarity index 87%
rename from test/org/opensha2/gmm/GroundMotionTableTests.java
rename to test/gov/usgs/earthquake/nshmp/gmm/GroundMotionTableTests.java
index c7b50297ae330909f261417b030dcc2543ad0226..1fc6c094c0a33b78aa4745779ddba2f15d83f106 100644
--- a/test/org/opensha2/gmm/GroundMotionTableTests.java
+++ b/test/gov/usgs/earthquake/nshmp/gmm/GroundMotionTableTests.java
@@ -1,11 +1,14 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
import static org.junit.Assert.assertEquals;
-import org.opensha2.gmm.GroundMotionTables.GroundMotionTable;
-
import org.junit.Test;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionTables;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+import gov.usgs.earthquake.nshmp.gmm.SiteClass;
+import gov.usgs.earthquake.nshmp.gmm.GroundMotionTables.GroundMotionTable;
+
@SuppressWarnings("javadoc")
public class GroundMotionTableTests {
diff --git a/test/org/opensha2/gmm/LegacySoftRock.java b/test/gov/usgs/earthquake/nshmp/gmm/LegacySoftRock.java
similarity index 73%
rename from test/org/opensha2/gmm/LegacySoftRock.java
rename to test/gov/usgs/earthquake/nshmp/gmm/LegacySoftRock.java
index cb331de606a0dc2b5b0b3a35977b1ca62184ed14..68e1bdd0132abf8583b7cc0cddc58c7a159ce4e1 100644
--- a/test/org/opensha2/gmm/LegacySoftRock.java
+++ b/test/gov/usgs/earthquake/nshmp/gmm/LegacySoftRock.java
@@ -1,12 +1,12 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import static org.opensha2.gmm.Gmm.AS_97;
-import static org.opensha2.gmm.Gmm.BJF_97;
-import static org.opensha2.gmm.Gmm.CB_03;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.Imt.SA0P2;
-import static org.opensha2.gmm.Imt.SA1P0;
-import static org.opensha2.gmm.Imt.SA2P0;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.AS_97;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.BJF_97;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.CB_03;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P2;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA1P0;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA2P0;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -17,6 +17,9 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
@SuppressWarnings("javadoc")
@RunWith(Parameterized.class)
public class LegacySoftRock extends GmmTest {
diff --git a/test/org/opensha2/gmm/Ngaw1.java b/test/gov/usgs/earthquake/nshmp/gmm/Ngaw1.java
similarity index 68%
rename from test/org/opensha2/gmm/Ngaw1.java
rename to test/gov/usgs/earthquake/nshmp/gmm/Ngaw1.java
index fb4c0a19c079639fd2d14d6b7d80a80633f8d73d..26242fb97a45842539c6dcf4c4a27a77896bfb95 100644
--- a/test/org/opensha2/gmm/Ngaw1.java
+++ b/test/gov/usgs/earthquake/nshmp/gmm/Ngaw1.java
@@ -1,13 +1,13 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import static org.opensha2.gmm.Gmm.BA_08;
-import static org.opensha2.gmm.Gmm.CB_08;
-import static org.opensha2.gmm.Gmm.CY_08;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.Imt.SA0P02;
-import static org.opensha2.gmm.Imt.SA0P2;
-import static org.opensha2.gmm.Imt.SA1P0;
-import static org.opensha2.gmm.Imt.SA3P0;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.BA_08;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.CB_08;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.CY_08;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P02;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P2;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA1P0;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA3P0;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -18,6 +18,9 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
@SuppressWarnings("javadoc")
@RunWith(Parameterized.class)
public class Ngaw1 extends GmmTest {
diff --git a/test/org/opensha2/gmm/Ngaw2.java b/test/gov/usgs/earthquake/nshmp/gmm/Ngaw2.java
similarity index 64%
rename from test/org/opensha2/gmm/Ngaw2.java
rename to test/gov/usgs/earthquake/nshmp/gmm/Ngaw2.java
index afed63f5a96ea933cefe4b973c4efb5a49481561..eaecc550ff9509cf053ff99e57d1afcc2a0de497 100644
--- a/test/org/opensha2/gmm/Ngaw2.java
+++ b/test/gov/usgs/earthquake/nshmp/gmm/Ngaw2.java
@@ -1,15 +1,15 @@
-package org.opensha2.gmm;
-
-import static org.opensha2.gmm.Gmm.ASK_14;
-import static org.opensha2.gmm.Gmm.BSSA_14;
-import static org.opensha2.gmm.Gmm.CB_14;
-import static org.opensha2.gmm.Gmm.CY_14;
-import static org.opensha2.gmm.Gmm.IDRISS_14;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.Imt.SA0P02;
-import static org.opensha2.gmm.Imt.SA0P2;
-import static org.opensha2.gmm.Imt.SA1P0;
-import static org.opensha2.gmm.Imt.SA3P0;
+package gov.usgs.earthquake.nshmp.gmm;
+
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.ASK_14;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.BSSA_14;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.CB_14;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.CY_14;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.IDRISS_14;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P02;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P2;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA1P0;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA3P0;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -20,6 +20,9 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
@SuppressWarnings("javadoc")
@RunWith(Parameterized.class)
public class Ngaw2 extends GmmTest {
diff --git a/test/org/opensha2/gmm/SubInterface.java b/test/gov/usgs/earthquake/nshmp/gmm/SubInterface.java
similarity index 65%
rename from test/org/opensha2/gmm/SubInterface.java
rename to test/gov/usgs/earthquake/nshmp/gmm/SubInterface.java
index 37bc736d6e3019affa0c92b8ce06e5382918b01c..728619f57b1c52d799a4562f509face7d2b521dc 100644
--- a/test/org/opensha2/gmm/SubInterface.java
+++ b/test/gov/usgs/earthquake/nshmp/gmm/SubInterface.java
@@ -1,15 +1,15 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import static org.opensha2.gmm.Gmm.AB_03_CASC_INTER;
-import static org.opensha2.gmm.Gmm.AB_03_GLOB_INTER;
-import static org.opensha2.gmm.Gmm.AM_09_INTER;
-import static org.opensha2.gmm.Gmm.BCHYDRO_12_INTER;
-import static org.opensha2.gmm.Gmm.YOUNGS_97_INTER;
-import static org.opensha2.gmm.Gmm.ZHAO_06_INTER;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.Imt.SA0P2;
-import static org.opensha2.gmm.Imt.SA1P0;
-import static org.opensha2.gmm.Imt.SA3P0;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.AB_03_CASC_INTER;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.AB_03_GLOB_INTER;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.AM_09_INTER;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.BCHYDRO_12_INTER;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.YOUNGS_97_INTER;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.ZHAO_06_INTER;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P2;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA1P0;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA3P0;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -20,6 +20,9 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
@SuppressWarnings("javadoc")
@RunWith(Parameterized.class)
public class SubInterface extends GmmTest {
diff --git a/test/org/opensha2/gmm/SubSlab.java b/test/gov/usgs/earthquake/nshmp/gmm/SubSlab.java
similarity index 63%
rename from test/org/opensha2/gmm/SubSlab.java
rename to test/gov/usgs/earthquake/nshmp/gmm/SubSlab.java
index a93d392de7dff5fc2257f0b7ff227f4fc118f815..b8b2068090e3c236ab7acd95056efb6b6656d60f 100644
--- a/test/org/opensha2/gmm/SubSlab.java
+++ b/test/gov/usgs/earthquake/nshmp/gmm/SubSlab.java
@@ -1,16 +1,16 @@
-package org.opensha2.gmm;
+package gov.usgs.earthquake.nshmp.gmm;
-import static org.opensha2.gmm.Gmm.AB_03_CASC_SLAB;
-import static org.opensha2.gmm.Gmm.AB_03_CASC_SLAB_LOW_SAT;
-import static org.opensha2.gmm.Gmm.AB_03_GLOB_SLAB;
-import static org.opensha2.gmm.Gmm.AB_03_GLOB_SLAB_LOW_SAT;
-import static org.opensha2.gmm.Gmm.BCHYDRO_12_SLAB;
-import static org.opensha2.gmm.Gmm.YOUNGS_97_SLAB;
-import static org.opensha2.gmm.Gmm.ZHAO_06_SLAB;
-import static org.opensha2.gmm.Imt.PGA;
-import static org.opensha2.gmm.Imt.SA0P2;
-import static org.opensha2.gmm.Imt.SA1P0;
-import static org.opensha2.gmm.Imt.SA3P0;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.AB_03_CASC_SLAB;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.AB_03_CASC_SLAB_LOW_SAT;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.AB_03_GLOB_SLAB;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.AB_03_GLOB_SLAB_LOW_SAT;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.BCHYDRO_12_SLAB;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.YOUNGS_97_SLAB;
+import static gov.usgs.earthquake.nshmp.gmm.Gmm.ZHAO_06_SLAB;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.PGA;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA0P2;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA1P0;
+import static gov.usgs.earthquake.nshmp.gmm.Imt.SA3P0;
import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@@ -21,6 +21,9 @@ import java.util.Collection;
import java.util.EnumSet;
import java.util.Set;
+import gov.usgs.earthquake.nshmp.gmm.Gmm;
+import gov.usgs.earthquake.nshmp.gmm.Imt;
+
@SuppressWarnings("javadoc")
@RunWith(Parameterized.class)
public class SubSlab extends GmmTest {
diff --git a/test/org/opensha2/gmm/data/CEUS_vs2000_inputs.csv b/test/gov/usgs/earthquake/nshmp/gmm/data/CEUS_vs2000_inputs.csv
similarity index 100%
rename from test/org/opensha2/gmm/data/CEUS_vs2000_inputs.csv
rename to test/gov/usgs/earthquake/nshmp/gmm/data/CEUS_vs2000_inputs.csv
diff --git a/test/org/opensha2/gmm/data/CEUS_vs2000_results.csv b/test/gov/usgs/earthquake/nshmp/gmm/data/CEUS_vs2000_results.csv
similarity index 100%
rename from test/org/opensha2/gmm/data/CEUS_vs2000_results.csv
rename to test/gov/usgs/earthquake/nshmp/gmm/data/CEUS_vs2000_results.csv
diff --git a/test/org/opensha2/gmm/data/CEUS_vs760_inputs.csv b/test/gov/usgs/earthquake/nshmp/gmm/data/CEUS_vs760_inputs.csv
similarity index 100%
rename from test/org/opensha2/gmm/data/CEUS_vs760_inputs.csv
rename to test/gov/usgs/earthquake/nshmp/gmm/data/CEUS_vs760_inputs.csv
diff --git a/test/org/opensha2/gmm/data/CEUS_vs760_results.csv b/test/gov/usgs/earthquake/nshmp/gmm/data/CEUS_vs760_results.csv
similarity index 100%
rename from test/org/opensha2/gmm/data/CEUS_vs760_results.csv
rename to test/gov/usgs/earthquake/nshmp/gmm/data/CEUS_vs760_results.csv
diff --git a/test/org/opensha2/gmm/data/INTERFACE_inputs.csv b/test/gov/usgs/earthquake/nshmp/gmm/data/INTERFACE_inputs.csv
similarity index 100%
rename from test/org/opensha2/gmm/data/INTERFACE_inputs.csv
rename to test/gov/usgs/earthquake/nshmp/gmm/data/INTERFACE_inputs.csv
diff --git a/test/org/opensha2/gmm/data/INTERFACE_results.csv b/test/gov/usgs/earthquake/nshmp/gmm/data/INTERFACE_results.csv
similarity index 100%
rename from test/org/opensha2/gmm/data/INTERFACE_results.csv
rename to test/gov/usgs/earthquake/nshmp/gmm/data/INTERFACE_results.csv
diff --git a/test/org/opensha2/gmm/data/LEGACY_vs760_results.csv b/test/gov/usgs/earthquake/nshmp/gmm/data/LEGACY_vs760_results.csv
similarity index 100%
rename from test/org/opensha2/gmm/data/LEGACY_vs760_results.csv
rename to test/gov/usgs/earthquake/nshmp/gmm/data/LEGACY_vs760_results.csv
diff --git a/test/org/opensha2/gmm/data/NGAW1_results.csv b/test/gov/usgs/earthquake/nshmp/gmm/data/NGAW1_results.csv
similarity index 100%
rename from test/org/opensha2/gmm/data/NGAW1_results.csv
rename to test/gov/usgs/earthquake/nshmp/gmm/data/NGAW1_results.csv
diff --git a/test/org/opensha2/gmm/data/NGAW2_results.csv b/test/gov/usgs/earthquake/nshmp/gmm/data/NGAW2_results.csv
similarity index 100%
rename from test/org/opensha2/gmm/data/NGAW2_results.csv
rename to test/gov/usgs/earthquake/nshmp/gmm/data/NGAW2_results.csv
diff --git a/test/org/opensha2/gmm/data/NGA_inputs.csv b/test/gov/usgs/earthquake/nshmp/gmm/data/NGA_inputs.csv
similarity index 100%
rename from test/org/opensha2/gmm/data/NGA_inputs.csv
rename to test/gov/usgs/earthquake/nshmp/gmm/data/NGA_inputs.csv
diff --git a/test/org/opensha2/gmm/data/SLAB_inputs.csv b/test/gov/usgs/earthquake/nshmp/gmm/data/SLAB_inputs.csv
similarity index 100%
rename from test/org/opensha2/gmm/data/SLAB_inputs.csv
rename to test/gov/usgs/earthquake/nshmp/gmm/data/SLAB_inputs.csv
diff --git a/test/org/opensha2/gmm/data/SLAB_results.csv b/test/gov/usgs/earthquake/nshmp/gmm/data/SLAB_results.csv
similarity index 100%
rename from test/org/opensha2/gmm/data/SLAB_results.csv
rename to test/gov/usgs/earthquake/nshmp/gmm/data/SLAB_results.csv
diff --git a/test/org/opensha2/mfd/MfdsTests.java b/test/gov/usgs/earthquake/nshmp/mfd/MfdsTests.java
similarity index 93%
rename from test/org/opensha2/mfd/MfdsTests.java
rename to test/gov/usgs/earthquake/nshmp/mfd/MfdsTests.java
index 8e5a148fce8716abea6791f5a50faedb5d614d98..da8ea87d27e95e1d0e322844b1fcc6431ad49eb3 100644
--- a/test/org/opensha2/mfd/MfdsTests.java
+++ b/test/gov/usgs/earthquake/nshmp/mfd/MfdsTests.java
@@ -1,4 +1,4 @@
-package org.opensha2.mfd;
+package gov.usgs.earthquake.nshmp.mfd;
import static org.junit.Assert.assertArrayEquals;
@@ -8,6 +8,9 @@ import com.google.common.primitives.Doubles;
import java.awt.geom.Point2D;
+import gov.usgs.earthquake.nshmp.mfd.IncrementalMfd;
+import gov.usgs.earthquake.nshmp.mfd.Mfds;
+
public class MfdsTests {
private static final double MFD_TOL = 1e-10;
diff --git a/test/org/opensha2/programs/HazardCurveTest.java b/test/gov/usgs/earthquake/nshmp/programs/HazardCurveTest.java
similarity index 89%
rename from test/org/opensha2/programs/HazardCurveTest.java
rename to test/gov/usgs/earthquake/nshmp/programs/HazardCurveTest.java
index 909199822798e8f0d8bf068d4b59442731147f74..0ee0056a9e9c630971add94376c72ead1de5fc19 100644
--- a/test/org/opensha2/programs/HazardCurveTest.java
+++ b/test/gov/usgs/earthquake/nshmp/programs/HazardCurveTest.java
@@ -1,4 +1,4 @@
-package org.opensha2.programs;
+package gov.usgs.earthquake.nshmp.programs;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git a/test/org/opensha2/util/ParsingTests.java b/test/gov/usgs/earthquake/nshmp/util/ParsingTests.java
similarity index 97%
rename from test/org/opensha2/util/ParsingTests.java
rename to test/gov/usgs/earthquake/nshmp/util/ParsingTests.java
index a683ae4b87dac4dd9008c80c71bf6ba0f4e527bb..960c44a4f4c715a377ff8f4bb20592ec092217ee 100644
--- a/test/org/opensha2/util/ParsingTests.java
+++ b/test/gov/usgs/earthquake/nshmp/util/ParsingTests.java
@@ -1,4 +1,4 @@
-package org.opensha2.util;
+package gov.usgs.earthquake.nshmp.util;
/**
* Add comments here