Revert "Merge branch 'azamat/mira/add-smp-present' into next (PR #1549)"

This reverts commit aabde09, reversing
changes made to 5a48e63.

Revert the second merge of this branch because still causing
build fails on next.

cime/scripts/lib/CIME/case.py

@@ -1213,8 +1213,6 @@ def set_file(self, xmlfile):
         gfile = GenericXML(infile=xmlfile)
         ftype = gfile.get_id()
 
-        self.flush(flushall=True)
-
         logger.warn("setting case file to %s"%xmlfile)
         new_env_file = None
         for env_file in self._env_entryid_files:

components/cice/cime_config/buildnml

@@ -96,7 +96,7 @@ my $cppdefs = "$cppdefs -DBLCKX=$CICE_BLCKX -DBLCKY=$CICE_BLCKY -DMXBLCKS=$CICE_
 # this will determine if need to rebuild at runtime - force user to call $CASE.buildexe
 
 chdir "$CASEROOT";
-my $sysmod  = "./xmlchange --noecho --id CICE_CPPDEFS --val=\'$cppdefs\'";
+my $sysmod  = "./xmlchange -noecho -id CICE_CPPDEFS -file env_build.xml -val=\'$cppdefs\'";
 system($sysmod) == 0 or die "ERROR cice.buildnml: $sysmod failed: $?\n";
 chdir "$CASEROOT/Buildconf/ciceconf";