Skip to content
Snippets Groups Projects

Gulf coast margin zSed handlers and config updates

Merged Powers, Peter M. requested to merge ghsc/users/pmpowers/nshmp-lib:zsed-125 into main
5 files
+ 20
1
Compare changes
  • Side-by-side
  • Inline
Files
5
@@ -221,6 +221,13 @@ public final class CalcConfig {
*/
public final double gmmDampingRatio;
/**
* Whether or not {@link GroundMotionModel} (GMM) sigmas are also modified
* according to the Rezaeian et al. (2014) model when applying damping
* scaling factors (DSF).
*/
public final boolean gmmDampingSigma;
/**
* Factor by which the aleatory variability (sigma) for all GMMs should be
* scaled.
@@ -251,6 +258,7 @@ public final class CalcConfig {
this.sourceTypes = b.sourceTypes;
this.vs30s = b.vs30s;
this.gmmDampingRatio = b.gmmDampingRatio;
this.gmmDampingSigma = b.gmmDampingSigma;
this.gmmSigmaScale = b.gmmSigmaScale;
this.valueFormat = b.valueFormat;
@@ -293,6 +301,7 @@ public final class CalcConfig {
Set<SourceType> sourceTypes;
Set<Double> vs30s;
Double gmmDampingRatio;
Boolean gmmDampingSigma;
Double gmmSigmaScale;
ValueFormat valueFormat;
Map<Imt, double[]> customImls;
@@ -312,6 +321,7 @@ public final class CalcConfig {
RezaeianDamping_2014.DAMPING_RATIO_RANGE,
"gmmDampingRatio",
gmmDampingRatio);
checkNotNull(gmmDampingSigma);
checkNotNull(gmmSigmaScale);
checkInRange(
Range.closed(0.5, 1.0),
@@ -330,6 +340,7 @@ public final class CalcConfig {
this.sourceTypes = that.sourceTypes;
this.vs30s = that.vs30s;
this.gmmDampingRatio = that.gmmDampingRatio;
this.gmmDampingSigma = that.gmmDampingSigma;
this.gmmSigmaScale = that.gmmSigmaScale;
this.valueFormat = that.valueFormat;
this.customImls = that.customImls;
@@ -357,6 +368,9 @@ public final class CalcConfig {
if (that.gmmDampingRatio != null) {
this.gmmDampingRatio = that.gmmDampingRatio;
}
if (that.gmmDampingSigma != null) {
this.gmmDampingSigma = that.gmmDampingSigma;
}
if (that.gmmSigmaScale != null) {
this.gmmSigmaScale = that.gmmSigmaScale;
}
Loading