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

bug fixes for #1638 #1639

Merged
merged 1 commit into from
Jun 4, 2017
Merged

bug fixes for #1638 #1639

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
2 changes: 1 addition & 1 deletion scripts/Tools/normalize_cases
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ def normalize_cases(case1, case2):
from_dir=case1)

for case1_lid, case2_lid in zip(case1_lids, case2_lids):
files_needing_rename = run_cmd_no_fail('find -depth -name "*.{}"'.format(case1_lid, from_dir=case1).splitlines())
files_needing_rename = run_cmd_no_fail('find -depth -name "*.{}"'.format(case1_lid), from_dir=case1).splitlines()
for file_needing_rename in files_needing_rename:
expect(file_needing_rename.endswith(case1_lid), "broken")
new_name = file_needing_rename.rstrip(case1_lid) + case2_lid
Expand Down
4 changes: 2 additions & 2 deletions scripts/lib/CIME/SystemTests/erp.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,8 @@ def run_phase(self):
"ERROR: LockedFiles/env_mach_pes.ERP{:d}.xml does not exist, run case.build".format(run ))

# Use the second env_mach_pes.xml and env_build.xml files
restore("env_mach_pes.ERP{:d}.xml".format(run, newname="env_mach_pes.xml"))
restore("env_build.ERP{:d}.xml".format(run, newname="env_build.xml"))
restore("env_mach_pes.ERP{:d}.xml".format(run), newname="env_mach_pes.xml")
restore("env_build.ERP{:d}.xml".format(run), newname="env_build.xml")

# update the case to use the new values
self._case.read_xml()
Expand Down
4 changes: 2 additions & 2 deletions scripts/lib/CIME/SystemTests/homme.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def build_phase(self, sharedlib_only=False, model_only=False):
cmake_cmd = "cmake -C {}/components/homme/cmake/machineFiles/{}.cmake -DUSE_NUM_PROCS={} {}/components/homme -DHOMME_BASELINE_DIR={}/{}".format(srcroot, mach, procs, srcroot, baseline, basename)

run_cmd_no_fail(cmake_cmd, arg_stdout="homme.bldlog", combine_output=True, from_dir=exeroot)
run_cmd_no_fail("{} -j8".format(gmake, arg_stdout="homme.bldlog", combine_output=True), from_dir=exeroot)
run_cmd_no_fail("{} -j8".format(gmake), arg_stdout="homme.bldlog", combine_output=True, from_dir=exeroot)

post_build(self._case, [os.path.join(exeroot, "homme.bldlog")])

Expand All @@ -56,7 +56,7 @@ def run_phase(self):

if generate:
full_baseline_dir = os.path.join(baseline, basegen, "tests", "baseline")
stat = run_cmd("{} -j 4 baseline".format(gmake, arg_stdout=log, combine_output=True), from_dir=exeroot)[0]
stat = run_cmd("{} -j 4 baseline".format(gmake), arg_stdout=log, combine_output=True, from_dir=exeroot)[0]
if stat == 0:
if os.path.isdir(full_baseline_dir):
shutil.rmtree(full_baseline_dir)
Expand Down
2 changes: 1 addition & 1 deletion scripts/lib/CIME/SystemTests/ncr.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ def run_phase(self):
os.remove("{}/{}.exe".format(exeroot, cime_model))
shutil.copy("{}/{}.exe.NCR2".format(exeroot, cime_model),
"{}/{}.exe".format(exeroot, cime_model))
restore("env_build.NCR2.xml", "env_build.xml")
restore("env_build.NCR2.xml", newname="env_build.xml")

logger.info("default: doing a {} {} with NINST2".format(stop_n, stop_option))
self.run_indv(suffix="multiinst")
Expand Down