Merge pull request #38 from EcoExtreML/fix_ebal

remove incorrect syntax introduced after merging
EcoExtreML · Mar 23, 2022 · a16e8c2 · a16e8c2
2 parents 1e77d35 + 940987f
commit a16e8c2
Showing 1 changed file with 0 additions and 4 deletions.
diff --git a/src/ebal.m b/src/ebal.m
@@ -496,11 +496,7 @@
 fluxes.aPAR_Wm2 = Rntot_PAR;% [W m-2]      absorbed PAR
 fluxes.aPAR_Cab_eta = aPAR_Cab_eta;
 fluxes.GPP    = Actot*12/1000000000;  % [kg C m-2 s-1]      gross primary production
-<<<<<<< HEAD
 fluxes.NEE      = (Actot-Resp)*12/1000000000; % [kg C m-2 s-1]      net primary production
-=======
-fluxes.NEE      = (Resp-Actot)*12/1000000000; % [kg C m-2 s-1]      net primary production
->>>>>>> main
 
 thermal.Ta    = Ta;       % [oC]                air temperature (as in input)
 thermal.Ts    = Ts;       % [oC]                soil temperature, sunlit and shaded [2x1]