Merge pull request #1445 from jedwards4b/erp_fix_again

Erp fix again

config/cesm/machines/config_compilers.xml

@@ -283,7 +283,6 @@ using a fortran linker.
     <!-- Runtime checks with OpenMP (in fact, all OpenMP cases) are WIP.       -->
     <append DEBUG="TRUE"> -C=all -g -time -f2003 -ieee=stop </append>
     <append DEBUG="TRUE" compile_threaded="false"> -gline </append>
-    <append compile_threaded="true"> -openmp </append>
     <!-- The SLAP library (which is part of the CISM build) has many instances of
        arguments being passed to different types. So disable argument type
        checking when building CISM. This can be removed once we remove SLAP from
@@ -298,7 +297,6 @@ using a fortran linker.
     <!-- having them use FFLAGS_NOOPT in Depends.nag                           -->
     <append DEBUG="TRUE"> -g -time -f2003 -ieee=stop </append>
     <append DEBUG="TRUE" compile_threaded="false"> -gline        </append>
-    <append compile_threaded="true"> -openmp </append>
   </FFLAGS_NOOPT>
   <FIXEDFLAGS>
     <base> -fixed </base>
@@ -307,9 +305,6 @@ using a fortran linker.
     <base> -free </base>
   </FREEFLAGS>
   <HAS_F2008_CONTIGUOUS>FALSE</HAS_F2008_CONTIGUOUS>
-  <LDFLAGS>
-    <append compile_threaded="true"> -openmp </append>
-  </LDFLAGS>
   <MPICC> mpicc </MPICC>
   <MPIFC> mpif90 </MPIFC>
   <SCC> gcc </SCC>

scripts/lib/CIME/SystemTests/erp.py

@@ -31,6 +31,7 @@ def build_phase(self, sharedlib_only=False, model_only=False):
         and tasks. This test will fail for components (e.g. pop) that do not reproduce exactly
         with different numbers of mpi tasks.
         """
+        self._case.set_value("BUILD_THREADED",True)
         if sharedlib_only:
             return self.build_indv(sharedlib_only=sharedlib_only, model_only=model_only)
 
@@ -58,7 +59,6 @@ def build_phase(self, sharedlib_only=False, model_only=False):
         # affect the executable that is used
         for bld in range(1,3):
             logging.warn("Starting bld %s"%bld)
-            self._case.set_value("BUILD_THREADED",True)
 
             if (bld == 2):
                 # halve the number of tasks and threads
@@ -79,7 +79,6 @@ def build_phase(self, sharedlib_only=False, model_only=False):
                 case_setup(self._case, test_mode=True, reset=True)
 
             # Now rebuild the system, given updated information in env_build.xml
-
             self.build_indv(sharedlib_only=sharedlib_only, model_only=model_only)
             shutil.move("%s/%s.exe"%(exeroot,cime_model),
                         "%s/%s.ERP%s.exe"%(exeroot,cime_model,bld))

scripts/lib/CIME/case_setup.py

@@ -156,8 +156,6 @@ def _case_setup_impl(case, caseroot, clean=False, test_mode=False, reset=False):
             case.set_value("TOTALPES", pestot)
             thread_count = env_mach_pes.get_max_thread_count(models)
             build_threaded = case.get_build_threaded()
-            expect(not (build_threaded and compiler == "nag"),
-                   "it is not possible to run with OpenMP if using the NAG Fortran compiler")
             cost_pes = env_mach_pes.get_cost_pes(pestot, thread_count, machine=case.get_value("MACH"))
             case.set_value("COST_PES", cost_pes)