Skip to content

Commit

Permalink
Removed spurious collate command line options
Browse files Browse the repository at this point in the history
  • Loading branch information
aidanheerdegen committed May 8, 2020
1 parent 9dd4edc commit f4ce4e7
Showing 1 changed file with 8 additions and 7 deletions.
15 changes: 8 additions & 7 deletions payu/subcommands/collate_cmd.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,13 @@
title = 'collate'
parameters = {'description': 'Collate tiled output into single output files'}

arguments = [args.model, args.config, args.initial, args.nruns,
args.laboratory, args.dir_path]
arguments = [args.model, args.config, args.initial, args.laboratory, args.dir_path]


def runcmd(model_type, config_path, init_run, n_runs, lab_path, dir_path):
def runcmd(model_type, config_path, init_run, lab_path, dir_path):

pbs_config = fsops.read_config(config_path)
pbs_vars = cli.set_env_vars(init_run, n_runs, lab_path, dir_path)
pbs_vars = cli.set_env_vars(init_run, lab_path, dir_path)

collate_config = pbs_config.get('collate', {})

Expand Down Expand Up @@ -95,13 +94,15 @@ def runscript():

run_args = parser.parse_args()

pbs_vars = cli.set_env_vars(run_args.init_run, run_args.n_runs,
run_args.lab_path, run_args.dir_path)
pbs_vars = cli.set_env_vars(run_args.init_run,
run_args.lab_path,
run_args.dir_path)

for var in pbs_vars:
os.environ[var] = str(pbs_vars[var])

lab = Laboratory(run_args.model_type, run_args.config_path,
lab = Laboratory(run_args.model_type,
run_args.config_path,
run_args.lab_path)
expt = Experiment(lab)
expt.collate()
Expand Down

0 comments on commit f4ce4e7

Please sign in to comment.