fix a couple of minor issues

ESMCI · Jun 15, 2017 · 7ea6879 · 7ea6879
1 parent 41ea9a0
commit 7ea6879
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 16 deletions.
diff --git a/scripts/lib/CIME/case.py b/scripts/lib/CIME/case.py
@@ -425,7 +425,6 @@ def _set_compset(self, compset_name, files, user_compset=False):
         """
         science_support = []
         compset_alias = None
-        component_defining_compset = None
         components = files.get_components("COMPSETS_SPEC_FILE")
         logger.debug(" Possible components for COMPSETS_SPEC_FILE are {}".format(components))
 
@@ -445,13 +444,12 @@ def _set_compset(self, compset_name, files, user_compset=False):
                     self._compsetname = match
                     self.set_lookup_value("COMPSETS_SPEC_FILE" ,
                                    files.get_value("COMPSETS_SPEC_FILE", {"component":component}, resolved=False))
-                    component_defining_compset = component
                     logger.info("Compset longname is {}".format(match))
                     logger.info("Compset specification file is {}".format(compsets_filename))
                     if user_compset is True:
                         logger.info("Found a compset match for longname {} in alias {}".format(compset_name, compset_alias))
 
-                    return compset_alias, science_support, component_defining_compset
+                    return compset_alias, science_support
 
         if user_compset is True:
             self._compsetname = compset_name
@@ -460,7 +458,7 @@ def _set_compset(self, compset_name, files, user_compset=False):
                    "Could not find a compset match for either alias or longname in {}\n".format(compset_name)
                    + "You may need the --user-compset argument.")
 
-        return None, science_support, None
+        return None, science_support
 
     def _find_primary_component(self):
         """
@@ -754,7 +752,7 @@ def configure(self, compset_name, grid_name, machine_name=None,
         # compset, pesfile, and compset components
         #--------------------------------------------
         files = Files()
-        compset_alias, science_support, component_defining_compset = self._set_compset(
+        compset_alias, science_support = self._set_compset(
             compset_name, files, user_compset=user_compset)
 
         self._components = self.get_compset_components()
@@ -777,12 +775,10 @@ def configure(self, compset_name, grid_name, machine_name=None,
         #--------------------------------------------
         self._get_component_config_data(files)
 
-        if component_defining_compset is None:
-            # This needs to be called after self.set_comp_classes, which is called
-            # from self._get_component_config_data
-            self._primary_component = self._find_primary_component()
-        else:
-            self._primary_component = component_defining_compset
+        # This needs to be called after self.set_comp_classes, which is called
+        # from self._get_component_config_data
+        self._primary_component = self._find_primary_component()
+
         self._set_info_from_primary_component(files, pesfile=pesfile)
 
         self.get_compset_var_settings()

diff --git a/src/build_scripts/buildlib.csm_share b/src/build_scripts/buildlib.csm_share
@@ -33,14 +33,11 @@ $ENV{PIO_VERSION}  	= `./xmlquery PIO_VERSION	-value`;
 # Filepath: list of source code directories (in order of importance).
 #--------------------------------------------------------------------
 
-my $comp="mct";
-$comp = "esmf" if ($COMP_INTERFACE eq "ESMF");
-
 my $useesmf = "noesmf";
 $useesmf = "esmf" if ($USE_ESMF_LIB eq "TRUE");
 
-my $libdir = "$sharedlibroot/$comp/$useesmf/${NINST_VALUE}/csm_share";
-my $installdir = "$installroot/$comp/$useesmf/${NINST_VALUE}";
+my $libdir = "$sharedlibroot/$COMP_INTERFACE/$useesmf/${NINST_VALUE}/csm_share";
+my $installdir = "$installroot/$COMP_INTERFACE/$useesmf/${NINST_VALUE}";
 mkpath($libdir) unless -d $libdir;
 chdir($libdir) or die "Could not cd to $libdir: $!\n";