From 83d217abda17df0b6d2d76d4653017cef21ca036 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Mon, 28 Mar 2022 14:12:48 -0600
Subject: [PATCH] update all zTop to zTor
---
.../gmm-lib/src/lib/models/gmm-parameters.model.ts | 2 +-
projects/nshmp-apps/cypress/utils/gmm-lib.utils.ts | 2 +-
.../control-panel/control-panel.component.html | 14 +++++++-------
.../src/app/gmm/distance/state/app.effects.ts | 2 +-
.../app/gmm/distance/utils/app.default-values.ts | 2 +-
.../gmm/distance/utils/control-form.validators.ts | 2 +-
.../source-parameters.component.html | 14 +++++++-------
.../src/app/gmm/magnitude/state/app.effects.ts | 2 +-
.../app/gmm/magnitude/utils/app.default-values.ts | 2 +-
.../src/app/gmm/magnitude/utils/app.utils.ts | 2 +-
.../magnitude/utils/control-panel.validators.ts | 2 +-
.../source-parameters.component.html | 14 +++++++-------
.../src/app/gmm/spectra/state/app.effects.ts | 4 ++--
.../app/gmm/spectra/utils/app.default-values.ts | 2 +-
.../src/app/gmm/spectra/utils/app.utils.ts | 12 ++++++------
.../gmm/spectra/utils/control-panel.validators.ts | 2 +-
16 files changed, 40 insertions(+), 40 deletions(-)
diff --git a/projects/gmm-lib/src/lib/models/gmm-parameters.model.ts b/projects/gmm-lib/src/lib/models/gmm-parameters.model.ts
index 31a8d66d0..a796c54c4 100644
--- a/projects/gmm-lib/src/lib/models/gmm-parameters.model.ts
+++ b/projects/gmm-lib/src/lib/models/gmm-parameters.model.ts
@@ -11,7 +11,7 @@ export interface GmmParameters {
width: number;
z1p0: number;
z2p5: number;
- zTop: number;
+ zTor: number;
}
export interface GmmImtParameters extends GmmParameters {
diff --git a/projects/nshmp-apps/cypress/utils/gmm-lib.utils.ts b/projects/nshmp-apps/cypress/utils/gmm-lib.utils.ts
index 24042d710..ce1ff60b4 100644
--- a/projects/nshmp-apps/cypress/utils/gmm-lib.utils.ts
+++ b/projects/nshmp-apps/cypress/utils/gmm-lib.utils.ts
@@ -65,7 +65,7 @@ export function setSiteParameters() {
}
export function setSourceGeometryParameters() {
cy.get('nshmp-template-control-panel').within(() => {
- cy.get('.ztop-input')
+ cy.get('.ztor-input')
.scrollIntoView()
.find('input')
.should('be.visible')
diff --git a/projects/nshmp-apps/src/app/gmm/distance/components/control-panel/control-panel.component.html b/projects/nshmp-apps/src/app/gmm/distance/components/control-panel/control-panel.component.html
index e21a756d8..1d6296931 100644
--- a/projects/nshmp-apps/src/app/gmm/distance/components/control-panel/control-panel.component.html
+++ b/projects/nshmp-apps/src/app/gmm/distance/components/control-panel/control-panel.component.html
@@ -62,21 +62,21 @@
<mat-label class="settings-subsection--label">Source Geometry</mat-label>
<div class="settings-subsection--section grid-row grid-gap-sm">
- <!-- Source geometry: zTop input -->
- <mat-form-field class="grid-col-4 ztop-input">
+ <!-- Source geometry: zTor input -->
+ <mat-form-field class="grid-col-4 ztor-input">
<mat-label>Z<sub>TOR</sub> (km)</mat-label>
<input
matInput
- [max]="(parameters$ | async)?.zTop.max"
- [min]="(parameters$ | async)?.zTop.min"
- [ngrxFormControlState]="(controls$ | async)?.zTop"
+ [max]="(parameters$ | async)?.zTor.max"
+ [min]="(parameters$ | async)?.zTor.min"
+ [ngrxFormControlState]="(controls$ | async)?.zTor"
step="0.5"
type="number"
/>
<mat-error>
[
- {{ (parameters$ | async)?.zTop.min }},
- {{ (parameters$ | async)?.zTop.max }}
+ {{ (parameters$ | async)?.zTor.min }},
+ {{ (parameters$ | async)?.zTor.max }}
]
</mat-error>
</mat-form-field>
diff --git a/projects/nshmp-apps/src/app/gmm/distance/state/app.effects.ts b/projects/nshmp-apps/src/app/gmm/distance/state/app.effects.ts
index 7806d7a77..e8f410090 100644
--- a/projects/nshmp-apps/src/app/gmm/distance/state/app.effects.ts
+++ b/projects/nshmp-apps/src/app/gmm/distance/state/app.effects.ts
@@ -108,7 +108,7 @@ export class GmmDistanceAppEffects {
width: parameters.width.value as number,
z1p0: parameters.z1p0.value as number,
z2p5: parameters.z2p5.value as number,
- zTop: parameters.zTop.value as number,
+ zTor: parameters.zTor.value as number,
};
const typedActions = initialFormSetActions(form, values, parameters);
diff --git a/projects/nshmp-apps/src/app/gmm/distance/utils/app.default-values.ts b/projects/nshmp-apps/src/app/gmm/distance/utils/app.default-values.ts
index 93063fb8e..7c57f13f7 100644
--- a/projects/nshmp-apps/src/app/gmm/distance/utils/app.default-values.ts
+++ b/projects/nshmp-apps/src/app/gmm/distance/utils/app.default-values.ts
@@ -24,7 +24,7 @@ export const DEFAULT_FORM_VALUES: FormControls = {
width: null,
z1p0: null,
z2p5: null,
- zTop: null,
+ zTor: null,
};
/**
diff --git a/projects/nshmp-apps/src/app/gmm/distance/utils/control-form.validators.ts b/projects/nshmp-apps/src/app/gmm/distance/utils/control-form.validators.ts
index 26e90c1d1..97f43ce40 100644
--- a/projects/nshmp-apps/src/app/gmm/distance/utils/control-form.validators.ts
+++ b/projects/nshmp-apps/src/app/gmm/distance/utils/control-form.validators.ts
@@ -15,5 +15,5 @@ export const validateControlPanelForm = updateGroup<FormControls>({
multiSelectableParam: validate([required]),
vs30: validateBounds,
width: validateBounds,
- zTop: validateBounds,
+ zTor: validateBounds,
});
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/components/source-parameters/source-parameters.component.html b/projects/nshmp-apps/src/app/gmm/magnitude/components/source-parameters/source-parameters.component.html
index c4cda19bc..b3578de94 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/components/source-parameters/source-parameters.component.html
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/components/source-parameters/source-parameters.component.html
@@ -4,21 +4,21 @@
<mat-label class="settings-subsection--label">Source Geometry</mat-label>
<div class="settings-subsection--section grid-row grid-gap-sm">
- <!-- Source Parameters: zTop input -->
- <mat-form-field class="grid-col-4 ztop-input">
+ <!-- Source Parameters: zTor input -->
+ <mat-form-field class="grid-col-4 ztor-input">
<mat-label>Z<sub>TOR</sub> (km)</mat-label>
<input
matInput
- [max]="(parameters$ | async)?.zTop?.max"
- [min]="(parameters$ | async)?.zTop?.min"
- [ngrxFormControlState]="(controls$ | async)?.zTop"
+ [max]="(parameters$ | async)?.zTor?.max"
+ [min]="(parameters$ | async)?.zTor?.min"
+ [ngrxFormControlState]="(controls$ | async)?.zTor"
step="0.5"
type="number"
/>
<mat-error>
[
- {{ (parameters$ | async)?.zTop?.min }},
- {{ (parameters$ | async)?.zTop?.max }}
+ {{ (parameters$ | async)?.zTor?.min }},
+ {{ (parameters$ | async)?.zTor?.max }}
]
</mat-error>
</mat-form-field>
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/state/app.effects.ts b/projects/nshmp-apps/src/app/gmm/magnitude/state/app.effects.ts
index 1b9f46f5b..c6d24c5a7 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/state/app.effects.ts
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/state/app.effects.ts
@@ -120,7 +120,7 @@ export class AppEffects {
width: parameters.width.value as number,
z1p0: parameters.z1p0.value as number,
z2p5: parameters.z2p5.value as number,
- zTop: parameters.zTop.value as number,
+ zTor: parameters.zTor.value as number,
};
const typedActions = initialFormSetActions(form, values, parameters);
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/utils/app.default-values.ts b/projects/nshmp-apps/src/app/gmm/magnitude/utils/app.default-values.ts
index abb84f8c0..54e0ad381 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/utils/app.default-values.ts
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/utils/app.default-values.ts
@@ -29,7 +29,7 @@ export const DEFAULT_FORM_VALUES: GmmMagnitudeFormControls = {
width: null,
z1p0: null,
z2p5: null,
- zTop: null,
+ zTor: null,
};
/**
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/utils/app.utils.ts b/projects/nshmp-apps/src/app/gmm/magnitude/utils/app.utils.ts
index d3312ebad..ff4758507 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/utils/app.utils.ts
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/utils/app.utils.ts
@@ -24,7 +24,7 @@ export const resetControlPanel = (
width: parameters.width.value as number,
z1p0: parameters.z1p0.value as number,
z2p5: parameters.z2p5.value as number,
- zTop: parameters.zTop.value as number,
+ zTor: parameters.zTor.value as number,
});
form = markAsUntouched(form);
diff --git a/projects/nshmp-apps/src/app/gmm/magnitude/utils/control-panel.validators.ts b/projects/nshmp-apps/src/app/gmm/magnitude/utils/control-panel.validators.ts
index ee3a4f09b..54368efbd 100644
--- a/projects/nshmp-apps/src/app/gmm/magnitude/utils/control-panel.validators.ts
+++ b/projects/nshmp-apps/src/app/gmm/magnitude/utils/control-panel.validators.ts
@@ -28,7 +28,7 @@ export const validateControlPanelForm = updateGroup<GmmMagnitudeFormControls>({
step: validateBounds,
vs30: validateBounds,
width: validateBounds,
- zTop: validateBounds,
+ zTor: validateBounds,
});
export const validateMagnitude = (
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/components/source-parameters/source-parameters.component.html b/projects/nshmp-apps/src/app/gmm/spectra/components/source-parameters/source-parameters.component.html
index 41dca40d4..581e51dfc 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/components/source-parameters/source-parameters.component.html
+++ b/projects/nshmp-apps/src/app/gmm/spectra/components/source-parameters/source-parameters.component.html
@@ -4,21 +4,21 @@
<mat-label class="settings-subsection--label">Source Geometry</mat-label>
<div class="settings-subsection--section grid-row grid-gap-sm">
- <!-- Source Parameters: zTop input -->
- <mat-form-field class="grid-col-4 ztop-input">
+ <!-- Source Parameters: zTor input -->
+ <mat-form-field class="grid-col-4 ztor-input">
<mat-label>Z<sub>TOR</sub> (km)</mat-label>
<input
matInput
- [max]="(parameters$ | async).zTop.max"
- [min]="(parameters$ | async).zTop.min"
- [ngrxFormControlState]="(controls$ | async)?.zTop"
+ [max]="(parameters$ | async).zTor.max"
+ [min]="(parameters$ | async).zTor.min"
+ [ngrxFormControlState]="(controls$ | async)?.zTor"
step="0.5"
type="number"
/>
<mat-error>
[
- {{ (parameters$ | async).zTop.min }},
- {{ (parameters$ | async).zTop.max }}
+ {{ (parameters$ | async).zTor.min }},
+ {{ (parameters$ | async).zTor.max }}
]
</mat-error>
</mat-form-field>
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/state/app.effects.ts b/projects/nshmp-apps/src/app/gmm/spectra/state/app.effects.ts
index 77feb894a..85140f611 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/state/app.effects.ts
+++ b/projects/nshmp-apps/src/app/gmm/spectra/state/app.effects.ts
@@ -78,7 +78,7 @@ export class AppEffects {
z1p0: values.z1p0,
z2p5: values.z2p5,
zHyp: values.zHyp,
- zTop: values.zTop,
+ zTor: values.zTor,
};
const urls = this.facade.formServiceUrls(
parameters,
@@ -140,7 +140,7 @@ export class AppEffects {
z2p5: parameters.z2p5.value as number,
zHyp: parameters.zHyp.value as number,
zHypCentered: true,
- zTop: parameters.zTop.value as number,
+ zTor: parameters.zTor.value as number,
};
const typedActions = initialFormSetActions(form, values, parameters);
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/utils/app.default-values.ts b/projects/nshmp-apps/src/app/gmm/spectra/utils/app.default-values.ts
index 8ebd75d26..0d3d11ac2 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/utils/app.default-values.ts
+++ b/projects/nshmp-apps/src/app/gmm/spectra/utils/app.default-values.ts
@@ -34,7 +34,7 @@ export const DEFAULT_FORM_VALUES: FormControls = {
z2p5: null,
zHyp: null,
zHypCentered: true,
- zTop: null,
+ zTor: null,
};
/**
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/utils/app.utils.ts b/projects/nshmp-apps/src/app/gmm/spectra/utils/app.utils.ts
index 73c2bc9ba..cab5b6ab8 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/utils/app.utils.ts
+++ b/projects/nshmp-apps/src/app/gmm/spectra/utils/app.utils.ts
@@ -37,7 +37,7 @@ export const resetControlPanel = (state: SpectraAppState): FormGroupState<FormCo
z1p0: parameters.z1p0.value as number,
z2p5: parameters.z2p5.value as number,
zHyp: parameters.zHyp.value as number,
- zTop: parameters.zTop.value as number,
+ zTor: parameters.zTor.value as number,
});
form = markAsUntouched(form);
@@ -54,7 +54,7 @@ export const calcHypocenterDepth = (
const values = state.value;
const dip = Maths.toRadians(values.dip);
- const zHyp = values.zTop + (Math.sin(dip) * values.width) / 2.0;
+ const zHyp = values.zTor + (Math.sin(dip) * values.width) / 2.0;
return updateGroup<FormControls>({
zHyp: control => updateControl(control, zHyp, values.zHypCentered),
@@ -70,9 +70,9 @@ export const calcPathParameters = (
const values = state.value;
const rX = values.rX;
- const zTop = values.zTop;
+ const zTor = values.zTor;
const footwall = !values.hangingWall;
- let rRup = Math.hypot(rX, zTop);
+ let rRup = Math.hypot(rX, zTor);
if (footwall) {
return updatePathFormValues(state, {rJB: rX, rRup, rX});
@@ -85,14 +85,14 @@ export const calcPathParameters = (
const Wx = W * cosδ;
const Wz = W * sinδ;
const rJB = Math.max(0.0, rX - Wx);
- const h1 = zTop / cosδ;
+ const h1 = zTor / cosδ;
const rCut1 = h1 * sinδ;
if (rX < rCut1) {
return updatePathFormValues(state, {rJB, rRup, rX});
}
- const zBot = zTop + Wz;
+ const zBot = zTor + Wz;
const h2 = zBot / cosδ;
const rCut2 = Wx + h2 * sinδ;
diff --git a/projects/nshmp-apps/src/app/gmm/spectra/utils/control-panel.validators.ts b/projects/nshmp-apps/src/app/gmm/spectra/utils/control-panel.validators.ts
index 0093dfc8a..102f12018 100644
--- a/projects/nshmp-apps/src/app/gmm/spectra/utils/control-panel.validators.ts
+++ b/projects/nshmp-apps/src/app/gmm/spectra/utils/control-panel.validators.ts
@@ -20,5 +20,5 @@ export const validateControlPanelForm = updateGroup<FormControls>({
rJB: validateBounds,
vs30: validateBounds,
width: validateBounds,
- zTop: validateBounds,
+ zTor: validateBounds,
});
--
GitLab