Update ECP Data & Vis SDK packages (#13027)

* ecp-io-sdk: Add faodel and sort variants

* ecp-viz-sdk: Re-enable catalyst, sort variants, turn on by default

* ecp-io-sdk and ecp-viz-sdk: Fix dependency variants

2 files changed, 22 insertions, 23 deletions

diff --git a/var/spack/repos/builtin/packages/ecp-io-sdk/package.py b/var/spack/repos/builtin/packages/ecp-io-sdk/package.py
index dd0f09eff9..774704ff0f 100644
--- a/var/spack/repos/builtin/packages/ecp-io-sdk/package.py
+++ b/var/spack/repos/builtin/packages/ecp-io-sdk/package.py
@@ -16,26 +16,27 @@ class EcpIoSdk(CMakePackage):
 
     version('1.0', branch='master')
 
-    variant('hdf5', default=True, description="Enable HDF5")
     variant('adios2', default=True, description="Enable ADIOS2")
-    variant('pnetcdf', default=True, description="Enable PNetCDF")
     variant('darshan', default=True, description="Enable Darshan")
+    variant('faodel', default=False, description="Enable FAODEL")
+    variant('hdf5', default=True, description="Enable HDF5")
     variant('mercury', default=True, description="Enable Mercury")
+    variant('pnetcdf', default=True, description="Enable PNetCDF")
     variant('unifyfs', default=True, description="Enable UnifyFS")
     variant('veloc', default=True, description="Enable VeloC")
 
     # Currently no spack packages
     # variant('romio', default=False, description="Enable ROMIO")
-    # variant('faodel', default=False, description="Enable FAODEL")
 
-    depends_on('hdf5', when='+hdf5')
-    depends_on('adios2', when='+adios2')
-    depends_on('parallel-netcdf', when='+pnetcdf')
-    depends_on('veloc', when='+veloc')
-    depends_on('unifyfs', when='+unifyfs')
+    depends_on('adios2+mpi+fortran+zfp+hdf5', when='+adios2')
     depends_on('darshan-runtime', when='+darshan')
     depends_on('darshan-util', when='+darshan')
-    depends_on('mercury', when='+mercury')
+    depends_on('faodel+mpi+hdf5', when='+faodel')
+    depends_on('hdf5+mpi+fortran', when='+hdf5')
+    depends_on('mercury+mpi+ofi+sm', when='+mercury')
+    depends_on('parallel-netcdf+fortran+pic', when='+pnetcdf')
+    depends_on('unifyfs+fortran+numa', when='+unifyfs')
+    depends_on('veloc', when='+veloc')
 
     def cmake_args(self):
         return ['-DIO=ON']
diff --git a/var/spack/repos/builtin/packages/ecp-viz-sdk/package.py b/var/spack/repos/builtin/packages/ecp-viz-sdk/package.py
index 734982799b..f86330613c 100644
--- a/var/spack/repos/builtin/packages/ecp-viz-sdk/package.py
+++ b/var/spack/repos/builtin/packages/ecp-viz-sdk/package.py
@@ -16,31 +16,29 @@ class EcpVizSdk(CMakePackage):
 
     version('1.0', branch='master')
 
-    variant('paraview', default=False, description="Enable ParaView")
-    variant('vtkm', default=False, description="Enable VTK-m")
-    variant('zfp', default=False, description="Enable ZFP")
-    variant('sz', default=False, description="Enable SZ")
-
-    # TODO: fix +osmesa~rendering conflict
-    variant('catalyst', default=False, description="Enable Catalyst")
-
-    # Unsatisfiable dependencies: hdf5 and netcdf
-    # variant('visit', default=False, description="Enable VisIt")
+    variant('catalyst', default=True, description="Enable Catalyst")
+    variant('paraview', default=True, description="Enable ParaView")
+    variant('sz', default=True, description="Enable SZ")
+    variant('vtkm', default=True, description="Enable VTK-m")
+    variant('zfp', default=True, description="Enable ZFP")
 
     # Broken dependency: vtk-h
     # variant('ascent', default=False, description="Enable Ascent")
 
+    # Outstanding build issues
+    # variant('visit', default=False, description="Enable VisIt")
+
     # Missing spack package
     # variant('cinema', default=False, description="Enable Cinema")
     # variant('rover', default=False, description="Enable ROVER")
 
-    depends_on('paraview', when='+paraview')
-    depends_on('catalyst', when='+catalyst')
-    depends_on('vtkm', when='+vtkm')
     depends_on('ascent', when='+ascent')
+    depends_on('catalyst', when='+catalyst')
+    depends_on('paraview', when='+paraview')
+    depends_on('sz', when='+sz')
     depends_on('visit', when='+visit')
+    depends_on('vtkm', when='+vtkm')
     depends_on('zfp', when='+zfp')
-    depends_on('sz', when='+sz')
 
     def cmake_args(self):
         return ['-DVIZ=ON']