@dnv-plant/typescriptpws 1.0.86 → 1.0.88

package/src/calculations/utilities.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);
   }
 
   /**
@@ -167,19 +170,16 @@ class ConvertCompositionMassToMoleCalculationRequest extends CalculationRequestB
   /**
    * ConvertCompositionMassToMole calculation request class.
    *
-   * @param {Entities.Material} mixture -  a material entity with two or more material components to have composition converted.
-   * @param {number[]} compositionMass - Array of mass fractions.
-   * @param {number} compositionMassCount - Number of components in mixture.
    */
-  constructor(
+  constructor(data: {
     mixture: Entities.Material,
     compositionMass: number[],
     compositionMassCount: number
-  ) {
+  }) {
     super();
-    this.mixture = mixture;
-    this.compositionMass = compositionMass;
-    this.compositionMassCount = compositionMassCount;
+    this.mixture = data.mixture;
+    this.compositionMass = data.compositionMass;
+    this.compositionMassCount = data.compositionMassCount;
   }
 }
 
@@ -213,11 +213,7 @@ export class ConvertCompositionMassToMoleCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: ConvertCompositionMassToMoleCalculationRequestSchemaData): ConvertCompositionMassToMoleCalculationRequest {
-    return new ConvertCompositionMassToMoleCalculationRequest(
-      data.mixture,
-      data.compositionMass,
-      data.compositionMassCount
-    );
+    return new ConvertCompositionMassToMoleCalculationRequest(data);
   }
 }
 
