Merge pull request #1556 from ESMCI/mvertens/fix_usermods

fixed bug in usermods
Hot fix for duplicate user_mods call in PR #1551

Test suite: None
Test baseline: None
Test namelist changes: manual verification that user_mods is not called twice
Test status: bit for bit
Fixes
User interface changes?:
Code review: jedwards

scripts/lib/CIME/case.py

@@ -1067,9 +1067,9 @@ def apply_user_mods(self, user_mods_dir=None):
         """
         all_user_mods = []
         for comp in self._component_classes:
-            if comp == self._primary_component:
-                continue
             component = str(self.get_value("COMP_%s"%comp))
+            if component == self._primary_component:
+                continue
             comp_user_mods = self.get_value("%s_USER_MODS"%component.upper())
             if comp_user_mods is not None:
                 all_user_mods.append(comp_user_mods)