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

dsf cleanup

parent 2505fa9c
No related branches found
No related tags found
1 merge request!415CalcConfig updates
...@@ -79,13 +79,17 @@ public class UsgsDampingScaling { ...@@ -79,13 +79,17 @@ public class UsgsDampingScaling {
* TODO Disable subduction below 0.1s * TODO Disable subduction below 0.1s
*/ */
/** The range of supported damping ratios: {@code [0.5..30]}. */ /** The range of supported damping scaling factors: {@code [0.5..30]}. */
public static final Range<Double> DAMPING_RATIO_RANGE = Range.closed(0.05, 30.0); public static final Range<Double> DAMPING_RATIO_RANGE = Range.closed(0.05, 30.0);
private static final String[] DSF_KEYS = private static final String[] DSF_KEYS =
{ "0.5", "1", "2", "3", "5", "7", "10", "15", "20", "25", "30" }; { "0.5", "1", "2", "3", "5", "7", "10", "15", "20", "25", "30" };
private static final List<Double> DSF_VALUES = Arrays.stream(DSF_KEYS) /**
* The list of supported damping scaling factors (percentage values):
* {@code [0.5, 1, 2, 3, 5, 7, 10, 15, 20, 25, 30]}.
*/
public static final List<Double> DSF_VALUES = Arrays.stream(DSF_KEYS)
.map(Double::valueOf) .map(Double::valueOf)
.collect(toList()); .collect(toList());
...@@ -148,7 +152,7 @@ public class UsgsDampingScaling { ...@@ -148,7 +152,7 @@ public class UsgsDampingScaling {
return XySequence.create(DSF_VALUES, corrCoeffs); return XySequence.create(DSF_VALUES, corrCoeffs);
} }
/** The set of IMTs supported by this class. */ /** The set of IMTs supported by the damping models in this class. */
public static final Set<Imt> supportedImts() { public static final Set<Imt> supportedImts() {
return INSTANCE_MAP.get(ACTIVE_CRUST).coeffs.keySet(); return INSTANCE_MAP.get(ACTIVE_CRUST).coeffs.keySet();
} }
......
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