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

sp16 rRup --> rJB; cleanup

parent 433dfa6b
No related branches found
No related tags found
1 merge request!269SP16 fix
...@@ -524,8 +524,8 @@ public abstract class NgaEast implements GroundMotionModel { ...@@ -524,8 +524,8 @@ public abstract class NgaEast implements GroundMotionModel {
for (int i = 0; i < GMMS.size(); i++) { for (int i = 0; i < GMMS.size(); i++) {
Gmm seed = GMMS.get(i); Gmm seed = GMMS.get(i);
if (seed == Gmm.NGA_EAST_SEED_SP16) { if (seed == Gmm.NGA_EAST_SEED_SP16) {
double μ = sp16.calcMeanRock(in.Mw, in.rRup); double μ = sp16.calcMeanRock(in.Mw, in.rJB);
double μPga = exp(sp16pga.calcMeanRock(in.Mw, in.rRup)); double μPga = exp(sp16pga.calcMeanRock(in.Mw, in.rJB));
SiteAmp.Value fSite = siteAmp.calc(μPga, in.vs30); SiteAmp.Value fSite = siteAmp.calc(μPga, in.vs30);
μs[i] = fSite.apply(μ); μs[i] = fSite.apply(μ);
} else if (imt == Imt.PGV && noPgvSeeds.contains(seed)) { } else if (imt == Imt.PGV && noPgvSeeds.contains(seed)) {
...@@ -547,20 +547,6 @@ public abstract class NgaEast implements GroundMotionModel { ...@@ -547,20 +547,6 @@ public abstract class NgaEast implements GroundMotionModel {
} }
} }
public static void main(String[] args) {
// TODO clean
// Gmm gmm = Gmm.NGA_EAST_SEED_SP16;
Gmm gmm = Gmm.NGA_EAST_SEEDS_2018;
// Gmm gmm = Gmm.NGA_EAST_SEED_SP16;
GmmInput in = GmmInput.builder().withDefaults().build();
LogicTree<GroundMotion> gms = gmm.instance(Imt.PGA).calc(in);
System.out.println(gms);
gms.forEach(gm -> System.out.println(gm.id() + ": " + gm.value()));
GroundMotion gm = GroundMotions.combine(gms);
System.out.println(gm);
}
/* /*
* Updated NGA-East for use in the 2023 nshm-conus update. This model includes * Updated NGA-East for use in the 2023 nshm-conus update. This model includes
* (1) the final published nonlinear site amplification model of Hshash et al. * (1) the final published nonlinear site amplification model of Hshash et al.
......
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