@dnv-plant/typescriptpws 1.0.86 → 1.0.88

package/src/calculations/fireball.ts

@@ -6,12 +6,10 @@
 * Editing it may lead to inconsistent results and limit DNV's ability to provide support.
 * Please contact DNV if you believe changes are required.
 *
-* Version:   1.0.86
-* Date/time: 10 Jul 2025 09:49:06
+* Version:   1.0.89
+* Date/time: 29 Jul 2025 17:59:11
 * Template:  templates/typescriptpws/calculations.razor.
- ***********************************************************************/
-
-
+***********************************************************************/
 
 import * as Enums from "../enums";
 import * as Entities from "../entities";
@@ -36,12 +34,17 @@ class CalculationBase {
   messages: string[] = [];
   calculationElapsedTime?: number = 0.0;
   operationId?: string = "";
+  controller?: AbortController;
+
+  constructor(controller?: AbortController) {
+    this.controller = controller;
+  }
 
   /**
    * Post JSON to URL and time the call
    */
   async postRequest(url: string, data: string): Promise<AxiosResponse> {
-    return postRequest(url, data);
+    return postRequest(url, data, this.controller);
   }
 
   /**
@@ -173,28 +176,22 @@ class FireballCalculationRequest extends CalculationRequestBase {
   /**
    * Fireball calculation request class.
    *
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.State} state -  a state entity.
-   * @param {Entities.DischargeRecord[]} dischargeRecords -  an array of discharge records.
-   * @param {number} dischargeRecordCount - Number of discharge records.
-   * @param {Entities.DischargeResult} dischargeResult - Discharge / source term definition.
-   * @param {Entities.Weather} weather -  a weather entity.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     state: Entities.State,
     dischargeRecords: Entities.DischargeRecord[],
     dischargeRecordCount: number,
     dischargeResult: Entities.DischargeResult,
     weather: Entities.Weather
-  ) {
+  }) {
     super();
-    this.material = material;
-    this.state = state;
-    this.dischargeRecords = dischargeRecords;
-    this.dischargeRecordCount = dischargeRecordCount;
-    this.dischargeResult = dischargeResult;
-    this.weather = weather;
+    this.material = data.material;
+    this.state = data.state;
+    this.dischargeRecords = data.dischargeRecords;
+    this.dischargeRecordCount = data.dischargeRecordCount;
+    this.dischargeResult = data.dischargeResult;
+    this.weather = data.weather;
   }
 }
 
@@ -234,14 +231,7 @@ export class FireballCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: FireballCalculationRequestSchemaData): FireballCalculationRequest {
-    return new FireballCalculationRequest(
-      data.material,
-      data.state,
-      data.dischargeRecords,
-      data.dischargeRecordCount,
-      data.dischargeResult,
-      data.weather
-    );
+    return new FireballCalculationRequest(data);
   }
 }
 
@@ -258,40 +248,35 @@ export class FireballCalculation extends CalculationBase {
   /**
    * Calculates a fireball produced from an instantaneous or (short duration) time-varying source term.  The output can be used can be used to run radiation models for prediction of thermal effects.
    *
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.State} state -  a state entity.
-   * @param {Entities.DischargeRecord[]} dischargeRecords -  an array of discharge records.
-   * @param {number} dischargeRecordCount - Number of discharge records.
-   * @param {Entities.DischargeResult} dischargeResult - Discharge / source term definition.
-   * @param {Entities.Weather} weather -  a weather entity.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     state: Entities.State,
     dischargeRecords: Entities.DischargeRecord[],
     dischargeRecordCount: number,
     dischargeResult: Entities.DischargeResult,
     weather: Entities.Weather
-  ) {
-    super();
-    this.material = material;
-    this.state = state;
-    this.dischargeRecords = dischargeRecords;
-    this.dischargeRecordCount = dischargeRecordCount;
-    this.dischargeResult = dischargeResult;
-    this.weather = weather;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.material = data.material;
+    this.state = data.state;
+    this.dischargeRecords = data.dischargeRecords;
+    this.dischargeRecordCount = data.dischargeRecordCount;
+    this.dischargeResult = data.dischargeResult;
+    this.weather = data.weather;
   }
 
   async run() {
     try {
-      const request = new FireballCalculationRequest(
-        this.material,
-        this.state,
-        this.dischargeRecords,
-        this.dischargeRecordCount,
-        this.dischargeResult,
-        this.weather
-      );
+      const request = new FireballCalculationRequest({
+        material: this.material,
+        state: this.state,
+        dischargeRecords: this.dischargeRecords,
+        dischargeRecordCount: this.dischargeRecordCount,
+        dischargeResult: this.dischargeResult,
+        weather: this.weather
+      });
 
       const schema = new FireballCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -358,24 +343,22 @@ export class FireballCalculationResponse extends CalculationResponseBase {
   /**
    * Fireball calculation response class.
    *
-   * @param {Entities.FlameResult} flameResult - Flame scalar result.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of fireball flame records.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -449,13 +432,6 @@ export class FireballCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: FireballCalculationResponseSchemaData): FireballCalculationResponse {
-    return new FireballCalculationResponse(
-      data.flameResult,
-      data.flameRecords,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new FireballCalculationResponse(data);
   }
 }

package/src/calculations/jetFire.ts

@@ -6,12 +6,10 @@
 * Editing it may lead to inconsistent results and limit DNV's ability to provide support.
 * Please contact DNV if you believe changes are required.
 *
-* Version:   1.0.86
-* Date/time: 10 Jul 2025 09:49:06
+* Version:   1.0.89
+* Date/time: 29 Jul 2025 17:59:11
 * Template:  templates/typescriptpws/calculations.razor.
- ***********************************************************************/
-
-
+***********************************************************************/
 
 import * as Enums from "../enums";
 import * as Entities from "../entities";
@@ -36,12 +34,17 @@ class CalculationBase {
   messages: string[] = [];
   calculationElapsedTime?: number = 0.0;
   operationId?: string = "";
+  controller?: AbortController;
+
+  constructor(controller?: AbortController) {
+    this.controller = controller;
+  }
 
   /**
    * Post JSON to URL and time the call
    */
   async postRequest(url: string, data: string): Promise<AxiosResponse> {
-    return postRequest(url, data);
+    return postRequest(url, data, this.controller);
   }
 
   /**
@@ -175,15 +178,8 @@ class JetFireCalculationRequest extends CalculationRequestBase {
   /**
    * JetFire calculation request class.
    *
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.DischargeRecord[]} dischargeRecords - Discharge / source term definition.
-   * @param {number} dischargeRecordCount - Number of discharge records.
-   * @param {Entities.DischargeResult} dischargeResult - Discharge / source term definition.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     dischargeRecords: Entities.DischargeRecord[],
     dischargeRecordCount: number,
@@ -191,15 +187,15 @@ class JetFireCalculationRequest extends CalculationRequestBase {
     weather: Entities.Weather,
     substrate: Entities.Substrate,
     flammableParameters: Entities.FlammableParameters
-  ) {
+  }) {
     super();
-    this.material = material;
-    this.dischargeRecords = dischargeRecords;
-    this.dischargeRecordCount = dischargeRecordCount;
-    this.dischargeResult = dischargeResult;
-    this.weather = weather;
-    this.substrate = substrate;
-    this.flammableParameters = flammableParameters;
+    this.material = data.material;
+    this.dischargeRecords = data.dischargeRecords;
+    this.dischargeRecordCount = data.dischargeRecordCount;
+    this.dischargeResult = data.dischargeResult;
+    this.weather = data.weather;
+    this.substrate = data.substrate;
+    this.flammableParameters = data.flammableParameters;
   }
 }
 
@@ -241,15 +237,7 @@ export class JetFireCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: JetFireCalculationRequestSchemaData): JetFireCalculationRequest {
-    return new JetFireCalculationRequest(
-      data.material,
-      data.dischargeRecords,
-      data.dischargeRecordCount,
-      data.dischargeResult,
-      data.weather,
-      data.substrate,
-      data.flammableParameters
-    );
+    return new JetFireCalculationRequest(data);
   }
 }
 
@@ -269,15 +257,8 @@ export class JetFireCalculation extends CalculationBase {
 use average discharge data based on the averaging time for jet fires of 20 s. For continuous releases the model will use the 
 initial constant discharge data provided.
    *
-   * @param {Entities.Material} material -  a material entity with post-discharge composition.
-   * @param {Entities.DischargeRecord[]} dischargeRecords - Discharge / source term definition.
-   * @param {number} dischargeRecordCount - Number of discharge records.
-   * @param {Entities.DischargeResult} dischargeResult - Discharge / source term definition.
-   * @param {Entities.Weather} weather -  a weather entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
-   * @param {Entities.FlammableParameters} flammableParameters -  a flammable parameters entity.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     dischargeRecords: Entities.DischargeRecord[],
     dischargeRecordCount: number,
@@ -285,28 +266,29 @@ initial constant discharge data provided.
     weather: Entities.Weather,
     substrate: Entities.Substrate,
     flammableParameters: Entities.FlammableParameters
-  ) {
-    super();
-    this.material = material;
-    this.dischargeRecords = dischargeRecords;
-    this.dischargeRecordCount = dischargeRecordCount;
-    this.dischargeResult = dischargeResult;
-    this.weather = weather;
-    this.substrate = substrate;
-    this.flammableParameters = flammableParameters;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.material = data.material;
+    this.dischargeRecords = data.dischargeRecords;
+    this.dischargeRecordCount = data.dischargeRecordCount;
+    this.dischargeResult = data.dischargeResult;
+    this.weather = data.weather;
+    this.substrate = data.substrate;
+    this.flammableParameters = data.flammableParameters;
   }
 
   async run() {
     try {
-      const request = new JetFireCalculationRequest(
-        this.material,
-        this.dischargeRecords,
-        this.dischargeRecordCount,
-        this.dischargeResult,
-        this.weather,
-        this.substrate,
-        this.flammableParameters
-      );
+      const request = new JetFireCalculationRequest({
+        material: this.material,
+        dischargeRecords: this.dischargeRecords,
+        dischargeRecordCount: this.dischargeRecordCount,
+        dischargeResult: this.dischargeResult,
+        weather: this.weather,
+        substrate: this.substrate,
+        flammableParameters: this.flammableParameters
+      });
 
       const schema = new JetFireCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -373,24 +355,22 @@ export class JetFireCalculationResponse extends CalculationResponseBase {
   /**
    * JetFire calculation response class.
    *
-   * @param {Entities.FlameResult} flameResult - Flame scalar results.
-   * @param {Entities.FlameRecord[]} flameRecords -  an array of jet fire flame records.
    */
-  constructor(
+  constructor(data: {
     flameResult: Entities.FlameResult,
     flameRecords: Entities.FlameRecord[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.flameResult = flameResult;
-    this.flameRecords = flameRecords;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.flameResult = data.flameResult;
+    this.flameRecords = data.flameRecords;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -464,14 +444,7 @@ export class JetFireCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: JetFireCalculationResponseSchemaData): JetFireCalculationResponse {
-    return new JetFireCalculationResponse(
-      data.flameResult,
-      data.flameRecords,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new JetFireCalculationResponse(data);
   }
 }
 
@@ -493,25 +466,20 @@ class ModifyFuelRateForJetFireCalculationRequest extends CalculationRequestBase
   /**
    * ModifyFuelRateForJetFire calculation request class.
    *
-   * @param {Entities.DischargeRecord[]} dischargeRecords - Discharge records.
-   * @param {number} dischargeRecordCount - Number of discharge records.
-   * @param {Entities.PoolRecord[]} poolRecords - Pool records.
-   * @param {number} poolRecordCount - Number of pool records.
-   * @param {Entities.FlammableParameters} flammableParameters - Flammable parameters.
    */
-  constructor(
+  constructor(data: {
     dischargeRecords: Entities.DischargeRecord[],
     dischargeRecordCount: number,
     poolRecords: Entities.PoolRecord[],
     poolRecordCount: number,
     flammableParameters: Entities.FlammableParameters
-  ) {
+  }) {
     super();
-    this.dischargeRecords = dischargeRecords;
-    this.dischargeRecordCount = dischargeRecordCount;
-    this.poolRecords = poolRecords;
-    this.poolRecordCount = poolRecordCount;
-    this.flammableParameters = flammableParameters;
+    this.dischargeRecords = data.dischargeRecords;
+    this.dischargeRecordCount = data.dischargeRecordCount;
+    this.poolRecords = data.poolRecords;
+    this.poolRecordCount = data.poolRecordCount;
+    this.flammableParameters = data.flammableParameters;
   }
 }
 
@@ -549,13 +517,7 @@ export class ModifyFuelRateForJetFireCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: ModifyFuelRateForJetFireCalculationRequestSchemaData): ModifyFuelRateForJetFireCalculationRequest {
-    return new ModifyFuelRateForJetFireCalculationRequest(
-      data.dischargeRecords,
-      data.dischargeRecordCount,
-      data.poolRecords,
-      data.poolRecordCount,
-      data.flammableParameters
-    );
+    return new ModifyFuelRateForJetFireCalculationRequest(data);
   }
 }
 
@@ -575,36 +537,32 @@ taken into account. In cases where 33% or more of the discharged mass vaporises,
 (Hasegawa and Sato, 1977 and Roberts, 1982) found that the whole discharged mass should be the fuel mass used in fire models. CCPS later 
 adapted this to a rule set of 33%. Thus, this correction only applies for cases where more than 67% of the mass rains out.
    *
-   * @param {Entities.DischargeRecord[]} dischargeRecords - Discharge records.
-   * @param {number} dischargeRecordCount - Number of discharge records.
-   * @param {Entities.PoolRecord[]} poolRecords - Pool records.
-   * @param {number} poolRecordCount - Number of pool records.
-   * @param {Entities.FlammableParameters} flammableParameters - Flammable parameters.
    */
-  constructor(
+  constructor(data: {
     dischargeRecords: Entities.DischargeRecord[],
     dischargeRecordCount: number,
     poolRecords: Entities.PoolRecord[],
     poolRecordCount: number,
     flammableParameters: Entities.FlammableParameters
-  ) {
-    super();
-    this.dischargeRecords = dischargeRecords;
-    this.dischargeRecordCount = dischargeRecordCount;
-    this.poolRecords = poolRecords;
-    this.poolRecordCount = poolRecordCount;
-    this.flammableParameters = flammableParameters;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.dischargeRecords = data.dischargeRecords;
+    this.dischargeRecordCount = data.dischargeRecordCount;
+    this.poolRecords = data.poolRecords;
+    this.poolRecordCount = data.poolRecordCount;
+    this.flammableParameters = data.flammableParameters;
   }
 
   async run() {
     try {
-      const request = new ModifyFuelRateForJetFireCalculationRequest(
-        this.dischargeRecords,
-        this.dischargeRecordCount,
-        this.poolRecords,
-        this.poolRecordCount,
-        this.flammableParameters
-      );
+      const request = new ModifyFuelRateForJetFireCalculationRequest({
+        dischargeRecords: this.dischargeRecords,
+        dischargeRecordCount: this.dischargeRecordCount,
+        poolRecords: this.poolRecords,
+        poolRecordCount: this.poolRecordCount,
+        flammableParameters: this.flammableParameters
+      });
 
       const schema = new ModifyFuelRateForJetFireCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -668,21 +626,20 @@ export class ModifyFuelRateForJetFireCalculationResponse extends CalculationResp
   /**
    * ModifyFuelRateForJetFire calculation response class.
    *
-   * @param {Entities.DischargeRecord[]} modDischargeRecords - Modified discharge records.
    */
-  constructor(
+  constructor(data: {
     modDischargeRecords: Entities.DischargeRecord[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.modDischargeRecords = modDischargeRecords;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.modDischargeRecords = data.modDischargeRecords;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -749,12 +706,6 @@ export class ModifyFuelRateForJetFireCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: ModifyFuelRateForJetFireCalculationResponseSchemaData): ModifyFuelRateForJetFireCalculationResponse {
-    return new ModifyFuelRateForJetFireCalculationResponse(
-      data.modDischargeRecords,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new ModifyFuelRateForJetFireCalculationResponse(data);
   }
 }