From 1808a81882ae651f181d1f8744b21863402f8d54 Mon Sep 17 00:00:00 2001 From: Nicholas Persley Date: Wed, 26 Jun 2024 19:29:09 -0400 Subject: [PATCH] Fix SW_OUTTEXT preprocessor check in `SW_OUT_write_today()` - Incorrect merge adjustment from https://github.com/DrylandEcology/SOILWAT2/commit/32ae7d5c377ea29ea89781f521c4580fca5ff1ad - SW_OUTTEXT is active when using SOILWAT2 or STEPWAT2, as long as SWNETCDF is not defined * This results in the generation of SOILWAT2 output code in `SW_OUT_write_today()` when using STEPWAT2 --- src/SW_Output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/SW_Output.c b/src/SW_Output.c index f0cbdfcd7..35c04c2f8 100644 --- a/src/SW_Output.c +++ b/src/SW_Output.c @@ -3301,7 +3301,7 @@ void SW_OUT_write_today( continue; // don't call any `get_XXX` function } -#if defined(SW_OUTTEXT) +#if defined(SOILWAT) && !defined(SWNETCDF) #ifdef SWDEBUG if (debug) { sw_printf(