Skip to content

Commit df0324f

Browse files
authored
feat: VIV columns after the 14-column finite-EI LINE TYPES row (#152)
A line restrained in torsion takes GJ and Irn from the 14-column LINE TYPES row (GAs GJ Irt Irn), and that row could not carry MoorDyn's cross-flow VIV columns: a torsion-restrained power cable had no way to get VIV. The row now takes Cl, or Cl dF cF, after its fourteen columns (15 or 17 columns), with MoorDyn's dF = 0.08 and cF = 0.18 where only Cl is given and the checks of the 11- and 13-column rows. The VIV wiring does not depend on the row width or on the nodal twist, so nothing else changes. The Python deck reader takes the widths, reads Cl dF cF after the fourteenth column and names them cl, df, cf in the field paths; the builder writes them after the wide row instead of refusing the combination. Checks (tests/test_viv_inline_deck.f90, D6): a 17-column row free in torsion is the 13-column deck to the printed digits; a 15-column row is the 17-column one with 0.08 and 0.18; on the line rigid in torsion at both ends (nodal twist solved) the lift locks the cable in at A/D 0.66 and 0.292 Hz, the amplitude and frequency of the line free in torsion, as it must be with no torque-tension coupling. Python: read, kept and refused like the native reader (test_deck_file.py), builder round trip (test_builder.py). Full ctest under both BLAS kernels, pytest, ruff, mypy, Sphinx -W, pre-commit. Signed-off-by: Jae Hoon Seo <jaehoon.seo@inha.ac.kr>
1 parent b5feeac commit df0324f

9 files changed

Lines changed: 197 additions & 50 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,9 @@ All notable changes to CableDyn are recorded in this file. The format follows
3030
and in-line phases, on `EI = 0` lines and finite-EI cables. On the in-line example `Chh` 1.0
3131
raises the quarter-span in-line response at four times the cross-flow frequency fourfold. The
3232
Python deck reader and builder take the column.
33+
- The cross-flow VIV columns `Cl [dF cF]` may follow the 14-column finite-EI `LINE TYPES` row
34+
(15 or 17 columns), so a line restrained in torsion can carry VIV; such a row free in torsion
35+
runs as the 13-column one. The Python deck reader and builder take it.
3336
- Load power channels `VIVPow<L>`, `DragPow<L>` and `DampPow<L>` [W], and `<name><L>N<J>` per
3437
unit length about a node [W/m]: the power the VIV loads, the drag and the structural damping
3538
(`BA`, `Bb`) deliver to a line at the committed state, on `EI = 0` lines and finite-EI cables,

‎doc/cli.rst‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1016,8 +1016,8 @@ native reader's rules.
10161016
- ``LINE TYPES`` row ``NAME``; fields ``name``, ``diam``, ``mass``, ``ea``, ``ba``,
10171017
``ei`` followed by ``cdn``, ``cdt``, ``can``, ``cat`` (CableDyn columns), ``cd``,
10181018
``ca``, ``cdax``, ``caax`` (MoorDyn-style columns), or ``gas``, ``gj``, ``irt``,
1019-
``irn``, ``cdn``, ``cdt``, ``can``, ``cat`` (14-column rows); an 11- or 13-column row
1020-
adds ``cl`` or ``cl``, ``df``, ``cf`` (VIV).
1019+
``irn``, ``cdn``, ``cdt``, ``can``, ``cat`` (14-column rows); an 11- or 13-column row, or
1020+
a 15- or 17-column one, adds ``cl`` or ``cl``, ``df``, ``cf`` (VIV).
10211021
* - ``section.LINE.OCCURRENCE.FIELD``
10221022
- The ``OCCURRENCE``-th section (1-based, End A to End B) of line ``LINE``; fields
10231023
``lineid``, ``linetype``, ``length``, ``numsegs``. A 7-column ``LINES`` row counts as a

‎doc/driver_format.md‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,12 +291,13 @@ frequency `f` [Hz], `Bb = ζ EI/(π f)`, set once per line type (it does not dep
291291
rates).
292292

293293
**Cross-flow VIV columns (MoorDyn v2).** A 10-column row may end with `Cl` (11 columns) or
294-
`Cl dF cF` (13 columns): the lift coefficient of the vortex-shedding synchronisation model and
294+
`Cl dF cF` (13 columns), and a 14-column row likewise (15 or 17 columns, so a line restrained in
295+
torsion can carry VIV): the lift coefficient of the vortex-shedding synchronisation model and
295296
the half-range and centre of its band in non-dimensional frequency (MoorDyn's `dF = 0.08` and
296297
`cF = 0.18` when only `Cl` is given). `Cl = 0` is no VIV; `Cl > 0` needs `cF > 0` and
297298
`0 <= dF < cF`, and the line's drag in water. It acts in the dynamics on `EI = 0` lines and
298-
finite-EI cables (see [Cross-flow VIV](theory.rst)); the 14-column row has no VIV columns. The
299-
in-line force of a type is a [VIV](#viv-optional) section row.
299+
finite-EI cables (see [Cross-flow VIV](theory.rst)). The in-line force of a type is a
300+
[VIV](#viv-optional) section row.
300301

301302
**Viscoelastic axial stiffness (MoorDyn `ElasticMod`).** The EA and BA columns accept
302303
bar-separated parts:

‎python/cabledyn/builder.py‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -206,8 +206,9 @@ class LineType:
206206
cl, df, cf : float | None
207207
Optional cross-flow VIV columns of a type (MoorDyn's lift
208208
coefficient and the half-range and centre of the synchronisation band
209-
in non-dimensional frequency). ``cl`` set writes the 13-column row, with
210-
MoorDyn's ``df = 0.08`` and ``cf = 0.18`` where they are ``None``.
209+
in non-dimensional frequency). ``cl`` set writes them after the ten or
210+
fourteen columns (the 13- or 17-column row), with MoorDyn's
211+
``df = 0.08`` and ``cf = 0.18`` where they are ``None``.
211212
clx, il_alpha : float | None
212213
Optional in-line VIV of a type, a ``VIV`` section row
213214
``Name ClX [alpha]``: the in-line shedding coefficient (it needs ``cl``,
@@ -2717,9 +2718,6 @@ def _line_type_table(self) -> tuple[str, str, list[list[str]]]:
27172718
raise ValueError(f"{what}: give all of gas, gj, irt, irn or none")
27182719
row += [_num(v, what) for v in (item.cdn, item.cdt, item.can, item.cat)]
27192720
if item.cl is not None:
2720-
if all(value is not None for value in extra):
2721-
# a LINE TYPES row has 10, 11, 13 or 14 columns: no VIV on the wide row
2722-
raise ValueError(f"{what}: cl, df and cf do not combine with gas, gj, irt, irn")
27232721
viv = True
27242722
df = 0.08 if item.df is None else item.df
27252723
cf = 0.18 if item.cf is None else item.cf
@@ -2730,6 +2728,9 @@ def _line_type_table(self) -> tuple[str, str, list[list[str]]]:
27302728
if wide:
27312729
header = "Name Diam Mass EA BA EI GAs GJ Irt Irn Cd_n Cd_t Ca_n Ca_t"
27322730
units = "(-) (m) (kg/m) (N) (N-s) (N-m^2) (N) (N-m^2) (kg-m) (kg-m) (-) (-) (-) (-)"
2731+
if viv:
2732+
header += " Cl dF cF"
2733+
units += " (-) (-) (-)"
27332734
elif viv:
27342735
header = "Name Diam Mass EA BA EI Cd_n Cd_t Ca_n Ca_t Cl dF cF"
27352736
units = "(-) (m) (kg/m) (N) (N-s) (N-m^2) (-) (-) (-) (-) (-) (-) (-)"

‎python/cabledyn/deck_file.py‎

Lines changed: 25 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3780,7 +3780,11 @@ def effective(key: str, default: float) -> float:
37803780
raise DeckFormatError(
37813781
f"{self._label}: standalone OPTION frictionMu requires dtM and TMax"
37823782
)
3783-
allowed_widths = {"LINE TYPES": {10, 11, 13, 14}, "POINTS": {5, 9}, "LINES": {3, 4, 7}}
3783+
allowed_widths = {
3784+
"LINE TYPES": {10, 11, 13, 14, 15, 17},
3785+
"POINTS": {5, 9},
3786+
"LINES": {3, 4, 7},
3787+
}
37843788
# Every row present is checked, also in a line-free deck of bodies and rods: the
37853789
# native reader parses each table row whether or not a line uses it.
37863790
for name in sorted(allowed_widths):
@@ -3808,7 +3812,7 @@ def numeric(token: str, row: DeckRecord, field: str) -> float:
38083812
viv_type_names: set[str] = set()
38093813
for row in self.line_types:
38103814
for index in (1, 2, *range(5, len(row.tokens))):
3811-
if len(row.tokens) == 14 and index == 7:
3815+
if len(row.tokens) >= 14 and index == 7:
38123816
continue # the GJ column, GJ, GJ|K or GJ|K|Bt, is read below
38133817
if index == 5:
38143818
continue # the EI column, EI, EI|Bb or EI|-zeta|f, is read below
@@ -3861,9 +3865,9 @@ def numeric(token: str, row: DeckRecord, field: str) -> float:
38613865
f"{self._at(row)}: Syrope BA_s and BA_d must be non-negative "
38623866
"with a positive sum"
38633867
)
3864-
# Native append_type: drag and added-mass coefficients (columns 7-10, the last
3865-
# four of a 14-column row, in either column order) must be non-negative.
3866-
hydro_start = len(row.tokens) - 4 if len(row.tokens) == 14 else 6
3868+
# Native append_type: drag and added-mass coefficients (columns 7-10, or 11-14 of
3869+
# a 14-column row, in either column order) must be non-negative.
3870+
hydro_start = 10 if len(row.tokens) >= 14 else 6
38673871
hydro = [
38683872
numeric(row.tokens[index], row, f"LINE TYPES column {index + 1}")
38693873
for index in range(hydro_start, hydro_start + 4)
@@ -3910,12 +3914,14 @@ def numeric(token: str, row: DeckRecord, field: str) -> float:
39103914
f"{self._at(row)}: LINE TYPES {row.tokens[0]}: bending damping (EI|Bb) needs "
39113915
"a finite-EI cable (EI > 0)"
39123916
)
3913-
if len(row.tokens) in (11, 13):
3914-
# Native check_viv_columns: MoorDyn's cross-flow VIV columns Cl [dF cF]
3915-
cl = numeric(row.tokens[10], row, "Cl")
3917+
if len(row.tokens) in (11, 13, 15, 17):
3918+
# Native check_viv_columns: MoorDyn's cross-flow VIV columns Cl [dF cF], after
3919+
# the ten standard columns or the fourteen of a finite-EI row
3920+
at = 10 if len(row.tokens) in (11, 13) else 14
3921+
cl = numeric(row.tokens[at], row, "Cl")
39163922
d_f, c_f = (
3917-
(numeric(row.tokens[11], row, "dF"), numeric(row.tokens[12], row, "cF"))
3918-
if len(row.tokens) == 13
3923+
(numeric(row.tokens[at + 1], row, "dF"), numeric(row.tokens[at + 2], row, "cF"))
3924+
if len(row.tokens) in (13, 17)
39193925
else (0.08, 0.18)
39203926
)
39213927
if cl < 0.0:
@@ -3934,7 +3940,7 @@ def numeric(token: str, row: DeckRecord, field: str) -> float:
39343940
model = "Syrope" if is_syrope else "viscoelastic stiffness"
39353941
raise DeckFormatError(f"{self._at(row)}: {model} is not supported with EI > 0")
39363942
gj_value = 0.0
3937-
if len(row.tokens) == 14:
3943+
if len(row.tokens) >= 14:
39383944
# the GJ column is GJ, GJ|K or GJ|K|Bt (K the torque-tension coupling, N m;
39393945
# Bt the torsional damping, N m^2 s, negative: -zeta)
39403946
gj_parts = row.tokens[7].split("|")
@@ -4091,7 +4097,7 @@ def unique(records: tuple[DeckRecord, ...], label: str, numeric: bool) -> set[st
40914097

40924098
type_names = unique(self.line_types, "line type", False)
40934099
if any(
4094-
len(row.tokens) == 14 and self._stock_line_type_columns(row) for row in self.line_types
4100+
len(row.tokens) >= 14 and self._stock_line_type_columns(row) for row in self.line_types
40954101
):
40964102
raise DeckFormatError(
40974103
f"{self._label}: 14-column LINE TYPES rows require CableDyn hydro-column order"
@@ -6185,10 +6191,13 @@ def _check_torsion_lines(
61856191

61866192
def _line_type_fields(self, record: DeckRecord) -> tuple[str, ...]:
61876193
fields = _FIELDS["line_type"]
6188-
if len(record.tokens) == 14:
6189-
return (*fields[:6], "gas", "gj", "irt", "irn", "cdn", "cdt", "can", "cat")
6190-
# MoorDyn's optional cross-flow VIV columns follow the ten standard ones
6191-
viv = {11: ("cl",), 13: ("cl", "df", "cf")}.get(len(record.tokens), ())
6194+
# MoorDyn's optional cross-flow VIV columns follow the ten standard ones, or the
6195+
# fourteen of a finite-EI row
6196+
viv = {11: ("cl",), 13: ("cl", "df", "cf"), 15: ("cl",), 17: ("cl", "df", "cf")}.get(
6197+
len(record.tokens), ()
6198+
)
6199+
if len(record.tokens) >= 14:
6200+
return (*fields[:6], "gas", "gj", "irt", "irn", "cdn", "cdt", "can", "cat", *viv)
61926201
if self._stock_line_type_columns(record):
61936202
return (*fields[:6], "cd", "ca", "cdax", "caax", *viv)
61946203
return (*fields, *viv)

‎python/tests/test_builder.py‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ def test_build_single_catenary_validates_and_saves(tmp_path: Path) -> None:
185185
assert model.save(target, overwrite=True) == target
186186

187187

188-
def test_viv_columns_do_not_combine_with_the_wide_finite_ei_row(tmp_path: Path) -> None:
188+
def test_viv_columns_follow_the_wide_finite_ei_row(tmp_path: Path) -> None:
189189
model = _chain_model(tmp_path)
190190
model.add_line_type(
191191
"cable",
@@ -197,10 +197,20 @@ def test_viv_columns_do_not_combine_with_the_wide_finite_ei_row(tmp_path: Path)
197197
gj=1.0e3,
198198
irt=0.1,
199199
irn=0.05,
200-
cl=0.0,
200+
cl=0.8,
201+
cf=0.17,
201202
)
202-
with pytest.raises(ValueError, match="do not combine with gas, gj, irt, irn"):
203-
model.to_text(validate=False)
203+
text = model.to_text()
204+
deck = DeckFile.from_text(text, path=tmp_path / "deck.dat")
205+
rows = {row.tokens[0].upper(): row.tokens for row in deck.line_types}
206+
# the 14 finite-EI columns, then Cl dF cF (MoorDyn's dF = 0.08 where df is None)
207+
assert len(rows["CABLE"]) == 17
208+
assert [float(value) for value in rows["CABLE"][14:]] == [0.8, 0.08, 0.17]
209+
assert len(rows["CHAIN"]) == 10
210+
loaded = DeckModel.from_text(text, path=tmp_path / "deck.dat")
211+
cable = loaded.line_types["CABLE"]
212+
assert (cable.gj, cable.irn, cable.cl, cable.df, cable.cf) == (1.0e3, 0.05, 0.8, 0.08, 0.17)
213+
assert loaded.to_text() == text
204214

205215

206216
def test_build_spread_mooring_with_multi_section_lines() -> None:

‎python/tests/test_deck_file.py‎

Lines changed: 44 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4614,7 +4614,7 @@ def test_line_free_object_deck_checks_line_type_rows_without_crashing():
46144614
("1 2 1 -\n", ""),
46154615
("1 chain 410.0 41\n", ""),
46164616
)
4617-
with pytest.raises(DeckFormatError, match="LINE TYPES row needs 10, 11, 13, 14 fields"):
4617+
with pytest.raises(DeckFormatError, match="LINE TYPES row needs 10, 11, 13, 14, 15, 17 fields"):
46184618
DeckFile.from_text(_with_section(no_lines, "BODIES", *body_rows))
46194619
# a header-only LINES section does not make the deck a line deck (the rule counts rows)
46204620
with pytest.raises(DeckFormatError) as caught:
@@ -4791,7 +4791,7 @@ def test_line_type_viv_columns_are_read_and_kept(tmp_path, columns, expected):
47914791
(" -0.1", "Cl must be non-negative"),
47924792
(" 0.8 0.2 0.18", "needs cF > 0 and 0 <= dF < cF"),
47934793
(" 0.8 0.05 0.0", "needs cF > 0 and 0 <= dF < cF"),
4794-
(" 0.8 0.08", "LINE TYPES row needs 10, 11, 13, 14 fields"),
4794+
(" 0.8 0.08", "LINE TYPES row needs 10, 11, 13, 14, 15, 17 fields"),
47954795
],
47964796
)
47974797
def test_line_type_viv_columns_follow_the_native_checks(columns, message):
@@ -4811,6 +4811,48 @@ def test_line_type_viv_is_accepted_on_a_finite_ei_line_type(tmp_path):
48114811
assert (line_type.ei, line_type.cl) == (1.0e4, 0.8)
48124812

48134813

4814+
# the 14-column finite-EI row (GAs GJ Irt Irn) takes the same VIV columns after its last
4815+
_WIDE_VIV_ROW = (
4816+
"chain 0.252 390.0 1.674e9 -1.0 1.0e4 1.0e8 1.0e3|0|-0.01 0.1 0.05 1.37 0.64 1.0 0.0"
4817+
)
4818+
4819+
4820+
@pytest.mark.parametrize(
4821+
"columns, expected",
4822+
[
4823+
(" 0.8", (0.8, None, None)),
4824+
(" 0.8 0.05 0.2", (0.8, 0.05, 0.2)),
4825+
],
4826+
)
4827+
def test_line_type_viv_columns_follow_the_finite_ei_row(tmp_path, columns, expected):
4828+
from cabledyn import DeckModel
4829+
4830+
row = "chain 0.252 390.0 1.674e9 -1.0 1.0e4 1.37 0.64 1.0 0.0"
4831+
text = _edit(_DYNAMIC, (row, _WIDE_VIV_ROW + columns))
4832+
record = DeckFile.from_text(text).line_types[0]
4833+
assert len(record.tokens) == 14 + len(columns.split())
4834+
path = tmp_path / "viv_wide.dat"
4835+
path.write_text(text, encoding="utf-8")
4836+
line_type = DeckModel.load(path).line_types["chain"]
4837+
assert (line_type.gj, line_type.irn) == ((1.0e3, 0.0, -0.01), 0.05)
4838+
assert (line_type.cl, line_type.df, line_type.cf) == expected
4839+
assert (line_type.cdn, line_type.cdt, line_type.can, line_type.cat) == (1.37, 0.64, 1.0, 0.0)
4840+
4841+
4842+
@pytest.mark.parametrize(
4843+
"columns, message",
4844+
[
4845+
(" -0.1", "Cl must be non-negative"),
4846+
(" 0.8 0.2 0.18", "needs cF > 0 and 0 <= dF < cF"),
4847+
(" 0.8 0.08", "LINE TYPES row needs 10, 11, 13, 14, 15, 17 fields"),
4848+
],
4849+
)
4850+
def test_finite_ei_row_viv_columns_follow_the_native_checks(columns, message):
4851+
row = "chain 0.252 390.0 1.674e9 -1.0 1.0e4 1.37 0.64 1.0 0.0"
4852+
with pytest.raises(DeckFormatError, match=re.escape(message)):
4853+
DeckFile.from_text(_edit(_DYNAMIC, (row, _WIDE_VIV_ROW + columns)))
4854+
4855+
48144856
def test_viv_is_accepted_on_the_coupled_route():
48154857
text = _edit(_STATIC, (_VIV_ROW, _VIV_ROW + " 0.8"))
48164858
DeckFile.from_text(text)

‎src/CableDyn_DeckDriver.f90‎

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15833,11 +15833,11 @@ SUBROUTINE append_type(line, types, nt, stock_cols, ErrStat, ErrMsg)
1583315833
INTEGER :: ios, ntok
1583415834
ErrStat = 0; ErrMsg = ''
1583515835
ntok = count_tokens(line)
15836-
IF (ntok /= 10 .AND. ntok /= 11 .AND. ntok /= 13 .AND. ntok /= 14) THEN
15836+
IF (ntok /= 10 .AND. ntok /= 11 .AND. ntok /= 13 .AND. ntok /= 14 .AND. ntok /= 15 .AND. ntok /= 17) THEN
1583715837
CALL fail(ErrStat, ErrMsg, 'LINE TYPES row needs 10 cols '// &
15838-
'(Name Diam MassDenInAir EA BA/-zeta EI Cd_n Cd_t Ca_n Ca_t), 11 or 13 cols (the same '// &
15839-
'followed by MoorDyn''s VIV columns Cl [dF cF]) or 14 cols '// &
15840-
'(Name Diam MassDenInAir EA BA/-zeta EI GAs GJ Irt Irn Cd_n Cd_t Ca_n Ca_t)'); RETURN
15838+
'(Name Diam MassDenInAir EA BA/-zeta EI Cd_n Cd_t Ca_n Ca_t) or 14 cols '// &
15839+
'(Name Diam MassDenInAir EA BA/-zeta EI GAs GJ Irt Irn Cd_n Cd_t Ca_n Ca_t), either '// &
15840+
'followed by MoorDyn''s VIV columns Cl [dF cF] (11, 13, 15 or 17 cols)'); RETURN
1584115841
END IF
1584215842
! EA and BA read as STRINGS: MoorDyn's viscoelastic syntax carries
1584315843
! bar-separated parts (Es|Ed[|alpha], Bs|Bd) that a numeric read cannot see.
@@ -15868,18 +15868,28 @@ SUBROUTINE append_type(line, types, nt, stock_cols, ErrStat, ErrMsg)
1586815868
END IF
1586915869
ELSE
1587015870
IF (stock_cols) THEN
15871-
CALL fail(ErrStat, ErrMsg, 'the 14-column LINE TYPES row is a CableDyn form (... Cd_n Cd_t '// &
15872-
'Ca_n Ca_t); it does not combine with a stock-order header (Cd Ca CdAx CaAx)'); RETURN
15871+
CALL fail(ErrStat, ErrMsg, 'the 14-column LINE TYPES row (15 or 17 with VIV) is a CableDyn form '// &
15872+
'(... Cd_n Cd_t Ca_n Ca_t); it does not combine with a stock-order header (Cd Ca CdAx CaAx)')
15873+
RETURN
15874+
END IF
15875+
! the CableDyn finite-EI row, with MoorDyn's VIV columns Cl or Cl dF cF after it
15876+
IF (ntok == 14) THEN
15877+
READ (line, *, IOSTAT=ios) t%name, t%diam, t%mass, ea_str, ba_str, ei_str, t%gas, gj_str, t%i_rt, t%i_rn, &
15878+
t%cdn, t%cdt, t%can, t%cat
15879+
ELSE IF (ntok == 15) THEN
15880+
READ (line, *, IOSTAT=ios) t%name, t%diam, t%mass, ea_str, ba_str, ei_str, t%gas, gj_str, t%i_rt, t%i_rn, &
15881+
t%cdn, t%cdt, t%can, t%cat, t%cl
15882+
ELSE
15883+
READ (line, *, IOSTAT=ios) t%name, t%diam, t%mass, ea_str, ba_str, ei_str, t%gas, gj_str, t%i_rt, t%i_rn, &
15884+
t%cdn, t%cdt, t%can, t%cat, t%cl, t%viv_df, t%viv_cf
1587315885
END IF
15874-
READ (line, *, IOSTAT=ios) t%name, t%diam, t%mass, ea_str, ba_str, ei_str, t%gas, gj_str, t%i_rt, t%i_rn, &
15875-
t%cdn, t%cdt, t%can, t%cat
1587615886
END IF
1587715887
IF (ios /= 0) THEN
1587815888
CALL fail(ErrStat, ErrMsg, 'malformed LINE TYPES row'); RETURN
1587915889
END IF
1588015890
CALL parse_ei_column(ei_str, t, ErrStat, ErrMsg)
1588115891
IF (ErrStat /= 0) RETURN
15882-
IF (ntok == 14) THEN
15892+
IF (ntok >= 14) THEN
1588315893
CALL parse_gj_column(gj_str, t, ErrStat, ErrMsg)
1588415894
IF (ErrStat /= 0) RETURN
1588515895
END IF
@@ -15891,7 +15901,7 @@ SUBROUTINE append_type(line, types, nt, stock_cols, ErrStat, ErrMsg)
1589115901
END IF
1589215902
CALL parse_stiffness_columns(ea_str, ba_str, t, ErrStat, ErrMsg)
1589315903
IF (ErrStat /= 0) RETURN
15894-
IF (ntok == 11 .OR. ntok == 13) THEN
15904+
IF (ntok == 11 .OR. ntok == 13 .OR. ntok == 15 .OR. ntok == 17) THEN
1589515905
CALL check_viv_columns(t, ErrStat, ErrMsg)
1589615906
IF (ErrStat /= 0) RETURN
1589715907
END IF

0 commit comments

Comments
 (0)