Skip to content

Commit cff4cb9

Browse files
committed
Updates formatting in sipnet.c
1 parent 7b1abf8 commit cff4cb9

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

modelStructures.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// Begin definitions for choosing different model structures
1313
// See also sipnet.c for other options (that should be moved here if/when testing is added)
1414

15-
#define EVENT_HANDLER 0
15+
#define EVENT_HANDLER 1
1616
// Read in and process agronomic events. SIPNET expects a file named events.in to exist, though
1717
// unit tests may use other names.
1818

sipnet.c

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2433,13 +2433,13 @@ void setupModel(SpatialParams *spatialParams, int loc) {
24332433

24342434
// ensure that all the allocation parameters sum up to something less than one:
24352435
#if ROOTS
2436-
ensureAllocation();
2436+
ensureAllocation();
24372437
#endif
24382438

24392439
// If we aren't explicitly modeling microbe pool, then do not have a pulse to microbes,
24402440
// exudates go directly to the soil
24412441
#if !MICROBES
2442-
params.microbePulseEff=0;
2442+
params.microbePulseEff=0;
24432443
#endif
24442444

24452445
// change units of parameters:
@@ -2456,49 +2456,49 @@ void setupModel(SpatialParams *spatialParams, int loc) {
24562456
#if ROOTS
24572457
envi.plantWoodC = (1-params.coarseRootFrac-params.fineRootFrac)*params.plantWoodInit;
24582458
#else
2459-
envi.plantWoodC = params.plantWoodInit;
2459+
envi.plantWoodC = params.plantWoodInit;
24602460
#endif
24612461

24622462
envi.plantLeafC = params.laiInit * params.leafCSpWt;
24632463
envi.litter = params.litterInit;
24642464

24652465

24662466
// If SOIL_QUALITY, split initial soilCarbon equally among all the pools
2467-
#if SOIL_MULTIPOOL
2468-
int counter;
2467+
#if SOIL_MULTIPOOL
2468+
int counter;
24692469

2470-
for( counter=0; counter <NUMBER_SOIL_CARBON_POOLS; counter++) {
2470+
for( counter=0; counter <NUMBER_SOIL_CARBON_POOLS; counter++) {
24712471

2472-
envi.soil[counter]=params.soilInit/NUMBER_SOIL_CARBON_POOLS;
2472+
envi.soil[counter]=params.soilInit/NUMBER_SOIL_CARBON_POOLS;
24732473

2474-
}
2475-
trackers.totSoilC=params.soilInit;
2476-
#else
2477-
envi.soil = params.soilInit;
2474+
}
2475+
trackers.totSoilC=params.soilInit;
2476+
#else
2477+
envi.soil = params.soilInit;
24782478

2479-
#endif
2479+
#endif
24802480

2481-
#if SOIL_QUALITY
2482-
params.maxIngestionRate = params.maxIngestionRate*24*params.microbeInit/1000;
2483-
// change from per hour to per day rate, and then multiply by microbial concentration (mg C / g soil).
2481+
#if SOIL_QUALITY
2482+
params.maxIngestionRate = params.maxIngestionRate*24*params.microbeInit/1000;
2483+
// change from per hour to per day rate, and then multiply by microbial concentration (mg C / g soil).
24842484

2485-
#else
2486-
params.maxIngestionRate = params.maxIngestionRate*24; // change from per hour to per day rate
2487-
#endif
2485+
#else
2486+
params.maxIngestionRate = params.maxIngestionRate*24; // change from per hour to per day rate
2487+
#endif
24882488

24892489

24902490

2491-
envi.microbeC = params.microbeInit*params.soilInit/1000; // convert to gC m-2
2491+
envi.microbeC = params.microbeInit*params.soilInit/1000; // convert to gC m-2
24922492

24932493

2494-
params.totNitrogen = params.totNitrogen*params.soilInit; // convert to gC m-2
2494+
params.totNitrogen = params.totNitrogen*params.soilInit; // convert to gC m-2
24952495

24962496
params.fineRootTurnoverRate /= 365.0;
24972497
params.coarseRootTurnoverRate /= 365.0;
24982498

24992499
params.baseCoarseRootResp /= 365.0;
25002500
params.baseFineRootResp /= 365.0;
2501-
params.baseMicrobeResp = params.baseMicrobeResp*24; // change from per hour to per day rate
2501+
params.baseMicrobeResp = params.baseMicrobeResp*24; // change from per hour to per day rate
25022502

25032503

25042504
envi.coarseRootC = params.coarseRootFrac*params.plantWoodInit;

0 commit comments

Comments
 (0)