Skip to content

Commit

Permalink
create_test: Remove very strange hack when nlcompareonly is on
Browse files Browse the repository at this point in the history
For some reason, when the nlcompareonly flag was passed to create_test,
the tools forced the machine to be yellowstone. Since we want to use
this flag to quickly bless namelist changes, this commit removes
that 'feature'.

[BFB]

SEG-92
  • Loading branch information
jgfouca committed Mar 19, 2015
1 parent 170361c commit 2defc26
Showing 1 changed file with 3 additions and 16 deletions.
19 changes: 3 additions & 16 deletions scripts/create_test
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

0 comments on commit 2defc26

Please sign in to comment.