gs-cae-design 1.1.63 → 1.1.65

package/src/gsDevFx/managers/persistenceManager.ts

@@ -11,7 +11,7 @@ import { WeightIdObject } from "../objects/weightObjects/weightIdObject";
 import { WeightBaseObject } from "../objects/weightObjects/weightBaseObject";
 import { JointWeightObject } from "../objects/weightObjects/jointWeightObject";
 import { MemberWeightConcentratedObject } from "../objects/weightObjects/memberWeightConcentratedObject";
-import { MemberWeightDistributedObject  } from "../objects/weightObjects/memberWeightDistributedObject";
+import { MemberWeightDistributedObject } from "../objects/weightObjects/memberWeightDistributedObject";
 import { CenterRenderObject } from "../objects/caeObjects/pretreatment/centerRenderObject";
 import { SurfaceDefinitionObject } from "../objects/caeObjects/pretreatment/surfaceDefinitionObject";
 import { BoundaryJointsObject } from "../objects/caeObjects/pretreatment/boundaryJointsObject";
@@ -70,7 +70,9 @@ import { SeastateWind } from "../objects/caeObjects/optionObjects/seastateWind";
 import { SeastateCurr } from "../objects/caeObjects/optionObjects/seastateCurr";
 import { SeastateLcomb } from "../objects/caeObjects/optionObjects/seastateLcomb";
 import { DeadLoadObject } from '../objects/caeObjects/aftertreatment/deadLoadObject'
