Add flexpart-cosmo build modes eg. +omp

repos/c2sm/packages/flexpart-cosmo/package.py

@@ -5,9 +5,19 @@
 
 #
 from spack import *
+import spack.error as error
+
 from llnl.util.filesystem import working_dir, install_tree
 
 
+def validate_mode(mode):
+    if 'none' in mode and any(
+        [x in mode for x in ('omp', 'opt', 'ncdfout', 'debug')]):
+        raise error.SpecError(
+            'Cannot have mode none in addition to other modes (omp, opt, ncdfout, debug) in the same build'
+        )
+
+
 class FlexpartCosmo(MakefilePackage):
     """flexpart is a Lagrangian dispersion model"""
 
@@ -27,6 +37,27 @@ class FlexpartCosmo(MakefilePackage):
     conflicts('%pgi')
     conflicts('%cce')
 
+    # Make mode/Compile time options of Flexpart as defined in:
+    # https://github.com/C2SM-RCM/flexpart/blob/main/documentation/installation.md#compile-time-options
+    variant(
+        'none',
+        default=False,
+        description=
+        'Enable default flags only (do not combine with other variants); serial model.'
+    )
+    variant('omp',
+            default=False,
+            description='Specify OpenMP parallelism explicitly in mode.')
+    variant('opt',
+            default=False,
+            description='Specify code optimization explicitly in mode.')
+    variant('ncdfout',
+            default=False,
+            description='Specify netcdf output explicitly in mode.')
+    variant('debug',
+            default=False,
+            description='Specify netcdf output explicitly in mode.')
+
     build_directory = 'src'
 
     makefile_file = "Makefile.spack"
@@ -41,9 +72,19 @@ def setup_build_environment(self, env):
 
     def build(self, spec, prefix):
 
+        mode = ''
+
+        for x in ['none', 'omp', 'opt', 'ncdfout', 'debug']:
+            if f'+{x}' in self.spec:
+                mode += x
+
         with working_dir(self.build_directory):
             make.jobs = 1
-            make('-f', self.makefile_file)
+            if mode:
+                validate_mode(mode)
+                make('-f', self.makefile_file, f"mode={mode}")
+            else:
+                make('-f', self.makefile_file)
 
     def install(self, spec, prefix):
         mkdir(prefix.bin)

test/system_test.py

@@ -99,6 +99,11 @@ def test_install_flexpart_cosmo():
     spack_install('flexpart-cosmo @V8C4.0')
 
 
+@pytest.mark.flexpart_cosmo
+def test_install_flexpart_cosmo_omp():
+    spack_install('flexpart-cosmo @V8C4.0 +omp')
+
+
 @pytest.mark.fdb
 def test_install_fdb_5_11_17_gcc():
     spack_install('fdb @5.11.17 %gcc')