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

Three patches for time series generation #218

Merged
merged 1 commit into from
Dec 8, 2023
+3 −3
Merged

Three patches for time series generation #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions timeseries/template.timeseries
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def _main_func(description):
env_mach_specific = case.get_env('mach_specific')
env_workflow = case.get_env("workflow")
overrides = {}
overrides["total_tasks"], overrides["num_nodes"], overrides["tasks_per_node"], overrides["thread_count"] = env_workflow.get_job_specs(job)
overrides["total_tasks"], overrides["num_nodes"], overrides["tasks_per_node"], overrides["thread_count"] = env_workflow.get_job_specs(case, job)

# Things that will have to be matched against mpirun element attributes
mpi_attribs = {
Expand All @@ -37,7 +37,7 @@ def _main_func(description):
"queue" : case.get_value("JOB_QUEUE", subgroup=job),
"unit_testing" : False
}
executable, mpi_arg_list = env_mach_specific.get_mpirun(case, mpi_attribs, job, overrides=overrides)
executable, mpi_arg_list, _, _ = env_mach_specific.get_mpirun(case, mpi_attribs, job, overrides=overrides)
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't really understand why this change was necessary. Maybe something weird from python 2.7?

cmd = executable+" "+" ".join(mpi_arg_list) + " " + run_exe
os.environ["ARGS_FOR_SCRIPT"] = " --caseroot={}".format(os.path.join(caseroot,"postprocess"))
stat = run_cmd(cmd,
Expand Down
2 changes: 1 addition & 1 deletion timeseries/timeseries/cesm_tseries_generator.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ def commandline_options():
err_msg = 'cesm_tseries_generator.py ERROR: invalid option --caseroot {0}'.format(options.caseroot[0])
raise OSError(err_msg)

return options.caseroot[0], options.debug[0], options.standalone, options.backtrace
return options.caseroot[0], options.debug, options.standalone, options.backtrace

#==============================================================================================
# readArchiveXML - read the $CASEROOT/env_timeseries.xml file and build the pyReshaper classes
Expand Down