cleanup

CIME/SystemTests/err.py

@@ -28,7 +28,7 @@ def __init__(self, case, **kwargs):  # pylint: disable=super-init-not-called
     def _case_one_setup(self):
         super(ERR, self)._case_one_setup()
         self._case.set_value("DOUT_S", True)
-        
+
     def _case_two_setup(self):
         super(ERR, self)._case_two_setup()
         self._case.set_value("DOUT_S", False)

CIME/SystemTests/ers.py

@@ -14,7 +14,7 @@ def __init__(self, case, **kwargs):
         initialize an object interface to the ERS system test
         """
         SystemTestsCommon.__init__(self, case, **kwargs)
-        
+
     def _ers_first_phase(self):
         self._rest_n = self._set_restart_interval()
         self.run_indv()

CIME/XML/env_test.py

@@ -4,7 +4,7 @@
 from CIME.XML.standard_module_setup import *
 
 from CIME.XML.env_base import EnvBase
-from CIME.utils import convert_to_type, expect
+from CIME.utils import convert_to_type
 
 logger = logging.getLogger(__name__)
 

CIME/case/case.py

@@ -169,7 +169,6 @@ def __init__(self, case_root=None, read_only=True, record=False, non_local=False
         # Command Line user_mods are handled seperately
 
         # Derived attributes
-        self.mem_per_node = None
         self.thread_count = None
         self.total_tasks = None
         self.tasks_per_node = None
@@ -266,11 +265,10 @@ def initialize_derived_attributes(self):
             self.tasks_per_node = env_mach_pes.get_tasks_per_node(
                 self.total_tasks, self.thread_count
             )
-            self.mem_per_node = 230 / max_mpitasks_per_node * self.tasks_per_node
-
             self.num_nodes, self.spare_nodes = env_mach_pes.get_total_nodes(
                 self.total_tasks, self.thread_count
             )
+
             self.num_nodes += self.spare_nodes
 
         logger.debug(