diff --git a/dynamics/spam/CMakeLists.txt b/dynamics/spam/CMakeLists.txt index 736a37a8..c9bf30e1 100644 --- a/dynamics/spam/CMakeLists.txt +++ b/dynamics/spam/CMakeLists.txt @@ -17,6 +17,9 @@ target_include_directories(dycore INTERFACE src/grids) target_include_directories(dycore INTERFACE src/io) target_include_directories(dycore INTERFACE src/core) +set(PAMC_NDIMS "1" CACHE STRING "PAM-C ndims") +target_compile_definitions(dycore INTERFACE -DPAMC_NDIMS=${PAMC_NDIMS}) + if ("${PAMC_MODEL}" STREQUAL "layermodel") target_compile_definitions(dycore INTERFACE -DPAMC_LAYER) endif() diff --git a/dynamics/spam/src/extrudedmodel-common.h b/dynamics/spam/src/extrudedmodel-common.h index 878c3afa..c0d61bae 100644 --- a/dynamics/spam/src/extrudedmodel-common.h +++ b/dynamics/spam/src/extrudedmodel-common.h @@ -10,7 +10,7 @@ uint constexpr ntracers_dycore = 0; ////////////////////////////////////////////////////////////////////////////// // Number of Dimensions -uint constexpr ndims = 2; +uint constexpr ndims = PAMC_NDIMS; } // namespace pamc #include "params.h" diff --git a/standalone/mmf_simplified/build/cmakescript_pamc.sh b/standalone/mmf_simplified/build/cmakescript_pamc.sh index 882545ec..8015476f 100755 --- a/standalone/mmf_simplified/build/cmakescript_pamc.sh +++ b/standalone/mmf_simplified/build/cmakescript_pamc.sh @@ -6,6 +6,7 @@ PAM_MICRO="p3" PAM_SGS="none" +PAMC_NDIMS="1" PAMC_MODEL="extrudedmodel" PAMC_HAMIL="man" PAMC_THERMO="constkappavirpottemp" @@ -36,6 +37,7 @@ cmake \ -DPAM_MICRO=${PAM_MICRO} \ -DPAM_SGS=${PAM_SGS} \ -DPAM_RAD="none" \ + -DPAMC_NDIMS=${PAMC_NDIMS} \ -DPAMC_MODEL=${PAMC_MODEL} \ -DPAMC_HAMIL=${PAMC_HAMIL} \ -DPAMC_THERMO=${PAMC_THERMO} \