Merge pull request #552 from xylar/fix-cell-culler

Make some variables optional in MpasCellCuller.x

azure-pipelines.yml

@@ -38,7 +38,7 @@ jobs:
   - bash: |
       eval "$(conda shell.bash hook)"
       conda activate build
-      conda build -m "conda_package/ci/linux_python${PYTHON_VERSION}.yaml" "conda_package/recipe"
+      conda build -m "conda_package/ci/linux_64_python${PYTHON_VERSION}.____cpython.yaml" "conda_package/recipe"
     displayName: Build MPAS-Tools
 
   - bash: |
@@ -158,7 +158,7 @@ jobs:
   - bash: |
       eval "$(conda shell.bash hook)"
       conda activate build
-      conda build -m "conda_package/ci/osx_python${PYTHON_VERSION}.yaml" "conda_package/recipe"
+      conda build -m "conda_package/ci/osx_64_python${PYTHON_VERSION}.____cpython.yaml" "conda_package/recipe"
     displayName: Build MPAS-Tools
 
   - bash: |

conda_package/ci/linux_python3.10.yaml → conda_package/ci/linux_64_python3.10.____cpython.yaml

@@ -15,7 +15,7 @@ fortran_compiler:
 fortran_compiler_version:
 - '12'
 hdf5:
-- 1.14.2
+- 1.14.3
 libnetcdf:
 - 4.9.2
 netcdf_fortran:

conda_package/ci/linux_python3.11.yaml → conda_package/ci/linux_64_python3.11.____cpython.yaml

@@ -15,7 +15,7 @@ fortran_compiler:
 fortran_compiler_version:
 - '12'
 hdf5:
-- 1.14.2
+- 1.14.3
 libnetcdf:
 - 4.9.2
 netcdf_fortran:

conda_package/ci/linux_64_python3.12.____cpython.yaml

@@ -0,0 +1,33 @@
+cdt_name:
+- cos6
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '12'
+docker_image:
+- quay.io/condaforge/linux-anvil-cos7-x86_64
+fortran_compiler:
+- gfortran
+fortran_compiler_version:
+- '12'
+hdf5:
+- 1.14.3
+libnetcdf:
+- 4.9.2
+netcdf_fortran:
+- '4.6'
+pin_run_as_build:
+  python:
+    min_pin: x.x
+    max_pin: x.x
+python:
+- 3.12.* *_cpython
+target_platform:
+- linux-64
+zip_keys:
+- - cxx_compiler_version
+  - fortran_compiler_version

conda_package/ci/linux_64_python3.8.____cpython.yaml

@@ -0,0 +1,33 @@
+cdt_name:
+- cos6
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- gxx
+cxx_compiler_version:
+- '12'
+docker_image:
+- quay.io/condaforge/linux-anvil-cos7-x86_64
+fortran_compiler:
+- gfortran
+fortran_compiler_version:
+- '12'
+hdf5:
+- 1.14.3
+libnetcdf:
+- 4.9.2
+netcdf_fortran:
+- '4.6'
+pin_run_as_build:
+  python:
+    min_pin: x.x
+    max_pin: x.x
+python:
+- 3.8.* *_cpython
+target_platform:
+- linux-64
+zip_keys:
+- - cxx_compiler_version
+  - fortran_compiler_version

conda_package/ci/linux_python3.9.yaml → conda_package/ci/linux_64_python3.9.____cpython.yaml

@@ -15,7 +15,7 @@ fortran_compiler:
 fortran_compiler_version:
 - '12'
 hdf5:
-- 1.14.2
+- 1.14.3
 libnetcdf:
 - 4.9.2
 netcdf_fortran:

conda_package/ci/osx_python3.10.yaml → conda_package/ci/osx_64_python3.10.____cpython.yaml

@@ -7,17 +7,17 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '12'
 hdf5:
-- 1.14.2
+- 1.14.3
 libnetcdf:
 - 4.9.2
 llvm_openmp:
-- '15'
+- '16'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 netcdf_fortran:

conda_package/ci/osx_python3.11.yaml → conda_package/ci/osx_64_python3.11.____cpython.yaml

@@ -7,17 +7,17 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '12'
 hdf5:
-- 1.14.2
+- 1.14.3
 libnetcdf:
 - 4.9.2
 llvm_openmp:
-- '15'
+- '16'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 netcdf_fortran:

conda_package/ci/osx_64_python3.12.____cpython.yaml

@@ -0,0 +1,35 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '10.9'
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- clangxx
+cxx_compiler_version:
+- '16'
+fortran_compiler:
+- gfortran
+fortran_compiler_version:
+- '12'
+hdf5:
+- 1.14.3
+libnetcdf:
+- 4.9.2
+llvm_openmp:
+- '16'
+macos_machine:
+- x86_64-apple-darwin13.4.0
+netcdf_fortran:
+- '4.6'
+pin_run_as_build:
+  python:
+    min_pin: x.x
+    max_pin: x.x
+python:
+- 3.12.* *_cpython
+target_platform:
+- osx-64
+zip_keys:
+- - cxx_compiler_version
+  - fortran_compiler_version

conda_package/ci/osx_64_python3.8.____cpython.yaml

@@ -0,0 +1,35 @@
+MACOSX_DEPLOYMENT_TARGET:
+- '10.9'
+channel_sources:
+- conda-forge
+channel_targets:
+- conda-forge main
+cxx_compiler:
+- clangxx
+cxx_compiler_version:
+- '16'
+fortran_compiler:
+- gfortran
+fortran_compiler_version:
+- '12'
+hdf5:
+- 1.14.3
+libnetcdf:
+- 4.9.2
+llvm_openmp:
+- '16'
+macos_machine:
+- x86_64-apple-darwin13.4.0
+netcdf_fortran:
+- '4.6'
+pin_run_as_build:
+  python:
+    min_pin: x.x
+    max_pin: x.x
+python:
+- 3.8.* *_cpython
+target_platform:
+- osx-64
+zip_keys:
+- - cxx_compiler_version
+  - fortran_compiler_version

conda_package/ci/osx_python3.9.yaml → conda_package/ci/osx_64_python3.9.____cpython.yaml

@@ -7,17 +7,17 @@ channel_targets:
 cxx_compiler:
 - clangxx
 cxx_compiler_version:
-- '15'
+- '16'
 fortran_compiler:
 - gfortran
 fortran_compiler_version:
 - '12'
 hdf5:
-- 1.14.2
+- 1.14.3
 libnetcdf:
 - 4.9.2
 llvm_openmp:
-- '15'
+- '16'
 macos_machine:
 - x86_64-apple-darwin13.4.0
 netcdf_fortran: