Skip to content

Commit 2d7091a

Browse files
KylerF229KylerF229
committed
Removed main output file sections and cleaned up code
1 parent 36ee755 commit 2d7091a

File tree

4 files changed

+14
-91
lines changed

4 files changed

+14
-91
lines changed

‎docs/inputs.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -435,8 +435,8 @@ outputs are wanted. Eight output properties are currently possible:
435435
- P – dynamic pressure at each node
436436
- X – transverse drag force at each node
437437
- Y – tangential drag force at each node
438-
- A – transverse inertia force at each node
439-
- a – axial fluid inertia force at each node
438+
- A – transverse fluid inertia force at each node
439+
- a – tangential fluid inertia force at each node
440440
- b – bottom contact force
441441
For example, outputting node positions and segment tensions could be achieved by writing “pt” for
442442
this last column. These outputs will go to a dedicated output file for each rod. For sending

‎source/Misc.hpp‎

Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1241,28 +1241,6 @@ enum QTypeEnum : int
12411241
Sub = 26,
12421242
TenA = 27,
12431243
TenB = 28,
1244-
WZ = 31,
1245-
DpX = 32,
1246-
DpY = 33,
1247-
DpZ = 34,
1248-
DqX = 35,
1249-
DqY = 36,
1250-
DqZ = 37,
1251-
ApX = 38,
1252-
ApY = 39,
1253-
ApZ = 40,
1254-
AqX = 41,
1255-
AqY = 42,
1256-
AqZ = 43,
1257-
PdX = 44,
1258-
PdY = 45,
1259-
PdZ = 46,
1260-
BX = 47,
1261-
BY = 48,
1262-
BZ = 49,
1263-
BoX = 50,
1264-
BoY = 51,
1265-
BoZ = 52
12661244
};
12671245

12681246
// The following are some definitions for use with the output options in

‎source/MoorDyn2.cpp‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -80,16 +80,6 @@ const char* UnitList[] = {
8080
"N", "N", "N", // 20: FX 21: FY 22: FZ
8181
"N*m", "N*m", "N*m", // 23: MX 24: MY 25: MZ
8282
"(frac)", // 26: Sub
83-
"N", "N", // 27: TenA 28: TenB
84-
"N", // 29: WZ
85-
"N", "N", "N", // 30: BoX 31: BoY 32: BoZ
86-
"N", "N", "N", // 33: DpX 34: DpY 35: DpZ
87-
"N*m", "N*m", "N*m", // 36: DqX 37: DqY 38: DqZ
88-
"N", "N", "N", // 39: ApX 40: ApY 41: ApZ
89-
"N", "N", "N", // 42: AqX 43: AqY 44: AqZ
90-
"Pa", "Pa", "Pa", // 45: PdX 46: PdY 47: PdZ
91-
"N", "N", "N", // 48: BX 49: BY 50: BZ
92-
"N", "N", "N" // 51: BoX 52: BoY 53: BoZ
9383
};
9484

9585
std::atomic<size_t> __systems_counter(0);

‎source/Rod.cpp‎

