Skip to content

Commit a809da7

Browse files
SteveDoyle2SteveDoyle2
committed
merging
disabling warnings
1 parent f07cd08 commit a809da7

File tree

17 files changed

+58
-35
lines changed

17 files changed

+58
-35
lines changed

‎.github/workflows/main.yml‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,12 @@ jobs:
6060
runs-on: ubuntu-latest
6161
strategy:
6262
matrix:
63-
# '3.9', '3.11-dev'
63+
# '3.14', '3.15-dev'
6464
python-version: ['3.11', '3.12', '3.13', '3.14']
6565
os: [ubuntu-latest]
6666
# , macos-latest, windows-latest
67-
mode: ['latest', 'latest_basic', 'old', 'latest_pyqt5_gui', 'latest_pyqt6_gui', 'latest_pyside2_gui', ]
68-
# 'old_basic', 'old_pyside2_gui', 'old_pyqt5_gui', 'latest_pyside6_gui'
67+
mode: ['latest', 'latest_basic', 'old', 'latest_pyqt5_gui','latest_pyside2_gui', ]
68+
# 'old_basic', 'old_pyside2_gui', 'old_pyqt5_gui', 'latest_pyqt6_gui', 'latest_pyside6_gui'
6969
experimental: [false]
7070
#include:
7171
# - python: '3.11-dev'
@@ -75,33 +75,25 @@ jobs:
7575
# os: ubuntu-18.04
7676
# experimental: true
7777
exclude:
78-
# Exclude all DB images except "mariadb_10.4" for all PHP versions except "7.3".
79-
#- {python-version: '3.9', mode: 'latest_pyside6_gui'} # 'pip install imageio pillow' fails
80-
#- {python-version: '3.9', mode: 'latest_pyqt5_gui'} # 'pip install imageio pillow' fails
81-
#- {python-version: '3.9', mode: 'latest_pyqt6_gui'} # 'pip install imageio pillow' fails
82-
83-
#- {python-version: '3.10', mode: 'old'} # redundant
84-
#- {python-version: '3.10', mode: 'latest_pyqt5_gui'} # 'pip install imageio pillow' fails
85-
#- {python-version: '3.10', mode: 'latest_pyqt6_gui'} # 'pip install imageio pillow' fails
8678
#- {python-version: '3.11', mode: 'latest_pyside2_gui'}
8779
#- {python-version: '3.11', mode: 'latest_pyside6_gui'}
8880

8981
- {python-version: '3.11', mode: 'old'} # redundant
9082
#- {python-version: '3.11', mode: 'latest_pyqt5_gui'}
9183
- {python-version: '3.11', mode: 'latest_pyqt6_gui'}
9284
#- {python-version: '3.11', mode: 'latest_pyside2_gui'}
93-
- {python-version: '3.11', mode: 'latest_pyside6_gui'} # DLL error
85+
#- {python-version: '3.11', mode: 'latest_pyside6_gui'} # DLL error
9486

9587
- {python-version: '3.12', mode: 'old'} # redundant
9688
- {python-version: '3.12', mode: 'latest_pyqt5_gui'}
9789
- {python-version: '3.12', mode: 'latest_pyqt6_gui'}
9890
- {python-version: '3.12', mode: 'latest_pyside2_gui'}
99-
- {python-version: '3.12', mode: 'latest_pyside6_gui'}
91+
- {python-version: '3.11', mode: 'latest_pyside6_gui'}
10092

10193
- {python-version: '3.13', mode: 'old'} # redundant
10294
- {python-version: '3.13', mode: 'latest_pyqt5_gui'}
10395
- {python-version: '3.13', mode: 'latest_pyqt6_gui'}
104-
#- {python-version: '3.13', mode: 'latest_pyside2_gui'}
96+
- {python-version: '3.13', mode: 'latest_pyside2_gui'}
10597

