official SCOPEv1.61

SCOPE_mac_linux.m

@@ -2,7 +2,7 @@
 %     SCOPE is a coupled radiative transfer and energy balance model
 %     Copyright (C) 2015  Christiaan van der Tol
 % 
-%     This program is free software: you can redistribute it and/or modify
+%    This program is free software: you can redistribute it and/or modify
 %     it under the terms of the GNU General Public License as published by
 %     the Free Software Foundation, either version 3 of the License, or
 %      any later version.

ebal.m

@@ -197,8 +197,8 @@
     resist_in.rbs = soil.rbs;
     resist_in.rss = soil.rss;
     resist_in.rwc = canopy.rwc;
-    resist_in.zo  = meteo.zo;
-    resist_in.d   = meteo.d;
+    resist_in.zo  = canopy.zo;
+    resist_in.d   = canopy.d;
     resist_in.z   = meteo.z;
     resist_in.hc  = canopy.hc;
     resist_in.w   = canopy.leafwidth;
@@ -297,13 +297,11 @@
     Hstot       = Fs*Hs;
     Hctot       = LAI*(Fc*Hch + meanleaf(canopy,Hcu,'angles_and_layers',Ps));
     Htot        = Hstot + Hctot;
-    %G           = (t>0 && SoilHeatMethod<2)*(Rns-lEs-Hs) + (t==0 || SoilHeatMethod==2)*(0.35*Rns);
     if SoilHeatMethod==2;
        G = 0.35*Rns;
     else      
        G = GAM/sqrt(pi) * 2* sum(([Ts'; Tsold(1:end-1,:)] - Tsold)/Deltat .* (sqrt(x) - sqrt(x-Deltat)));
        G = G';
-       %if max(abs(G))> max(abs(Rns)), G = 0.35*Rns; end
     end
     % 2.5. Monin-Obukhov length L
     L           = -rhoa*cp*ustar.^3.*(Ta+273.15)./(kappa*g*Htot);           % [1]

fluspect_bcar.m

@@ -3,7 +3,7 @@
 % Fluspect simulated reflectance, transmittance and fluorescence of leaves
 %     Copyright (C) 2015  Wout Verhoef and Christiaan van der Tol
 % 
-%     This program is free software: you can redistribute it and/or modify
+%    This program is free software: you can redistribute it and/or modify
 %     it under the terms of the GNU General Public License as published by
 %     the Free Software Foundation, either version 3 of the License, or
 %     any later version.

load_timeseries.m

@@ -64,22 +64,17 @@
     hctable         = load([path_input,Dataset_dir,'/',hc_file]);
     V(23).Val       = interp1(hctable(:,1),hctable(:,2),t_); 
     canopy.hc = V(23).Val;
-    %[V(24).Val ,V(25).Val ]  = zo_and_d(V(22).Val,ts.V(23).Val);
     if options.calc_zo
         [V(24).Val ,V(25).Val ]  = zo_and_d(soil,canopy);
     else
         V(24).Val   = ones(size(t_))*V(24).Val;
         V(25).Val   = ones(size(t_))*V(25).Val;
     end
-%     if options.calc_zo
-%         [canopy.zo,canopy.d ]  = zo_and_d(soil,canopy);
-%         keyboard
-%     end
 
 else
     V(23).Val        = canopy.hc*ones(size(t_)); 
-    V(24).Val        = meteo.zo*ones(size(t_)); 
-    V(25).Val        = meteo.d*ones(size(t_));
+    V(24).Val        = canopy.zo*ones(size(t_)); 
+    V(25).Val        = canopy.d*ones(size(t_));
 end
 
 
@@ -96,7 +91,7 @@
 
 %% 6. Soil Moisture Content
 if ~isempty(SMC_file)
-    V(55).Val          = load([path_input,Dataset_dir,'/',SMC_file]);
+    V(54).Val          = load([path_input,Dataset_dir,'/',SMC_file]);
 end
 
 %% 7. Leaf biochemical parameters

select_input.m

@@ -48,9 +48,9 @@
 canopy.Psicor  = V(42).Val(vi(42));
 canopy.rwc  = V(45).Val(vi(45));
 canopy.kV = V(12).Val(vi(12));
+canopy.zo  = V(24).Val(vi(24));
+canopy.d = V(25).Val(vi(25));
 
-meteo.zo  = V(24).Val(vi(24));
-meteo.d   = V(25).Val(vi(25));
 meteo.z  = V(29).Val(vi(29));
 meteo.Rin   = V(30).Val(vi(30));
 meteo.Ta = V(31).Val(vi(31));