Lines changed: 12 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -298,7 +298,7 @@ Rod::openoutput()
298298
*outfile << "Node" << i << "ApX \t Node" << i << "ApY \t Node"
299299
<< i << "ApZ \t ";
300300
}
301-
// output axial fluid inertia force
301+
// output tangential fluid inertia force
302302
if (channels.find("a") != string::npos) {
303303
for (unsigned int i = 0; i <= N; i++)
304304
*outfile << "Node" << i << "AqX \t Node" << i << "AqY \t Node"
@@ -361,12 +361,12 @@ Rod::openoutput()
361361
for (unsigned int i = 0; i <= 3 * N + 2; i++)
362362
*outfile << "(N) \t";
363363
}
364-
// output transverse inertia force
364+
// output transverse fluid inertia force
365365
if (channels.find("A") != string::npos) {
366366
for (unsigned int i = 0; i <= 3 * N + 2; i++)
367367
*outfile << "(N) \t";
368368
}
369-
// output axial fluid inertia force
369+
// output tangential fluid inertia force
370370
if (channels.find("a") != string::npos) {
371371
for (unsigned int i = 0; i <= 3 * N + 2; i++)
372372
*outfile << "(N) \t";
@@ -511,51 +511,6 @@ Rod::GetRodOutput(OutChanProps outChan)
511511
return Fnet[outChan.NodeID][1];
512512
else if (outChan.QType == FZ)
513513
return Fnet[outChan.NodeID][2];
514-
else if (outChan.QType == WZ)
515-
return W[outChan.NodeID][2];
516-
else if (outChan.QType == BoX)
517-
return Bo[outChan.NodeID][0];
518-
else if (outChan.QType == BoY)
519-
return Bo[outChan.NodeID][1];
520-
else if (outChan.QType == BoZ)
521-
return Bo[outChan.NodeID][2];
522-
else if (outChan.QType == DpX)
523-
return Dp[outChan.NodeID][0];
524-
else if (outChan.QType == DpY)
525-
return Dp[outChan.NodeID][1];
526-
else if (outChan.QType == DpZ)
527-
return Dp[outChan.NodeID][2];
528-
else if (outChan.QType == DqX)
529-
return Dq[outChan.NodeID][0];
530-
else if (outChan.QType == DqY)
531-
return Dq[outChan.NodeID][1];
532-
else if (outChan.QType == DqZ)
533-
return Dq[outChan.NodeID][2];
534-
else if (outChan.QType == ApX)
535-
return Ap[outChan.NodeID][0];
536-
else if (outChan.QType == ApY)
537-
return Ap[outChan.NodeID][1];
538-
else if (outChan.QType == ApZ)
539-
return Ap[outChan.NodeID][2];
540-
else if (outChan.QType == AqX)
541-
return Aq[outChan.NodeID][0];
542-
else if (outChan.QType == AqY)
543-
return Aq[outChan.NodeID][1];
544-
else if (outChan.QType == AqZ)
545-
return Aq[outChan.NodeID][2];
546-
else if (outChan.QType == PdX)
547-
return Pd[outChan.NodeID][0];
548-
else if (outChan.QType == PdY)
549-
return Pd[outChan.NodeID][1];
550-
else if (outChan.QType == PdZ)
551-
return Pd[outChan.NodeID][2];
552-
else if (outChan.QType == BX)
553-
return B[outChan.NodeID][0];
554-
else if (outChan.QType == BY)
555-
return B[outChan.NodeID][1];
556-
else if (outChan.QType == BZ)
557-
return B[outChan.NodeID][2];
558-
559514
}
560515
LOGWRN << "Unrecognized output channel " << outChan.QType << endl;
561516
return 0.0;
@@ -1571,37 +1526,37 @@ Rod::Output(real time)
15711526
for (unsigned int i = 0; i <= N; i++)
15721527
for (unsigned int J = 0; J < 3; J++)
15731528
*outfile << W[i][J] << "\t ";
1574-
1529+
// output buoyancy forces
15751530
if (channels.find("B") != string::npos)
15761531
for (unsigned int i = 0; i <= N; i++)
15771532
for (unsigned int J = 0; J < 3; J++)
15781533
*outfile << Bo[i][J] << "\t ";
1579-
1534+
// output tangential drag forces
15801535
if (channels.find("Y") != string::npos)
15811536
for (unsigned int i = 0; i <= N; i++)
15821537
for (unsigned int J = 0; J < 3; J++)
1583-
*outfile << Dp[i][J] << "\t ";
1584-
1538+
*outfile << Dq[i][J] << "\t ";
1539+
// output transverse drag forces
15851540
if (channels.find("X") != string::npos)
15861541
for (unsigned int i = 0; i <= N; i++)
15871542
for (unsigned int J = 0; J < 3; J++)
1588-
*outfile << Dq[i][J] << "\t ";
1589-
1543+
*outfile << Dp[i][J] << "\t ";
1544+
// output transverse fluid inertia forces
15901545
if (channels.find("A") != string::npos)
15911546
for (unsigned int i = 0; i <= N; i++)
15921547
for (unsigned int J = 0; J < 3; J++)
15931548
*outfile << Ap[i][J] << "\t ";
1594-
1549+
// output tangential fluid inertia forces
15951550
if (channels.find("a") != string::npos)
15961551
for (unsigned int i = 0; i <= N; i++)
15971552
for (unsigned int J = 0; J < 3; J++)
15981553
*outfile << Aq[i][J] << "\t ";
1599-
1554+
// output dynamic pressure forces
16001555
if (channels.find("P") != string::npos)
16011556
for (unsigned int i = 0; i <= N; i++)
16021557
for (unsigned int J = 0; J < 3; J++)
16031558
*outfile << Pd[i][J] << "\t ";
1604-
1559+
// output seabed bottom contact forces
16051560
if (channels.find("b") != string::npos)
16061561
for (unsigned int i = 0; i <= N; i++)
16071562
for (unsigned int J = 0; J < 3; J++)

0 commit comments

Comments
 (0)