Skip to content

Change events.out to pool amounts instead of fluxes #349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Alomir wants to merge 4 commits into
base: master
Choose a base branch
from
+388 −383
Open

Change events.out to pool amounts instead of fluxes #349

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fb58c88
Change events.out to pool amounts instead of fluxes
Alomir Jul 2, 2026
346d1b6
Update events.out example
Alomir Jul 2, 2026
7624da4
events.out change
Alomir Jul 2, 2026
05c4778
Update events.out after change to pool amounts
Alomir Jul 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions docs/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ sections to include in release notes:
### Changed

- Renamed the CLI option `--file-name` to `--file-prefix` for clarity while keeping `--file-name` as a backward-compatible alias (#320)
- Values in `events.out` changed to pool deltas rather than flux amounts (#349)

### Removed

Expand Down
12 changes: 6 additions & 6 deletions docs/user-guide/model-outputs.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ Note the delimiters: spaces separate columns, commas separate name/value pairs,

```
year day type param_name=delta[,param_name=delta,...]
2023 65 plant envi.plantLeafC=3.00,envi.plantWoodC=4.00,envi.fineRootC=5.00,envi.coarseRootC=6.00
2023 70 irrig envi.soilWater=5.00
2023 200 harv env.litter=5.46,envi.plantLeafC=-5.93,envi.plantWoodC=-4.75,envi.fineRootC=-3.73,envi.coarseRootC=-3.89
2024 65 plant envi.plantLeafC=3.00,envi.plantWoodC=5.00,envi.fineRootC=7.00,envi.coarseRootC=9.00
2024 70 irrig fluxes.immedEvap=2.50,envi.soilWater=2.50
2024 200 harv env.litter=4.25,envi.plantLeafC=-1.39,envi.plantWoodC=-1.63,envi.fineRootC=-2.52,envi.coarseRootC=-2.97
2023 65 plant eventLeafC=3.00,eventWoodC=4.00,eventFineRootC=5.00,eventCoarseRootC=6.00,eventInputC=18.00,eventInputN=0.00
2023 70 irrig eventSoilWater=5.00,eventEvap=0.00
2023 200 harv eventSoilC=1.40,eventLitterC=5.06,eventLeafC=-5.93,eventWoodC=-4.75,eventFineRootC=-3.73,eventCoarseRootC=-3.89,eventSoilOrgN=0.00,eventLitterN=0.00,eventOutputC=10.05,eventOutputN=0.00
2024 65 plant eventLeafC=3.00,eventWoodC=4.00,eventFineRootC=5.00,eventCoarseRootC=6.00,eventInputC=18.00,eventInputN=0.00
2024 70 irrig eventSoilWater=2.50,eventEvap=2.50
2024 200 harv eventSoilC=1.40,eventLitterC=5.06,eventLeafC=-5.93,eventWoodC=-4.75,eventFineRootC=-3.73,eventCoarseRootC=-3.89,eventSoilOrgN=0.00,eventLitterN=0.00,eventOutputC=10.05,eventOutputN=0.00
```
57 changes: 30 additions & 27 deletions src/sipnet/events.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -486,8 +486,8 @@ void processEvents(void) {
}
fluxes.eventEvap += evapAmount / climLen;
fluxes.eventSoilWater += soilAmount / climLen;
writeEventOut(gEvent, 2, "fluxes.eventSoilWater", soilAmount / climLen,
"fluxes.eventEvap", evapAmount / climLen);
writeEventOut(gEvent, 2, "eventSoilWater", soilAmount, "eventEvap",
evapAmount);
} break;
case PLANTING: {
const PlantingParams *plantParams = gEvent->eventParams;
Expand Down Expand Up @@ -515,12 +515,15 @@ void processEvents(void) {
fluxes.eventInputN += inputN / climLen;
}

writeEventOut(gEvent, 6, "fluxes.eventLeafC", leafC / climLen,
"fluxes.eventWoodC", woodC / climLen,
"fluxes.eventFineRootC", fineRootC / climLen,
"fluxes.eventCoarseRootC", coarseRootC / climLen,
"fluxes.eventInputC", inputC / climLen,
"fluxes.eventInputN", inputN / climLen);
// clang-format off
writeEventOut(gEvent, 6,
"eventLeafC", leafC,
"eventWoodC", woodC,
"eventFineRootC", fineRootC,
"eventCoarseRootC", coarseRootC,
"eventInputC", inputC,
"eventInputN", inputN);
// clang-format on
} break;
case HARVEST: {
// Harvest can both remove biomass and move biomass to the soil/litter
Expand Down Expand Up @@ -592,16 +595,16 @@ void processEvents(void) {
// clang-format off
writeEventOut(
gEvent, 10,
"fluxes.eventSoilC", soilAdd / climLen,
"fluxes.eventLitterC", litterAdd / climLen,
"fluxes.eventLeafC", leafDelta / climLen,
"fluxes.eventWoodC", woodDelta / climLen,
"fluxes.eventFineRootC", fineDelta / climLen,
"fluxes.eventCoarseRootC", coarseDelta / climLen,
"fluxes.eventSoilOrgN", soilNAdd / climLen,
"fluxes.eventLitterN", litterNAdd / climLen,
"fluxes.eventOutputC", outputC / climLen,
"fluxes.eventOutputN", outputN / climLen);
"eventSoilC", soilAdd,
"eventLitterC", litterAdd,
"eventLeafC", leafDelta,
"eventWoodC", woodDelta,
"eventFineRootC", fineDelta,
"eventCoarseRootC", coarseDelta,
"eventSoilOrgN", soilNAdd,
"eventLitterN", litterNAdd,
"eventOutputC", outputC,
"eventOutputN", outputN);
// clang-format on
} break;
case TILLAGE: {
Expand Down Expand Up @@ -646,12 +649,12 @@ void processEvents(void) {

// clang-format off
writeEventOut(gEvent, 6,
"fluxes.eventLitterC", ctx.litterPool ? orgC / climLen : 0.0,
"fluxes.eventSoilC", ctx.litterPool ? 0.0 : orgC / climLen,
"fluxes.eventMinN", minN / climLen,
"fluxes.eventLitterN", orgN / climLen,
"fluxes.eventInputC", orgC / climLen,
"fluxes.eventInputN", (orgN + minN) / climLen);
"eventLitterC", ctx.litterPool ? orgC : 0.0,
"eventSoilC", ctx.litterPool ? 0.0 : orgC,
"eventMinN", minN,
"eventLitterN", orgN,
"eventInputC", orgC,
"eventInputN", (orgN + minN));
// clang-format on
} break;
case LEAFON: {
Expand Down Expand Up @@ -692,9 +695,9 @@ void processEvents(void) {

// clang-format off
writeEventOut(gEvent, 3,
"fluxes.eventLeafOffLitter", leafOff / climLen,
"fluxes.eventLeafOffNResorption", leafNResorption / climLen,
"fluxes.eventLitterN", litterNAdd / climLen);
"eventLeafOffLitter", leafOff,
"eventLeafOffNResorption", leafNResorption,
"eventLitterN", litterNAdd);
// clang-format on
} break;
default:
Expand Down
13 changes: 7 additions & 6 deletions src/sipnet/sipnet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,19 +1250,20 @@ void resetFluxes(void) { fluxes = (struct FluxVars){0}; }
*/
void writeLeafOnEventIfNeeded(void) {
const char *type = eventTypeToString(LEAFON);
const double len = climate->length;
if (fluxes.leafOnCreation > TINY && ctx.events) {
writeComputedEventOut(climate->year, climate->day, type, 2,
"fluxes.leafOnCreation", fluxes.leafOnCreation,
"fluxes.leafOnCreationFromWood",
fluxes.leafOnCreationFromWood);
"leafOnCreation", fluxes.leafOnCreation * len,
"leafOnCreationFromWood",
fluxes.leafOnCreationFromWood * len);
Comment on lines 1251 to +1258

@Alomir Alomir Jul 3, 2026

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When you're right, you're right. Will fix.

}
if (fluxes.eventLeafOnCreation > TINY && ctx.events) {
// Not really a computed event, but we don't have the event object here, so
// we use this mechanism
writeComputedEventOut(
climate->year, climate->day, type, 2, "fluxes.eventLeafOnCreation",
fluxes.eventLeafOnCreation, "fluxes.eventLeafOnCreationFromWood",
fluxes.eventLeafOnCreationFromWood);
climate->year, climate->day, type, 2, "eventLeafOnCreation",
fluxes.eventLeafOnCreation * len, "eventLeafOnCreationFromWood",
fluxes.eventLeafOnCreationFromWood * len);
}
}

