Skip to content

Commit a62e281

Browse files
committed
Add new/missing DOF fields in ElastoDyn file
1 parent 3c73097 commit a62e281

2 files changed

Lines changed: 42 additions & 24 deletions

File tree

fio.go

Lines changed: 28 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -274,28 +274,34 @@ type BeamDynBlade struct {
274274

275275
type ElastoDyn struct {
276276
FileBase
277-
FlapDOF1 Bool `json:"FlapDOF1"`
278-
FlapDOF2 Bool `json:"FlapDOF2"`
279-
EdgeDOF Bool `json:"EdgeDOF"`
280-
TeetDOF Bool `json:"TeetDOF"`
281-
DrTrDOF Bool `json:"DrTrDOF"`
282-
GenDOF Bool `json:"GenDOF"`
283-
YawDOF Bool `json:"YawDOF"`
284-
TwFADOF1 Bool `json:"TwFADOF1"`
285-
TwFADOF2 Bool `json:"TwFADOF2"`
286-
TwSSDOF1 Bool `json:"TwSSDOF1"`
287-
TwSSDOF2 Bool `json:"TwSSDOF2"`
288-
BlPitch1 Real `json:"BlPitch1" key:"BlPitch(1)"`
289-
BlPitch2 Real `json:"BlPitch2" key:"BlPitch(2)"`
290-
BlPitch3 Real `json:"BlPitch3" key:"BlPitch(3)"`
291-
RotSpeed Real `json:"RotSpeed"`
292-
NumBl Integer `json:"NumBl"`
293-
TipRad Real `json:"TipRad"`
294-
ShftTilt Real `json:"ShftTilt"`
295-
BldFile1 Path `json:"BldFile1" key:"BldFile(1)" ftype:"Misc"` // ElastoDynBlade
296-
BldFile2 Path `json:"BldFile2" key:"BldFile(2)" ftype:"Misc"` // ElastoDynBlade
297-
BldFile3 Path `json:"BldFile3" key:"BldFile(3)" ftype:"Misc"` // ElastoDynBlade
298-
TwrFile Path `json:"TwrFile" ftype:"Misc"` // ElastoDynTower
277+
FlapDOF1 Bool `json:"FlapDOF1"`
278+
FlapDOF2 Bool `json:"FlapDOF2"`
279+
EdgeDOF Bool `json:"EdgeDOF"`
280+
PitchDOF Bool `json:"PitchDOF"`
281+
DrTrDOF Bool `json:"DrTrDOF"`
282+
GenDOF Bool `json:"GenDOF"`
283+
YawDOF Bool `json:"YawDOF"`
284+
TwFADOF1 Bool `json:"TwFADOF1"`
285+
TwFADOF2 Bool `json:"TwFADOF2"`
286+
TwSSDOF1 Bool `json:"TwSSDOF1"`
287+
TwSSDOF2 Bool `json:"TwSSDOF2"`
288+
PtfmSgDOF Bool `json:"PtfmSgDOF"`
289+
PtfmSwDOF Bool `json:"PtfmSwDOF"`
290+
PtfmHvDOF Bool `json:"PtfmHvDOF"`
291+
PtfmRDOF Bool `json:"PtfmRDOF"`
292+
PtfmPDOF Bool `json:"PtfmPDOF"`
293+
PtfmYDOF Bool `json:"PtfmYDOF"`
294+
BlPitch1 Real `json:"BlPitch1" key:"BlPitch(1)"`
295+
BlPitch2 Real `json:"BlPitch2" key:"BlPitch(2)"`
296+
BlPitch3 Real `json:"BlPitch3" key:"BlPitch(3)"`
297+
RotSpeed Real `json:"RotSpeed"`
298+
NumBl Integer `json:"NumBl"`
299+
TipRad Real `json:"TipRad"`
300+
ShftTilt Real `json:"ShftTilt"`
301+
BldFile1 Path `json:"BldFile1" key:"BldFile(1)" ftype:"Misc"` // ElastoDynBlade
302+
BldFile2 Path `json:"BldFile2" key:"BldFile(2)" ftype:"Misc"` // ElastoDynBlade
303+
BldFile3 Path `json:"BldFile3" key:"BldFile(3)" ftype:"Misc"` // ElastoDynBlade
304+
TwrFile Path `json:"TwrFile" ftype:"Misc"` // ElastoDynTower
299305
}
300306

301307
type HydroDyn struct {

frontend/wailsjs/go/models.ts

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -717,14 +717,20 @@ export namespace main {
717717
FlapDOF1: Bool;
718718
FlapDOF2: Bool;
719719
EdgeDOF: Bool;
720-
TeetDOF: Bool;
720+
PitchDOF: Bool;
721721
DrTrDOF: Bool;
722722
GenDOF: Bool;
723723
YawDOF: Bool;
724724
TwFADOF1: Bool;
725725
TwFADOF2: Bool;
726726
TwSSDOF1: Bool;
727727
TwSSDOF2: Bool;
728+
PtfmSgDOF: Bool;
729+
PtfmSwDOF: Bool;
730+
PtfmHvDOF: Bool;
731+
PtfmRDOF: Bool;
732+
PtfmPDOF: Bool;
733+
PtfmYDOF: Bool;
728734
BlPitch1: Real;
729735
BlPitch2: Real;
730736
BlPitch3: Real;
@@ -749,14 +755,20 @@ export namespace main {
749755
this.FlapDOF1 = this.convertValues(source["FlapDOF1"], Bool);
750756
this.FlapDOF2 = this.convertValues(source["FlapDOF2"], Bool);
751757
this.EdgeDOF = this.convertValues(source["EdgeDOF"], Bool);
752-
this.TeetDOF = this.convertValues(source["TeetDOF"], Bool);
758+
this.PitchDOF = this.convertValues(source["PitchDOF"], Bool);
753759
this.DrTrDOF = this.convertValues(source["DrTrDOF"], Bool);
754760
this.GenDOF = this.convertValues(source["GenDOF"], Bool);
755761
this.YawDOF = this.convertValues(source["YawDOF"], Bool);
756762
this.TwFADOF1 = this.convertValues(source["TwFADOF1"], Bool);
757763
this.TwFADOF2 = this.convertValues(source["TwFADOF2"], Bool);
758764
this.TwSSDOF1 = this.convertValues(source["TwSSDOF1"], Bool);
759765
this.TwSSDOF2 = this.convertValues(source["TwSSDOF2"], Bool);
766+
this.PtfmSgDOF = this.convertValues(source["PtfmSgDOF"], Bool);
767+
this.PtfmSwDOF = this.convertValues(source["PtfmSwDOF"], Bool);
768+
this.PtfmHvDOF = this.convertValues(source["PtfmHvDOF"], Bool);
769+
this.PtfmRDOF = this.convertValues(source["PtfmRDOF"], Bool);
770+
this.PtfmPDOF = this.convertValues(source["PtfmPDOF"], Bool);
771+
this.PtfmYDOF = this.convertValues(source["PtfmYDOF"], Bool);
760772
this.BlPitch1 = this.convertValues(source["BlPitch1"], Real);
761773
this.BlPitch2 = this.convertValues(source["BlPitch2"], Real);
762774
this.BlPitch3 = this.convertValues(source["BlPitch3"], Real);

0 commit comments

Comments
 (0)