From 06a09b445c0ef35c729fa1a3d6f177ceefc4df55 Mon Sep 17 00:00:00 2001 From: Dom Heinzeller Date: Mon, 17 Jun 2024 07:23:23 -0600 Subject: [PATCH] Fix ESMF version by using require --- configs/common/packages.yaml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/configs/common/packages.yaml b/configs/common/packages.yaml index f9737d80b..088eaa814 100644 --- a/configs/common/packages.yaml +++ b/configs/common/packages.yaml @@ -59,19 +59,22 @@ # config and update the projections for lmod/tcl. # Also, check the acorn and derecho site configs which have esmf modifications. esmf: - version: ['8.6.1'] - variants: ~xerces ~pnetcdf snapshot=none +shared +external-parallelio + #version: ['8.6.1'] + #variants: ~xerces ~pnetcdf snapshot=none +shared +external-parallelio #version: ['8.6.1b04'] #variants: ~xerces ~pnetcdf snapshot=b04 +shared +external-parallelio #version: ['8.7.0b04'] #variants: ~xerces ~pnetcdf snapshot=b04 +shared +external-parallelio require: - - any_of: ['fflags="-fp-model precise" cxxflags="-fp-model precise"'] + - any_of: ['@=8.6.1 ~xerces ~pnetcdf snapshot=none +shared +external-parallelio fflags="-fp-model precise" cxxflags="-fp-model precise"'] when: "%intel" message: "Extra ESMF compile options for Intel" - - any_of: [''] + - any_of: ['@=8.6.1 ~xerces ~pnetcdf snapshot=none +shared +external-parallelio'] when: "%gcc" message: "Extra ESMF compile options for GCC" + - any_of: ['@=8.6.1 ~xerces ~pnetcdf snapshot=none +shared +external-parallelio'] + when: "%apple-clang" + message: "Extra ESMF compile options for GCC" fckit: version: ['0.11.0'] variants: +eckit