Skip to content

Commit 2bc8c0b

Browse files
nasa-ddallenasa-ddalle
committed
Merge branch 'main' of pfe:/nobackupnfs1/ddalle/cape/hub/src/cape
2 parents a633512 + b8a0a75 commit 2bc8c0b

File tree

11 files changed

+23
-27
lines changed

11 files changed

+23
-27
lines changed

‎cape/cfdx/casecntl.py‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4777,6 +4777,7 @@ def check_alt_exit(self, j: Optional[int] = None) -> bool:
47774777
*runner*: :class:`CaseRunner`
47784778
Controller to run one case of solver
47794779
*j*: {``None``} | :class:`int`
4780+
Phase index
47804781
:Outputs:
47814782
*q*: :class:`bool`
47824783
``True`` if no listed files have been modified recently
@@ -6007,7 +6008,7 @@ def clean(self, test: bool = False):
60076008
*test*: ``True`` | {``False``}
60086009
Option to log all actions but not actually copy/delete
60096010
:Versions:
6010-
* 2024-09-18 ``@ddalle`: v1.0
6011+
* 2024-09-18 ``@ddalle``: v1.0
60116012
"""
60126013
# Get archivist
60136014
a = self.get_archivist()
@@ -6027,7 +6028,7 @@ def archive(self, test: bool = False):
60276028
*test*: ``True`` | {``False``}
60286029
Option to log all actions but not actually copy/delete
60296030
:Versions:
6030-
* 2024-09-18 ``@ddalle`: v1.0
6031+
* 2024-09-18 ``@ddalle``: v1.0
60316032
"""
60326033
# Get archivist
60336034
a = self.get_archivist()
@@ -6047,7 +6048,7 @@ def skeleton(self, test: bool = False):
60476048
*test*: ``True`` | {``False``}
60486049
Option to log all actions but not actually copy/delete
60496050
:Versions:
6050-
* 2024-09-18 ``@ddalle`: v1.0
6051+
* 2024-09-18 ``@ddalle``: v1.0
60516052
"""
60526053
# Get archivist
60536054
a = self.get_archivist()
@@ -6066,7 +6067,7 @@ def unarchive(self, test: bool = False):
60666067
*test*: ``True`` | {``False``}
60676068
Option to log all actions but not actually copy/delete
60686069
:Versions:
6069-
* 2024-09-20 ``@ddalle`: v1.0
6070+
* 2024-09-20 ``@ddalle``: v1.0
60706071
"""
60716072
# Get archivist
60726073
a = self.get_archivist()

‎cape/cfdx/casedata.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1129,7 +1129,6 @@ def apply_mask_iters(self, mask: np.ndarray):
11291129
"""
11301130
# Find appropriate columns
11311131
cols = self.get_cols_parent(CASE_COL_ITERS)
1132-
cols.append(CASE_COL_ITERS)
11331132
# Apply mask to each
11341133
for col in cols:
11351134
self[col] = self[col][mask]
@@ -1160,7 +1159,7 @@ def get_cols_parent(self, col: str) -> list:
11601159
# Loop through cols
11611160
for colj, vj in self.items():
11621161
# Get parent
1163-
parent = parents.get(colj, "")
1162+
parent = parents.get(colj, colj)
11641163
# Check
11651164
if (parent == col) and (len(vj) == n):
11661165
cols.append(colj)

‎cape/optdict/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1901,6 +1901,7 @@ def get_subopt(self, sec: str, opt: str, key="Type", **kw):
19011901
2
19021902
>>> opts.get_subopt("C", "c")
19031903
3
1904+
19041905
:Call:
19051906
>>> v = opts.get_subopt(sec, opt, key="Type", **kw)
19061907
:Inputs:
@@ -2112,6 +2113,7 @@ def set_opt(self, opt: str, val, j=None, mode=None):
21122113
self[opt] = val
21132114

21142115
# Apply option to subsection, if possible
2116+
@expand_doc
21152117
def set_subopt(
21162118
self,
21172119
sec: str,

‎cape/pycart/cmdgen.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ def autoInputs(opts=None, j=0, **kw):
141141
*halfBody*: ``True`` | {``False``}
142142
Create a half-body mesh that starts at ``0`` for one axis
143143
*symmX*: ``True`` | {``False``}
144-
Use *x*=0 for symmetry plane
144+
Use *x*\ =0 for symmetry plane
145145
:Outputs:
146146
*cmd*: :class:`list`\ [:class:`str`]
147147
Command split into a list of strings

‎cape/setup_py/__init__.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
# Compile and link
2121
SETUP_SETTINGS = dict(
2222
name="cape",
23-
version="2.1.2alpha",
23+
version="2.2.0",
2424
description="CAPE computational aerosciences package",
2525
long_description=LONG_DESCRIPTION,
2626
url="https://www.github.com/nasa/cape",

‎doc/api/cape/_cape.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11

2-
:mod:`_cape3`: Compiled CAPE extension
2+
:mod:`_cape`: Compiled CAPE extension
33
===============================================
44

5-
The :mod:`cape._cape3` module contains methods that were written in C to
5+
The :mod:`_cape` module contains methods that were written in C to
66
increase speed and efficiency. The most commonly utilized methods enable Cape,
77
pyCart, etc. to write surface triangulations faster. Because these are simple
88
tasks that may need to be repeated many times, creating a compiled version can
99
save considerable time. However, Python versions of these methods are also
1010
included in the main modules.
1111

12-
.. automodule:: _cape3
12+
.. automodule:: _cape
1313
:members:

‎doc/api/cfdx/casecntl.rst‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,3 @@
22
.. automodule:: cape.cfdx.casecntl
33
:members:
44

5-
.. autoclass:: cape.cfdx.casecntl.CaseRunner
6-
:members:
7-
:private-members: _archivist_cls, _dex_cls, _logprefix, _modname,
8-
_nstart_max, _progname, _rc_cls, _zombie_files
9-

‎doc/api/cfdx/cntl.rst‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,3 @@
22
.. automodule:: cape.cfdx.cntl
33
:members:
44

5-
.. autoclass:: cape.cfdx.cntl.Cntl
6-
:members:
7-
:private-members: _case_cls, _case_mod, _databook_mod, _fjson_default,
8-
_name, _opts_cls, _report_mod, _solver,
9-
_warnmode_default, _warnmode_envvar, _zombie_files

‎doc/api/pylch/databook.rst‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
2+
.. automodule:: cape.pylch.databook
3+
:members:
4+

‎doc/test/index-3-11.rst‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ Test report for ``cape`` (Python 3.11)
1010
:failures: 0
1111
:skipped: 0
1212
:tests: 369
13-
:time: 516.342
14-
:timestamp: 2025-09-23T01:58:24.518923
15-
:hostname: r207c3t6n3
13+
:time: 494.597
14+
:timestamp: 2025-09-24T01:33:05.207603
15+
:hostname: r201c1t1n3
1616
:python-fullversion: 3.11.5 (main, Oct 26 2023, 15:30:22) [GCC 8.5.0 20210514 (Red Hat 8.5.0-18)]
1717
:python-executable: /nasa/pkgsrc/toss4/2023Q3/views/python/3.11.5/bin/python3

0 commit comments

Comments
 (0)