Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update petsc solver #3

Open
wants to merge 3 commits into
base: main
Choose a base branch
from
Open

Update petsc solver #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f128a08
use preonly petsc solvers
rileyhales Mar 15, 2024
332a5eb
increment version number
rileyhales Mar 15, 2024
f8b83f6
drop python 2 classifiers
rileyhales Mar 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 6 additions & 8 deletions RAPIDpy/rapid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -774,18 +774,16 @@ def rapid_cleanup(*args):
log("Running RAPID ...",
"INFO")
if os.name == "nt":
local_rapid_executable_location = \
self._get_cygwin_path(local_rapid_executable_location)
local_rapid_executable_location = self._get_cygwin_path(local_rapid_executable_location)

# htcondor will not allow mpiexec for single processor jobs
# this was added for that purpose
run_rapid_command = [local_rapid_executable_location,
"-ksp_type", self._ksp_type]
run_rapid_command = [local_rapid_executable_location, "-ksp_type", 'preonly']

if self._num_processors > 1:
run_rapid_command = [self._mpiexec_command,
"-n", str(self._num_processors)] \
+ run_rapid_command
# if self._num_processors > 1:
# run_rapid_command = [self._mpiexec_command,
# "-n", str(self._num_processors)] \
# + run_rapid_command

process = Popen(run_rapid_command,
stdout=PIPE, stderr=PIPE, shell=False)
Expand Down
4 changes: 1 addition & 3 deletions setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

setup(
name='RAPIDpy',
version='2.7.0',
version='2.8.0',
description='Python interface for RAPID (rapid-hub.org)',
long_description='RAPIDpy is a python interface for RAPID that assists '
'to prepare inputs, runs the RAPID program, and provides '
Expand All @@ -25,8 +25,6 @@
'Intended Audience :: Science/Research',
'Operating System :: OS Independent',
'Programming Language :: Python',
'Programming Language :: Python :: 2',
'Programming Language :: Python :: 2.7',
'Programming Language :: Python :: 3',
'Programming Language :: Python :: 3.5',
'Programming Language :: Python :: 3.6',
Expand Down