From fa4739c7ffe7a5ecc2cea82835aa833948180f12 Mon Sep 17 00:00:00 2001 From: ZSong Date: Sun, 11 Aug 2024 12:45:33 +0200 Subject: [PATCH 1/2] strings comparison --- src/+parameters/loadParameters.m | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/+parameters/loadParameters.m b/src/+parameters/loadParameters.m index 499d74ab..276fe159 100644 --- a/src/+parameters/loadParameters.m +++ b/src/+parameters/loadParameters.m @@ -27,24 +27,24 @@ cond = sum(~isnan(scopeInput(j, :))) < 1; end if isempty(j) || cond - if name == 'Cab' + if strcmp(name,'Cab') warning('warning: input "', name, '" not provided in input spreadsheet...', ... 'I will use 0.25*Cab instead'); Options.Cca_function_of_Cab = 1; - elseif ~(Options.simulation == 1) && (name == 'Rin' || name == 'Rli') + elseif ~(Options.simulation == 1) && (strcmp(name, 'Rin') || strcmp(name, 'Rli')) warning('warning: input "', name, '" not provided in input spreadsheet...', ... 'I will use the MODTRAN spectrum as it is'); elseif Options.simulation == 1 || (Options.simulation ~= 1 && (i < 46 || i > 50)) warning('warning: input "', name, '" not provided in input spreadsheet'); - if Options.simulation == 1 && (name == 'Cab' || name == 'Vcmo' || name == 'LAI' || name == 'hc' || name == 'SMC' || (i > 29 && i < 37)) + if Options.simulation == 1 && (strcmp(name, 'Cab') || strcmp(name, 'Vcmo') || strcmp(name, 'LAI') || strcmp(name, 'hc') || strcmp(name, 'SMC') || (i > 29 && i < 37)) fprintf(1, '%s %s %s\n', 'I will look for the values in Dataset Directory "', char(ForcingData(5).FileName), '"'); - elseif name == 'zo' || name == 'd' + elseif strcmp(name, 'zo') || strcmp(name, 'd') fprintf(1, '%s %s %s\n', 'will estimate it from LAI, CR, CD1, Psicor, and CSSOIL'); Options.calc_zo = 1; elseif i > 38 && i < 44 fprintf(1, '%s %s %s\n', 'will use the provided zo and d'); oOptions.calc_zo = 0; - elseif ~(Options.simulation == 1 && (name == 'Rin' || name == 'Rli')) + elseif ~(Options.simulation == 1 && (strcmp(name, 'Rin') || strcmp(name, 'Rli'))) fprintf(1, '%s \n', 'this input is required: SCOPE ends'); return else From 5d3c93b09f413fe1e1440803481e4466cfdc317e Mon Sep 17 00:00:00 2001 From: ZSong Date: Sun, 11 Aug 2024 12:53:29 +0200 Subject: [PATCH 2/2] style check --- src/+parameters/loadParameters.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/+parameters/loadParameters.m b/src/+parameters/loadParameters.m index 276fe159..11b4685e 100644 --- a/src/+parameters/loadParameters.m +++ b/src/+parameters/loadParameters.m @@ -27,7 +27,7 @@ cond = sum(~isnan(scopeInput(j, :))) < 1; end if isempty(j) || cond - if strcmp(name,'Cab') + if strcmp(name, 'Cab') warning('warning: input "', name, '" not provided in input spreadsheet...', ... 'I will use 0.25*Cab instead'); Options.Cca_function_of_Cab = 1;