-import {WindShieldObject} from "../objects/caeObjects/pretreatment/windShieldObject";
+import { LRFDFactorsObject } from '../objects/caeObjects/aftertreatment/LRFDFactorsObject'
+import { WindShieldObject } from "../objects/caeObjects/pretreatment/windShieldObject";
+import { WindAreaObject } from "../objects/caeObjects/pretreatment/windAreaObject";
 export class PersistenceManager extends Longan.PersistenceManager {
   referenceList = new Longan.StringKeyList<IReferenceObject>();
   needReferenceList = new Longan.List<IReferencedObject>();
@@ -219,8 +221,11 @@ export class PersistenceManager extends Longan.PersistenceManager {
       "MemberLoadDistributedObject",
       MemberLoadDistributedObject.prototype
     );
-    this.typeList.add('DeadLoadObject',DeadLoadObject.prototype)
-    this.typeList.add('WindShieldObject',WindShieldObject.prototype)
+    this.typeList.add('DeadLoadObject', DeadLoadObject.prototype)
+    this.typeList.add('LRFDFactorsObject', LRFDFactorsObject.prototype)
+
+    this.typeList.add('WindShieldObject', WindShieldObject.prototype)
+    this.typeList.add('WindAreaObject', WindAreaObject.prototype)
     // 项目配置数据.
     this.typeList.add("ModelTitle", ModelTitle.prototype);
     this.typeList.add("ModelOptions", ModelOptions.prototype);

package/src/gsDevFx/objects/caeObjects/aftertreatment/LRFDFactorsObject.ts

@@ -0,0 +1,128 @@
+import { PersistenceManager } from "../../../managers/persistenceManager";
+import { InstanceRenderObject } from "../../instancesObjects/instanceRenderObject";
+import { DesignBaseObject } from "gs-ceec-design";
+import { Longan } from "gs-bim-air";
+
+
+import { CardRFLRFD } from '../../../../caeCardEditor/caeCardObjects/seainp/cardRFLRFD'
+export class LRFDFactorsObject extends DesignBaseObject {
+  typeName = "LRFDFactorsObject";
+  cardData: string = null;
+  cardObject: CardRFLRFD = null;
+  // 屈服应力系数
+  yieldStressFactor: number = 1;
+  // 轴向拉力系数（管状）
+  tubularAxialTension: number = 0.95;
+  // 轴向压力系数（管状）
+  tubularAxialCompression: number = 0.85;
+  // 弯曲系数（管状）
+  tubularBending: number = 0.95;
+  // 剪力系数（管状）
+  tubularShear: number = 0.95;
+  // 环向应力系数（管状）
+  tubularHoop: number = 0.8;
+  noTubularAxialTension: number = 0.9;
+  noTubularAxialCompression: number = 0.85;
+  noTubularBending: number = 0.9;
+  noTubularShear: number = 0.9;
+  constructor() {
+    super();
+    this.instanceTypes.add("main", InstanceRenderObject.prototype);
+  }
+  serialize(): any {
+    let obj = super.serialize();
+    if (this.cardObject) {
+      obj.cardData = this.cardObject.getLine();
+    } else if (this.cardData) {
+      obj.cardData = this.cardData;
+    }
+    if (this.yieldStressFactor) {
+      obj.yieldStressFactor = this.yieldStressFactor;
+    }
+    if (this.tubularAxialTension) {
+      obj.tubularAxialTension = this.tubularAxialTension;
+    }
+    if (this.tubularAxialCompression) {
+      obj.tubularAxialCompression = this.tubularAxialCompression;
+    }
+    if (this.tubularBending) {
+      obj.tubularBending = this.tubularBending;
+    }
+    if (this.tubularShear) {
+      obj.tubularShear = this.tubularShear;
+    }
+    if (this.tubularHoop) {
+      obj.tubularHoop = this.tubularHoop;
+    }
+
+    if (this.noTubularAxialTension) {
+      obj.noTubularAxialTension = this.noTubularAxialTension;
+    }
+    if (this.noTubularAxialCompression) {
+      obj.noTubularAxialCompression = this.noTubularAxialCompression;
+    }
+    if (this.noTubularBending) {
+      obj.noTubularBending = this.noTubularBending;
+    }
+    if (this.noTubularShear) {
+      obj.noTubularShear = this.noTubularShear;
+    }
+    return obj;
+  }
+  deserialize(obj: any, pm: PersistenceManager) {
+    super.deserialize(obj, pm);
+    if (obj.yieldStressFactor) {
+      this.yieldStressFactor = obj.yieldStressFactor;
+    }
+    if (obj.tubularAxialTension) {
+      this.tubularAxialTension = obj.tubularAxialTension;
+    }
+    if (obj.tubularAxialCompression) {
+      this.tubularAxialCompression = obj.tubularAxialCompression;
+    }
+    if (obj.tubularBending) {
+      this.tubularBending = obj.tubularBending;
+    }
+    if (obj.tubularShear) {
+      this.tubularShear = obj.tubularShear;
+    }
+    if (obj.tubularHoop) {
+      this.tubularHoop = obj.tubularHoop;
+    }
+    if (obj.noTubularAxialTension) {
+      this.noTubularAxialTension = obj.noTubularAxialTension;
+    }
+    if (obj.noTubularAxialCompression) {
+      this.noTubularAxialCompression = obj.noTubularAxialCompression;
+    }
+    if (obj.noTubularBending) {
+      this.noTubularBending = obj.noTubularBending;
+    }
+    if (obj.noTubularShear) {
+      this.noTubularShear = obj.noTubularShear;
+    }
+  }
+  protected clone(cloneObj: any, cloneManager?: Longan.CloneManager) {
+    cloneObj = super.clone(cloneObj);
+    cloneObj.cardData = this.cardData;
+
+    return cloneObj;
+  }
+  serializeToCard() {
+    let cardRFLRFD = new CardRFLRFD();
+    cardRFLRFD.lineLabel.value = "RFLRFD";
+    //  需要c将数字转为字符串，卡片编辑就是处理字符串
+    cardRFLRFD.yieldStressFactor.value = this.yieldStressFactor.toString();
+    cardRFLRFD.tubularAxialTension.value = this.tubularAxialTension.toString();
+    cardRFLRFD.tubularAxialCompression.value = this.tubularAxialCompression.toString();
+    cardRFLRFD.tubularBending.value = this.tubularBending.toString();
+    cardRFLRFD.tubularShear.value = this.tubularShear.toString();
+    cardRFLRFD.tubularHoop.value = this.tubularHoop.toString();
+    cardRFLRFD.noTubularAxialTension.value = this.noTubularAxialTension.toString();
+    cardRFLRFD.noTubularAxialCompression.value = this.noTubularAxialCompression.toString();
+    cardRFLRFD.noTubularBending.value = this.noTubularBending.toString();
+    cardRFLRFD.noTubularShear.value = this.noTubularShear.toString();
+
+    return cardRFLRFD.getLine();
+  }
+}

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

@@ -889,24 +889,60 @@ export class MemberObject extends LineObject implements IReferencedObject {
 
     let result = cardMember.getLine();
     if (this.startOffset || this.endOffset) {
-      if (
-        !this.arrayEqual(this.startOffset, [0, 0, 0]) ||
-        !this.arrayEqual(this.endOffset, [0, 0, 0])
-      ) {
-        result += "\n";
-
-        let cardMemberOffsets = new CardMemberOffsets();
-        cardMemberOffsets.lineLabel.value = "MEMBER OFFSETS";
-        cardMemberOffsets.comments.value = "";
-        cardMemberOffsets.jointA_XOffset.value = this.startOffset[0];
-        cardMemberOffsets.jointA_YOffset.value = this.startOffset[1];
-        cardMemberOffsets.jointA_ZOffset.value = this.startOffset[2];
-
-        cardMemberOffsets.jointB_XOffset.value = this.endOffset[0];
-        cardMemberOffsets.jointB_YOffset.value = this.endOffset[1];
-        cardMemberOffsets.jointB_ZOffset.value = this.endOffset[2];
-
-        result += cardMemberOffsets.getLine();
+      if (!this.startOffset) {
+        if (!this.arrayEqual(this.endOffset, [0, 0, 0])) {
+          result += "\n";
+
+          let cardMemberOffsets = new CardMemberOffsets();
+          cardMemberOffsets.lineLabel.value = "MEMBER OFFSETS";
+          cardMemberOffsets.comments.value = "";
+          cardMemberOffsets.jointA_XOffset.value = 0;
+          cardMemberOffsets.jointA_YOffset.value = 0;
+          cardMemberOffsets.jointA_ZOffset.value = 0;
+
+          cardMemberOffsets.jointB_XOffset.value = this.endOffset[0];
+          cardMemberOffsets.jointB_YOffset.value = this.endOffset[1];
+          cardMemberOffsets.jointB_ZOffset.value = this.endOffset[2];
+
+          result += cardMemberOffsets.getLine();
+        }
+      } else if (!this.endOffset) {
+        if (!this.arrayEqual(this.startOffset, [0, 0, 0])) {
+          result += "\n";
+
+          let cardMemberOffsets = new CardMemberOffsets();
+          cardMemberOffsets.lineLabel.value = "MEMBER OFFSETS";
+          cardMemberOffsets.comments.value = "";
+          cardMemberOffsets.jointA_XOffset.value = this.startOffset[0];
+          cardMemberOffsets.jointA_YOffset.value = this.startOffset[1];
+          cardMemberOffsets.jointA_ZOffset.value = this.startOffset[2];
+
+          cardMemberOffsets.jointB_XOffset.value = 0;
+          cardMemberOffsets.jointB_YOffset.value = 0;
+          cardMemberOffsets.jointB_ZOffset.value = 0;
+
+          result += cardMemberOffsets.getLine();
+        }
+      } else {
+        if (
+          !this.arrayEqual(this.startOffset, [0, 0, 0]) ||
+          !this.arrayEqual(this.endOffset, [0, 0, 0])
+        ) {
+          result += "\n";
+
+          let cardMemberOffsets = new CardMemberOffsets();
+          cardMemberOffsets.lineLabel.value = "MEMBER OFFSETS";
+          cardMemberOffsets.comments.value = "";
+          cardMemberOffsets.jointA_XOffset.value = this.startOffset[0];
+          cardMemberOffsets.jointA_YOffset.value = this.startOffset[1];
+          cardMemberOffsets.jointA_ZOffset.value = this.startOffset[2];
+
+          cardMemberOffsets.jointB_XOffset.value = this.endOffset[0];
+          cardMemberOffsets.jointB_YOffset.value = this.endOffset[1];
+          cardMemberOffsets.jointB_ZOffset.value = this.endOffset[2];
+
+          result += cardMemberOffsets.getLine();
+        }
       }
     }
 
@@ -1702,7 +1738,7 @@ export class MemberObject extends LineObject implements IReferencedObject {
       }
     }
 
-    if(length < 0) {
+    if (length < 0) {
       length = 0;
     }
 

package/src/gsDevFx/objects/caeObjects/optionObjects/seastateUcpart.ts

@@ -1,16 +1,19 @@
 import { DesignBaseObject } from "gs-ceec-design";
 import { PersistenceManager } from "../../../managers/persistenceManager";
-import { Longan } from "gs-bim-air";
 import { CardUCPART } from "../../../../caeCardEditor/caeCardObjects/seainp/cardUCPART";
+import { CaeNumber } from "../../../../utility/utility";
 /**
  * SeaSInp的UCPART卡片数据.
  */
 export class SeastateUcpart extends DesignBaseObject {
   typeName = "SeastateUcpart";
 
-  cardData: string = null;
-
-  cardObject: CardUCPART = null;
+  lowerLimmit_first: number = 0;
+  upperLimmit_first: number = 0;
+  lowerLimmit_second: number = 0;
+  upperLimmit_second: number = 0;
+  lowerLimmit_thrid: number = 0;
+  upperLimmit_thrid: number = 0;
 
   constructor() {
     super();
@@ -19,10 +22,23 @@ export class SeastateUcpart extends DesignBaseObject {
   serialize(): any {
     let obj = super.serialize();
 
-    if (this.cardObject) {
-      obj.cardData = this.cardObject.getLine();
-    } else if (this.cardData) {
-      obj.cardData = this.cardData;
+    if(this.notNullAndNotUndefined(this.lowerLimmit_first)) {
+      obj.lowerLimmit_first = this.lowerLimmit_first
+    }
+    if(this.notNullAndNotUndefined(this.upperLimmit_first)) {
+      obj.upperLimmit_first = this.upperLimmit_first
+    }
+    if(this.notNullAndNotUndefined(this.lowerLimmit_second)) {
+      obj.lowerLimmit_second = this.lowerLimmit_second
+    }
+    if(this.notNullAndNotUndefined(this.upperLimmit_second)) {
+      obj.upperLimmit_second = this.upperLimmit_second
+    }
+    if(this.notNullAndNotUndefined(this.lowerLimmit_thrid)) {
+      obj.lowerLimmit_thrid = this.lowerLimmit_thrid
+    }
+    if(this.notNullAndNotUndefined(this.upperLimmit_thrid)) {
+      obj.upperLimmit_thrid = this.upperLimmit_thrid
     }
 
     return obj;
@@ -31,26 +47,30 @@ export class SeastateUcpart extends DesignBaseObject {
   deserialize(obj: any, pm: PersistenceManager) {
     super.deserialize(obj, pm);
 
-    if (obj.cardData) {
-      this.cardData = obj.cardData;
-      this.cardObject = new CardUCPART(this.cardData);
-    }
+    this.lowerLimmit_first = CaeNumber(obj.lowerLimmit_first)
 
-    this.setNeedUpdate();
-  }
+    this.upperLimmit_first = CaeNumber(obj.upperLimmit_first)
+
+    this.lowerLimmit_second = CaeNumber(obj.lowerLimmit_second)
 
-  protected clone(cloneObj: any, cloneManager?: Longan.CloneManager) {
-    cloneObj = super.clone(cloneObj);
-    cloneObj.cardData = this.cardData;
+    this.upperLimmit_second = CaeNumber(obj.upperLimmit_second)
 
-    return cloneObj;
+    this.lowerLimmit_thrid = CaeNumber(obj.lowerLimmit_thrid)
+
+    this.upperLimmit_thrid = CaeNumber(obj.upperLimmit_thrid)
+
+    
   }
 
   serializeToCard() {
-    let result = null;
-
-    result = this.cardObject.getLine();
+    let cardUCPART = new CardUCPART()
+    cardUCPART.lowerLimmit_first.value = this.lowerLimmit_first ? this.lowerLimmit_first.toString() : ''
+    cardUCPART.upperLimmit_first.value = this.upperLimmit_first ? this.upperLimmit_first.toString() : ''
+    cardUCPART.lowerLimmit_second.value = this.lowerLimmit_second ? this.lowerLimmit_second.toString() : ''
+    cardUCPART.upperLimmit_second.value = this.upperLimmit_second ? this.upperLimmit_second.toString() : ''
+    cardUCPART.lowerLimmit_thrid.value = this.lowerLimmit_thrid ? this.lowerLimmit_thrid.toString() : ''
+    cardUCPART.upperLimmit_thrid.value = this.upperLimmit_thrid ? this.upperLimmit_thrid.toString() : ''
 
-    return result;
+    return cardUCPART
   }
 }

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

@@ -0,0 +1,166 @@
+import { PersistenceManager } from "../../../managers/persistenceManager";
+import { InstanceRenderObject } from "../../instancesObjects/instanceRenderObject";
+import { DesignBaseObject } from "gs-ceec-design";
+import { CaeNumber } from "../../../../utility/utility";
+import { Longan } from "gs-bim-air";
+import { CardAREA } from "../../../../caeCardEditor/caeCardObjects/sacinp/cardAREA";
+export class WindAreaObject extends DesignBaseObject {
+  typeName = "WindAreaObject";
+  cardData: string = "";
+  cardObject: CardAREA = null;
+  areaID: string = '';
+  areaDefinition: string = '';
+  xProjArea: string = '';
+  yProjArea: string = ''
+  zProjArea: string = '';
+  totalArea: string = '';
+  horizontalAngle: string = '';
+  verticalAngle: string = '';
+  XCoord: string = '';
+  YCoord: string = '';
+  ZCoord: string = '';
+  shearFactor: string = '';
+  actionNodeList: Array<any> = [];
+  constructor(areaID) {
+    super();
+    this.name = areaID
+    this.instanceTypes.add("main", InstanceRenderObject.prototype);
+  }
+  serialize(): any {
+    let obj = super.serialize();
+    if (this.cardObject) {
+      obj.cardData = this.cardObject.getLine();
+    }
+    else if (this.cardData) {
+      obj.cardData = this.cardData;
+    }
+    if (this.areaID) {
+      obj.areaID = this.areaID;
+    }
+    if (this.areaDefinition) {
+      obj.areaDefinition = this.areaDefinition;
+    }
+    obj.xProjArea = this.xProjArea;
+    obj.yProjArea = this.yProjArea;
+    obj.zProjArea = this.zProjArea;
+    obj.totalArea = this.totalArea;
+    obj.horizontalAngle = this.horizontalAngle;
+    obj.horizontalAngle = this.horizontalAngle;
+    obj.verticalAngle = this.verticalAngle;
+    obj.XCoord = this.XCoord;
+    obj.YCoord = this.YCoord;
+    obj.ZCoord = this.ZCoord;
+    obj.shearFactor = this.shearFactor;
+    obj.actionNodeList = this.actionNodeList;
+    return obj
+  }
+  deserialize(obj: any, pm: PersistenceManager) {
+    super.deserialize(obj, pm);
+    if (obj.cardData) {
+      this.cardData = obj.cardData;
+    }
+    if (obj.areaID) {
+      this.areaID = obj.areaID;
+    }
+    if (obj.areaDefinition) {
+      this.areaDefinition = obj.areaDefinition;
+    }
+    console.log('deserialize',obj);
+
+    this.xProjArea = CaeNumber(obj.xProjArea);
+    this.yProjArea = CaeNumber(obj.yProjArea);
+    this.zProjArea = CaeNumber(obj.zProjArea);
+    this.totalArea = CaeNumber(obj.totalArea);
+    this.horizontalAngle = CaeNumber(obj.horizontalAngle);
+    this.verticalAngle = CaeNumber(obj.verticalAngle);
+    this.XCoord = CaeNumber(obj.XCoord);
+    this.YCoord = CaeNumber(obj.YCoord);
+    this.ZCoord = CaeNumber(obj.ZCoord);
+    this.shearFactor = CaeNumber(obj.shearFactor);
+    if (obj.actionNodeList) {
+      this.actionNodeList = obj.actionNodeList;
+    }
+
+  }
+  protected clone(cloneObj: any, cloneManager?: Longan.CloneManager) {
+    cloneObj = super.clone(cloneObj);
+    cloneObj.cardData = this.cardData;
+
+    return cloneObj;
+  }
+
+  static checkName(name: string): boolean {
+    let reg = /^[A-Z0-9]*$/;
+    if (!reg.test(name) || name.trimEnd().length > 2) {
+      console.log("受风面ID不符合规范");
+      return false;
+    }
+    return true;
+  }
+  serializeToCard(): string {
+    const lines: string[] = [];
+
+    // -----------------------
+    // 主行 (含基本信息 + 最多 7 个节点)
+    // -----------------------
+    const cardAREA = new CardAREA();
+    cardAREA.lineLabel.value = "AREA";
+    cardAREA.areaID.value = this.areaID;
+
+    if (['F', 'B', 'D'].includes(this.areaDefinition)) {
+      cardAREA.xProjArea.value = this.xProjArea || this.xProjArea === '0' ? this.xProjArea.toString() : '';
+      cardAREA.yProjArea.value = this.yProjArea || this.yProjArea === '0' ? this.yProjArea.toString() : '';
+      cardAREA.zProjArea.value = this.zProjArea || this.zProjArea === '0' ? this.zProjArea.toString() : '';
+    } else if (['A', 'R'].includes(this.areaDefinition)) {
+      cardAREA.xProjArea.value = '';
+      cardAREA.yProjArea.value = '';
+      cardAREA.zProjArea.value = '';
+    }
+
+    cardAREA.totalArea.value = this.totalArea || this.totalArea === '0' ? this.totalArea.toString() : '';
+    cardAREA.horizontalAngle.value = this.horizontalAngle || this.horizontalAngle === '0' ? this.horizontalAngle.toString() : '';
+    cardAREA.verticalAngle.value = this.verticalAngle || this.verticalAngle === '0' ? this.verticalAngle.toString() : '';
+    cardAREA.XCoord.value = this.XCoord || this.XCoord === '0' ? this.XCoord.toString() : '';
+    cardAREA.YCoord.value = this.YCoord || this.YCoord === '0' ? this.YCoord.toString() : '';
+    cardAREA.ZCoord.value = this.ZCoord || this.ZCoord === '0' ? this.ZCoord.toString() : '';
+    cardAREA.shearFactor.value = this.shearFactor || this.shearFactor === '0' ? this.shearFactor.toString() : '';
+    cardAREA.areaDefinition.value = this.areaDefinition;
+
+    // -----------------------
+    // 作用节点分配到 jointName1 ~ jointName7
+    // -----------------------
+    const nodes = Array.isArray(this.actionNodeList)
+      ? this.actionNodeList.filter(n => !!n)
+      : [];
+
+    const groups: string[][] = [];
+    for (let i = 0; i < nodes.length; i += 7) {
+      groups.push(nodes.slice(i, i + 7));
+    }
+
+    // 第一行：卡片基本信息 + 前7个节点
+    if (groups.length > 0) {
+      groups[0].forEach((node, idx) => {
+        const jointValue = node || ''
+        cardAREA[`jointName${idx + 1}`].value = jointValue;
+      });
+    }
+    lines.push(cardAREA.getLine());
+    // -----------------------
+    // 后续行：只包含 areaID + 节点
+    // -----------------------
+    for (let g = 1; g < groups.length; g++) {
+      const extra = new CardAREA();
+      extra.lineLabel.value = "AREA";
+      extra.areaID.value = this.areaID;
+
+      groups[g].forEach((node, idx) => {
+
+        (extra as any)[`jointName${idx + 1}`].value = node;
+      });
+      lines.push(extra.getLine());
+    }
+    return lines.join("\n");
+  }
+
+}

package/src/gsDevFx/objects/caeObjects/sections/tubSectionObject.ts

@@ -236,6 +236,10 @@ export class TubSectionObject
         radius3 = R2 / 2;
         radius4 = R2 / 2 - D2;
 
+        if(radius2 <= radius3) {
+          radius2 = radius3 * 1.01;
+        }
+
         // 内圆的三个点  外上  外下  内上
         let point4 = Longan.Vector.multiply(zAxis, radius3);
         let point5 = Longan.Vector.multiply(zAxis, -radius3);

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

@@ -5,7 +5,6 @@ import { CardCURR } from "../../../caeCardEditor/caeCardObjects/seainp/cardCURR"
 import { CaeNumber } from "../../../utility/utility";
 
 export enum FactorOption {
-  None = "",
   BC = "BC",
   US = "US",
 }
@@ -14,22 +13,18 @@ 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 {
@@ -164,14 +159,14 @@ export class CurrLoadObject extends DesignBaseObject {
     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.elevationPercentOption.value = this.isElevationPercentOption ? ElevationPercentOption.True : "";
+    cardCURR.apparentWavePeriodOption.value = this.isApparentWavePeriodOption ? ApparentWavePeriodOption.True : "";
     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
+    cardCURR.velocityUnitsOption.value = this.isVelocityUnitsOption ? VelocityUnitsOption.True : ""
 
     return cardCURR.getLine()
   }

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

@@ -17,8 +17,7 @@ export enum WaveType {
 }
 
 export enum LocalAccelOnly {
-  True = "L",
-  False = ""
+  True = "L"
 }
 
 export enum InputMode {

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

@@ -24,7 +24,6 @@ export enum WindVariationDefinition {
 }
 
 export enum MemberLoadingOption {
-  None = "",
   W = "W",
   I = "I"
 }
@@ -35,8 +34,7 @@ export enum WaterDepthRatherThanOriginElevation {
 }
 
 export enum PrintDetailedLoadReport {
-  True = "1",
-  False = ""
+  True = "1"
 }
 
 export class WindLoadObject extends DesignBaseObject {
@@ -52,7 +50,7 @@ export class WindLoadObject extends DesignBaseObject {
 
   windDirection: number = 0;
 
-  memberLoadingOption: MemberLoadingOption = null;
+  memberLoadingOption = "";
 
   isOriginElevationRatherThanWaterDepth: boolean = false;
 
@@ -153,7 +151,7 @@ export class WindLoadObject extends DesignBaseObject {
 
     cardWIND.stillWaterDepthOverride.value = this.stillWaterDepthOverride ? this.stillWaterDepthOverride.toString() : ""
 
-    cardWIND.printDetailedLoadReport.value = this.isPrintDetailedLoadReport ? PrintDetailedLoadReport.True : PrintDetailedLoadReport.False
+    cardWIND.printDetailedLoadReport.value = this.isPrintDetailedLoadReport ? PrintDetailedLoadReport.True : ""
 
     return cardWIND.getLine();
   }

package/src/gsDevFx/objects/pretreatmentObjects/colorDivGrupThicknessObject.ts

@@ -96,7 +96,7 @@ export class ColorDivGrupThicknessObject extends ColorDivBaseObject {
           }
         } else if (
           grupSeg.section &&
-          grupSeg.section.crossSectionType === "Tub"
+          grupSeg.section.crossSectionType === "TUB"
         ) {
           //
           console.log("Tub");