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

UFS-dev PR#184 #482

Merged
merged 16 commits into from
Jun 4, 2024
Merged

UFS-dev PR#184 #482

Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
0cd476c
changes to work with ufs-dev PR#184
grantfirl May 23, 2024
37f6272
add initial working dummy MPI statements to SCM code
grantfirl May 28, 2024
100f921
Changes fro Grants branch
dustinswales May 29, 2024
de62a3d
Move openmpi build up in CI workflow
dustinswales May 29, 2024
9ffcea0
CI changes
dustinswales May 29, 2024
ed1e4d8
CI changes
dustinswales May 29, 2024
dcb2e5f
CI changes
dustinswales May 29, 2024
e54a78a
CI changes
dustinswales May 29, 2024
7b8ca91
Merge pull request #7 from dustinswales/ufs-dev-PR184-djs
grantfirl May 30, 2024
0958467
remove ifdefs from SCM code since MPI is required now; add MPI_FINALI…
grantfirl May 30, 2024
356e4ee
fix compilation error for MPI_INIT/FINALIZE error messages
grantfirl May 30, 2024
81296f2
add mpi_command command line argument
grantfirl May 30, 2024
f168abc
Merge branch 'main' into ufs-dev-PR184
grantfirl May 30, 2024
7a695dd
swap launch_exe arugment order
grantfirl May 30, 2024
4e1ad07
change len to shape for numpy array checking
grantfirl May 31, 2024
5dee89c
update ccpp/physics submodule pointer
grantfirl Jun 4, 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
Prev Previous commit
Next Next commit
swap launch_exe arugment order
  • Loading branch information
@grantfirl
grantfirl committed May 30, 2024
commit 7a695dd74a8c2f7cb55df7875b00b60c3d28a35c
4 changes: 2 additions & 2 deletions scm/src/run_scm.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -720,7 +720,7 @@ def setup_rundir(self):

return os.path.join(SCM_RUN, output_dir)

def launch_executable(use_gdb, gdb, ignore_error = False, mpi_command):
def launch_executable(use_gdb, gdb, mpi_command, ignore_error = False):
"""Configure model run command and pass control to shell/gdb"""
if use_gdb:
if not mpi_command:
Expand Down Expand Up @@ -882,7 +882,7 @@ def main():
l_ignore_error = MULTIRUN_IGNORE_ERROR
else:
l_ignore_error = False
(status, time_elapsed) = launch_executable(use_gdb, gdb, ignore_error = l_ignore_error, mpi_command)
(status, time_elapsed) = launch_executable(use_gdb, gdb, mpi_command, ignore_error = l_ignore_error)
#
if status == 0:
logging.info('Process "(case={0}, suite={1}, namelist={2}" completed successfully'. \
Expand Down
Loading