Skip to content

Commit

Permalink
Fix SW_OUTTEXT preprocessor check in SW_OUT_write_today()
Browse files Browse the repository at this point in the history
- Incorrect merge adjustment from 32ae7d5
- 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
  • Loading branch information
N1ckP3rsl3y committed Jun 26, 2024
1 parent 41a9b0a commit 1808a81
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/SW_Output.c
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down

0 comments on commit 1808a81

Please sign in to comment.