@dnv-plant/typescriptpws 1.0.85 → 1.0.86

package/src/calculations/linkedRunners.ts

@@ -6,8 +6,8 @@
 * 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.85
-* Date/time: 09 Jul 2025 12:13:29
+* Version:   1.0.86
+* Date/time: 10 Jul 2025 09:49:06
 * Template:  templates/typescriptpws/calculations.razor.
  ***********************************************************************/
 
@@ -153,11 +153,15 @@ class CalculationFailedResponseSchema {
   }
   }
     
-export interface BESSLinkedRunnerCalculationRequestSchemaData {
-  bessUnit: Entities.BESSUnit;
-  bessRelease: Entities.BESSRelease;
-  weather: Entities.Weather;
+export interface UserDefinedSourceLinkedRunCalculationRequestSchemaData {
+  material: Entities.Material;
+  dischargeResult: Entities.DischargeResult;
+  dischargeRecords: Entities.DischargeRecord[];
+  dischargeRecordCount: number;
+  phaseToBeReleased: Enums.Phase;
+  dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
+  weather: Entities.Weather;
   dispersionParameters: Entities.DispersionParameters[];
   dispersionParameterCount: number;
   endPointConcentration: number;
@@ -175,11 +179,15 @@ export interface BESSLinkedRunnerCalculationRequestSchemaData {
   explosionConfinedVolumeCount: number;
 }
 
-class BESSLinkedRunnerCalculationRequest extends CalculationRequestBase {
-  bessUnit: Entities.BESSUnit;
-  bessRelease: Entities.BESSRelease;
-  weather: Entities.Weather;
+class UserDefinedSourceLinkedRunCalculationRequest extends CalculationRequestBase {
+  material: Entities.Material;
+  dischargeResult: Entities.DischargeResult;
+  dischargeRecords: Entities.DischargeRecord[];
+  dischargeRecordCount: number;
+  phaseToBeReleased: Enums.Phase;
+  dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
+  weather: Entities.Weather;
   dispersionParameters: Entities.DispersionParameters[];
   dispersionParameterCount: number;
   endPointConcentration: number;
@@ -197,12 +205,16 @@ class BESSLinkedRunnerCalculationRequest extends CalculationRequestBase {
   explosionConfinedVolumeCount: number;
 
   /**
-   * BESSLinkedRunner calculation request class.
+   * UserDefinedSourceLinkedRun calculation request class.
    *
-   * @param {Entities.BESSUnit} bessUnit -  a BESS unit entity.
-   * @param {Entities.BESSRelease} bessRelease -  a BESS release entity.
-   * @param {Entities.Weather} weather -  a weather entity.
+   * @param {Entities.Material} material -  a material entity.
+   * @param {Entities.DischargeResult} dischargeResult - Scalar discharge data.
+   * @param {Entities.DischargeRecord[]} dischargeRecords -  an array of discharge records.
+   * @param {number} dischargeRecordCount - Number of discharge records.
+   * @param {Enums.Phase} phaseToBeReleased - Phase to be released ( vapour, two-phase or liquid).
+   * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
    * @param {Entities.Substrate} substrate -  a substrate entity.
+   * @param {Entities.Weather} weather -  a weather entity.
    * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
    * @param {number} dispersionParameterCount - Number of dispersion parameters.
    * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
@@ -220,10 +232,14 @@ class BESSLinkedRunnerCalculationRequest extends CalculationRequestBase {
    * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
   constructor(
-    bessUnit: Entities.BESSUnit,
-    bessRelease: Entities.BESSRelease,
-    weather: Entities.Weather,
+    material: Entities.Material,
+    dischargeResult: Entities.DischargeResult,
+    dischargeRecords: Entities.DischargeRecord[],
+    dischargeRecordCount: number,
+    phaseToBeReleased: Enums.Phase,
+    dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
+    weather: Entities.Weather,
     dispersionParameters: Entities.DispersionParameters[],
     dispersionParameterCount: number,
     endPointConcentration: number,
@@ -241,10 +257,14 @@ class BESSLinkedRunnerCalculationRequest extends CalculationRequestBase {
     explosionConfinedVolumeCount: number
   ) {
     super();
-    this.bessUnit = bessUnit;
-    this.bessRelease = bessRelease;
-    this.weather = weather;
+    this.material = material;
+    this.dischargeResult = dischargeResult;
+    this.dischargeRecords = dischargeRecords;
+    this.dischargeRecordCount = dischargeRecordCount;
+    this.phaseToBeReleased = phaseToBeReleased;
+    this.dischargeParameters = dischargeParameters;
     this.substrate = substrate;
+    this.weather = weather;
     this.dispersionParameters = dispersionParameters;
     this.dispersionParameterCount = dispersionParameterCount;
     this.endPointConcentration = endPointConcentration;
@@ -263,19 +283,23 @@ class BESSLinkedRunnerCalculationRequest extends CalculationRequestBase {
   }
 }
 
-export class BESSLinkedRunnerCalculationRequestSchema {
+export class UserDefinedSourceLinkedRunCalculationRequestSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the BESSLinkedRunner calculation request.
+   * Schema for the UserDefinedSourceLinkedRun calculation request.
    */
   constructor() {
     this.schema = Joi.object({
-      bessUnit: new EntitySchemas.BESSUnitSchema().schema,
-      bessRelease: new EntitySchemas.BESSReleaseSchema().schema,
-      weather: new EntitySchemas.WeatherSchema().schema,
+      material: new EntitySchemas.MaterialSchema().schema,
+      dischargeResult: new EntitySchemas.DischargeResultSchema().schema,
+      dischargeRecords: Joi.array().items(new EntitySchemas.DischargeRecordSchema().schema).allow(null),
+      dischargeRecordCount: Joi.number().integer(),
+      phaseToBeReleased: Joi.string().valid(...Object.values(Enums.Phase)),
+      dischargeParameters: new EntitySchemas.DischargeParametersSchema().schema,
       substrate: new EntitySchemas.SubstrateSchema().schema,
+      weather: new EntitySchemas.WeatherSchema().schema,
       dispersionParameters: Joi.array().items(new EntitySchemas.DispersionParametersSchema().schema).allow(null),
       dispersionParameterCount: Joi.number().integer(),
       endPointConcentration: Joi.number().unsafe(),
@@ -294,10 +318,14 @@ export class BESSLinkedRunnerCalculationRequestSchema {
     }).unknown(true);
 
     this.propertyTypes = {
-      bessUnit: "Entities.BESSUnit",
-      bessRelease: "Entities.BESSRelease",
-      weather: "Entities.Weather",
+      material: "Entities.Material",
+      dischargeResult: "Entities.DischargeResult",
+      dischargeRecords: "Entities.DischargeRecord[]",
+      dischargeRecordCount: "number",
+      phaseToBeReleased: "Enums.Phase",
+      dischargeParameters: "Entities.DischargeParameters",
       substrate: "Entities.Substrate",
+      weather: "Entities.Weather",
       dispersionParameters: "Entities.DispersionParameters[]",
       dispersionParameterCount: "number",
       endPointConcentration: "number",
@@ -316,7 +344,7 @@ export class BESSLinkedRunnerCalculationRequestSchema {
     };
   }
 
-  validate(data: BESSLinkedRunnerCalculationRequestSchemaData): BESSLinkedRunnerCalculationRequest {
+  validate(data: UserDefinedSourceLinkedRunCalculationRequestSchemaData): UserDefinedSourceLinkedRunCalculationRequest {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -324,12 +352,16 @@ export class BESSLinkedRunnerCalculationRequestSchema {
     return this.makeCalculationRequest(value);
   }
 
-  makeCalculationRequest(data: BESSLinkedRunnerCalculationRequestSchemaData): BESSLinkedRunnerCalculationRequest {
-    return new BESSLinkedRunnerCalculationRequest(
-      data.bessUnit,
-      data.bessRelease,
-      data.weather,
+  makeCalculationRequest(data: UserDefinedSourceLinkedRunCalculationRequestSchemaData): UserDefinedSourceLinkedRunCalculationRequest {
+    return new UserDefinedSourceLinkedRunCalculationRequest(
+      data.material,
+      data.dischargeResult,
+      data.dischargeRecords,
+      data.dischargeRecordCount,
+      data.phaseToBeReleased,
+      data.dischargeParameters,
       data.substrate,
+      data.weather,
       data.dispersionParameters,
       data.dispersionParameterCount,
       data.endPointConcentration,
@@ -349,11 +381,15 @@ export class BESSLinkedRunnerCalculationRequestSchema {
   }
 }
 
-export class BESSLinkedRunnerCalculation extends CalculationBase {
-  bessUnit: Entities.BESSUnit;
-  bessRelease: Entities.BESSRelease;
-  weather: Entities.Weather;
+export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
+  material: Entities.Material;
+  dischargeResult: Entities.DischargeResult;
+  dischargeRecords: Entities.DischargeRecord[];
+  dischargeRecordCount: number;
+  phaseToBeReleased: Enums.Phase;
+  dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
+  weather: Entities.Weather;
   dispersionParameters: Entities.DispersionParameters[];
   dispersionParameterCount: number;
   endPointConcentration: number;
@@ -369,8 +405,6 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
   explosionOutputConfigCount: number;
   explosionConfinedVolumes: Entities.ExplosionConfinedVolume[];
   explosionConfinedVolumeCount: number;
-  exitMaterial?: Entities.Material;
-  dischargeRecord?: Entities.DischargeRecord;
   distancesToJetFireRadiation?: number[];
   jetContourPoints?: Entities.LocalPosition[];
   nJetContourPoints?: number[];
@@ -394,12 +428,16 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
   poolFireFlameResult?: Entities.PoolFireFlameResult;
 
   /**
-   *  Calculates maximum distance to a number of concentration levels for  toxic materials, given a BESS unit, BESS release and weather definition.
+   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given the discharge inputs and weather definition.
    *
-   * @param {Entities.BESSUnit} bessUnit -  a BESS unit entity.
-   * @param {Entities.BESSRelease} bessRelease -  a BESS release entity.
-   * @param {Entities.Weather} weather -  a weather entity.
+   * @param {Entities.Material} material -  a material entity.
+   * @param {Entities.DischargeResult} dischargeResult - Scalar discharge data.
+   * @param {Entities.DischargeRecord[]} dischargeRecords -  an array of discharge records.
+   * @param {number} dischargeRecordCount - Number of discharge records.
+   * @param {Enums.Phase} phaseToBeReleased - Phase to be released ( vapour, two-phase or liquid).
+   * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
    * @param {Entities.Substrate} substrate -  a substrate entity.
+   * @param {Entities.Weather} weather -  a weather entity.
    * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
    * @param {number} dispersionParameterCount - Number of dispersion parameters.
    * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
@@ -417,10 +455,14 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
    * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
   constructor(
-    bessUnit: Entities.BESSUnit,
-    bessRelease: Entities.BESSRelease,
-    weather: Entities.Weather,
+    material: Entities.Material,
+    dischargeResult: Entities.DischargeResult,
+    dischargeRecords: Entities.DischargeRecord[],
+    dischargeRecordCount: number,
+    phaseToBeReleased: Enums.Phase,
+    dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
+    weather: Entities.Weather,
     dispersionParameters: Entities.DispersionParameters[],
     dispersionParameterCount: number,
     endPointConcentration: number,
@@ -438,10 +480,14 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
     explosionConfinedVolumeCount: number
   ) {
     super();
-    this.bessUnit = bessUnit;
-    this.bessRelease = bessRelease;
-    this.weather = weather;
+    this.material = material;
+    this.dischargeResult = dischargeResult;
+    this.dischargeRecords = dischargeRecords;
+    this.dischargeRecordCount = dischargeRecordCount;
+    this.phaseToBeReleased = phaseToBeReleased;
+    this.dischargeParameters = dischargeParameters;
     this.substrate = substrate;
+    this.weather = weather;
     this.dispersionParameters = dispersionParameters;
     this.dispersionParameterCount = dispersionParameterCount;
     this.endPointConcentration = endPointConcentration;
@@ -461,11 +507,15 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
 
   async run() {
     try {
-      const request = new BESSLinkedRunnerCalculationRequest(
-        this.bessUnit,
-        this.bessRelease,
-        this.weather,
+      const request = new UserDefinedSourceLinkedRunCalculationRequest(
+        this.material,
+        this.dischargeResult,
+        this.dischargeRecords,
+        this.dischargeRecordCount,
+        this.phaseToBeReleased,
+        this.dischargeParameters,
         this.substrate,
+        this.weather,
         this.dispersionParameters,
         this.dispersionParameterCount,
         this.endPointConcentration,
@@ -483,24 +533,22 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
         this.explosionConfinedVolumeCount
       );
 
-      const schema = new BESSLinkedRunnerCalculationRequestSchema();
+      const schema = new UserDefinedSourceLinkedRunCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
 
       const requestJson = JSON.stringify(validatedRequest);
-      const url = `${getAnalyticsApiTarget()}calculatebesslinkedrunner?clientId=${getClientAliasId()}`;
+      const url = `${getAnalyticsApiTarget()}userdefinedsourcelinkedrun?clientId=${getClientAliasId()}`;
 
       this.resultCode = Enums.ResultCode.UNEXPECTED_APPLICATION_ERROR;
 
       const { data } = await this.postRequest(url, requestJson);
 
-      const responseSchema = new BESSLinkedRunnerCalculationResponseSchema();
+      const responseSchema = new UserDefinedSourceLinkedRunCalculationResponseSchema();
       const validatedResponse = responseSchema.validate(data);
 
       this.resultCode = validatedResponse.resultCode;
       if (this.resultCode === Enums.ResultCode.SUCCESS) {
         Object.assign(this, {
-          exitMaterial: validatedResponse.exitMaterial,
-          dischargeRecord: validatedResponse.dischargeRecord,
           distancesToJetFireRadiation: validatedResponse.distancesToJetFireRadiation,
           jetContourPoints: validatedResponse.jetContourPoints,
           nJetContourPoints: validatedResponse.nJetContourPoints,
@@ -543,10 +591,8 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
   }
 
   toString() {
-    const parts = ["* BESSLinkedRunner"];
+    const parts = ["* UserDefinedSourceLinkedRun"];
 
-    parts.push(`exitMaterial: ${String(this.exitMaterial)}`);
-    parts.push(`dischargeRecord: ${String(this.dischargeRecord)}`);
     parts.push("*** distancesToJetFireRadiation:");
     parts.push(
       this.distancesToJetFireRadiation && this.distancesToJetFireRadiation.length > 0
@@ -673,9 +719,7 @@ export class BESSLinkedRunnerCalculation extends CalculationBase {
   }
 }
 
-export class BESSLinkedRunnerCalculationResponse extends CalculationResponseBase {
-  exitMaterial: Entities.Material;
-  dischargeRecord: Entities.DischargeRecord;
+export class UserDefinedSourceLinkedRunCalculationResponse extends CalculationResponseBase {
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
   nJetContourPoints: number[];
@@ -699,10 +743,8 @@ export class BESSLinkedRunnerCalculationResponse extends CalculationResponseBase
   poolFireFlameResult: Entities.PoolFireFlameResult;
 
   /**
-   * BESSLinkedRunner calculation response class.
+   * UserDefinedSourceLinkedRun calculation response class.
    *
-   * @param {Entities.Material} exitMaterial - Exit material from the BESS unit, dependent on BESS chemistry.
-   * @param {Entities.DischargeRecord} dischargeRecord -  a discharge record entity.
    * @param {number[]} distancesToJetFireRadiation -  an array of distances to jet fire radiation levels, ordered according to the flammable output configs.
    * @param {Entities.LocalPosition[]} jetContourPoints -  an array of jet fire radiation contour points, ordered according to the flammable output configs.
    * @param {number[]} nJetContourPoints -  an array of the number of jet fire radiation contour points, ordered according to the flammable output configs.
@@ -726,8 +768,6 @@ export class BESSLinkedRunnerCalculationResponse extends CalculationResponseBase
    * @param {Entities.PoolFireFlameResult} poolFireFlameResult -  a pool fire flame results entity, for pool fire.
    */
   constructor(
-    exitMaterial: Entities.Material,
-    dischargeRecord: Entities.DischargeRecord,
     distancesToJetFireRadiation: number[],
     jetContourPoints: Entities.LocalPosition[],
     nJetContourPoints: number[],
@@ -755,8 +795,6 @@ export class BESSLinkedRunnerCalculationResponse extends CalculationResponseBase
     operationId: string
   ) {
     super();
-    this.exitMaterial = exitMaterial;
-    this.dischargeRecord = dischargeRecord;
     this.distancesToJetFireRadiation = distancesToJetFireRadiation;
     this.jetContourPoints = jetContourPoints;
     this.nJetContourPoints = nJetContourPoints;
@@ -785,14 +823,6 @@ export class BESSLinkedRunnerCalculationResponse extends CalculationResponseBase
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
-    if (data.exitMaterial) {
-      this.exitMaterial = new Entities.Material();
-      this.exitMaterial.initialiseFromDictionary(data.exitMaterial as { [key: string]: unknown });
-    }
-    if (data.dischargeRecord) {
-      this.dischargeRecord = new Entities.DischargeRecord();
-      this.dischargeRecord.initialiseFromDictionary(data.dischargeRecord as { [key: string]: unknown });
-    }
     if (data.distancesToJetFireRadiation && Array.isArray(data.distancesToJetFireRadiation)) {
       this.distancesToJetFireRadiation = data.distancesToJetFireRadiation.map((item) => parseFloat(item));
     }
@@ -904,9 +934,7 @@ export class BESSLinkedRunnerCalculationResponse extends CalculationResponseBase
   }
 }
 
-export interface BESSLinkedRunnerCalculationResponseSchemaData {
-  exitMaterial: Entities.Material;
-  dischargeRecord: Entities.DischargeRecord;
+export interface UserDefinedSourceLinkedRunCalculationResponseSchemaData {
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
   nJetContourPoints: number[];
@@ -934,17 +962,15 @@ export interface BESSLinkedRunnerCalculationResponseSchemaData {
   operationId: string;
 }
 
-export class BESSLinkedRunnerCalculationResponseSchema {
+export class UserDefinedSourceLinkedRunCalculationResponseSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the BESSLinkedRunner calculation response.
+   * Schema for the UserDefinedSourceLinkedRun calculation response.
    */
   constructor() {
     this.schema = Joi.object({
-      exitMaterial: new EntitySchemas.MaterialSchema().schema,
-      dischargeRecord: new EntitySchemas.DischargeRecordSchema().schema,
       distancesToJetFireRadiation: Joi.array().items(Joi.number().unsafe()).allow(null),
       jetContourPoints: Joi.array().items(new EntitySchemas.LocalPositionSchema().schema).allow(null),
       nJetContourPoints: Joi.array().items(Joi.number().integer()).allow(null),
@@ -973,8 +999,6 @@ export class BESSLinkedRunnerCalculationResponseSchema {
     }).unknown(true);
 
     this.propertyTypes = {
-      exitMaterial: "Entities.Material",
-      dischargeRecord: "Entities.DischargeRecord",
       distancesToJetFireRadiation: "number[]",
       jetContourPoints: "Entities.LocalPosition[]",
       nJetContourPoints: "number[]",
@@ -999,7 +1023,7 @@ export class BESSLinkedRunnerCalculationResponseSchema {
     };
   }
 
-  validate(data: BESSLinkedRunnerCalculationResponseSchemaData): BESSLinkedRunnerCalculationResponse {
+  validate(data: UserDefinedSourceLinkedRunCalculationResponseSchemaData): UserDefinedSourceLinkedRunCalculationResponse {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -1007,10 +1031,8 @@ export class BESSLinkedRunnerCalculationResponseSchema {
     return this.makeCalculationResponse(value);
   }
 
-  makeCalculationResponse(data: BESSLinkedRunnerCalculationResponseSchemaData): BESSLinkedRunnerCalculationResponse {
-    return new BESSLinkedRunnerCalculationResponse(
-      data.exitMaterial,
-      data.dischargeRecord,
+  makeCalculationResponse(data: UserDefinedSourceLinkedRunCalculationResponseSchemaData): UserDefinedSourceLinkedRunCalculationResponse {
+    return new UserDefinedSourceLinkedRunCalculationResponse(
       data.distancesToJetFireRadiation,
       data.jetContourPoints,
       data.nJetContourPoints,
@@ -1040,12 +1062,9 @@ export class BESSLinkedRunnerCalculationResponseSchema {
   }
 }
 
-export interface UserDefinedSourceLinkedRunCalculationRequestSchemaData {
-  material: Entities.Material;
-  dischargeResult: Entities.DischargeResult;
-  dischargeRecords: Entities.DischargeRecord[];
-  dischargeRecordCount: number;
-  phaseToBeReleased: Enums.Phase;
+export interface VesselLeakLinkedRunCalculationRequestSchemaData {
+  vessel: Entities.Vessel;
+  leak: Entities.Leak;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -1066,12 +1085,9 @@ export interface UserDefinedSourceLinkedRunCalculationRequestSchemaData {
   explosionConfinedVolumeCount: number;
 }
 
-class UserDefinedSourceLinkedRunCalculationRequest extends CalculationRequestBase {
-  material: Entities.Material;
-  dischargeResult: Entities.DischargeResult;
-  dischargeRecords: Entities.DischargeRecord[];
-  dischargeRecordCount: number;
-  phaseToBeReleased: Enums.Phase;
+class VesselLeakLinkedRunCalculationRequest extends CalculationRequestBase {
+  vessel: Entities.Vessel;
+  leak: Entities.Leak;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -1092,13 +1108,10 @@ class UserDefinedSourceLinkedRunCalculationRequest extends CalculationRequestBas
   explosionConfinedVolumeCount: number;
 
   /**
-   * UserDefinedSourceLinkedRun calculation request class.
+   * VesselLeakLinkedRun calculation request class.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {Entities.DischargeResult} dischargeResult - Scalar discharge data.
-   * @param {Entities.DischargeRecord[]} dischargeRecords -  an array of discharge records.
-   * @param {number} dischargeRecordCount - Number of discharge records.
-   * @param {Enums.Phase} phaseToBeReleased - Phase to be released ( vapour, two-phase or liquid).
+   * @param {Entities.Vessel} vessel -  a vessel entity.
+   * @param {Entities.Leak} leak -  a leak entity.
    * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
    * @param {Entities.Substrate} substrate -  a substrate entity.
    * @param {Entities.Weather} weather -  a weather entity.
@@ -1119,11 +1132,8 @@ class UserDefinedSourceLinkedRunCalculationRequest extends CalculationRequestBas
    * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
   constructor(
-    material: Entities.Material,
-    dischargeResult: Entities.DischargeResult,
-    dischargeRecords: Entities.DischargeRecord[],
-    dischargeRecordCount: number,
-    phaseToBeReleased: Enums.Phase,
+    vessel: Entities.Vessel,
+    leak: Entities.Leak,
     dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
     weather: Entities.Weather,
@@ -1144,11 +1154,8 @@ class UserDefinedSourceLinkedRunCalculationRequest extends CalculationRequestBas
     explosionConfinedVolumeCount: number
   ) {
     super();
-    this.material = material;
-    this.dischargeResult = dischargeResult;
-    this.dischargeRecords = dischargeRecords;
-    this.dischargeRecordCount = dischargeRecordCount;
-    this.phaseToBeReleased = phaseToBeReleased;
+    this.vessel = vessel;
+    this.leak = leak;
     this.dischargeParameters = dischargeParameters;
     this.substrate = substrate;
     this.weather = weather;
@@ -1170,20 +1177,17 @@ class UserDefinedSourceLinkedRunCalculationRequest extends CalculationRequestBas
   }
 }
 
-export class UserDefinedSourceLinkedRunCalculationRequestSchema {
+export class VesselLeakLinkedRunCalculationRequestSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the UserDefinedSourceLinkedRun calculation request.
+   * Schema for the VesselLeakLinkedRun calculation request.
    */
   constructor() {
     this.schema = Joi.object({
-      material: new EntitySchemas.MaterialSchema().schema,
-      dischargeResult: new EntitySchemas.DischargeResultSchema().schema,
-      dischargeRecords: Joi.array().items(new EntitySchemas.DischargeRecordSchema().schema).allow(null),
-      dischargeRecordCount: Joi.number().integer(),
-      phaseToBeReleased: Joi.string().valid(...Object.values(Enums.Phase)),
+      vessel: new EntitySchemas.VesselSchema().schema,
+      leak: new EntitySchemas.LeakSchema().schema,
       dischargeParameters: new EntitySchemas.DischargeParametersSchema().schema,
       substrate: new EntitySchemas.SubstrateSchema().schema,
       weather: new EntitySchemas.WeatherSchema().schema,
@@ -1205,11 +1209,8 @@ export class UserDefinedSourceLinkedRunCalculationRequestSchema {
     }).unknown(true);
 
     this.propertyTypes = {
-      material: "Entities.Material",
-      dischargeResult: "Entities.DischargeResult",
-      dischargeRecords: "Entities.DischargeRecord[]",
-      dischargeRecordCount: "number",
-      phaseToBeReleased: "Enums.Phase",
+      vessel: "Entities.Vessel",
+      leak: "Entities.Leak",
       dischargeParameters: "Entities.DischargeParameters",
       substrate: "Entities.Substrate",
       weather: "Entities.Weather",
@@ -1231,7 +1232,7 @@ export class UserDefinedSourceLinkedRunCalculationRequestSchema {
     };
   }
 
-  validate(data: UserDefinedSourceLinkedRunCalculationRequestSchemaData): UserDefinedSourceLinkedRunCalculationRequest {
+  validate(data: VesselLeakLinkedRunCalculationRequestSchemaData): VesselLeakLinkedRunCalculationRequest {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -1239,13 +1240,10 @@ export class UserDefinedSourceLinkedRunCalculationRequestSchema {
     return this.makeCalculationRequest(value);
   }
 
-  makeCalculationRequest(data: UserDefinedSourceLinkedRunCalculationRequestSchemaData): UserDefinedSourceLinkedRunCalculationRequest {
-    return new UserDefinedSourceLinkedRunCalculationRequest(
-      data.material,
-      data.dischargeResult,
-      data.dischargeRecords,
-      data.dischargeRecordCount,
-      data.phaseToBeReleased,
+  makeCalculationRequest(data: VesselLeakLinkedRunCalculationRequestSchemaData): VesselLeakLinkedRunCalculationRequest {
+    return new VesselLeakLinkedRunCalculationRequest(
+      data.vessel,
+      data.leak,
       data.dischargeParameters,
       data.substrate,
       data.weather,
@@ -1268,12 +1266,9 @@ export class UserDefinedSourceLinkedRunCalculationRequestSchema {
   }
 }
 
-export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
-  material: Entities.Material;
-  dischargeResult: Entities.DischargeResult;
-  dischargeRecords: Entities.DischargeRecord[];
-  dischargeRecordCount: number;
-  phaseToBeReleased: Enums.Phase;
+export class VesselLeakLinkedRunCalculation extends CalculationBase {
+  vessel: Entities.Vessel;
+  leak: Entities.Leak;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -1292,6 +1287,7 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
   explosionOutputConfigCount: number;
   explosionConfinedVolumes: Entities.ExplosionConfinedVolume[];
   explosionConfinedVolumeCount: number;
+  dischargeRecord?: Entities.DischargeRecord;
   distancesToJetFireRadiation?: number[];
   jetContourPoints?: Entities.LocalPosition[];
   nJetContourPoints?: number[];
@@ -1315,13 +1311,10 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
   poolFireFlameResult?: Entities.PoolFireFlameResult;
 
   /**
-   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given the discharge inputs and weather definition.
+   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given a vessel, leak and weather definition.
    *
-   * @param {Entities.Material} material -  a material entity.
-   * @param {Entities.DischargeResult} dischargeResult - Scalar discharge data.
-   * @param {Entities.DischargeRecord[]} dischargeRecords -  an array of discharge records.
-   * @param {number} dischargeRecordCount - Number of discharge records.
-   * @param {Enums.Phase} phaseToBeReleased - Phase to be released ( vapour, two-phase or liquid).
+   * @param {Entities.Vessel} vessel -  a vessel entity.
+   * @param {Entities.Leak} leak -  a leak entity.
    * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
    * @param {Entities.Substrate} substrate -  a substrate entity.
    * @param {Entities.Weather} weather -  a weather entity.
@@ -1342,11 +1335,8 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
    * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
   constructor(
-    material: Entities.Material,
-    dischargeResult: Entities.DischargeResult,
-    dischargeRecords: Entities.DischargeRecord[],
-    dischargeRecordCount: number,
-    phaseToBeReleased: Enums.Phase,
+    vessel: Entities.Vessel,
+    leak: Entities.Leak,
     dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
     weather: Entities.Weather,
@@ -1367,11 +1357,8 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
     explosionConfinedVolumeCount: number
   ) {
     super();
-    this.material = material;
-    this.dischargeResult = dischargeResult;
-    this.dischargeRecords = dischargeRecords;
-    this.dischargeRecordCount = dischargeRecordCount;
-    this.phaseToBeReleased = phaseToBeReleased;
+    this.vessel = vessel;
+    this.leak = leak;
     this.dischargeParameters = dischargeParameters;
     this.substrate = substrate;
     this.weather = weather;
@@ -1394,12 +1381,9 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
 
   async run() {
     try {
-      const request = new UserDefinedSourceLinkedRunCalculationRequest(
-        this.material,
-        this.dischargeResult,
-        this.dischargeRecords,
-        this.dischargeRecordCount,
-        this.phaseToBeReleased,
+      const request = new VesselLeakLinkedRunCalculationRequest(
+        this.vessel,
+        this.leak,
         this.dischargeParameters,
         this.substrate,
         this.weather,
@@ -1420,22 +1404,23 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
         this.explosionConfinedVolumeCount
       );
 
-      const schema = new UserDefinedSourceLinkedRunCalculationRequestSchema();
+      const schema = new VesselLeakLinkedRunCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
 
       const requestJson = JSON.stringify(validatedRequest);
-      const url = `${getAnalyticsApiTarget()}userdefinedsourcelinkedrun?clientId=${getClientAliasId()}`;
+      const url = `${getAnalyticsApiTarget()}vesselleaklinkedrun?clientId=${getClientAliasId()}`;
 
       this.resultCode = Enums.ResultCode.UNEXPECTED_APPLICATION_ERROR;
 
       const { data } = await this.postRequest(url, requestJson);
 
-      const responseSchema = new UserDefinedSourceLinkedRunCalculationResponseSchema();
+      const responseSchema = new VesselLeakLinkedRunCalculationResponseSchema();
       const validatedResponse = responseSchema.validate(data);
 
       this.resultCode = validatedResponse.resultCode;
       if (this.resultCode === Enums.ResultCode.SUCCESS) {
         Object.assign(this, {
+          dischargeRecord: validatedResponse.dischargeRecord,
           distancesToJetFireRadiation: validatedResponse.distancesToJetFireRadiation,
           jetContourPoints: validatedResponse.jetContourPoints,
           nJetContourPoints: validatedResponse.nJetContourPoints,
@@ -1478,8 +1463,9 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
   }
 
   toString() {
-    const parts = ["* UserDefinedSourceLinkedRun"];
+    const parts = ["* VesselLeakLinkedRun"];
 
+    parts.push(`dischargeRecord: ${String(this.dischargeRecord)}`);
     parts.push("*** distancesToJetFireRadiation:");
     parts.push(
       this.distancesToJetFireRadiation && this.distancesToJetFireRadiation.length > 0
@@ -1606,7 +1592,8 @@ export class UserDefinedSourceLinkedRunCalculation extends CalculationBase {
   }
 }
 
-export class UserDefinedSourceLinkedRunCalculationResponse extends CalculationResponseBase {
+export class VesselLeakLinkedRunCalculationResponse extends CalculationResponseBase {
+  dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
   nJetContourPoints: number[];
@@ -1630,8 +1617,9 @@ export class UserDefinedSourceLinkedRunCalculationResponse extends CalculationRe
   poolFireFlameResult: Entities.PoolFireFlameResult;
 
   /**
-   * UserDefinedSourceLinkedRun calculation response class.
+   * VesselLeakLinkedRun calculation response class.
    *
+   * @param {Entities.DischargeRecord} dischargeRecord -  a discharge record entity.
    * @param {number[]} distancesToJetFireRadiation -  an array of distances to jet fire radiation levels, ordered according to the flammable output configs.
    * @param {Entities.LocalPosition[]} jetContourPoints -  an array of jet fire radiation contour points, ordered according to the flammable output configs.
    * @param {number[]} nJetContourPoints -  an array of the number of jet fire radiation contour points, ordered according to the flammable output configs.
@@ -1655,6 +1643,7 @@ export class UserDefinedSourceLinkedRunCalculationResponse extends CalculationRe
    * @param {Entities.PoolFireFlameResult} poolFireFlameResult -  a pool fire flame results entity, for pool fire.
    */
   constructor(
+    dischargeRecord: Entities.DischargeRecord,
     distancesToJetFireRadiation: number[],
     jetContourPoints: Entities.LocalPosition[],
     nJetContourPoints: number[],
@@ -1682,6 +1671,7 @@ export class UserDefinedSourceLinkedRunCalculationResponse extends CalculationRe
     operationId: string
   ) {
     super();
+    this.dischargeRecord = dischargeRecord;
     this.distancesToJetFireRadiation = distancesToJetFireRadiation;
     this.jetContourPoints = jetContourPoints;
     this.nJetContourPoints = nJetContourPoints;
@@ -1710,6 +1700,10 @@ export class UserDefinedSourceLinkedRunCalculationResponse extends CalculationRe
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
+    if (data.dischargeRecord) {
+      this.dischargeRecord = new Entities.DischargeRecord();
+      this.dischargeRecord.initialiseFromDictionary(data.dischargeRecord as { [key: string]: unknown });
+    }
     if (data.distancesToJetFireRadiation && Array.isArray(data.distancesToJetFireRadiation)) {
       this.distancesToJetFireRadiation = data.distancesToJetFireRadiation.map((item) => parseFloat(item));
     }
@@ -1821,7 +1815,8 @@ export class UserDefinedSourceLinkedRunCalculationResponse extends CalculationRe
   }
 }
 
-export interface UserDefinedSourceLinkedRunCalculationResponseSchemaData {
+export interface VesselLeakLinkedRunCalculationResponseSchemaData {
+  dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
   nJetContourPoints: number[];
@@ -1849,15 +1844,16 @@ export interface UserDefinedSourceLinkedRunCalculationResponseSchemaData {
   operationId: string;
 }
 
-export class UserDefinedSourceLinkedRunCalculationResponseSchema {
+export class VesselLeakLinkedRunCalculationResponseSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the UserDefinedSourceLinkedRun calculation response.
+   * Schema for the VesselLeakLinkedRun calculation response.
    */
   constructor() {
     this.schema = Joi.object({
+      dischargeRecord: new EntitySchemas.DischargeRecordSchema().schema,
       distancesToJetFireRadiation: Joi.array().items(Joi.number().unsafe()).allow(null),
       jetContourPoints: Joi.array().items(new EntitySchemas.LocalPositionSchema().schema).allow(null),
       nJetContourPoints: Joi.array().items(Joi.number().integer()).allow(null),
@@ -1886,6 +1882,7 @@ export class UserDefinedSourceLinkedRunCalculationResponseSchema {
     }).unknown(true);
 
     this.propertyTypes = {
+      dischargeRecord: "Entities.DischargeRecord",
       distancesToJetFireRadiation: "number[]",
       jetContourPoints: "Entities.LocalPosition[]",
       nJetContourPoints: "number[]",
@@ -1910,7 +1907,7 @@ export class UserDefinedSourceLinkedRunCalculationResponseSchema {
     };
   }
 
-  validate(data: UserDefinedSourceLinkedRunCalculationResponseSchemaData): UserDefinedSourceLinkedRunCalculationResponse {
+  validate(data: VesselLeakLinkedRunCalculationResponseSchemaData): VesselLeakLinkedRunCalculationResponse {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -1918,8 +1915,9 @@ export class UserDefinedSourceLinkedRunCalculationResponseSchema {
     return this.makeCalculationResponse(value);
   }
 
-  makeCalculationResponse(data: UserDefinedSourceLinkedRunCalculationResponseSchemaData): UserDefinedSourceLinkedRunCalculationResponse {
-    return new UserDefinedSourceLinkedRunCalculationResponse(
+  makeCalculationResponse(data: VesselLeakLinkedRunCalculationResponseSchemaData): VesselLeakLinkedRunCalculationResponse {
+    return new VesselLeakLinkedRunCalculationResponse(
+      data.dischargeRecord,
       data.distancesToJetFireRadiation,
       data.jetContourPoints,
       data.nJetContourPoints,
@@ -1949,9 +1947,9 @@ export class UserDefinedSourceLinkedRunCalculationResponseSchema {
   }
 }
 
-export interface VesselLeakLinkedRunCalculationRequestSchemaData {
+export interface VesselLineRuptureLinkedRunCalculationRequestSchemaData {
   vessel: Entities.Vessel;
-  leak: Entities.Leak;
+  lineRupture: Entities.LineRupture;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -1972,9 +1970,9 @@ export interface VesselLeakLinkedRunCalculationRequestSchemaData {
   explosionConfinedVolumeCount: number;
 }
 
-class VesselLeakLinkedRunCalculationRequest extends CalculationRequestBase {
+class VesselLineRuptureLinkedRunCalculationRequest extends CalculationRequestBase {
   vessel: Entities.Vessel;
-  leak: Entities.Leak;
+  lineRupture: Entities.LineRupture;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -1995,10 +1993,10 @@ class VesselLeakLinkedRunCalculationRequest extends CalculationRequestBase {
   explosionConfinedVolumeCount: number;
 
   /**
-   * VesselLeakLinkedRun calculation request class.
+   * VesselLineRuptureLinkedRun calculation request class.
    *
    * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.Leak} leak -  a leak entity.
+   * @param {Entities.LineRupture} lineRupture -  a line rupture entity.
    * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
    * @param {Entities.Substrate} substrate -  a substrate entity.
    * @param {Entities.Weather} weather -  a weather entity.
@@ -2020,7 +2018,7 @@ class VesselLeakLinkedRunCalculationRequest extends CalculationRequestBase {
    */
   constructor(
     vessel: Entities.Vessel,
-    leak: Entities.Leak,
+    lineRupture: Entities.LineRupture,
     dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
     weather: Entities.Weather,
@@ -2042,7 +2040,7 @@ class VesselLeakLinkedRunCalculationRequest extends CalculationRequestBase {
   ) {
     super();
     this.vessel = vessel;
-    this.leak = leak;
+    this.lineRupture = lineRupture;
     this.dischargeParameters = dischargeParameters;
     this.substrate = substrate;
     this.weather = weather;
@@ -2064,17 +2062,17 @@ class VesselLeakLinkedRunCalculationRequest extends CalculationRequestBase {
   }
 }
 
-export class VesselLeakLinkedRunCalculationRequestSchema {
+export class VesselLineRuptureLinkedRunCalculationRequestSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the VesselLeakLinkedRun calculation request.
+   * Schema for the VesselLineRuptureLinkedRun calculation request.
    */
   constructor() {
     this.schema = Joi.object({
       vessel: new EntitySchemas.VesselSchema().schema,
-      leak: new EntitySchemas.LeakSchema().schema,
+      lineRupture: new EntitySchemas.LineRuptureSchema().schema,
       dischargeParameters: new EntitySchemas.DischargeParametersSchema().schema,
       substrate: new EntitySchemas.SubstrateSchema().schema,
       weather: new EntitySchemas.WeatherSchema().schema,
@@ -2097,7 +2095,7 @@ export class VesselLeakLinkedRunCalculationRequestSchema {
 
     this.propertyTypes = {
       vessel: "Entities.Vessel",
-      leak: "Entities.Leak",
+      lineRupture: "Entities.LineRupture",
       dischargeParameters: "Entities.DischargeParameters",
       substrate: "Entities.Substrate",
       weather: "Entities.Weather",
@@ -2119,7 +2117,7 @@ export class VesselLeakLinkedRunCalculationRequestSchema {
     };
   }
 
-  validate(data: VesselLeakLinkedRunCalculationRequestSchemaData): VesselLeakLinkedRunCalculationRequest {
+  validate(data: VesselLineRuptureLinkedRunCalculationRequestSchemaData): VesselLineRuptureLinkedRunCalculationRequest {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -2127,10 +2125,10 @@ export class VesselLeakLinkedRunCalculationRequestSchema {
     return this.makeCalculationRequest(value);
   }
 
-  makeCalculationRequest(data: VesselLeakLinkedRunCalculationRequestSchemaData): VesselLeakLinkedRunCalculationRequest {
-    return new VesselLeakLinkedRunCalculationRequest(
+  makeCalculationRequest(data: VesselLineRuptureLinkedRunCalculationRequestSchemaData): VesselLineRuptureLinkedRunCalculationRequest {
+    return new VesselLineRuptureLinkedRunCalculationRequest(
       data.vessel,
-      data.leak,
+      data.lineRupture,
       data.dischargeParameters,
       data.substrate,
       data.weather,
@@ -2153,9 +2151,9 @@ export class VesselLeakLinkedRunCalculationRequestSchema {
   }
 }
 
-export class VesselLeakLinkedRunCalculation extends CalculationBase {
+export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
   vessel: Entities.Vessel;
-  leak: Entities.Leak;
+  lineRupture: Entities.LineRupture;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -2198,10 +2196,10 @@ export class VesselLeakLinkedRunCalculation extends CalculationBase {
   poolFireFlameResult?: Entities.PoolFireFlameResult;
 
   /**
-   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given a vessel, leak and weather definition.
+   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given a vessel, line rupture and weather definition.
    *
    * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.Leak} leak -  a leak entity.
+   * @param {Entities.LineRupture} lineRupture -  a line rupture entity.
    * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
    * @param {Entities.Substrate} substrate -  a substrate entity.
    * @param {Entities.Weather} weather -  a weather entity.
@@ -2223,7 +2221,7 @@ export class VesselLeakLinkedRunCalculation extends CalculationBase {
    */
   constructor(
     vessel: Entities.Vessel,
-    leak: Entities.Leak,
+    lineRupture: Entities.LineRupture,
     dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
     weather: Entities.Weather,
@@ -2245,7 +2243,7 @@ export class VesselLeakLinkedRunCalculation extends CalculationBase {
   ) {
     super();
     this.vessel = vessel;
-    this.leak = leak;
+    this.lineRupture = lineRupture;
     this.dischargeParameters = dischargeParameters;
     this.substrate = substrate;
     this.weather = weather;
@@ -2268,9 +2266,9 @@ export class VesselLeakLinkedRunCalculation extends CalculationBase {
 
   async run() {
     try {
-      const request = new VesselLeakLinkedRunCalculationRequest(
+      const request = new VesselLineRuptureLinkedRunCalculationRequest(
         this.vessel,
-        this.leak,
+        this.lineRupture,
         this.dischargeParameters,
         this.substrate,
         this.weather,
@@ -2291,17 +2289,17 @@ export class VesselLeakLinkedRunCalculation extends CalculationBase {
         this.explosionConfinedVolumeCount
       );
 
-      const schema = new VesselLeakLinkedRunCalculationRequestSchema();
+      const schema = new VesselLineRuptureLinkedRunCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
 
       const requestJson = JSON.stringify(validatedRequest);
-      const url = `${getAnalyticsApiTarget()}vesselleaklinkedrun?clientId=${getClientAliasId()}`;
+      const url = `${getAnalyticsApiTarget()}vessellinerupturelinkedrun?clientId=${getClientAliasId()}`;
 
       this.resultCode = Enums.ResultCode.UNEXPECTED_APPLICATION_ERROR;
 
       const { data } = await this.postRequest(url, requestJson);
 
-      const responseSchema = new VesselLeakLinkedRunCalculationResponseSchema();
+      const responseSchema = new VesselLineRuptureLinkedRunCalculationResponseSchema();
       const validatedResponse = responseSchema.validate(data);
 
       this.resultCode = validatedResponse.resultCode;
@@ -2350,7 +2348,7 @@ export class VesselLeakLinkedRunCalculation extends CalculationBase {
   }
 
   toString() {
-    const parts = ["* VesselLeakLinkedRun"];
+    const parts = ["* VesselLineRuptureLinkedRun"];
 
     parts.push(`dischargeRecord: ${String(this.dischargeRecord)}`);
     parts.push("*** distancesToJetFireRadiation:");
@@ -2479,7 +2477,7 @@ export class VesselLeakLinkedRunCalculation extends CalculationBase {
   }
 }
 
-export class VesselLeakLinkedRunCalculationResponse extends CalculationResponseBase {
+export class VesselLineRuptureLinkedRunCalculationResponse extends CalculationResponseBase {
   dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
@@ -2504,7 +2502,7 @@ export class VesselLeakLinkedRunCalculationResponse extends CalculationResponseB
   poolFireFlameResult: Entities.PoolFireFlameResult;
 
   /**
-   * VesselLeakLinkedRun calculation response class.
+   * VesselLineRuptureLinkedRun calculation response class.
    *
    * @param {Entities.DischargeRecord} dischargeRecord -  a discharge record entity.
    * @param {number[]} distancesToJetFireRadiation -  an array of distances to jet fire radiation levels, ordered according to the flammable output configs.
@@ -2702,7 +2700,7 @@ export class VesselLeakLinkedRunCalculationResponse extends CalculationResponseB
   }
 }
 
-export interface VesselLeakLinkedRunCalculationResponseSchemaData {
+export interface VesselLineRuptureLinkedRunCalculationResponseSchemaData {
   dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
@@ -2731,12 +2729,12 @@ export interface VesselLeakLinkedRunCalculationResponseSchemaData {
   operationId: string;
 }
 
-export class VesselLeakLinkedRunCalculationResponseSchema {
+export class VesselLineRuptureLinkedRunCalculationResponseSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the VesselLeakLinkedRun calculation response.
+   * Schema for the VesselLineRuptureLinkedRun calculation response.
    */
   constructor() {
     this.schema = Joi.object({
@@ -2794,7 +2792,7 @@ export class VesselLeakLinkedRunCalculationResponseSchema {
     };
   }
 
-  validate(data: VesselLeakLinkedRunCalculationResponseSchemaData): VesselLeakLinkedRunCalculationResponse {
+  validate(data: VesselLineRuptureLinkedRunCalculationResponseSchemaData): VesselLineRuptureLinkedRunCalculationResponse {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -2802,8 +2800,8 @@ export class VesselLeakLinkedRunCalculationResponseSchema {
     return this.makeCalculationResponse(value);
   }
 
-  makeCalculationResponse(data: VesselLeakLinkedRunCalculationResponseSchemaData): VesselLeakLinkedRunCalculationResponse {
-    return new VesselLeakLinkedRunCalculationResponse(
+  makeCalculationResponse(data: VesselLineRuptureLinkedRunCalculationResponseSchemaData): VesselLineRuptureLinkedRunCalculationResponse {
+    return new VesselLineRuptureLinkedRunCalculationResponse(
       data.dischargeRecord,
       data.distancesToJetFireRadiation,
       data.jetContourPoints,
@@ -2834,9 +2832,9 @@ export class VesselLeakLinkedRunCalculationResponseSchema {
   }
 }
 
-export interface VesselLineRuptureLinkedRunCalculationRequestSchemaData {
+export interface VesselReliefValveLinkedRunCalculationRequestSchemaData {
   vessel: Entities.Vessel;
-  lineRupture: Entities.LineRupture;
+  reliefValve: Entities.ReliefValve;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -2857,9 +2855,9 @@ export interface VesselLineRuptureLinkedRunCalculationRequestSchemaData {
   explosionConfinedVolumeCount: number;
 }
 
-class VesselLineRuptureLinkedRunCalculationRequest extends CalculationRequestBase {
+class VesselReliefValveLinkedRunCalculationRequest extends CalculationRequestBase {
   vessel: Entities.Vessel;
-  lineRupture: Entities.LineRupture;
+  reliefValve: Entities.ReliefValve;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -2880,10 +2878,10 @@ class VesselLineRuptureLinkedRunCalculationRequest extends CalculationRequestBas
   explosionConfinedVolumeCount: number;
 
   /**
-   * VesselLineRuptureLinkedRun calculation request class.
+   * VesselReliefValveLinkedRun calculation request class.
    *
    * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.LineRupture} lineRupture -  a line rupture entity.
+   * @param {Entities.ReliefValve} reliefValve -  a relief valve entity.
    * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
    * @param {Entities.Substrate} substrate -  a substrate entity.
    * @param {Entities.Weather} weather -  a weather entity.
@@ -2905,7 +2903,7 @@ class VesselLineRuptureLinkedRunCalculationRequest extends CalculationRequestBas
    */
   constructor(
     vessel: Entities.Vessel,
-    lineRupture: Entities.LineRupture,
+    reliefValve: Entities.ReliefValve,
     dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
     weather: Entities.Weather,
@@ -2927,7 +2925,7 @@ class VesselLineRuptureLinkedRunCalculationRequest extends CalculationRequestBas
   ) {
     super();
     this.vessel = vessel;
-    this.lineRupture = lineRupture;
+    this.reliefValve = reliefValve;
     this.dischargeParameters = dischargeParameters;
     this.substrate = substrate;
     this.weather = weather;
@@ -2949,17 +2947,17 @@ class VesselLineRuptureLinkedRunCalculationRequest extends CalculationRequestBas
   }
 }
 
-export class VesselLineRuptureLinkedRunCalculationRequestSchema {
+export class VesselReliefValveLinkedRunCalculationRequestSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the VesselLineRuptureLinkedRun calculation request.
+   * Schema for the VesselReliefValveLinkedRun calculation request.
    */
   constructor() {
     this.schema = Joi.object({
       vessel: new EntitySchemas.VesselSchema().schema,
-      lineRupture: new EntitySchemas.LineRuptureSchema().schema,
+      reliefValve: new EntitySchemas.ReliefValveSchema().schema,
       dischargeParameters: new EntitySchemas.DischargeParametersSchema().schema,
       substrate: new EntitySchemas.SubstrateSchema().schema,
       weather: new EntitySchemas.WeatherSchema().schema,
@@ -2982,7 +2980,7 @@ export class VesselLineRuptureLinkedRunCalculationRequestSchema {
 
     this.propertyTypes = {
       vessel: "Entities.Vessel",
-      lineRupture: "Entities.LineRupture",
+      reliefValve: "Entities.ReliefValve",
       dischargeParameters: "Entities.DischargeParameters",
       substrate: "Entities.Substrate",
       weather: "Entities.Weather",
@@ -3004,7 +3002,7 @@ export class VesselLineRuptureLinkedRunCalculationRequestSchema {
     };
   }
 
-  validate(data: VesselLineRuptureLinkedRunCalculationRequestSchemaData): VesselLineRuptureLinkedRunCalculationRequest {
+  validate(data: VesselReliefValveLinkedRunCalculationRequestSchemaData): VesselReliefValveLinkedRunCalculationRequest {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -3012,10 +3010,10 @@ export class VesselLineRuptureLinkedRunCalculationRequestSchema {
     return this.makeCalculationRequest(value);
   }
 
-  makeCalculationRequest(data: VesselLineRuptureLinkedRunCalculationRequestSchemaData): VesselLineRuptureLinkedRunCalculationRequest {
-    return new VesselLineRuptureLinkedRunCalculationRequest(
+  makeCalculationRequest(data: VesselReliefValveLinkedRunCalculationRequestSchemaData): VesselReliefValveLinkedRunCalculationRequest {
+    return new VesselReliefValveLinkedRunCalculationRequest(
       data.vessel,
-      data.lineRupture,
+      data.reliefValve,
       data.dischargeParameters,
       data.substrate,
       data.weather,
@@ -3038,9 +3036,9 @@ export class VesselLineRuptureLinkedRunCalculationRequestSchema {
   }
 }
 
-export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
+export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
   vessel: Entities.Vessel;
-  lineRupture: Entities.LineRupture;
+  reliefValve: Entities.ReliefValve;
   dischargeParameters: Entities.DischargeParameters;
   substrate: Entities.Substrate;
   weather: Entities.Weather;
@@ -3083,10 +3081,10 @@ export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
   poolFireFlameResult?: Entities.PoolFireFlameResult;
 
   /**
-   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given a vessel, line rupture and weather definition.
+   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given a vessel, relief valve and weather definition.
    *
    * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.LineRupture} lineRupture -  a line rupture entity.
+   * @param {Entities.ReliefValve} reliefValve -  a relief valve entity.
    * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
    * @param {Entities.Substrate} substrate -  a substrate entity.
    * @param {Entities.Weather} weather -  a weather entity.
@@ -3108,7 +3106,7 @@ export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
    */
   constructor(
     vessel: Entities.Vessel,
-    lineRupture: Entities.LineRupture,
+    reliefValve: Entities.ReliefValve,
     dischargeParameters: Entities.DischargeParameters,
     substrate: Entities.Substrate,
     weather: Entities.Weather,
@@ -3130,7 +3128,7 @@ export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
   ) {
     super();
     this.vessel = vessel;
-    this.lineRupture = lineRupture;
+    this.reliefValve = reliefValve;
     this.dischargeParameters = dischargeParameters;
     this.substrate = substrate;
     this.weather = weather;
@@ -3153,9 +3151,9 @@ export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
 
   async run() {
     try {
-      const request = new VesselLineRuptureLinkedRunCalculationRequest(
+      const request = new VesselReliefValveLinkedRunCalculationRequest(
         this.vessel,
-        this.lineRupture,
+        this.reliefValve,
         this.dischargeParameters,
         this.substrate,
         this.weather,
@@ -3176,17 +3174,17 @@ export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
         this.explosionConfinedVolumeCount
       );
 
-      const schema = new VesselLineRuptureLinkedRunCalculationRequestSchema();
+      const schema = new VesselReliefValveLinkedRunCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
 
       const requestJson = JSON.stringify(validatedRequest);
-      const url = `${getAnalyticsApiTarget()}vessellinerupturelinkedrun?clientId=${getClientAliasId()}`;
+      const url = `${getAnalyticsApiTarget()}vesselreliefvalvelinkedrun?clientId=${getClientAliasId()}`;
 
       this.resultCode = Enums.ResultCode.UNEXPECTED_APPLICATION_ERROR;
 
       const { data } = await this.postRequest(url, requestJson);
 
-      const responseSchema = new VesselLineRuptureLinkedRunCalculationResponseSchema();
+      const responseSchema = new VesselReliefValveLinkedRunCalculationResponseSchema();
       const validatedResponse = responseSchema.validate(data);
 
       this.resultCode = validatedResponse.resultCode;
@@ -3235,7 +3233,7 @@ export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
   }
 
   toString() {
-    const parts = ["* VesselLineRuptureLinkedRun"];
+    const parts = ["* VesselReliefValveLinkedRun"];
 
     parts.push(`dischargeRecord: ${String(this.dischargeRecord)}`);
     parts.push("*** distancesToJetFireRadiation:");
@@ -3364,7 +3362,7 @@ export class VesselLineRuptureLinkedRunCalculation extends CalculationBase {
   }
 }
 
-export class VesselLineRuptureLinkedRunCalculationResponse extends CalculationResponseBase {
+export class VesselReliefValveLinkedRunCalculationResponse extends CalculationResponseBase {
   dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
@@ -3389,13 +3387,13 @@ export class VesselLineRuptureLinkedRunCalculationResponse extends CalculationRe
   poolFireFlameResult: Entities.PoolFireFlameResult;
 
   /**
-   * VesselLineRuptureLinkedRun calculation response class.
+   * VesselReliefValveLinkedRun calculation response class.
    *
    * @param {Entities.DischargeRecord} dischargeRecord -  a discharge record entity.
    * @param {number[]} distancesToJetFireRadiation -  an array of distances to jet fire radiation levels, ordered according to the flammable output configs.
-   * @param {Entities.LocalPosition[]} jetContourPoints -  an array of jet fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} nJetContourPoints -  an array of the number of jet fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourJet -  an array of areas of the jet fire contours, ordered according to the flammable output configs.
+   * @param {Entities.LocalPosition[]} jetContourPoints -  an array of jet fire radiation ellipse contour points, ordered according to the flammable output configs.
+   * @param {number[]} nJetContourPoints -  an array of the number of jet fire radiation ellipse contour points, ordered according to the flammable output configs.
+   * @param {number[]} areaContourJet -  an array of areas of the jet fire ellipses, ordered according to the flammable output configs.
    * @param {number[]} distancesToFlamConcentration -  an array of distances to flammable concentration levels, ordered according to the dispersion output configs for flammable concentrations of interest.
    * @param {number[]} flamConcentrationsUsed -  an array of flammable concentration levels used in the calculations, ordered according to the dispersion output configs for flammable concentrations of interest.
    * @param {Entities.LocalPosition[]} flamConcContourPoints -  an array of maximum flammable concentration footprint contour points, ordered according to the dispersion output configs for flammable concentrations of interest.
@@ -3404,7 +3402,7 @@ export class VesselLineRuptureLinkedRunCalculationResponse extends CalculationRe
    * @param {number[]} distancesToPoolFireRadiation -  an array of distances to pool fire radiation levels, ordered according to the flammable output configs.
    * @param {Entities.LocalPosition[]} poolContourPoints -  an array of pool fire radiation contour points, ordered according to the flammable output configs.
    * @param {number[]} nPoolContourPoints -  an array of the number of pool fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourPool -  an array of areas of the pool fire contours, ordered according to the flammable output configs.
+   * @param {number[]} areaContourPool -  an array of areas of the pool fire ellipses, ordered according to the flammable output configs.
    * @param {Entities.ExplosionOverpressureResult[]} explosionOverpressureResults -  an array of explosion overpressure results, ordered according to the explosion output configs.
    * @param {number[]} distancesToToxicConcentration -  an array of distances to toxic concentration levels, ordered according to the dispersion output configs for toxic concentrations of interest.
    * @param {number[]} toxicConcentrationUsed -  an array of toxic concentration levels used in the calculations, ordered according to the dispersion output configs for toxic concentrations of interest.
@@ -3587,7 +3585,7 @@ export class VesselLineRuptureLinkedRunCalculationResponse extends CalculationRe
   }
 }
 
-export interface VesselLineRuptureLinkedRunCalculationResponseSchemaData {
+export interface VesselReliefValveLinkedRunCalculationResponseSchemaData {
   dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
@@ -3616,12 +3614,12 @@ export interface VesselLineRuptureLinkedRunCalculationResponseSchemaData {
   operationId: string;
 }
 
-export class VesselLineRuptureLinkedRunCalculationResponseSchema {
+export class VesselReliefValveLinkedRunCalculationResponseSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the VesselLineRuptureLinkedRun calculation response.
+   * Schema for the VesselReliefValveLinkedRun calculation response.
    */
   constructor() {
     this.schema = Joi.object({
@@ -3679,7 +3677,7 @@ export class VesselLineRuptureLinkedRunCalculationResponseSchema {
     };
   }
 
-  validate(data: VesselLineRuptureLinkedRunCalculationResponseSchemaData): VesselLineRuptureLinkedRunCalculationResponse {
+  validate(data: VesselReliefValveLinkedRunCalculationResponseSchemaData): VesselReliefValveLinkedRunCalculationResponse {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -3687,8 +3685,8 @@ export class VesselLineRuptureLinkedRunCalculationResponseSchema {
     return this.makeCalculationResponse(value);
   }
 
-  makeCalculationResponse(data: VesselLineRuptureLinkedRunCalculationResponseSchemaData): VesselLineRuptureLinkedRunCalculationResponse {
-    return new VesselLineRuptureLinkedRunCalculationResponse(
+  makeCalculationResponse(data: VesselReliefValveLinkedRunCalculationResponseSchemaData): VesselReliefValveLinkedRunCalculationResponse {
+    return new VesselReliefValveLinkedRunCalculationResponse(
       data.dischargeRecord,
       data.distancesToJetFireRadiation,
       data.jetContourPoints,
@@ -3719,12 +3717,11 @@ export class VesselLineRuptureLinkedRunCalculationResponseSchema {
   }
 }
 
-export interface VesselReliefValveLinkedRunCalculationRequestSchemaData {
-  vessel: Entities.Vessel;
-  reliefValve: Entities.ReliefValve;
-  dischargeParameters: Entities.DischargeParameters;
-  substrate: Entities.Substrate;
+export interface BESSLinkedRunnerCalculationRequestSchemaData {
+  bessUnit: Entities.BESSUnit;
+  bessRelease: Entities.BESSRelease;
   weather: Entities.Weather;
+  substrate: Entities.Substrate;
   dispersionParameters: Entities.DispersionParameters[];
   dispersionParameterCount: number;
   endPointConcentration: number;
@@ -3742,12 +3739,11 @@ export interface VesselReliefValveLinkedRunCalculationRequestSchemaData {
   explosionConfinedVolumeCount: number;
 }
 
-class VesselReliefValveLinkedRunCalculationRequest extends CalculationRequestBase {
-  vessel: Entities.Vessel;
-  reliefValve: Entities.ReliefValve;
-  dischargeParameters: Entities.DischargeParameters;
-  substrate: Entities.Substrate;
+class BESSLinkedRunnerCalculationRequest extends CalculationRequestBase {
+  bessUnit: Entities.BESSUnit;
+  bessRelease: Entities.BESSRelease;
   weather: Entities.Weather;
+  substrate: Entities.Substrate;
   dispersionParameters: Entities.DispersionParameters[];
   dispersionParameterCount: number;
   endPointConcentration: number;
@@ -3765,13 +3761,12 @@ class VesselReliefValveLinkedRunCalculationRequest extends CalculationRequestBas
   explosionConfinedVolumeCount: number;
 
   /**
-   * VesselReliefValveLinkedRun calculation request class.
+   * BESSLinkedRunner calculation request class.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.ReliefValve} reliefValve -  a relief valve entity.
-   * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
+   * @param {Entities.BESSUnit} bessUnit -  a BESS unit entity.
+   * @param {Entities.BESSRelease} bessRelease -  a BESS release entity.
    * @param {Entities.Weather} weather -  a weather entity.
+   * @param {Entities.Substrate} substrate -  a substrate entity.
    * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
    * @param {number} dispersionParameterCount - Number of dispersion parameters.
    * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
@@ -3789,11 +3784,10 @@ class VesselReliefValveLinkedRunCalculationRequest extends CalculationRequestBas
    * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
   constructor(
-    vessel: Entities.Vessel,
-    reliefValve: Entities.ReliefValve,
-    dischargeParameters: Entities.DischargeParameters,
-    substrate: Entities.Substrate,
+    bessUnit: Entities.BESSUnit,
+    bessRelease: Entities.BESSRelease,
     weather: Entities.Weather,
+    substrate: Entities.Substrate,
     dispersionParameters: Entities.DispersionParameters[],
     dispersionParameterCount: number,
     endPointConcentration: number,
@@ -3811,11 +3805,10 @@ class VesselReliefValveLinkedRunCalculationRequest extends CalculationRequestBas
     explosionConfinedVolumeCount: number
   ) {
     super();
-    this.vessel = vessel;
-    this.reliefValve = reliefValve;
-    this.dischargeParameters = dischargeParameters;
-    this.substrate = substrate;
+    this.bessUnit = bessUnit;
+    this.bessRelease = bessRelease;
     this.weather = weather;
+    this.substrate = substrate;
     this.dispersionParameters = dispersionParameters;
     this.dispersionParameterCount = dispersionParameterCount;
     this.endPointConcentration = endPointConcentration;
@@ -3834,20 +3827,19 @@ class VesselReliefValveLinkedRunCalculationRequest extends CalculationRequestBas
   }
 }
 
-export class VesselReliefValveLinkedRunCalculationRequestSchema {
+export class BESSLinkedRunnerCalculationRequestSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the VesselReliefValveLinkedRun calculation request.
+   * Schema for the BESSLinkedRunner calculation request.
    */
   constructor() {
     this.schema = Joi.object({
-      vessel: new EntitySchemas.VesselSchema().schema,
-      reliefValve: new EntitySchemas.ReliefValveSchema().schema,
-      dischargeParameters: new EntitySchemas.DischargeParametersSchema().schema,
-      substrate: new EntitySchemas.SubstrateSchema().schema,
+      bessUnit: new EntitySchemas.BESSUnitSchema().schema,
+      bessRelease: new EntitySchemas.BESSReleaseSchema().schema,
       weather: new EntitySchemas.WeatherSchema().schema,
+      substrate: new EntitySchemas.SubstrateSchema().schema,
       dispersionParameters: Joi.array().items(new EntitySchemas.DispersionParametersSchema().schema).allow(null),
       dispersionParameterCount: Joi.number().integer(),
       endPointConcentration: Joi.number().unsafe(),
@@ -3866,11 +3858,10 @@ export class VesselReliefValveLinkedRunCalculationRequestSchema {
     }).unknown(true);
 
     this.propertyTypes = {
-      vessel: "Entities.Vessel",
-      reliefValve: "Entities.ReliefValve",
-      dischargeParameters: "Entities.DischargeParameters",
-      substrate: "Entities.Substrate",
+      bessUnit: "Entities.BESSUnit",
+      bessRelease: "Entities.BESSRelease",
       weather: "Entities.Weather",
+      substrate: "Entities.Substrate",
       dispersionParameters: "Entities.DispersionParameters[]",
       dispersionParameterCount: "number",
       endPointConcentration: "number",
@@ -3889,7 +3880,7 @@ export class VesselReliefValveLinkedRunCalculationRequestSchema {
     };
   }
 
-  validate(data: VesselReliefValveLinkedRunCalculationRequestSchemaData): VesselReliefValveLinkedRunCalculationRequest {
+  validate(data: BESSLinkedRunnerCalculationRequestSchemaData): BESSLinkedRunnerCalculationRequest {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -3897,13 +3888,12 @@ export class VesselReliefValveLinkedRunCalculationRequestSchema {
     return this.makeCalculationRequest(value);
   }
 
-  makeCalculationRequest(data: VesselReliefValveLinkedRunCalculationRequestSchemaData): VesselReliefValveLinkedRunCalculationRequest {
-    return new VesselReliefValveLinkedRunCalculationRequest(
-      data.vessel,
-      data.reliefValve,
-      data.dischargeParameters,
-      data.substrate,
+  makeCalculationRequest(data: BESSLinkedRunnerCalculationRequestSchemaData): BESSLinkedRunnerCalculationRequest {
+    return new BESSLinkedRunnerCalculationRequest(
+      data.bessUnit,
+      data.bessRelease,
       data.weather,
+      data.substrate,
       data.dispersionParameters,
       data.dispersionParameterCount,
       data.endPointConcentration,
@@ -3923,12 +3913,11 @@ export class VesselReliefValveLinkedRunCalculationRequestSchema {
   }
 }
 
-export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
-  vessel: Entities.Vessel;
-  reliefValve: Entities.ReliefValve;
-  dischargeParameters: Entities.DischargeParameters;
-  substrate: Entities.Substrate;
+export class BESSLinkedRunnerCalculation extends CalculationBase {
+  bessUnit: Entities.BESSUnit;
+  bessRelease: Entities.BESSRelease;
   weather: Entities.Weather;
+  substrate: Entities.Substrate;
   dispersionParameters: Entities.DispersionParameters[];
   dispersionParameterCount: number;
   endPointConcentration: number;
@@ -3944,6 +3933,7 @@ export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
   explosionOutputConfigCount: number;
   explosionConfinedVolumes: Entities.ExplosionConfinedVolume[];
   explosionConfinedVolumeCount: number;
+  exitMaterial?: Entities.Material;
   dischargeRecord?: Entities.DischargeRecord;
   distancesToJetFireRadiation?: number[];
   jetContourPoints?: Entities.LocalPosition[];
@@ -3968,13 +3958,12 @@ export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
   poolFireFlameResult?: Entities.PoolFireFlameResult;
 
   /**
-   *  Calculates maximum distance to a number of concentration, radiation and overpressure levels for flammable and toxic materials, given a vessel, relief valve and weather definition.
+   *  Calculates maximum distance to a number of concentration levels for  toxic materials, given a BESS unit, BESS release and weather definition.
    *
-   * @param {Entities.Vessel} vessel -  a vessel entity.
-   * @param {Entities.ReliefValve} reliefValve -  a relief valve entity.
-   * @param {Entities.DischargeParameters} dischargeParameters -  a discharge parameters entity.
-   * @param {Entities.Substrate} substrate -  a substrate entity.
+   * @param {Entities.BESSUnit} bessUnit -  a BESS unit entity.
+   * @param {Entities.BESSRelease} bessRelease -  a BESS release entity.
    * @param {Entities.Weather} weather -  a weather entity.
+   * @param {Entities.Substrate} substrate -  a substrate entity.
    * @param {Entities.DispersionParameters[]} dispersionParameters -  an array of dispersion parameters.
    * @param {number} dispersionParameterCount - Number of dispersion parameters.
    * @param {number} endPointConcentration - Concentration at which the dispersion calculations will terminate (v/v fraction).
@@ -3992,11 +3981,10 @@ export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
    * @param {number} explosionConfinedVolumeCount - Number of explosion confined volumes.
    */
   constructor(
-    vessel: Entities.Vessel,
-    reliefValve: Entities.ReliefValve,
-    dischargeParameters: Entities.DischargeParameters,
-    substrate: Entities.Substrate,
+    bessUnit: Entities.BESSUnit,
+    bessRelease: Entities.BESSRelease,
     weather: Entities.Weather,
+    substrate: Entities.Substrate,
     dispersionParameters: Entities.DispersionParameters[],
     dispersionParameterCount: number,
     endPointConcentration: number,
@@ -4014,11 +4002,10 @@ export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
     explosionConfinedVolumeCount: number
   ) {
     super();
-    this.vessel = vessel;
-    this.reliefValve = reliefValve;
-    this.dischargeParameters = dischargeParameters;
-    this.substrate = substrate;
+    this.bessUnit = bessUnit;
+    this.bessRelease = bessRelease;
     this.weather = weather;
+    this.substrate = substrate;
     this.dispersionParameters = dispersionParameters;
     this.dispersionParameterCount = dispersionParameterCount;
     this.endPointConcentration = endPointConcentration;
@@ -4038,12 +4025,11 @@ export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
 
   async run() {
     try {
-      const request = new VesselReliefValveLinkedRunCalculationRequest(
-        this.vessel,
-        this.reliefValve,
-        this.dischargeParameters,
-        this.substrate,
+      const request = new BESSLinkedRunnerCalculationRequest(
+        this.bessUnit,
+        this.bessRelease,
         this.weather,
+        this.substrate,
         this.dispersionParameters,
         this.dispersionParameterCount,
         this.endPointConcentration,
@@ -4061,22 +4047,23 @@ export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
         this.explosionConfinedVolumeCount
       );
 
-      const schema = new VesselReliefValveLinkedRunCalculationRequestSchema();
+      const schema = new BESSLinkedRunnerCalculationRequestSchema();
       const validatedRequest = schema.validate(request);
 
       const requestJson = JSON.stringify(validatedRequest);
-      const url = `${getAnalyticsApiTarget()}vesselreliefvalvelinkedrun?clientId=${getClientAliasId()}`;
+      const url = `${getAnalyticsApiTarget()}batteryhazardlinkedrun?clientId=${getClientAliasId()}`;
 
       this.resultCode = Enums.ResultCode.UNEXPECTED_APPLICATION_ERROR;
 
       const { data } = await this.postRequest(url, requestJson);
 
-      const responseSchema = new VesselReliefValveLinkedRunCalculationResponseSchema();
+      const responseSchema = new BESSLinkedRunnerCalculationResponseSchema();
       const validatedResponse = responseSchema.validate(data);
 
       this.resultCode = validatedResponse.resultCode;
       if (this.resultCode === Enums.ResultCode.SUCCESS) {
         Object.assign(this, {
+          exitMaterial: validatedResponse.exitMaterial,
           dischargeRecord: validatedResponse.dischargeRecord,
           distancesToJetFireRadiation: validatedResponse.distancesToJetFireRadiation,
           jetContourPoints: validatedResponse.jetContourPoints,
@@ -4120,8 +4107,9 @@ export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
   }
 
   toString() {
-    const parts = ["* VesselReliefValveLinkedRun"];
+    const parts = ["* BESSLinkedRunner"];
 
+    parts.push(`exitMaterial: ${String(this.exitMaterial)}`);
     parts.push(`dischargeRecord: ${String(this.dischargeRecord)}`);
     parts.push("*** distancesToJetFireRadiation:");
     parts.push(
@@ -4249,7 +4237,8 @@ export class VesselReliefValveLinkedRunCalculation extends CalculationBase {
   }
 }
 
-export class VesselReliefValveLinkedRunCalculationResponse extends CalculationResponseBase {
+export class BESSLinkedRunnerCalculationResponse extends CalculationResponseBase {
+  exitMaterial: Entities.Material;
   dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
@@ -4274,13 +4263,14 @@ export class VesselReliefValveLinkedRunCalculationResponse extends CalculationRe
   poolFireFlameResult: Entities.PoolFireFlameResult;
 
   /**
-   * VesselReliefValveLinkedRun calculation response class.
+   * BESSLinkedRunner calculation response class.
    *
+   * @param {Entities.Material} exitMaterial - Exit material from the BESS unit, dependent on BESS chemistry.
    * @param {Entities.DischargeRecord} dischargeRecord -  a discharge record entity.
    * @param {number[]} distancesToJetFireRadiation -  an array of distances to jet fire radiation levels, ordered according to the flammable output configs.
-   * @param {Entities.LocalPosition[]} jetContourPoints -  an array of jet fire radiation ellipse contour points, ordered according to the flammable output configs.
-   * @param {number[]} nJetContourPoints -  an array of the number of jet fire radiation ellipse contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourJet -  an array of areas of the jet fire ellipses, ordered according to the flammable output configs.
+   * @param {Entities.LocalPosition[]} jetContourPoints -  an array of jet fire radiation contour points, ordered according to the flammable output configs.
+   * @param {number[]} nJetContourPoints -  an array of the number of jet fire radiation contour points, ordered according to the flammable output configs.
+   * @param {number[]} areaContourJet -  an array of areas of the jet fire contours, ordered according to the flammable output configs.
    * @param {number[]} distancesToFlamConcentration -  an array of distances to flammable concentration levels, ordered according to the dispersion output configs for flammable concentrations of interest.
    * @param {number[]} flamConcentrationsUsed -  an array of flammable concentration levels used in the calculations, ordered according to the dispersion output configs for flammable concentrations of interest.
    * @param {Entities.LocalPosition[]} flamConcContourPoints -  an array of maximum flammable concentration footprint contour points, ordered according to the dispersion output configs for flammable concentrations of interest.
@@ -4289,7 +4279,7 @@ export class VesselReliefValveLinkedRunCalculationResponse extends CalculationRe
    * @param {number[]} distancesToPoolFireRadiation -  an array of distances to pool fire radiation levels, ordered according to the flammable output configs.
    * @param {Entities.LocalPosition[]} poolContourPoints -  an array of pool fire radiation contour points, ordered according to the flammable output configs.
    * @param {number[]} nPoolContourPoints -  an array of the number of pool fire radiation contour points, ordered according to the flammable output configs.
-   * @param {number[]} areaContourPool -  an array of areas of the pool fire ellipses, ordered according to the flammable output configs.
+   * @param {number[]} areaContourPool -  an array of areas of the pool fire contours, ordered according to the flammable output configs.
    * @param {Entities.ExplosionOverpressureResult[]} explosionOverpressureResults -  an array of explosion overpressure results, ordered according to the explosion output configs.
    * @param {number[]} distancesToToxicConcentration -  an array of distances to toxic concentration levels, ordered according to the dispersion output configs for toxic concentrations of interest.
    * @param {number[]} toxicConcentrationUsed -  an array of toxic concentration levels used in the calculations, ordered according to the dispersion output configs for toxic concentrations of interest.
@@ -4300,6 +4290,7 @@ export class VesselReliefValveLinkedRunCalculationResponse extends CalculationRe
    * @param {Entities.PoolFireFlameResult} poolFireFlameResult -  a pool fire flame results entity, for pool fire.
    */
   constructor(
+    exitMaterial: Entities.Material,
     dischargeRecord: Entities.DischargeRecord,
     distancesToJetFireRadiation: number[],
     jetContourPoints: Entities.LocalPosition[],
@@ -4328,6 +4319,7 @@ export class VesselReliefValveLinkedRunCalculationResponse extends CalculationRe
     operationId: string
   ) {
     super();
+    this.exitMaterial = exitMaterial;
     this.dischargeRecord = dischargeRecord;
     this.distancesToJetFireRadiation = distancesToJetFireRadiation;
     this.jetContourPoints = jetContourPoints;
@@ -4357,6 +4349,10 @@ export class VesselReliefValveLinkedRunCalculationResponse extends CalculationRe
   }
 
   initialiseFromDictionary(data: { [key: string]: unknown }) {
+    if (data.exitMaterial) {
+      this.exitMaterial = new Entities.Material();
+      this.exitMaterial.initialiseFromDictionary(data.exitMaterial as { [key: string]: unknown });
+    }
     if (data.dischargeRecord) {
       this.dischargeRecord = new Entities.DischargeRecord();
       this.dischargeRecord.initialiseFromDictionary(data.dischargeRecord as { [key: string]: unknown });
@@ -4472,7 +4468,8 @@ export class VesselReliefValveLinkedRunCalculationResponse extends CalculationRe
   }
 }
 
-export interface VesselReliefValveLinkedRunCalculationResponseSchemaData {
+export interface BESSLinkedRunnerCalculationResponseSchemaData {
+  exitMaterial: Entities.Material;
   dischargeRecord: Entities.DischargeRecord;
   distancesToJetFireRadiation: number[];
   jetContourPoints: Entities.LocalPosition[];
@@ -4501,15 +4498,16 @@ export interface VesselReliefValveLinkedRunCalculationResponseSchemaData {
   operationId: string;
 }
 
-export class VesselReliefValveLinkedRunCalculationResponseSchema {
+export class BESSLinkedRunnerCalculationResponseSchema {
   schema: Joi.ObjectSchema;
   propertyTypes: Record<string, string>;
 
   /**
-   * Schema for the VesselReliefValveLinkedRun calculation response.
+   * Schema for the BESSLinkedRunner calculation response.
    */
   constructor() {
     this.schema = Joi.object({
+      exitMaterial: new EntitySchemas.MaterialSchema().schema,
       dischargeRecord: new EntitySchemas.DischargeRecordSchema().schema,
       distancesToJetFireRadiation: Joi.array().items(Joi.number().unsafe()).allow(null),
       jetContourPoints: Joi.array().items(new EntitySchemas.LocalPositionSchema().schema).allow(null),
@@ -4539,6 +4537,7 @@ export class VesselReliefValveLinkedRunCalculationResponseSchema {
     }).unknown(true);
 
     this.propertyTypes = {
+      exitMaterial: "Entities.Material",
       dischargeRecord: "Entities.DischargeRecord",
       distancesToJetFireRadiation: "number[]",
       jetContourPoints: "Entities.LocalPosition[]",
@@ -4564,7 +4563,7 @@ export class VesselReliefValveLinkedRunCalculationResponseSchema {
     };
   }
 
-  validate(data: VesselReliefValveLinkedRunCalculationResponseSchemaData): VesselReliefValveLinkedRunCalculationResponse {
+  validate(data: BESSLinkedRunnerCalculationResponseSchemaData): BESSLinkedRunnerCalculationResponse {
     const { error, value } = this.schema.validate(data, { abortEarly: false });
     if (error) {
       throw new Error(`Validation error: ${error.details.map((x) => x.message).join(", ")}`);
@@ -4572,8 +4571,9 @@ export class VesselReliefValveLinkedRunCalculationResponseSchema {
     return this.makeCalculationResponse(value);
   }
 
-  makeCalculationResponse(data: VesselReliefValveLinkedRunCalculationResponseSchemaData): VesselReliefValveLinkedRunCalculationResponse {
-    return new VesselReliefValveLinkedRunCalculationResponse(
+  makeCalculationResponse(data: BESSLinkedRunnerCalculationResponseSchemaData): BESSLinkedRunnerCalculationResponse {
+    return new BESSLinkedRunnerCalculationResponse(
+      data.exitMaterial,
       data.dischargeRecord,
       data.distancesToJetFireRadiation,
       data.jetContourPoints,