Skip to content
Snippets Groups Projects
Commit 1a196f23 authored by Powers, Peter M.'s avatar Powers, Peter M.
Browse files

ag20 seattle

parent 9f214340
No related branches found
No related tags found
1 merge request!282Gmm updates
......@@ -171,6 +171,16 @@ public abstract class AbrahamsonGulerce_2020 implements GroundMotionModel {
@Override
public final LogicTree<GroundMotion> calc(GmmInput in) {
/*
* need flag from siteData; check gmmSiteModel array
*
* if siteData.gmmSiteModel.contains(SiteModel.M9)
*
* in siteData seattlePoly.contains and ad M9 to
*
* boolean m9amp = true;
*/
if (coeffs.imt == PGV) {
GroundMotion pgv = UsgsPgvSupport.calcAB20Pgv(subtype, in);
return GroundMotions.createTree(pgv.mean(), pgv.sigma());
......@@ -524,6 +534,25 @@ public abstract class AbrahamsonGulerce_2020 implements GroundMotionModel {
}
}
static final class SeattleAdjustedInterfaceBasin extends CascadiaAdjustedInterface {
static final String NAME = CascadiaAdjustedInterface.NAME + " (Seattle basin)";
SeattleAdjustedInterfaceBasin(Imt imt) {
super(imt, Gmm.AG_20_SEATTLE_ADJ_INTERFACE_BASIN);
}
@Override
boolean basin() {
return true;
}
@Override
boolean seattle() {
return true;
}
}
static final class CascadiaAdjustedSlabBasin extends CascadiaAdjustedSlab {
static final String NAME = CascadiaAdjustedSlab.NAME + " (basin)";
......@@ -550,6 +579,24 @@ public abstract class AbrahamsonGulerce_2020 implements GroundMotionModel {
}
}
static final class SeattleInterfaceBasin extends CascadiaInterface {
static final String NAME = CascadiaInterface.NAME + " (Seattle basin)";
SeattleInterfaceBasin(Imt imt) {
super(imt, Gmm.AG_20_SEATTLE_INTERFACE_BASIN);
}
@Override
boolean basin() {
return true;
}
@Override
boolean seattle() {
return true;
}
}
static final class CascadiaSlabBasin extends CascadiaSlab {
static final String NAME = CascadiaSlab.NAME + " (basin)";
......
......@@ -372,6 +372,13 @@ public enum Gmm {
AbrahamsonGulerce_2020.COEFFS,
AbrahamsonGulerce_2020.CONSTRAINTS_INTERFACE),
/** @see AbrahamsonGulerce_2020 */
AG_20_SEATTLE_INTERFACE_BASIN(
AbrahamsonGulerce_2020.SeattleInterfaceBasin.class,
AbrahamsonGulerce_2020.SeattleInterfaceBasin.NAME,
AbrahamsonGulerce_2020.COEFFS,
AbrahamsonGulerce_2020.CONSTRAINTS_INTERFACE),
/** @see AbrahamsonGulerce_2020 */
AG_20_CASCADIA_SLAB_BASIN(
AbrahamsonGulerce_2020.CascadiaSlabBasin.class,
......@@ -386,6 +393,13 @@ public enum Gmm {
AbrahamsonGulerce_2020.COEFFS,
AbrahamsonGulerce_2020.CONSTRAINTS_INTERFACE),
/** @see AbrahamsonGulerce_2020 */
AG_20_SEATTLE_ADJ_INTERFACE_BASIN(
AbrahamsonGulerce_2020.SeattleAdjustedInterfaceBasin.class,
AbrahamsonGulerce_2020.SeattleAdjustedInterfaceBasin.NAME,
AbrahamsonGulerce_2020.COEFFS,
AbrahamsonGulerce_2020.CONSTRAINTS_INTERFACE),
/** @see AbrahamsonGulerce_2020 */
AG_20_CASCADIA_ADJ_SLAB_BASIN(
AbrahamsonGulerce_2020.CascadiaAdjustedSlabBasin.class,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment