SUBSETDATAPOINT now works w/o custom CIME.

Author: samsrabin

.gitmodules

@@ -75,8 +75,8 @@ fxDONOTUSEurl = https://github.com/ESMCI/ccs_config_cesm.git
 
 [submodule "cime"]
 path = cime
-url = git@github.com:samsrabin/cime_myfork.git
-fxtag = dfac7c17e98576a543c1507c0d9daccfaa1038ae
+url = https://github.com/ESMCI/cime
+fxtag = cime6.1.102
 fxrequired = ToplevelRequired
 # Standard Fork to compare to with "git fleximod test" to ensure personal forks aren't committed
 fxDONOTUSEurl = https://github.com/ESMCI/cime

cime

@@ -7,6 +7,7 @@
 import sys
 import logging
 from CIME.SystemTests.system_tests_common import SystemTestsCommon
+from CIME.user_mod_support import apply_user_mods
 from CIME.XML.standard_module_setup import *
 
 # In case we need to import subset_data later
@@ -67,5 +68,10 @@ def build_phase(self, sharedlib_only=False, model_only=False):
         ]
         subset_data()
 
-        self._case.apply_user_mods([usermods_dir])
+        # Apply the user mods
+        self._case.flush(flushall=True)
+        apply_user_mods(self._get_caseroot(), usermods_dir)
+        self._case.read_xml()
+
+        # Do the build
         super().build_phase(sharedlib_only, model_only)