Merge branch 'issue-230' into 'main'

change values

Closes #230

See merge request !548

projects/nshmp-apps/src/app/designmaps/rtgm/components/risk-targets/risk-targets.component.ts

@@ -33,11 +33,11 @@ export class RiskTargetsComponent {
       },
       {
         td: [riskTargets.beta.toPrecision(4)],
-        th: 'Standard deviation of fragility curve',
+        th: 'Standard deviation of fragility curve (beta value)',
       },
       {
         td: [riskTargets.condCollapseProb.toPrecision(4)],
-        th: 'Target conditional collapse fragility percentile',
+        th: 'Target conditional collapse probability (decimal)',
       },
       {
         td: [`${riskTargets.riskTgt_Annual.toExponential(4)} yr^-1`],
@@ -45,7 +45,7 @@ export class RiskTargetsComponent {
       },
       {
         td: [riskTargets.tgtCollapseRisk_T.toPrecision(4)],
-        th: 'Target risk of collapse over the specified time horizon',
+        th: 'Target collapse probability (decimal) over the specified time horizon',
       },
       {
         td: [`${riskTargets.timeHorizon_Yr} years`],

projects/nshmp-apps/src/app/designmaps/rtgm/components/rtgm-summary/rtgm-summary.component.ts

@@ -26,27 +26,27 @@ export class RtgmSummaryComponent {
 
       return [
         {
-          td: [`${summary.uhgm.toPrecision(4)}g`],
-          th: 'Uniform hazard ground motion',
+          td: [`${summary.uhgm.toPrecision(4)} g`],
+          th: 'Uniform hazard ground motion (UHGM)',
         },
         {
-          td: [`${summary.rtgm.toFixed(4)}g`],
-          th: 'Risk-targeted ground motion',
+          td: [`${summary.rtgm.toFixed(4)} g`],
+          th: 'Risk-targeted ground motion (RTGM)',
         },
         {
           td: [summary.riskCoeff.toPrecision(4)],
           th: 'Risk Coefficient (RTGM / UHGM)',
         },
         {
-          td: [summary.colRisk_annual.toExponential(4)],
+          td: [`${summary.colRisk_annual.toExponential(4)} yr^-1`],
           th: 'Annualized collapse risk',
         },
         {
           td: [summary.colRisk_T.toPrecision(4)],
-          th: `collapse risk over ${summary.timePeriod} years`,
+          th: 'Collapse probability (decimal) over specified time horizon',
         },
         {
-          td: [summary.timePeriod],
+          td: [`${summary.timePeriod} years`],
           th: 'Time horizon over which collapse risk is to be determined',
         },
       ];