@@ -230,28 +226,26 @@ export class ConvertCompositionMassToMoleCalculation extends CalculationBase {
   /**
    * Converts mixture composition from mass to mole basis.
    *
-   * @param {Entities.Material} mixture -  a material entity with two or more material components to have composition converted.
-   * @param {number[]} compositionMass - Array of mass fractions.
-   * @param {number} compositionMassCount - Number of components in mixture.
    */
-  constructor(
+  constructor(data: {
     mixture: Entities.Material,
     compositionMass: number[],
     compositionMassCount: number
-  ) {
-    super();
-    this.mixture = mixture;
-    this.compositionMass = compositionMass;
-    this.compositionMassCount = compositionMassCount;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.mixture = data.mixture;
+    this.compositionMass = data.compositionMass;
+    this.compositionMassCount = data.compositionMassCount;
   }
 
   async run() {
     try {
-      const request = new ConvertCompositionMassToMoleCalculationRequest(
-        this.mixture,
-        this.compositionMass,
-        this.compositionMassCount
-      );
+      const request = new ConvertCompositionMassToMoleCalculationRequest({
+        mixture: this.mixture,
+        compositionMass: this.compositionMass,
+        compositionMassCount: this.compositionMassCount
+      });
 
       const schema = new ConvertCompositionMassToMoleCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -315,21 +309,20 @@ export class ConvertCompositionMassToMoleCalculationResponse extends Calculation
   /**
    * ConvertCompositionMassToMole calculation response class.
    *
-   * @param {number[]} compositionMole - Array of mole fractions.
    */
-  constructor(
+  constructor(data: {
     compositionMole: number[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.compositionMole = compositionMole;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.compositionMole = data.compositionMole;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -390,13 +383,7 @@ export class ConvertCompositionMassToMoleCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: ConvertCompositionMassToMoleCalculationResponseSchemaData): ConvertCompositionMassToMoleCalculationResponse {
-    return new ConvertCompositionMassToMoleCalculationResponse(
-      data.compositionMole,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new ConvertCompositionMassToMoleCalculationResponse(data);
   }
 }
 
@@ -414,19 +401,16 @@ class ConvertCompositionMoleToMassCalculationRequest extends CalculationRequestB
   /**
    * ConvertCompositionMoleToMass calculation request class.
    *
-   * @param {Entities.Material} mixture -  a material entity with two or more material components to have composition converted.
-   * @param {number[]} compositionMoles - Array of mole fractions.
-   * @param {number} compositionMolesCount - Number of components in mixture.
    */
-  constructor(
+  constructor(data: {
     mixture: Entities.Material,
     compositionMoles: number[],
     compositionMolesCount: number
-  ) {
+  }) {
     super();
-    this.mixture = mixture;
-    this.compositionMoles = compositionMoles;
-    this.compositionMolesCount = compositionMolesCount;
+    this.mixture = data.mixture;
+    this.compositionMoles = data.compositionMoles;
+    this.compositionMolesCount = data.compositionMolesCount;
   }
 }
 
@@ -460,11 +444,7 @@ export class ConvertCompositionMoleToMassCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: ConvertCompositionMoleToMassCalculationRequestSchemaData): ConvertCompositionMoleToMassCalculationRequest {
-    return new ConvertCompositionMoleToMassCalculationRequest(
-      data.mixture,
-      data.compositionMoles,
-      data.compositionMolesCount
-    );
+    return new ConvertCompositionMoleToMassCalculationRequest(data);
   }
 }
 
@@ -477,28 +457,26 @@ export class ConvertCompositionMoleToMassCalculation extends CalculationBase {
   /**
    * Converts mixture composition from mole to mass basis.
    *
-   * @param {Entities.Material} mixture -  a material entity with two or more material components to have composition converted.
-   * @param {number[]} compositionMoles - Array of mole fractions.
-   * @param {number} compositionMolesCount - Number of components in mixture.
    */
-  constructor(
+  constructor(data: {
     mixture: Entities.Material,
     compositionMoles: number[],
     compositionMolesCount: number
-  ) {
-    super();
-    this.mixture = mixture;
-    this.compositionMoles = compositionMoles;
-    this.compositionMolesCount = compositionMolesCount;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.mixture = data.mixture;
+    this.compositionMoles = data.compositionMoles;
+    this.compositionMolesCount = data.compositionMolesCount;
   }
 
   async run() {
     try {
-      const request = new ConvertCompositionMoleToMassCalculationRequest(
-        this.mixture,
-        this.compositionMoles,
-        this.compositionMolesCount
-      );
+      const request = new ConvertCompositionMoleToMassCalculationRequest({
+        mixture: this.mixture,
+        compositionMoles: this.compositionMoles,
+        compositionMolesCount: this.compositionMolesCount
+      });
 
       const schema = new ConvertCompositionMoleToMassCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -562,21 +540,20 @@ export class ConvertCompositionMoleToMassCalculationResponse extends Calculation
   /**
    * ConvertCompositionMoleToMass calculation response class.
    *
-   * @param {number[]} compositionMass - Array of mass fractions.
    */
-  constructor(
+  constructor(data: {
     compositionMass: number[],
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.compositionMass = compositionMass;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.compositionMass = data.compositionMass;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -637,13 +614,7 @@ export class ConvertCompositionMoleToMassCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: ConvertCompositionMoleToMassCalculationResponseSchemaData): ConvertCompositionMoleToMassCalculationResponse {
-    return new ConvertCompositionMoleToMassCalculationResponse(
-      data.compositionMass,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new ConvertCompositionMoleToMassCalculationResponse(data);
   }
 }
 
@@ -657,13 +628,12 @@ class GetMassFromVesselCalculationRequest extends CalculationRequestBase {
   /**
    * GetMassFromVessel calculation request class.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
    */
-  constructor(
+  constructor(data: {
     vessel: Entities.Vessel
-  ) {
+  }) {
     super();
-    this.vessel = vessel;
+    this.vessel = data.vessel;
   }
 }
 
@@ -693,9 +663,7 @@ export class GetMassFromVesselCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: GetMassFromVesselCalculationRequestSchemaData): GetMassFromVesselCalculationRequest {
-    return new GetMassFromVesselCalculationRequest(
-      data.vessel
-    );
+    return new GetMassFromVesselCalculationRequest(data);
   }
 }
 
@@ -706,20 +674,20 @@ export class GetMassFromVesselCalculation extends CalculationBase {
   /**
    * Calculates the mass in a vessel.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
    */
-  constructor(
+  constructor(data: {
     vessel: Entities.Vessel
-  ) {
-    super();
-    this.vessel = vessel;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.vessel = data.vessel;
   }
 
   async run() {
     try {
-      const request = new GetMassFromVesselCalculationRequest(
-        this.vessel
-      );
+      const request = new GetMassFromVesselCalculationRequest({
+        vessel: this.vessel
+      });
 
       const schema = new GetMassFromVesselCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -778,21 +746,20 @@ export class GetMassFromVesselCalculationResponse extends CalculationResponseBas
   /**
    * GetMassFromVessel calculation response class.
    *
-   * @param {number} massInventory - Mass inventory in the vessel (kg).
    */
-  constructor(
+  constructor(data: {
     massInventory: number,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.massInventory = massInventory;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.massInventory = data.massInventory;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -853,13 +820,7 @@ export class GetMassFromVesselCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: GetMassFromVesselCalculationResponseSchemaData): GetMassFromVesselCalculationResponse {
-    return new GetMassFromVesselCalculationResponse(
-      data.massInventory,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new GetMassFromVesselCalculationResponse(data);
   }
 }
 
@@ -885,15 +846,8 @@ class LoadMassInventoryVesselForLeakScenarioCalculationRequest extends Calculati
   /**
    * LoadMassInventoryVesselForLeakScenario calculation request class.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {number} mass - Total vessel mass inventory.
-   * @param {number} pressure - Absolute pressure of the fluid.
-   * @param {number} temperature - Temperature of the fluid.
-   * @param {number} holeSize - The diameter of the equivalent circular orifice with the same area as the area of the leak.
-   * @param {number} releaseElevation - Elevation of the release above ground level.
-   * @param {number} releaseAngle - Angle of release above a horizontal plane.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     mass: number,
     pressure: number,
@@ -901,15 +855,15 @@ class LoadMassInventoryVesselForLeakScenarioCalculationRequest extends Calculati
     holeSize: number,
     releaseElevation: number,
     releaseAngle: number
-  ) {
+  }) {
     super();
-    this.material = material;
-    this.mass = mass;
-    this.pressure = pressure;
-    this.temperature = temperature;
-    this.holeSize = holeSize;
-    this.releaseElevation = releaseElevation;
-    this.releaseAngle = releaseAngle;
+    this.material = data.material;
+    this.mass = data.mass;
+    this.pressure = data.pressure;
+    this.temperature = data.temperature;
+    this.holeSize = data.holeSize;
+    this.releaseElevation = data.releaseElevation;
+    this.releaseAngle = data.releaseAngle;
   }
 }
 
@@ -951,15 +905,7 @@ export class LoadMassInventoryVesselForLeakScenarioCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: LoadMassInventoryVesselForLeakScenarioCalculationRequestSchemaData): LoadMassInventoryVesselForLeakScenarioCalculationRequest {
-    return new LoadMassInventoryVesselForLeakScenarioCalculationRequest(
-      data.material,
-      data.mass,
-      data.pressure,
-      data.temperature,
-      data.holeSize,
-      data.releaseElevation,
-      data.releaseAngle
-    );
+    return new LoadMassInventoryVesselForLeakScenarioCalculationRequest(data);
   }
 }
 
@@ -977,15 +923,8 @@ export class LoadMassInventoryVesselForLeakScenarioCalculation extends Calculati
   /**
    * Sets up a vessel and a leak scenario from a mass inventory, pressure, temperature and hole size specifications.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {number} mass - Total vessel mass inventory.
-   * @param {number} pressure - Absolute pressure of the fluid.
-   * @param {number} temperature - Temperature of the fluid.
-   * @param {number} holeSize - The diameter of the equivalent circular orifice with the same area as the area of the leak.
-   * @param {number} releaseElevation - Elevation of the release above ground level.
-   * @param {number} releaseAngle - Angle of release above a horizontal plane.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     mass: number,
     pressure: number,
@@ -993,28 +932,29 @@ export class LoadMassInventoryVesselForLeakScenarioCalculation extends Calculati
     holeSize: number,
     releaseElevation: number,
     releaseAngle: number
-  ) {
-    super();
-    this.material = material;
-    this.mass = mass;
-    this.pressure = pressure;
-    this.temperature = temperature;
-    this.holeSize = holeSize;
-    this.releaseElevation = releaseElevation;
-    this.releaseAngle = releaseAngle;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.material = data.material;
+    this.mass = data.mass;
+    this.pressure = data.pressure;
+    this.temperature = data.temperature;
+    this.holeSize = data.holeSize;
+    this.releaseElevation = data.releaseElevation;
+    this.releaseAngle = data.releaseAngle;
   }
 
   async run() {
     try {
-      const request = new LoadMassInventoryVesselForLeakScenarioCalculationRequest(
-        this.material,
-        this.mass,
-        this.pressure,
-        this.temperature,
-        this.holeSize,
-        this.releaseElevation,
-        this.releaseAngle
-      );
+      const request = new LoadMassInventoryVesselForLeakScenarioCalculationRequest({
+        material: this.material,
+        mass: this.mass,
+        pressure: this.pressure,
+        temperature: this.temperature,
+        holeSize: this.holeSize,
+        releaseElevation: this.releaseElevation,
+        releaseAngle: this.releaseAngle
+      });
 
       const schema = new LoadMassInventoryVesselForLeakScenarioCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -1076,24 +1016,22 @@ export class LoadMassInventoryVesselForLeakScenarioCalculationResponse extends C
   /**
    * LoadMassInventoryVesselForLeakScenario calculation response class.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.Leak} leak -  a leak entity.
    */
-  constructor(
+  constructor(data: {
     vessel: Entities.Vessel,
     leak: Entities.Leak,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.vessel = vessel;
-    this.leak = leak;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.vessel = data.vessel;
+    this.leak = data.leak;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -1162,14 +1100,7 @@ export class LoadMassInventoryVesselForLeakScenarioCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: LoadMassInventoryVesselForLeakScenarioCalculationResponseSchemaData): LoadMassInventoryVesselForLeakScenarioCalculationResponse {
-    return new LoadMassInventoryVesselForLeakScenarioCalculationResponse(
-      data.vessel,
-      data.leak,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new LoadMassInventoryVesselForLeakScenarioCalculationResponse(data);
   }
 }
 
@@ -1197,16 +1128,8 @@ class LoadMassInventoryVesselForLineRuptureScenarioCalculationRequest extends Ca
   /**
    * LoadMassInventoryVesselForLineRuptureScenario calculation request class.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {number} mass - Total vessel mass inventory.
-   * @param {number} pressure - Absolute pressure of the fluid.
-   * @param {number} temperature - Temperature of the fluid.
-   * @param {number} pipeDiameter - Internal diameter of the pipe.
-   * @param {number} pipeLength - Length of the pipe.
-   * @param {number} releaseElevation - Elevation of the release above ground level.
-   * @param {number} releaseAngle - Angle of release above a horizontal plane.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     mass: number,
     pressure: number,
@@ -1215,16 +1138,16 @@ class LoadMassInventoryVesselForLineRuptureScenarioCalculationRequest extends Ca
     pipeLength: number,
     releaseElevation: number,
     releaseAngle: number
-  ) {
+  }) {
     super();
-    this.material = material;
-    this.mass = mass;
-    this.pressure = pressure;
-    this.temperature = temperature;
-    this.pipeDiameter = pipeDiameter;
-    this.pipeLength = pipeLength;
-    this.releaseElevation = releaseElevation;
-    this.releaseAngle = releaseAngle;
+    this.material = data.material;
+    this.mass = data.mass;
+    this.pressure = data.pressure;
+    this.temperature = data.temperature;
+    this.pipeDiameter = data.pipeDiameter;
+    this.pipeLength = data.pipeLength;
+    this.releaseElevation = data.releaseElevation;
+    this.releaseAngle = data.releaseAngle;
   }
 }
 
@@ -1268,16 +1191,7 @@ export class LoadMassInventoryVesselForLineRuptureScenarioCalculationRequestSche
   }
 
   makeCalculationRequest(data: LoadMassInventoryVesselForLineRuptureScenarioCalculationRequestSchemaData): LoadMassInventoryVesselForLineRuptureScenarioCalculationRequest {
-    return new LoadMassInventoryVesselForLineRuptureScenarioCalculationRequest(
-      data.material,
-      data.mass,
-      data.pressure,
-      data.temperature,
-      data.pipeDiameter,
-      data.pipeLength,
-      data.releaseElevation,
-      data.releaseAngle
-    );
+    return new LoadMassInventoryVesselForLineRuptureScenarioCalculationRequest(data);
   }
 }
 
@@ -1296,16 +1210,8 @@ export class LoadMassInventoryVesselForLineRuptureScenarioCalculation extends Ca
   /**
    * Sets up a vessel and a line rupture scenario from a mass inventory, pressure, temperature  pipe diameter and length specifications.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {number} mass - Total vessel mass inventory.
-   * @param {number} pressure - Absolute pressure of the fluid.
-   * @param {number} temperature - Temperature of the fluid.
-   * @param {number} pipeDiameter - Internal diameter of the pipe.
-   * @param {number} pipeLength - Length of the pipe.
-   * @param {number} releaseElevation - Elevation of the release above ground level.
-   * @param {number} releaseAngle - Angle of release above a horizontal plane.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     mass: number,
     pressure: number,
@@ -1314,30 +1220,31 @@ export class LoadMassInventoryVesselForLineRuptureScenarioCalculation extends Ca
     pipeLength: number,
     releaseElevation: number,
     releaseAngle: number
-  ) {
-    super();
-    this.material = material;
-    this.mass = mass;
-    this.pressure = pressure;
-    this.temperature = temperature;
-    this.pipeDiameter = pipeDiameter;
-    this.pipeLength = pipeLength;
-    this.releaseElevation = releaseElevation;
-    this.releaseAngle = releaseAngle;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.material = data.material;
+    this.mass = data.mass;
+    this.pressure = data.pressure;
+    this.temperature = data.temperature;
+    this.pipeDiameter = data.pipeDiameter;
+    this.pipeLength = data.pipeLength;
+    this.releaseElevation = data.releaseElevation;
+    this.releaseAngle = data.releaseAngle;
   }
 
   async run() {
     try {
-      const request = new LoadMassInventoryVesselForLineRuptureScenarioCalculationRequest(
-        this.material,
-        this.mass,
-        this.pressure,
-        this.temperature,
-        this.pipeDiameter,
-        this.pipeLength,
-        this.releaseElevation,
-        this.releaseAngle
-      );
+      const request = new LoadMassInventoryVesselForLineRuptureScenarioCalculationRequest({
+        material: this.material,
+        mass: this.mass,
+        pressure: this.pressure,
+        temperature: this.temperature,
+        pipeDiameter: this.pipeDiameter,
+        pipeLength: this.pipeLength,
+        releaseElevation: this.releaseElevation,
+        releaseAngle: this.releaseAngle
+      });
 
       const schema = new LoadMassInventoryVesselForLineRuptureScenarioCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -1399,24 +1306,22 @@ export class LoadMassInventoryVesselForLineRuptureScenarioCalculationResponse ex
   /**
    * LoadMassInventoryVesselForLineRuptureScenario calculation response class.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.LineRupture} lineRupture -  a line rupture entity.
    */
-  constructor(
+  constructor(data: {
     vessel: Entities.Vessel,
     lineRupture: Entities.LineRupture,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.vessel = vessel;
-    this.lineRupture = lineRupture;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.vessel = data.vessel;
+    this.lineRupture = data.lineRupture;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -1485,14 +1390,7 @@ export class LoadMassInventoryVesselForLineRuptureScenarioCalculationResponseSch
   }
 
   makeCalculationResponse(data: LoadMassInventoryVesselForLineRuptureScenarioCalculationResponseSchemaData): LoadMassInventoryVesselForLineRuptureScenarioCalculationResponse {
-    return new LoadMassInventoryVesselForLineRuptureScenarioCalculationResponse(
-      data.vessel,
-      data.lineRupture,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new LoadMassInventoryVesselForLineRuptureScenarioCalculationResponse(data);
   }
 }
 
@@ -1522,17 +1420,8 @@ class LoadMassInventoryVesselForReliefValveScenarioCalculationRequest extends Ca
   /**
    * LoadMassInventoryVesselForReliefValveScenario calculation request class.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {number} mass - Total vessel mass inventory.
-   * @param {number} pressure - Absolute pressure of the fluid.
-   * @param {number} temperature - Tmperature of the fluid.
-   * @param {number} constrictionSize - Constriction diameter at the upstream end of the pipe.
-   * @param {number} pipeDiameter - Internal diameter of the pipe.
-   * @param {number} pipeLength - Length of the pipe.
-   * @param {number} releaseElevation - Elevation of the release above ground level.
-   * @param {number} releaseAngle - Angle of release above a horizontal plane.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     mass: number,
     pressure: number,
@@ -1542,17 +1431,17 @@ class LoadMassInventoryVesselForReliefValveScenarioCalculationRequest extends Ca
     pipeLength: number,
     releaseElevation: number,
     releaseAngle: number
-  ) {
+  }) {
     super();
-    this.material = material;
-    this.mass = mass;
-    this.pressure = pressure;
-    this.temperature = temperature;
-    this.constrictionSize = constrictionSize;
-    this.pipeDiameter = pipeDiameter;
-    this.pipeLength = pipeLength;
-    this.releaseElevation = releaseElevation;
-    this.releaseAngle = releaseAngle;
+    this.material = data.material;
+    this.mass = data.mass;
+    this.pressure = data.pressure;
+    this.temperature = data.temperature;
+    this.constrictionSize = data.constrictionSize;
+    this.pipeDiameter = data.pipeDiameter;
+    this.pipeLength = data.pipeLength;
+    this.releaseElevation = data.releaseElevation;
+    this.releaseAngle = data.releaseAngle;
   }
 }
 
@@ -1598,17 +1487,7 @@ export class LoadMassInventoryVesselForReliefValveScenarioCalculationRequestSche
   }
 
   makeCalculationRequest(data: LoadMassInventoryVesselForReliefValveScenarioCalculationRequestSchemaData): LoadMassInventoryVesselForReliefValveScenarioCalculationRequest {
-    return new LoadMassInventoryVesselForReliefValveScenarioCalculationRequest(
-      data.material,
-      data.mass,
-      data.pressure,
-      data.temperature,
-      data.constrictionSize,
-      data.pipeDiameter,
-      data.pipeLength,
-      data.releaseElevation,
-      data.releaseAngle
-    );
+    return new LoadMassInventoryVesselForReliefValveScenarioCalculationRequest(data);
   }
 }
 
@@ -1628,17 +1507,8 @@ export class LoadMassInventoryVesselForReliefValveScenarioCalculation extends Ca
   /**
    * Sets up a vessel and a relief valve scenario from a mass inventory, pressure, temperature pipe diameter, length and constriction size specifications.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {number} mass - Total vessel mass inventory.
-   * @param {number} pressure - Absolute pressure of the fluid.
-   * @param {number} temperature - Tmperature of the fluid.
-   * @param {number} constrictionSize - Constriction diameter at the upstream end of the pipe.
-   * @param {number} pipeDiameter - Internal diameter of the pipe.
-   * @param {number} pipeLength - Length of the pipe.
-   * @param {number} releaseElevation - Elevation of the release above ground level.
-   * @param {number} releaseAngle - Angle of release above a horizontal plane.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     mass: number,
     pressure: number,
@@ -1648,32 +1518,33 @@ export class LoadMassInventoryVesselForReliefValveScenarioCalculation extends Ca
     pipeLength: number,
     releaseElevation: number,
     releaseAngle: number
-  ) {
-    super();
-    this.material = material;
-    this.mass = mass;
-    this.pressure = pressure;
-    this.temperature = temperature;
-    this.constrictionSize = constrictionSize;
-    this.pipeDiameter = pipeDiameter;
-    this.pipeLength = pipeLength;
-    this.releaseElevation = releaseElevation;
-    this.releaseAngle = releaseAngle;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.material = data.material;
+    this.mass = data.mass;
+    this.pressure = data.pressure;
+    this.temperature = data.temperature;
+    this.constrictionSize = data.constrictionSize;
+    this.pipeDiameter = data.pipeDiameter;
+    this.pipeLength = data.pipeLength;
+    this.releaseElevation = data.releaseElevation;
+    this.releaseAngle = data.releaseAngle;
   }
 
   async run() {
     try {
-      const request = new LoadMassInventoryVesselForReliefValveScenarioCalculationRequest(
-        this.material,
-        this.mass,
-        this.pressure,
-        this.temperature,
-        this.constrictionSize,
-        this.pipeDiameter,
-        this.pipeLength,
-        this.releaseElevation,
-        this.releaseAngle
-      );
+      const request = new LoadMassInventoryVesselForReliefValveScenarioCalculationRequest({
+        material: this.material,
+        mass: this.mass,
+        pressure: this.pressure,
+        temperature: this.temperature,
+        constrictionSize: this.constrictionSize,
+        pipeDiameter: this.pipeDiameter,
+        pipeLength: this.pipeLength,
+        releaseElevation: this.releaseElevation,
+        releaseAngle: this.releaseAngle
+      });
 
       const schema = new LoadMassInventoryVesselForReliefValveScenarioCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -1735,24 +1606,22 @@ export class LoadMassInventoryVesselForReliefValveScenarioCalculationResponse ex
   /**
    * LoadMassInventoryVesselForReliefValveScenario calculation response class.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.ReliefValve} reliefValve -  a relief valve entity.
    */
-  constructor(
+  constructor(data: {
     vessel: Entities.Vessel,
     reliefValve: Entities.ReliefValve,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.vessel = vessel;
-    this.reliefValve = reliefValve;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.vessel = data.vessel;
+    this.reliefValve = data.reliefValve;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -1821,14 +1690,7 @@ export class LoadMassInventoryVesselForReliefValveScenarioCalculationResponseSch
   }
 
   makeCalculationResponse(data: LoadMassInventoryVesselForReliefValveScenarioCalculationResponseSchemaData): LoadMassInventoryVesselForReliefValveScenarioCalculationResponse {
-    return new LoadMassInventoryVesselForReliefValveScenarioCalculationResponse(
-      data.vessel,
-      data.reliefValve,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new LoadMassInventoryVesselForReliefValveScenarioCalculationResponse(data);
   }
 }
 
@@ -1844,16 +1706,14 @@ class ReliefValveMinTemperatureCalculationRequest extends CalculationRequestBase
   /**
    * ReliefValveMinTemperature calculation request class.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {number} pressure - Input pressure (absolute) at which to evaluate bubble point temperature.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     pressure: number
-  ) {
+  }) {
     super();
-    this.material = material;
-    this.pressure = pressure;
+    this.material = data.material;
+    this.pressure = data.pressure;
   }
 }
 
@@ -1885,10 +1745,7 @@ export class ReliefValveMinTemperatureCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: ReliefValveMinTemperatureCalculationRequestSchemaData): ReliefValveMinTemperatureCalculationRequest {
-    return new ReliefValveMinTemperatureCalculationRequest(
-      data.material,
-      data.pressure
-    );
+    return new ReliefValveMinTemperatureCalculationRequest(data);
   }
 }
 
@@ -1900,24 +1757,23 @@ export class ReliefValveMinTemperatureCalculation extends CalculationBase {
   /**
    * The Relief Valve scenario does not allow fluid conditions to be liquid. As such, his method calculates the lower limit for the input temperature to ensure vapour or two-phase fluid state.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {number} pressure - Input pressure (absolute) at which to evaluate bubble point temperature.
    */
-  constructor(
+  constructor(data: {
     material: Entities.Material,
     pressure: number
-  ) {
-    super();
-    this.material = material;
-    this.pressure = pressure;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.material = data.material;
+    this.pressure = data.pressure;
   }
 
   async run() {
     try {
-      const request = new ReliefValveMinTemperatureCalculationRequest(
-        this.material,
-        this.pressure
-      );
+      const request = new ReliefValveMinTemperatureCalculationRequest({
+        material: this.material,
+        pressure: this.pressure
+      });
 
       const schema = new ReliefValveMinTemperatureCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -1976,21 +1832,20 @@ export class ReliefValveMinTemperatureCalculationResponse extends CalculationRes
   /**
    * ReliefValveMinTemperature calculation response class.
    *
-   * @param {number} minTemperature - Calculated lower temperature limit for relief valve scenario.
    */
-  constructor(
+  constructor(data: {
     minTemperature: number,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.minTemperature = minTemperature;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.minTemperature = data.minTemperature;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -2051,13 +1906,7 @@ export class ReliefValveMinTemperatureCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: ReliefValveMinTemperatureCalculationResponseSchemaData): ReliefValveMinTemperatureCalculationResponse {
-    return new ReliefValveMinTemperatureCalculationResponse(
-      data.minTemperature,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new ReliefValveMinTemperatureCalculationResponse(data);
   }
 }
 
@@ -2071,13 +1920,12 @@ class SetMixingLayerHeightCalculationRequest extends CalculationRequestBase {
   /**
    * SetMixingLayerHeight calculation request class.
    *
-   * @param {Entities.Weather} weather -  a weather entity.
    */
-  constructor(
+  constructor(data: {
     weather: Entities.Weather
-  ) {
+  }) {
     super();
-    this.weather = weather;
+    this.weather = data.weather;
   }
 }
 
@@ -2107,9 +1955,7 @@ export class SetMixingLayerHeightCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: SetMixingLayerHeightCalculationRequestSchemaData): SetMixingLayerHeightCalculationRequest {
-    return new SetMixingLayerHeightCalculationRequest(
-      data.weather
-    );
+    return new SetMixingLayerHeightCalculationRequest(data);
   }
 }
 
@@ -2120,20 +1966,20 @@ export class SetMixingLayerHeightCalculation extends CalculationBase {
   /**
    * Updates the mixing layer height in a weather according to the stability class,.
    *
-   * @param {Entities.Weather} weather -  a weather entity.
    */
-  constructor(
+  constructor(data: {
     weather: Entities.Weather
-  ) {
-    super();
-    this.weather = weather;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.weather = data.weather;
   }
 
   async run() {
     try {
-      const request = new SetMixingLayerHeightCalculationRequest(
-        this.weather
-      );
+      const request = new SetMixingLayerHeightCalculationRequest({
+        weather: this.weather
+      });
 
       const schema = new SetMixingLayerHeightCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -2192,21 +2038,20 @@ export class SetMixingLayerHeightCalculationResponse extends CalculationResponse
   /**
    * SetMixingLayerHeight calculation response class.
    *
-   * @param {Entities.Weather} updatedWeather - Updated weather entity.
    */
-  constructor(
+  constructor(data: {
     updatedWeather: Entities.Weather,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.updatedWeather = updatedWeather;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.updatedWeather = data.updatedWeather;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -2268,13 +2113,7 @@ export class SetMixingLayerHeightCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: SetMixingLayerHeightCalculationResponseSchemaData): SetMixingLayerHeightCalculationResponse {
-    return new SetMixingLayerHeightCalculationResponse(
-      data.updatedWeather,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new SetMixingLayerHeightCalculationResponse(data);
   }
 }
 
@@ -2292,19 +2131,16 @@ class SetPhaseToReleaseForLeakScenarioCalculationRequest extends CalculationRequ
   /**
    * SetPhaseToReleaseForLeakScenario calculation request class.
    *
-   * @param {Enums.Phase} phaseToRelease - Requested fluid phase to release.
-   * @param {number} releaseElevation - Release point elevation above ground.
-   * @param {Entities.Vessel} vessel -  a vessel entity.
    */
-  constructor(
+  constructor(data: {
     phaseToRelease: Enums.Phase,
     releaseElevation: number,
     vessel: Entities.Vessel
-  ) {
+  }) {
     super();
-    this.phaseToRelease = phaseToRelease;
-    this.releaseElevation = releaseElevation;
-    this.vessel = vessel;
+    this.phaseToRelease = data.phaseToRelease;
+    this.releaseElevation = data.releaseElevation;
+    this.vessel = data.vessel;
   }
 }
 
@@ -2338,11 +2174,7 @@ export class SetPhaseToReleaseForLeakScenarioCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: SetPhaseToReleaseForLeakScenarioCalculationRequestSchemaData): SetPhaseToReleaseForLeakScenarioCalculationRequest {
-    return new SetPhaseToReleaseForLeakScenarioCalculationRequest(
-      data.phaseToRelease,
-      data.releaseElevation,
-      data.vessel
-    );
+    return new SetPhaseToReleaseForLeakScenarioCalculationRequest(data);
   }
 }
 
@@ -2356,28 +2188,26 @@ export class SetPhaseToReleaseForLeakScenarioCalculation extends CalculationBase
   /**
    * Calculates the hole height fraction and vessel z coordinate to release the requested phase (vapour or liquid).
    *
-   * @param {Enums.Phase} phaseToRelease - Requested fluid phase to release.
-   * @param {number} releaseElevation - Release point elevation above ground.
-   * @param {Entities.Vessel} vessel -  a vessel entity.
    */
-  constructor(
+  constructor(data: {
     phaseToRelease: Enums.Phase,
     releaseElevation: number,
     vessel: Entities.Vessel
-  ) {
-    super();
-    this.phaseToRelease = phaseToRelease;
-    this.releaseElevation = releaseElevation;
-    this.vessel = vessel;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.phaseToRelease = data.phaseToRelease;
+    this.releaseElevation = data.releaseElevation;
+    this.vessel = data.vessel;
   }
 
   async run() {
     try {
-      const request = new SetPhaseToReleaseForLeakScenarioCalculationRequest(
-        this.phaseToRelease,
-        this.releaseElevation,
-        this.vessel
-      );
+      const request = new SetPhaseToReleaseForLeakScenarioCalculationRequest({
+        phaseToRelease: this.phaseToRelease,
+        releaseElevation: this.releaseElevation,
+        vessel: this.vessel
+      });
 
       const schema = new SetPhaseToReleaseForLeakScenarioCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -2439,24 +2269,22 @@ export class SetPhaseToReleaseForLeakScenarioCalculationResponse extends Calcula
   /**
    * SetPhaseToReleaseForLeakScenario calculation response class.
    *
-   * @param {number} zCoordUpdated - Updated z-coordinate of vessel to accommodate requested phase to release.
-   * @param {number} holeHeightFractionUpdated - Updated hole height fraction to accommodate requested phase to release.
    */
-  constructor(
+  constructor(data: {
     zCoordUpdated: number,
     holeHeightFractionUpdated: number,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.zCoordUpdated = zCoordUpdated;
-    this.holeHeightFractionUpdated = holeHeightFractionUpdated;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.zCoordUpdated = data.zCoordUpdated;
+    this.holeHeightFractionUpdated = data.holeHeightFractionUpdated;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -2523,14 +2351,7 @@ export class SetPhaseToReleaseForLeakScenarioCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: SetPhaseToReleaseForLeakScenarioCalculationResponseSchemaData): SetPhaseToReleaseForLeakScenarioCalculationResponse {
-    return new SetPhaseToReleaseForLeakScenarioCalculationResponse(
-      data.zCoordUpdated,
-      data.holeHeightFractionUpdated,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new SetPhaseToReleaseForLeakScenarioCalculationResponse(data);
   }
 }
 
@@ -2548,19 +2369,16 @@ class SetPhaseToReleaseForLineRuptureScenarioCalculationRequest extends Calculat
   /**
    * SetPhaseToReleaseForLineRuptureScenario calculation request class.
    *
-   * @param {Enums.Phase} phaseToRelease - Requested fluid phase to release.
-   * @param {number} releaseElevation - Release point elevation above ground.
-   * @param {Entities.Vessel} vessel -  a vessel entity.
    */
-  constructor(
+  constructor(data: {
     phaseToRelease: Enums.Phase,
     releaseElevation: number,
     vessel: Entities.Vessel
-  ) {
+  }) {
     super();
-    this.phaseToRelease = phaseToRelease;
-    this.releaseElevation = releaseElevation;
-    this.vessel = vessel;
+    this.phaseToRelease = data.phaseToRelease;
+    this.releaseElevation = data.releaseElevation;
+    this.vessel = data.vessel;
   }
 }
 
@@ -2594,11 +2412,7 @@ export class SetPhaseToReleaseForLineRuptureScenarioCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: SetPhaseToReleaseForLineRuptureScenarioCalculationRequestSchemaData): SetPhaseToReleaseForLineRuptureScenarioCalculationRequest {
-    return new SetPhaseToReleaseForLineRuptureScenarioCalculationRequest(
-      data.phaseToRelease,
-      data.releaseElevation,
-      data.vessel
-    );
+    return new SetPhaseToReleaseForLineRuptureScenarioCalculationRequest(data);
   }
 }
 
@@ -2612,28 +2426,26 @@ export class SetPhaseToReleaseForLineRuptureScenarioCalculation extends Calculat
   /**
    * Calculates the pipe height fraction and vessel z coordinate to release the requested phase (vapour or liquid).
    *
-   * @param {Enums.Phase} phaseToRelease - Requested fluid phase to release.
-   * @param {number} releaseElevation - Release point elevation above ground.
-   * @param {Entities.Vessel} vessel -  a vessel entity.
    */
-  constructor(
+  constructor(data: {
     phaseToRelease: Enums.Phase,
     releaseElevation: number,
     vessel: Entities.Vessel
-  ) {
-    super();
-    this.phaseToRelease = phaseToRelease;
-    this.releaseElevation = releaseElevation;
-    this.vessel = vessel;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.phaseToRelease = data.phaseToRelease;
+    this.releaseElevation = data.releaseElevation;
+    this.vessel = data.vessel;
   }
 
   async run() {
     try {
-      const request = new SetPhaseToReleaseForLineRuptureScenarioCalculationRequest(
-        this.phaseToRelease,
-        this.releaseElevation,
-        this.vessel
-      );
+      const request = new SetPhaseToReleaseForLineRuptureScenarioCalculationRequest({
+        phaseToRelease: this.phaseToRelease,
+        releaseElevation: this.releaseElevation,
+        vessel: this.vessel
+      });
 
       const schema = new SetPhaseToReleaseForLineRuptureScenarioCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -2695,24 +2507,22 @@ export class SetPhaseToReleaseForLineRuptureScenarioCalculationResponse extends
   /**
    * SetPhaseToReleaseForLineRuptureScenario calculation response class.
    *
-   * @param {number} zCoordUpdated - Updated z-coordinate of vessel to accommodate requested phase to release.
-   * @param {number} pipeHeightFractionUpdated - Updated pipe height fraction to accommodate requested phase to release.
    */
-  constructor(
+  constructor(data: {
     zCoordUpdated: number,
     pipeHeightFractionUpdated: number,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.zCoordUpdated = zCoordUpdated;
-    this.pipeHeightFractionUpdated = pipeHeightFractionUpdated;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.zCoordUpdated = data.zCoordUpdated;
+    this.pipeHeightFractionUpdated = data.pipeHeightFractionUpdated;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -2779,14 +2589,7 @@ export class SetPhaseToReleaseForLineRuptureScenarioCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: SetPhaseToReleaseForLineRuptureScenarioCalculationResponseSchemaData): SetPhaseToReleaseForLineRuptureScenarioCalculationResponse {
-    return new SetPhaseToReleaseForLineRuptureScenarioCalculationResponse(
-      data.zCoordUpdated,
-      data.pipeHeightFractionUpdated,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new SetPhaseToReleaseForLineRuptureScenarioCalculationResponse(data);
   }
 }
 
@@ -2804,19 +2607,16 @@ class SetPhaseToReleaseForReliefValveScenarioCalculationRequest extends Calculat
   /**
    * SetPhaseToReleaseForReliefValveScenario calculation request class.
    *
-   * @param {Enums.Phase} phaseToRelease - Requested fluid phase to release.
-   * @param {number} releaseElevation - Release point elevation above ground.
-   * @param {Entities.Vessel} vessel -  a vessel entity.
    */
-  constructor(
+  constructor(data: {
     phaseToRelease: Enums.Phase,
     releaseElevation: number,
     vessel: Entities.Vessel
-  ) {
+  }) {
     super();
-    this.phaseToRelease = phaseToRelease;
-    this.releaseElevation = releaseElevation;
-    this.vessel = vessel;
+    this.phaseToRelease = data.phaseToRelease;
+    this.releaseElevation = data.releaseElevation;
+    this.vessel = data.vessel;
   }
 }
 
@@ -2850,11 +2650,7 @@ export class SetPhaseToReleaseForReliefValveScenarioCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: SetPhaseToReleaseForReliefValveScenarioCalculationRequestSchemaData): SetPhaseToReleaseForReliefValveScenarioCalculationRequest {
-    return new SetPhaseToReleaseForReliefValveScenarioCalculationRequest(
-      data.phaseToRelease,
-      data.releaseElevation,
-      data.vessel
-    );
+    return new SetPhaseToReleaseForReliefValveScenarioCalculationRequest(data);
   }
 }
 
@@ -2868,28 +2664,26 @@ export class SetPhaseToReleaseForReliefValveScenarioCalculation extends Calculat
   /**
    * Calculates the pipe height fraction and vessel z coordinate to release the requested phase.
    *
-   * @param {Enums.Phase} phaseToRelease - Requested fluid phase to release.
-   * @param {number} releaseElevation - Release point elevation above ground.
-   * @param {Entities.Vessel} vessel -  a vessel entity.
    */
-  constructor(
+  constructor(data: {
     phaseToRelease: Enums.Phase,
     releaseElevation: number,
     vessel: Entities.Vessel
-  ) {
-    super();
-    this.phaseToRelease = phaseToRelease;
-    this.releaseElevation = releaseElevation;
-    this.vessel = vessel;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.phaseToRelease = data.phaseToRelease;
+    this.releaseElevation = data.releaseElevation;
+    this.vessel = data.vessel;
   }
 
   async run() {
     try {
-      const request = new SetPhaseToReleaseForReliefValveScenarioCalculationRequest(
-        this.phaseToRelease,
-        this.releaseElevation,
-        this.vessel
-      );
+      const request = new SetPhaseToReleaseForReliefValveScenarioCalculationRequest({
+        phaseToRelease: this.phaseToRelease,
+        releaseElevation: this.releaseElevation,
+        vessel: this.vessel
+      });
 
       const schema = new SetPhaseToReleaseForReliefValveScenarioCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -2951,24 +2745,22 @@ export class SetPhaseToReleaseForReliefValveScenarioCalculationResponse extends
   /**
    * SetPhaseToReleaseForReliefValveScenario calculation response class.
    *
-   * @param {number} zCoordUpdated - Updated z-coordinate of vessel to accommodate requested phase to release.
-   * @param {number} pipeHeightFractionUpdated - Updated pipe height fraction to accommodate requested phase to release.
    */
-  constructor(
+  constructor(data: {
     zCoordUpdated: number,
     pipeHeightFractionUpdated: number,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.zCoordUpdated = zCoordUpdated;
-    this.pipeHeightFractionUpdated = pipeHeightFractionUpdated;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.zCoordUpdated = data.zCoordUpdated;
+    this.pipeHeightFractionUpdated = data.pipeHeightFractionUpdated;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -3035,14 +2827,7 @@ export class SetPhaseToReleaseForReliefValveScenarioCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: SetPhaseToReleaseForReliefValveScenarioCalculationResponseSchemaData): SetPhaseToReleaseForReliefValveScenarioCalculationResponse {
-    return new SetPhaseToReleaseForReliefValveScenarioCalculationResponse(
-      data.zCoordUpdated,
-      data.pipeHeightFractionUpdated,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new SetPhaseToReleaseForReliefValveScenarioCalculationResponse(data);
   }
 }
 
@@ -3060,19 +2845,16 @@ class SetReleaseElevationForScenarioCalculationRequest extends CalculationReques
   /**
    * SetReleaseElevationForScenario calculation request class.
    *
-   * @param {number} releaseElevation - Release point elevation above ground.
-   * @param {number} releaseHeightFraction - Release height fraction of the total vessel height.
-   * @param {Entities.Vessel} vessel -  a vessel entity.
    */
-  constructor(
+  constructor(data: {
     releaseElevation: number,
     releaseHeightFraction: number,
     vessel: Entities.Vessel
-  ) {
+  }) {
     super();
-    this.releaseElevation = releaseElevation;
-    this.releaseHeightFraction = releaseHeightFraction;
-    this.vessel = vessel;
+    this.releaseElevation = data.releaseElevation;
+    this.releaseHeightFraction = data.releaseHeightFraction;
+    this.vessel = data.vessel;
   }
 }
 
@@ -3106,11 +2888,7 @@ export class SetReleaseElevationForScenarioCalculationRequestSchema {
   }
 
   makeCalculationRequest(data: SetReleaseElevationForScenarioCalculationRequestSchemaData): SetReleaseElevationForScenarioCalculationRequest {
-    return new SetReleaseElevationForScenarioCalculationRequest(
-      data.releaseElevation,
-      data.releaseHeightFraction,
-      data.vessel
-    );
+    return new SetReleaseElevationForScenarioCalculationRequest(data);
   }
 }
 
@@ -3123,28 +2901,26 @@ export class SetReleaseElevationForScenarioCalculation extends CalculationBase {
   /**
    * Calculates the vessel z coordinate to release at the requested elevation. The release elevation is the point above the ground from where the dispersion and downstream models start. This method sets the vessel defined by its dimensions and shape to be elevated at a particular height such as to guarantee that the discharge result height is at the requested elevation.
    *
-   * @param {number} releaseElevation - Release point elevation above ground.
-   * @param {number} releaseHeightFraction - Release height fraction of the total vessel height.
-   * @param {Entities.Vessel} vessel -  a vessel entity.
    */
-  constructor(
+  constructor(data: {
     releaseElevation: number,
     releaseHeightFraction: number,
     vessel: Entities.Vessel
-  ) {
-    super();
-    this.releaseElevation = releaseElevation;
-    this.releaseHeightFraction = releaseHeightFraction;
-    this.vessel = vessel;
+    controller?: AbortController;
+  }) {
+    super(data.controller);
+    this.releaseElevation = data.releaseElevation;
+    this.releaseHeightFraction = data.releaseHeightFraction;
+    this.vessel = data.vessel;
   }
 
   async run() {
     try {
-      const request = new SetReleaseElevationForScenarioCalculationRequest(
-        this.releaseElevation,
-        this.releaseHeightFraction,
-        this.vessel
-      );
+      const request = new SetReleaseElevationForScenarioCalculationRequest({
+        releaseElevation: this.releaseElevation,
+        releaseHeightFraction: this.releaseHeightFraction,
+        vessel: this.vessel
+      });
 
       const schema = new SetReleaseElevationForScenarioCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
@@ -3203,21 +2979,20 @@ export class SetReleaseElevationForScenarioCalculationResponse extends Calculati
   /**
    * SetReleaseElevationForScenario calculation response class.
    *
-   * @param {Entities.Vessel} updatedVessel - Updated vessel entity with modified z coordinate.
    */
-  constructor(
+  constructor(data: {
     updatedVessel: Entities.Vessel,
     resultCode: Enums.ResultCode,
     messages: string[],
     calculationElapsedTime: number,
     operationId: string
-  ) {
+  }) {
     super();
-    this.updatedVessel = updatedVessel;
-    this.resultCode = resultCode;
-    this.messages = messages;
-    this.calculationElapsedTime = calculationElapsedTime;
-    this.operationId = operationId;
+    this.updatedVessel = data.updatedVessel;
+    this.resultCode = data.resultCode;
+    this.messages = data.messages;
+    this.calculationElapsedTime = data.calculationElapsedTime;
+    this.operationId = data.operationId;
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
@@ -3279,12 +3054,6 @@ export class SetReleaseElevationForScenarioCalculationResponseSchema {
   }
 
   makeCalculationResponse(data: SetReleaseElevationForScenarioCalculationResponseSchemaData): SetReleaseElevationForScenarioCalculationResponse {
-    return new SetReleaseElevationForScenarioCalculationResponse(
-      data.updatedVessel,
-      data.resultCode,
-      data.messages,
-      data.calculationElapsedTime,
-      data.operationId
-    );
+    return new SetReleaseElevationForScenarioCalculationResponse(data);
   }
 }