Expand Down
12 changes: 6 additions & 6 deletions tests/sipnet/test_events_infrastructure/events_output_header.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
year day type param_name=delta[,param_name=delta,...]
2023 65 plant fluxes.eventLeafC=6.00,fluxes.eventWoodC=8.00,fluxes.eventFineRootC=10.00,fluxes.eventCoarseRootC=12.00,fluxes.eventInputC=36.00,fluxes.eventInputN=0.00
2023 70 irrig fluxes.eventSoilWater=10.00,fluxes.eventEvap=0.00
2023 200 harv fluxes.eventSoilC=3.81,fluxes.eventLitterC=7.12,fluxes.eventLeafC=-11.86,fluxes.eventWoodC=-9.50,fluxes.eventFineRootC=-7.46,fluxes.eventCoarseRootC=-7.78,fluxes.eventSoilOrgN=0.00,fluxes.eventLitterN=0.00,fluxes.eventOutputC=25.66,fluxes.eventOutputN=0.00
2024 65 plant fluxes.eventLeafC=6.00,fluxes.eventWoodC=10.00,fluxes.eventFineRootC=14.00,fluxes.eventCoarseRootC=18.00,fluxes.eventInputC=48.00,fluxes.eventInputN=0.00
2024 70 irrig fluxes.eventSoilWater=5.00,fluxes.eventEvap=5.00
2024 200 harv fluxes.eventSoilC=5.48,fluxes.eventLitterC=3.02,fluxes.eventLeafC=-2.78,fluxes.eventWoodC=-3.27,fluxes.eventFineRootC=-5.04,fluxes.eventCoarseRootC=-5.93,fluxes.eventSoilOrgN=0.00,fluxes.eventLitterN=0.00,fluxes.eventOutputC=8.51,fluxes.eventOutputN=0.00
2023 65 plant eventLeafC=3.00,eventWoodC=4.00,eventFineRootC=5.00,eventCoarseRootC=6.00,eventInputC=18.00,eventInputN=0.00
2023 70 irrig eventSoilWater=5.00,eventEvap=0.00
2023 200 harv eventSoilC=1.90,eventLitterC=3.56,eventLeafC=-5.93,eventWoodC=-4.75,eventFineRootC=-3.73,eventCoarseRootC=-3.89,eventSoilOrgN=0.00,eventLitterN=0.00,eventOutputC=12.83,eventOutputN=0.00
2024 65 plant eventLeafC=3.00,eventWoodC=5.00,eventFineRootC=7.00,eventCoarseRootC=9.00,eventInputC=24.00,eventInputN=0.00
2024 70 irrig eventSoilWater=2.50,eventEvap=2.50
2024 200 harv eventSoilC=2.74,eventLitterC=1.51,eventLeafC=-1.39,eventWoodC=-1.63,eventFineRootC=-2.52,eventCoarseRootC=-2.97,eventSoilOrgN=0.00,eventLitterN=0.00,eventOutputC=4.25,eventOutputN=0.00
12 changes: 6 additions & 6 deletions tests/sipnet/test_events_infrastructure/events_output_no_header.out
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
2023 65 plant fluxes.eventLeafC=20.00,fluxes.eventWoodC=10.00,fluxes.eventFineRootC=8.00,fluxes.eventCoarseRootC=6.00,fluxes.eventInputC=44.00,fluxes.eventInputN=0.00
2023 70 irrig fluxes.eventSoilWater=10.00,fluxes.eventEvap=0.00
2023 200 harv fluxes.eventSoilC=24.80,fluxes.eventLitterC=0.00,fluxes.eventLeafC=-9.60,fluxes.eventWoodC=-6.40,fluxes.eventFineRootC=-9.60,fluxes.eventCoarseRootC=-9.60,fluxes.eventSoilOrgN=0.00,fluxes.eventLitterN=0.00,fluxes.eventOutputC=10.40,fluxes.eventOutputN=0.00
2024 65 plant fluxes.eventLeafC=20.00,fluxes.eventWoodC=10.00,fluxes.eventFineRootC=8.00,fluxes.eventCoarseRootC=6.00,fluxes.eventInputC=44.00,fluxes.eventInputN=0.00
2024 70 irrig fluxes.eventSoilWater=5.00,fluxes.eventEvap=5.00
2024 200 harv fluxes.eventSoilC=24.28,fluxes.eventLitterC=0.00,fluxes.eventLeafC=-20.64,fluxes.eventWoodC=-11.76,fluxes.eventFineRootC=-5.76,fluxes.eventCoarseRootC=-4.96,fluxes.eventSoilOrgN=0.00,fluxes.eventLitterN=0.00,fluxes.eventOutputC=18.84,fluxes.eventOutputN=0.00
2023 65 plant eventLeafC=10.00,eventWoodC=5.00,eventFineRootC=4.00,eventCoarseRootC=3.00,eventInputC=22.00,eventInputN=0.00
2023 70 irrig eventSoilWater=5.00,eventEvap=0.00
2023 200 harv eventSoilC=12.40,eventLitterC=0.00,eventLeafC=-4.80,eventWoodC=-3.20,eventFineRootC=-4.80,eventCoarseRootC=-4.80,eventSoilOrgN=0.00,eventLitterN=0.00,eventOutputC=5.20,eventOutputN=0.00
2024 65 plant eventLeafC=10.00,eventWoodC=5.00,eventFineRootC=4.00,eventCoarseRootC=3.00,eventInputC=22.00,eventInputN=0.00
2024 70 irrig eventSoilWater=2.50,eventEvap=2.50
2024 200 harv eventSoilC=12.14,eventLitterC=0.00,eventLeafC=-10.32,eventWoodC=-5.88,eventFineRootC=-2.88,eventCoarseRootC=-2.48,eventSoilOrgN=0.00,eventLitterN=0.00,eventOutputC=9.42,eventOutputN=0.00
Loading
Loading