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

create_test: Remove very strange hack when nlcompareonly is on #147

Merged
merged 1 commit into from
Mar 19, 2015
Merged

create_test: Remove very strange hack when nlcompareonly is on #147

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
19 changes: 3 additions & 16 deletions scripts/create_test
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,22 +592,9 @@ sub checkOptions
# Read options from config_machines.xml
my $machine = (defined $opts{mach}) ? $opts{mach} : $opts{xml_mach};

# If we're running namelist comparison tests, we want to set the machine to Yellowstone,
# otherwise use the supplied machine value.
if( defined $opts{'nlcompareonly'})
{
# The following call is wrong, but the right call (just below) causes problems -- see bug 2024
#$cfg_ref->set_machine("$opts{mach_dir}/config_machines.xml", "yellowstone", 0);
###############################################################################################
$cfg_ref->set_machine("$opts{mach_dir}/config_machines.xml", "yellowstone");
}
else
{
# The following call is wrong, but the right call (just below) causes problems -- see bug 2024
#$cfg_ref->set_machine("$opts{mach_dir}/config_machines.xml", $machine, 0);
###############################################################################################
$cfg_ref->set_machine("$opts{mach_dir}/config_machines.xml", $machine);
}
# The following call is wrong, but the right call (just below) causes problems -- see bug 2024
# $cfg_ref->set_machine("$opts{mach_dir}/config_machines.xml", $machine, 0);
$cfg_ref->set_machine("$opts{mach_dir}/config_machines.xml", $machine);

if(!defined $opts{'baselineroot'}) {
$opts{'baselineroot'} = SetupTools::expand_env_var($cfg_ref->get('CCSM_BASELINE'), $cfg_ref);
Expand Down