From 940987f8e5b44e498ae54d83d92343db272ddc9a Mon Sep 17 00:00:00 2001 From: SarahAlidoost Date: Wed, 23 Mar 2022 16:31:11 +0100 Subject: [PATCH] remove incorrect syntax introduced after merging --- src/ebal.m | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/ebal.m b/src/ebal.m index 3b2226d3..51a317c2 100644 --- 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]