Merge branch 'add_gp' into development

tests/python_for_tests/machines.py

@@ -7,7 +7,8 @@
 supported_machines = ['local',
                       'cheyenne',
                       'hobart',
-                      'edison']
+                      'edison',
+                      'greenplanet']
 
 # -----------------------------------------------
 
@@ -45,6 +46,14 @@ def load_module(mach, compiler, module_name):
     module(['load', 'craype/2.5.12'])
     module(['load', module_name])
 
+  if mach == 'greenplanet':
+    sys.path.insert(0, os.path.join(os.sep, 'usr', 'share', 'lmod', 'lmod', 'init'))
+    from env_modules_python import module
+    module('purge')
+    module('load', module_name)
+    module('load', 'netcdf/4.7.0')
+    module('load', 'openmpi/3.1.6')
+
 # -----------------------------------------------
 
 # Set up supported compilers based on what machine you are running on
@@ -86,6 +95,11 @@ def machine_specific(mach, supported_compilers, module_names):
     module_names['cray'] = 'PrgEnv-cray'
     return
 
+  if mach == 'greenplanet':
+    # UCI machine
+    supported_compilers.append('intel')
+    module_names['intel'] = 'intel/2018.3'
+
   if mach == 'local':
     # Not a specific machine, but a flag to specify
     # "look for all compilers in path, use what is available"

tests/python_for_tests/marbl_testing_class.py

@@ -92,6 +92,8 @@ def parse_args(self, desc, HaveCompiler=True, HaveInputFile=True,
         self._machine = 'hobart'
       elif 'edison' in self._hostname:
         self._machine = 'edison'
+      elif self._hostname.startswith('gplogin'):
+        self._machine = 'greenplanet'
       else:
         found = False
         logger.info('No machine specified and %s is not recognized' % self._hostname)