Skip to content

Commit

Permalink
Merge pull request #2548 from jedwards4b/configure_clean_location
Browse files Browse the repository at this point in the history
clean should not look for mpilibs
configure --clean shouldn't need to figure out what mpi library it needs.

Test suite: by hand configure --clean on cheyenne
Test baseline:
Test namelist changes:
Test status: [bit for bit, roundoff, climate changing]

Fixes #2542

User interface changes?:

Update gh-pages html (Y/N)?:

Code review:mnlevy1981
  • Loading branch information
jedwards4b authored May 7, 2018
2 parents 1626fe0 + 2fe2a8a commit e51d808
Showing 1 changed file with 13 additions and 11 deletions.
24 changes: 13 additions & 11 deletions tools/configure
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,19 @@ def parse_command_line(args):
% compiler)
opts['compiler'] = compiler
opts['os'] = machobj.get_value('OS')

if args.clean:
files = ["Macros.make", "Macros.cmake", "env_mach_specific.xml", ".env_mach_specific.sh",
".env_mach_specific.csh", "Depends.%s"%compiler, "Depends.%s"%args.machine,
"Depends.%s.%s"%(args.machine,compiler)]
for file_ in files:
if os.path.isfile(file_):
logger.warn("Removing file %s"%file_)
os.remove(file_)
if argcnt == 2:
opts['clean_only'] = True
return opts

# Set MPI library.
if args.mpilib is not None:
mpilib = args.mpilib
Expand All @@ -134,17 +147,6 @@ def parse_command_line(args):
opts['debug'] = debug


if args.clean:
files = ["Macros.make", "Macros.cmake", "env_mach_specific.xml", ".env_mach_specific.sh",
".env_mach_specific.csh", "Depends.%s"%compiler, "Depends.%s"%args.machine,
"Depends.%s.%s"%(args.machine,compiler)]
for file_ in files:
if os.path.isfile(file_):
logger.warn("Removing file %s"%file_)
os.remove(file_)
if argcnt == 2:
opts['clean_only'] = True

return opts

def _main():
Expand Down

0 comments on commit e51d808

Please sign in to comment.