10698
- {python-version: '3.14', mode: 'old'} # redundant
10799
- {python-version: '3.14', mode: 'latest_pyqt5_gui'}
@@ -192,7 +184,7 @@ jobs:
192184
pip install 'pandas>=1.0' matplotlib
193185
194186
- name: Install latest packages (h5py)
195-
if: ${{ matrix.python-version != '3.14-dev' && (matrix.mode == 'latest' ||
187+
if: ${{ matrix.python-version != '3.14' && (matrix.mode == 'latest' ||
196188
matrix.mode == 'latest_pyside2_gui' || matrix.mode == 'latest_pyside6_gui' ||
197189
matrix.mode == 'latest_pyqt5_gui' || matrix.mode == 'latest_pyqt6_gui') }}
198190
run: |

‎pyNastran/op2/result_objects/design_response.py‎

Lines changed: 36 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -576,6 +576,8 @@ def get_responses_by_group(self):
576576
msg += _write_dscmcol_flutter(self.responses, ids, response_name_to_f06_response_type)
577577
elif group_name == 'psd':
578578
msg += self._write_psd(ids, response_name_to_f06_response_type)
579+
elif group_name == 'equivalent radiated power':
580+
msg += self._write_eq_radiated_power(ids, response_name_to_f06_response_type)
579581
elif group_name == '2':
580582
msg += self._write_dresp2(ids)
581583
else:
@@ -667,8 +669,6 @@ def _write_psd(self, ids, response_name_to_f06_response_type):
667669

668670
msg += (
669671
' ----- PSD RESPONSES -----\n'
670-
)
671-
msg += (
672672
' ------------------------------------------------------------------------------------------------------------------------\n'
673673
' COLUMN DRESP1 RESPONSE GRID/ELM RANDPS COMPONENT SUB PLY \n'
674674
' NO. ENTRY ID TYPE ID ID NO. CASE NO. \n'
@@ -690,6 +690,40 @@ def _write_psd(self, ids, response_name_to_f06_response_type):
690690
raise RuntimeError(respi)
691691
return msg
692692

693+
def _write_eq_radiated_power(self, ids, response_name_to_f06_response_type):
694+
"""
695+
{'name': 'equivalent radiated power',
696+
'panel': 555,
697+
'flag': -102,
698+
'subcase': 2,
699+
'freq': 16.0,
700+
'seid': 0,
701+
'internal_response_id': 5,
702+
'external_response_id': 889,
703+
'response_type': 19,
704+
'iresponse': 4,
705+
'response_number': 1}
706+
TODO: not verified
707+
"""
708+
msg = ''
709+
710+
msg += (
711+
' ----- EQIVALENT RADIATED POWER RESPONSES -----\n'
712+
' ------------------------------------------------------------------------------------------------------------------------\n'
713+
' COLUMN DRESP1 RESPONSE GRID/ELM RANDPS SUB FREQ \n'
714+
' NO. ENTRY ID TYPE ID ID CASE \n'
715+
' ------------------------------------------------------------------------------------------------------------------------\n'
716+
)
717+
for i in ids:
718+
respi = self.responses[i]
719+
external_id = respi['external_response_id']
720+
name = respi['name']
721+
subcase = respi['subcase']
722+
freq = respi['freq']
723+
response_type = response_name_to_f06_response_type[name]
724+
msg += f' {i+1:8d} {external_id:8d} {response_type:8s} {subcase:8d} {freq}\n'
725+
return
726+
693727
def _write_dresp2(self, ids):
694728
msg = (
695729
' ----- IDENTIFICATION OF COLUMNS IN THE DESIGN SENSITIVITY -----\n'

‎pyNastran/op2/result_objects/table_object.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1127,7 +1127,7 @@ def write_op2(self, op2_file, fascii, itable: int, new_result,
11271127
if self.size == fdtype.itemsize:
11281128
pass
11291129
else:
1130-
warnings.warn(f'downcasting {self.class_name}...this is buggy')
1130+
# warnings.warn(f'downcasting {self.class_name}...this is buggy')
11311131
#idtype = np.int32(1)
11321132
fdtype = np.float32(1.0)
11331133

‎pyNastran/op2/tables/contact/bolt_objects.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ def write_op2(self, op2_file, fascii, itable: int, new_result,
9393
if self.size == fdtype.itemsize:
9494
pass
9595
else:
96-
warnings.warn(f'downcasting {self.class_name}...this is buggy')
96+
# warnings.warn(f'downcasting {self.class_name}...this is buggy')
9797
#idtype = np.int32(1)
9898
fdtype = np.float32(1.0)
9999

‎pyNastran/op2/tables/contact/slide_objects.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,7 @@ def write_op2(self, op2_file, fascii, itable: int, new_result,
9898
if self.size == fdtype.itemsize:
9999
pass
100100
else:
101-
warnings.warn(f'downcasting {self.class_name}...this is buggy')
101+
# warnings.warn(f'downcasting {self.class_name}...this is buggy')
102102
#idtype = np.int32(1)
103103
fdtype = np.float32(1.0)
104104

‎pyNastran/op2/tables/oes_stressStrain/real/oes_bush.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -318,7 +318,7 @@ def write_op2(self, op2_file, op2_ascii, itable, new_result, date,
318318
if self.size == fdtype.itemsize:
319319
pass
320320
else:
321-
print(f'downcasting {self.class_name}...')
321+
# print(f'downcasting {self.class_name}...')
322322
#cen_word_bytes = b'CEN/ '
323323
idtype = np.int32(1)
324324
fdtype = np.float32(1.0)

‎pyNastran/op2/tables/oes_stressStrain/real/oes_bush1d.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ def write_op2(self, op2_file, op2_ascii, itable, new_result, date,
304304
if self.size == fdtype.itemsize:
305305
pass
306306
else:
307-
print(f'downcasting {self.class_name}...')
307+
# print(f'downcasting {self.class_name}...')
308308
#cen_word_bytes = b'CEN/ '
309309
idtype = np.int32(1)
310310
fdtype = np.float32(1.0)
@@ -353,4 +353,3 @@ def write_op2(self, op2_file, op2_ascii, itable, new_result, date,
353353
op2_ascii.write('footer = %s\n' % header)
354354
new_result = False
355355
return itable
356-

‎pyNastran/op2/tables/oes_stressStrain/real/oes_composite_plates.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ def write_op2(self, op2_file, op2_ascii, itable, new_result,
640640
if self.size == fdtype.itemsize:
641641
pass
642642
else:
643-
print(f'downcasting {self.class_name}...')
643+
# print(f'downcasting {self.class_name}...')
644644
#idtype = np.int32(1)
645645
fdtype = np.float32(1.0)
646646

‎pyNastran/op2/tables/oes_stressStrain/real/oes_fast.py‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -267,7 +267,7 @@ def write_op2(self, op2_file, op2_ascii, itable, new_result, date,
267267
if self.size == fdtype.itemsize:
268268
pass
269269
else:
270-
print(f'downcasting {self.class_name}...')
270+
# print(f'downcasting {self.class_name}...')
271271
#idtype = np.int32(1)
272272
fdtype = np.float32(1.0)
273273

@@ -342,4 +342,3 @@ def get_f06_header(self) -> list[str]:
342342
#' 100 -1.554312E-14 1.059252E+00 -7.944389E-01 -4.062902E-08 9.630819E+01 1.284109E+02\n'
343343
]
344344
return msg
345-

‎pyNastran/op2/tables/oes_stressStrain/real/oes_plates.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -818,7 +818,7 @@ def write_op2(self, op2_file, op2_ascii, itable, new_result,
818818
if self.size == fdtype.itemsize:
819819
pass
820820
else:
821-
print(f'downcasting {self.class_name}...')
821+
# print(f'downcasting {self.class_name}...')
822822
#cen_word_bytes = b'CEN/ '
823823
idtype = np.int32(1)
824824
fdtype = np.float32(1.0)

0 commit comments

Comments
 (0)