From dd0b386ac2a984b4956a0092e8ed9bee07d415b9 Mon Sep 17 00:00:00 2001 From: Ahmad Nawab Date: Thu, 12 Sep 2024 12:23:00 +0000 Subject: [PATCH] Fix for NEMO SP builds --- cmake/ecwam_expand_drv_types.cmake | 2 +- src/ecwam/CMakeLists.txt | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/cmake/ecwam_expand_drv_types.cmake b/cmake/ecwam_expand_drv_types.cmake index 65ac08575..89e295618 100644 --- a/cmake/ecwam_expand_drv_types.cmake +++ b/cmake/ecwam_expand_drv_types.cmake @@ -14,7 +14,7 @@ macro( ecwam_expand_drv_types ) - if( ${PNAME}_OCEANMODEL_HAVE_SINGLE_PRECISION ) + if( ${OCEAN_PREC} STREQUAL SP ) list(APPEND FYPP_ARGS -DPARKIND1_SINGLE_NEMO) endif() diff --git a/src/ecwam/CMakeLists.txt b/src/ecwam/CMakeLists.txt index d6076acf6..ec71fedef 100644 --- a/src/ecwam/CMakeLists.txt +++ b/src/ecwam/CMakeLists.txt @@ -405,11 +405,11 @@ endif() set( ${PNAME}_OCEANMODEL_LIBRARIES "" ) if( HAVE_OCEAN_COUPLING ) list(APPEND ECWAM_DEFINITIONS WITH_NEMO ) - if( ${OCEAN_PREC} STREQUAL SP ) - list(APPEND ECWAM_DEFINITIONS PARKIND1_SINGLE_NEMO ) - endif() set( ${PNAME}_OCEANMODEL_LIBRARIES nemogcmcoup.${OCEAN_PREC} ) endif() +if( ${OCEAN_PREC} STREQUAL SP ) + list(APPEND ECWAM_DEFINITIONS PARKIND1_SINGLE_NEMO ) +endif() if( HAVE_ECFLOW ) list(APPEND ECWAM_PRIVATE_DEFINITIONS WAM_HAVE_ECFLOW)