gs-cae-design 1.1.58 → 1.1.60

package/src/gsDevFx/objects/caeObjects/plateObject.ts

@@ -15,7 +15,6 @@ import { Process } from "../../../gsDevFx/process";
 import { Viewer } from "gs-ceec-design";
 import { ColorDivComponentGroupObject } from "../pretreatmentObjects/colorDivComponentGroupObject";
 
-
 export enum ViewOption {
   Line,
   Body,
@@ -97,12 +96,14 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
   override get name() {
     return this._name;
   }
-  
+
   override set name(value) {
-    (Process.activeProcess as Process).nameMapPlate.delete(this.name);
+    if ((Process.activeProcess as Process).nameMapPlate.get(this.name)) {
+      (Process.activeProcess as Process).nameMapPlate.delete(this.name);
+      (Process.activeProcess as Process).nameMapPlate.set(value, this);
+    }
 
     this._name = value;
-    (Process.activeProcess as Process).nameMapPlate.set(value, this);
   }
 
   get additionalProperty() {
@@ -124,25 +125,42 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
       if (property.offsetOption !== null && property.overriedPlateOffset) {
         this.offsetOption = Longan.deepClone(property.offsetOption);
       }
-      if(property.offsetOption && property.offsetOption !== "0") {
-        this.offsets = [0,0,0,0,0,0,0,0,0];
+      if (property.offsetOption && property.offsetOption !== "0") {
+        this.offsets = [0, 0, 0, 0, 0, 0, 0, 0, 0];
       }
-      if (property.offsetOption && property.offsetOption !== "0" && property.overriedJointA) {
+      if (
+        property.offsetOption &&
+        property.offsetOption !== "0" &&
+        property.overriedJointA
+      ) {
         this.offsets[0] = property.jointA[0];
         this.offsets[1] = property.jointA[1];
         this.offsets[2] = property.jointA[2];
       }
-      if (property.offsetOption && property.offsetOption !== "0" && property.overriedJointB) {
+      if (
+        property.offsetOption &&
+        property.offsetOption !== "0" &&
+        property.overriedJointB
+      ) {
         this.offsets[3] = property.jointB[0];
         this.offsets[4] = property.jointB[1];
         this.offsets[5] = property.jointB[2];
       }
-      if (property.offsetOption && property.offsetOption !== "0" && property.overriedJointC) {
+      if (
+        property.offsetOption &&
+        property.offsetOption !== "0" &&
+        property.overriedJointC
+      ) {
         this.offsets[6] = property.jointC[0];
         this.offsets[7] = property.jointC[1];
         this.offsets[8] = property.jointC[2];
       }
-      if (property.offsetOption && property.offsetOption !== "0" && property.overriedJointD && this.joints.length > 3) {
+      if (
+        property.offsetOption &&
+        property.offsetOption !== "0" &&
+        property.overriedJointD &&
+        this.joints.length > 3
+      ) {
         this.offsets[9] = property.jointD[0];
         this.offsets[10] = property.jointD[1];
         this.offsets[11] = property.jointD[2];
@@ -200,8 +218,8 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
   public set offsetOption(value: string) {
     this._offsetOption = value;
     if (!value) {
-      if(this.offsets) {
-        for(let i = 0; i < this.offsets.length; i++) {
+      if (this.offsets) {
+        for (let i = 0; i < this.offsets.length; i++) {
           this.offsets[i] = 0;
         }
       }
@@ -294,7 +312,7 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
     if (this.joints) {
       let ids = new Array<string>();
       for (let i = 0; i < this.joints.length; i++) {
-        if(this.joints[i].typeName) {
+        if (this.joints[i].typeName) {
           ids.push(this.joints[i].id);
         } else {
           ids.push(this.joints[i] as any);
@@ -439,18 +457,36 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
       cardPlateOffset1.firstJoint_XOffset.value = this.offsets[0].toString();
       cardPlateOffset1.firstJoint_YOffset.value = this.offsets[1].toString();
       cardPlateOffset1.firstJoint_ZOffset.value = this.offsets[2].toString();
-      cardPlateOffset1.secondJoint_XOffset.value = (this.offsets[3] !== null && this.offsets[3] !== undefined) ? this.offsets[3].toString() : "";
-      cardPlateOffset1.secondJoint_YOffset.value = (this.offsets[4] !== null && this.offsets[3] !== undefined) ?this.offsets[4].toString() : "";
-      cardPlateOffset1.secondJoint_ZOffset.value = (this.offsets[5] !== null && this.offsets[3] !== undefined) ?this.offsets[5].toString() : "";
+      cardPlateOffset1.secondJoint_XOffset.value =
+        this.offsets[3] !== null && this.offsets[3] !== undefined
+          ? this.offsets[3].toString()
+          : "";
+      cardPlateOffset1.secondJoint_YOffset.value =
+        this.offsets[4] !== null && this.offsets[3] !== undefined
+          ? this.offsets[4].toString()
+          : "";
+      cardPlateOffset1.secondJoint_ZOffset.value =
+        this.offsets[5] !== null && this.offsets[3] !== undefined
+          ? this.offsets[5].toString()
+          : "";
 
       result += cardPlateOffset1.getLine() + "\n";
 
       let cardPlateOffset2 = new CardPlateOffsets();
       cardPlateOffset2.lineLabel.value = "PLATE  OFFSETS";
       cardPlateOffset2.comments.value = "";
-      cardPlateOffset2.firstJoint_XOffset.value = (this.offsets[6] !== null && this.offsets[3] !== undefined) ? this.offsets[6].toString(): "";
-      cardPlateOffset2.firstJoint_YOffset.value = (this.offsets[7] !== null && this.offsets[3] !== undefined) ? this.offsets[7].toString(): "";
-      cardPlateOffset2.firstJoint_ZOffset.value = (this.offsets[8] !== null && this.offsets[3] !== undefined) ? this.offsets[8].toString(): "";
+      cardPlateOffset2.firstJoint_XOffset.value =
+        this.offsets[6] !== null && this.offsets[3] !== undefined
+          ? this.offsets[6].toString()
+          : "";
+      cardPlateOffset2.firstJoint_YOffset.value =
+        this.offsets[7] !== null && this.offsets[3] !== undefined
+          ? this.offsets[7].toString()
+          : "";
+      cardPlateOffset2.firstJoint_ZOffset.value =
+        this.offsets[8] !== null && this.offsets[3] !== undefined
+          ? this.offsets[8].toString()
+          : "";
       if (this.offsets.length > 9) {
         if (this.offsets[9] !== null && this.offsets[9] !== undefined) {
           cardPlateOffset2.secondJoint_XOffset.value =
@@ -590,7 +626,10 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
         this.pGrup.plateZOffset !== null
       ) {
         let normal = this.getNormal();
-        let offset = Longan.Vector.multiply(normal, this.pGrup.plateZOffset / 100);
+        let offset = Longan.Vector.multiply(
+          normal,
+          this.pGrup.plateZOffset / 100
+        );
 
         let p0 = new Float32Array([positions[0], positions[1], positions[2]]);
         let p1 = new Float32Array([positions[3], positions[4], positions[5]]);
@@ -639,7 +678,7 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
       positions.push(this.joints[i].position[2]);
     }
 
-    return positions
+    return positions;
   }
 
   // 有限元网格处理.
@@ -695,7 +734,10 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
     let m1 = Longan.Vector.module(v1);
     let result = Longan.Point.add(
       center,
-      Longan.Vector.multiply(Longan.Vector.normalizeVector(v1), m1 * this.finiteElementCoeff)
+      Longan.Vector.multiply(
+        Longan.Vector.normalizeVector(v1),
+        m1 * this.finiteElementCoeff
+      )
     );
     return result;
   }
@@ -868,7 +910,7 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
 
   // 判断输入点是否都共面.
 
-   static checkPlateLegal(positions: number[]): boolean {
+  static checkPlateLegal(positions: number[]): boolean {
     // 先判断p0,p1,p2是否在同一直线上
     // 是---若不存在第4个点---绘制失败.
     //   ---存在第4个点---判断p0,p1,p2是否在同一直线上.
@@ -905,7 +947,12 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
           normal
         );
         let vector = Longan.Point.subtract(projectPoint, p3);
-        if (Longan.GeometryOperators.sameVector(vector, new Float32Array([0, 0, 0]))) {
+        if (
+          Longan.GeometryOperators.sameVector(
+            vector,
+            new Float32Array([0, 0, 0])
+          )
+        ) {
           // p3在面内,isLegal = true
         } else {
           isLegal = false;
@@ -920,7 +967,10 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
   }
 
   static isPlate(p0: Float32Array, p1: Float32Array, p2: Float32Array) {
-    if(Longan.GeometryOperators.samePoint(p1, p2) && Longan.GeometryOperators.samePoint(p1,p2)) {
+    if (
+      Longan.GeometryOperators.samePoint(p1, p2) &&
+      Longan.GeometryOperators.samePoint(p1, p2)
+    ) {
       return false;
     }
     let axis1 = Longan.Point.subtract(p1, p0);
@@ -944,18 +994,28 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
       let p2 = new Float32Array(positions.slice(6, 9));
       let p3 = new Float32Array(positions.slice(9, 12));
 
-      let inter0 = Longan.GeometryOperators.intersectionLineSegmentLineSegment(p0, p1, p2, p3);
-      let inter1 = Longan.GeometryOperators.intersectionLineSegmentLineSegment(p0, p2, p1, p3);
+      let inter0 = Longan.GeometryOperators.intersectionLineSegmentLineSegment(
+        p0,
+        p1,
+        p2,
+        p3
+      );
+      let inter1 = Longan.GeometryOperators.intersectionLineSegmentLineSegment(
+        p0,
+        p2,
+        p1,
+        p3
+      );
       // let inter2 = Longan.GeometryOperators.intersectionLineSegmentLineSegment(p0, p3, p1, p2);
-      if(inter1) {
+      if (inter1) {
         let points1 = positions.slice(0, 9);
         let points2 = positions.slice(6, 12).concat(positions.slice(0, 3));
         this.segment.insertTriangularShell(points1, indices1);
         this.segment.insertTriangularShell(points2, indices1);
-  
+
         this.segment.insertTriangularShell(points1, indices2);
         this.segment.insertTriangularShell(points2, indices2);
-      } else if(inter0) {
+      } else if (inter0) {
         let points1 = positions.slice(0, 9);
         let points2 = positions.slice(0, 6).concat(positions.slice(9, 12));
         this.segment.insertTriangularShell(points1, indices1);
@@ -1103,7 +1163,11 @@ export class PlateObject extends PolylineObject implements IReferencedObject {
       let zPoint = Longan.Point.add(origin, axis.zAxis);
 
       let matrix = Longan.Matrix4.identity();
-      if (this.segment.attributes.indexOf(Longan.LonganCore.ObjectType.TYPE_ModellingMatrix)) {
+      if (
+        this.segment.attributes.indexOf(
+          Longan.LonganCore.ObjectType.TYPE_ModellingMatrix
+        )
+      ) {
         if (this.segment.modellingMatrix.matrix) {
           matrix = new Float32Array(this.segment.modellingMatrix.matrix);
         }
@@ -1344,7 +1408,7 @@ export class PlateAdditionalProperty {
   jointB = [0, 0, 0];
   jointC = [0, 0, 0];
   jointD = [0, 0, 0];
-  
+
   overriedStreeReport: boolean = false;
   overriedPlateOffset: boolean = false;
   overriedJointA: boolean = false;

package/src/gsDevFx/objects/caeObjects/pretreatment/surfaceDefinitionObject.ts

@@ -119,7 +119,7 @@ export class SurfaceDefinitionObject extends DesignBaseObject {
   }
   static checkName(name: string): boolean {
     let reg = /^[A-Z0-9]*$/;
-    if (!reg.test(name) || name.trimEnd().length > 4) {
+    if (!reg.test(name) || name.trimEnd().length > 8) {
       console.log("表面id不符合规范");
       return false;
     }

package/src/gsDevFx/objects/caeObjects/pretreatment/surfaceWeightObject.ts

@@ -56,7 +56,9 @@ export class SurfaceWeightObject extends DesignBaseObject {
     if (this.zFactor) {
       obj.zFactor = CaeNumber(this.zFactor);
     }
-
+    if (this.surfaceIDfirst) {
+      obj.surfaceIDfirst = this.surfaceIDfirst;
+    }
     if (this.surfaceIDSecond) {
       obj.surfaceIDSecond = this.surfaceIDSecond;
     }
@@ -93,6 +95,9 @@ export class SurfaceWeightObject extends DesignBaseObject {
     }
     if (obj.zFactor) {
       this.zFactor = CaeNumber(obj.zFactor);
+    }
+      if (obj.surfaceIDfirst) {
+      this.surfaceIDfirst = obj.surfaceIDfirst;
     }
     if (obj.surfaceIDSecond) {
       this.surfaceIDSecond = obj.surfaceIDSecond;
@@ -135,7 +140,7 @@ export class SurfaceWeightObject extends DesignBaseObject {
   }
   static checkName(name: string): boolean {
     let reg = /^[A-Z0-9]*$/;
-    if (!reg.test(name) || name.trimEnd().length > 4) {
+    if (!reg.test(name) || name.trimEnd().length > 8) {
       return false;
     }
     return true;

package/src/gsDevFx/objects/caeObjects/sectionObject.ts

@@ -56,16 +56,18 @@ export class SectionObject
   stiffnessPro_IZ: string = null;
 
   standardSize: string = null;
-  
+
   override get name() {
     return this._name;
   }
-  
+
   override set name(value) {
-    (Process.activeProcess as Process).nameMapSection.delete(this.name);
+    if ((Process.activeProcess as Process).nameMapSection.get(this.name)) {
+      (Process.activeProcess as Process).nameMapSection.delete(this.name);
+      (Process.activeProcess as Process).nameMapSection.set(value, this);
+    }
 
     this._name = value;
-    (Process.activeProcess as Process).nameMapSection.set(value, this);
   }
 
   get disable() {
@@ -137,7 +139,7 @@ export class SectionObject
    */
   public deserializeFormParams(params) {}
 
-  public checkParameter(params): boolean{
+  public checkParameter(params): boolean {
     return true;
   }
 
@@ -382,8 +384,14 @@ export class SectionObject
       // console.log("lineAngel:", lineAngel / Math.PI * 180);
       let distance = radius / Math.tan(lineAngel / 2);
 
-      let pointA = Longan.Point.add(point1, Longan.Vector.multiply(p1p0, distance));
-      let pointB = Longan.Point.add(point1, Longan.Vector.multiply(p1p2, distance));
+      let pointA = Longan.Point.add(
+        point1,
+        Longan.Vector.multiply(p1p0, distance)
+      );
+      let pointB = Longan.Point.add(
+        point1,
+        Longan.Vector.multiply(p1p2, distance)
+      );
 
       let tempZAxis = Longan.Vector.cross(p1p0, p1p2);
       Longan.Vector.normalize(tempZAxis);
@@ -393,8 +401,14 @@ export class SectionObject
       let tempPBAxis = Longan.Vector.cross(tempZAxis, p1p2);
       Longan.Vector.normalize(tempPBAxis);
 
-      let pointA2 = Longan.Point.add(pointA, Longan.Vector.multiply(tempPAAxis, 1));
-      let pointB2 = Longan.Point.add(pointB, Longan.Vector.multiply(tempPBAxis, 1));
+      let pointA2 = Longan.Point.add(
+        pointA,
+        Longan.Vector.multiply(tempPAAxis, 1)
+      );
+      let pointB2 = Longan.Point.add(
+        pointB,
+        Longan.Vector.multiply(tempPBAxis, 1)
+      );
 
       // 求出中心点.
       let crossPoint = Longan.GeometryOperators.intersectionLineLine(
@@ -483,42 +497,41 @@ export class SectionObject
     if (this.typeName !== section.typeName) {
       isSame = false;
     } else {
-      switch(this.typeName) {
+      switch (this.typeName) {
         case "AngSectionObject":
           isSame = this.checkAngSectionEqual(this, section);
-        break;
+          break;
         case "BlbSectionObject":
           isSame = this.checkBlbSectionEqual(this, section);
-        break;
+          break;
         case "BoxSectionObject":
           isSame = this.checkBoxSectionEqual(this, section);
-        break;
+          break;
         case "ChlSectionObject":
           isSame = this.checkChlSectionEqual(this, section);
-        break;
+          break;
         case "ConSectionObject":
           isSame = this.checkConSectionEqual(this, section);
-        break;
+          break;
         case "DtbSectionObject":
           isSame = this.checkDtbSectionEqual(this, section);
-        break;
+          break;
         case "PriSectionObject":
           isSame = this.checkPriSectionEqual(this, section);
-        break;
+          break;
         case "RtbSectionObject":
           isSame = this.checkRtbSectionEqual(this, section);
-        break;
+          break;
         case "TeeSectionObject":
           isSame = this.checkTeeSectionEqual(this, section);
-        break;
+          break;
         case "TubSectionObject":
           isSame = this.checkTubSectionEqual(this, section);
-        break;
+          break;
         case "WFSectionObject":
           isSame = this.checkWFSectionEqual(this, section);
-        break;
+          break;
       }
-      
     }
     return isSame;
   }
@@ -572,8 +585,14 @@ export class SectionObject
     let e1 = this.checkNumberEqual(sec1.outerDiameter, sec2.outerDiameter);
     let e2 = this.checkNumberEqual(sec1.wallThick, sec2.wallThick);
     let e3 = this.checkNumberEqual(sec1.dentDepth, sec2.dentDepth);
-    let e4 = this.checkNumberEqual(sec1.groutFilledRatio, sec2.groutFilledRatio);
-    let e5 = this.checkNumberEqual(sec1.outOfStraightness, sec2.outOfStraightness);
+    let e4 = this.checkNumberEqual(
+      sec1.groutFilledRatio,
+      sec2.groutFilledRatio
+    );
+    let e5 = this.checkNumberEqual(
+      sec1.outOfStraightness,
+      sec2.outOfStraightness
+    );
 
     return e1 && e2 && e3 && e4 && e5;
   }
@@ -608,7 +627,10 @@ export class SectionObject
 
   private checkTubSectionEqual(sec1, sec2) {
     let e1 = this.checkNumberEqual(sec1.outsideRadius, sec2.outsideRadius);
-    let e2 = this.checkNumberEqual(sec1.outsideWallThick, sec2.outsideWallThick);
+    let e2 = this.checkNumberEqual(
+      sec1.outsideWallThick,
+      sec2.outsideWallThick
+    );
     let e3 = this.checkNumberEqual(sec1.insideRadius, sec2.insideRadius);
     let e4 = this.checkNumberEqual(sec1.insideWallThick, sec2.insideWallThick);
 

package/src/gsDevFx/objects/loadObjects/currLoadObject.ts

@@ -0,0 +1,162 @@
+import { Longan } from "gs-bim-air";
+import { DesignBaseObject } from "gs-ceec-design";
+import { InstanceRenderObject } from "../instancesObjects/instanceRenderObject";
+import { CardCURR } from "../../../caeCardEditor/caeCardObjects/seainp/cardCURR";
+import { CaeNumber } from "../../../utility/utility";
+
+export enum FactorOption {
+  None = "",
+  BC = "BC",
+  US = "US",
+}
+
+export enum CrsetStretchingOption {
+  CN = "CN",
+  NL = "NL",
+  LN = "LN",
+  None = "",
+}
+
+export enum ElevationPercentOption {
+  True = "WDP",
+  False = ""
+}
+
+export enum ApparentWavePeriodOption {
+  True = "AWP",
+  False = ""
+}
+
+export enum VelocityUnitsOption {
+  True = "FPS",
+  False = ""
+}
+
+export class CurrLoadObject extends DesignBaseObject {
+  public typeName = "CurrLoadObject";
+
+  loadCondition: string = "";
+
+  // 距离
+  elevationAboveMudline: number = 0;
+  // 流速
+  currentVelocity: number = 0;
+  // 方向
+  direction: number = 0;
+
+  mudlineElevationOverride: number = 0;
+
+  isElevationPercentOption: boolean = false;
+
+  isApparentWavePeriodOption: boolean = false;
+
+  factorOption: FactorOption = null;
+
+  factor: number = 0;
+
+  elevation: number = 0;
+
+  crsetStretchingOption: CrsetStretchingOption = null;
+
+  minimumInlineCurrentVelocity: number = 0;
+
+  isVelocityUnitsOption: boolean = false
+
+  public constructor(loadCondition?: string) {
+    super();
+
+    this.loadCondition = loadCondition;
+
+    this.instanceTypes.add("main", InstanceRenderObject.prototype);
+  }
+
+  serialize(): void {
+    let obj = super.serialize();
+
+    if(this.loadCondition) {
+      obj.loadCondition = this.loadCondition
+    }
+    if(this.notNullAndNotUndefined(this.mudlineElevationOverride)) {
+      obj.mudlineElevationOverride = this.mudlineElevationOverride
+    }
+    if(this.isElevationPercentOption) {
+      obj.isElevationPercentOption = this.isElevationPercentOption
+    }
+    if(this.isApparentWavePeriodOption) {
+      obj.isApparentWavePeriodOption = this.isApparentWavePeriodOption
+    }
+    if(this.factorOption) {
+      obj.factorOption = this.factorOption
+    }
+    if(this.notNullAndNotUndefined(this.factor)) {
+      obj.factor = this.factor
+    }
+    if(this.notNullAndNotUndefined(this.elevation)) {
+      obj.elevation = this.elevation
+    }
+    if(this.crsetStretchingOption) {
+      obj.crsetStretchingOption = this.crsetStretchingOption
+    }
+    if(this.notNullAndNotUndefined(this.minimumInlineCurrentVelocity)) {
+      obj.minimumInlineCurrentVelocity = this.minimumInlineCurrentVelocity
+    }
+    if(this.isVelocityUnitsOption) {
+      obj.isVelocityUnitsOption = this.isVelocityUnitsOption
+    }
+
+    return obj;
+  }
+
+  deserialize(obj: any, pm?: Longan.PersistenceManager): void {
+    super.deserialize(obj);
+
+    if(obj.loadCondition) {
+      this.loadCondition = obj.loadCondition
+    }
+
+      this.mudlineElevationOverride = CaeNumber(obj.mudlineElevationOverride)
+
+    if(obj.isElevationPercentOption) {
+      this.isElevationPercentOption = obj.isElevationPercentOption
+    }
+    if(obj.isApparentWavePeriodOption) {
+      this.isApparentWavePeriodOption = obj.isApparentWavePeriodOption
+    }
+    if(obj.factorOption) {
+      this.factorOption = obj.factorOption
+    }
+
+      this.factor = CaeNumber(obj.factor)
+
+      this.elevation = CaeNumber(obj.elevation)
+
+    if(obj.crsetStretchingOption) {
+      this.crsetStretchingOption = obj.crsetStretchingOption
+    }
+
+      this.minimumInlineCurrentVelocity = CaeNumber(obj.minimumInlineCurrentVelocity)
+
+    if(obj.isVelocityUnitsOption) {
+      this.isVelocityUnitsOption = obj.isVelocityUnitsOption
+    }
+  }
+
+  serializeToCard() {
+    let cardCURR = new CardCURR()
+    cardCURR.lineLabel.value = "CURR"
+    cardCURR.elevationAboveMudline.value = this.elevationAboveMudline ? this.elevationAboveMudline.toString() : "";
+    cardCURR.currentVelocity.value = this.currentVelocity ? this.currentVelocity.toString() : "";
+    cardCURR.direction.value = this.direction ? this.direction.toString() : "";
+    cardCURR.mudlineElevationOverride.value = this.mudlineElevationOverride ? this.mudlineElevationOverride.toString() : "";
+    cardCURR.elevationPercentOption.value = this.isElevationPercentOption ? ElevationPercentOption.True : ElevationPercentOption.False;
+    cardCURR.apparentWavePeriodOption.value = this.isApparentWavePeriodOption ? ApparentWavePeriodOption.True : ApparentWavePeriodOption.False;
+    cardCURR.option.value = this.factorOption;
+    cardCURR.factor.value = this.factor ? this.factor.toString() : "";
+    cardCURR.elevation.value = this.elevation ? this.elevation.toString() : "";
+    cardCURR.crsetStretchingOption.value = this.crsetStretchingOption;
+    cardCURR.minimumInlineCurrentVelocity.value = this.minimumInlineCurrentVelocity ? this.minimumInlineCurrentVelocity.toString() : ""
+    cardCURR.velocityUnitsOption.value = this.isVelocityUnitsOption ? VelocityUnitsOption.True : VelocityUnitsOption.False
+
+    return cardCURR.getLine()
+  }
+}

package/src/gsDevFx/objects/loadObjects/loadConditionObject.ts

@@ -6,6 +6,9 @@ import { CardLOADCN } from "../../../caeCardEditor/caeCardObjects/seainp/cardLOA
 import { MemberLoadBaseObject } from "./memberLoadBaseObject";
 import { LoadBaseObject } from "./loadBaseObject";
 import { JointLoadObject } from "./jointLoadObject";
+import { WaveLoadObject } from "./waveLoadObject";
+import { WindLoadObject } from "./windLoadObject";
+import { CurrLoadObject } from "./currLoadObject";
 import { SeastateWind } from "../caeObjects/optionObjects/seastateWind";
 import { SeastateWave } from "../caeObjects/optionObjects/seastateWave";
 import { SeastateCurr } from "../caeObjects/optionObjects/seastateCurr";
@@ -134,13 +137,13 @@ export class LoadConditionObject extends DesignBaseObject {
           if(result !== null) {
             text += result + "\n";
           }
-        } else if (grandChild instanceof SeastateWind) {
+        } else if (grandChild instanceof WaveLoadObject) {
           let result = grandChild.serializeToCard();
           text += result + "\n";
-        } else if (grandChild instanceof SeastateWave) {
+        } else if (grandChild instanceof WindLoadObject) {
           let result = grandChild.serializeToCard();
           text += result + "\n";
-        } else if (grandChild instanceof SeastateCurr) {
+        } else if (grandChild instanceof CurrLoadObject) {
           let result = grandChild.serializeToCard();
           text += result + "\n";
         }