diff --git a/3a Sequential/SequentialProcessing.m b/3a Sequential/SequentialProcessing.m index 19a9e68..ed09496 100644 --- a/3a Sequential/SequentialProcessing.m +++ b/3a Sequential/SequentialProcessing.m @@ -52,9 +52,9 @@ for NumHour = 1:25 % loop through each hour % To monitor the progress we will print out the status after every % 50 processes. - if idx/50 == ceil( idx/50) + if idx/10000 == ceil( idx/10000) tt = toc-t2; - fprintf('Total %i of %i, last 50 in %.2f s predicted time for all data %.1f s\n',... + fprintf('Total %i of %i, last 10000 in %.2f s predicted time for all data %.1f s\n',... idx, size(Data2Process,1), tt, size(Data2Process,1)/50*25*tt) t2 = toc; end diff --git a/3b Parallel/Graphs.m b/3c Plotting/Graphs.m similarity index 100% rename from 3b Parallel/Graphs.m rename to 3c Plotting/Graphs.m diff --git a/6a Testing Text/6a.pdf b/6a Testing Text/6a.pdf new file mode 100644 index 0000000..982de2f Binary files /dev/null and b/6a Testing Text/6a.pdf differ diff --git a/6a Testing Text/TestSolutions.m b/6a Testing Text/TestSolutions.m index 0686f5e..ff43f33 100644 --- a/6a Testing Text/TestSolutions.m +++ b/6a Testing Text/TestSolutions.m @@ -9,7 +9,7 @@ close all %% Test File with Errors NaNErrors = 0; %% Set file to test -FileName = '../Model/TestFileNaN.nc'; % define our test file +FileName = 'TestFileNaN.nc'; % define our test file % FileName = '../Model/o3_surface_20180701000000.nc'; % un rem this line to see what happens with good data Contents = ncinfo(FileName); % Store the file content information in a variable. diff --git a/6a Testing Text/TestText.asv b/6a Testing Text/TestText.asv deleted file mode 100644 index c2291ba..0000000 --- a/6a Testing Text/TestText.asv +++ /dev/null @@ -1,62 +0,0 @@ -%% Script to examine NetCDF data formats and check for non-numeric values (chars only) - -clear all -close all - -%% Define plain text variable types -DataTypes = {'NC_Byte', 'NC_Char', 'NC_Short', 'NC_Int', 'NC_Float', 'NC_Double'}; - -%% Test a good file -%% Set file to test -FileName = 'o3_surface_20180701000000.nc'; % define our test file - -Contents = ncinfo(FileName); % Store the file content information in a variable. -FileID = netcdf.open(FileName,'NC_NOWRITE'); % open file read only and create handle - -for idx = 0:size(Contents.Variables,2)-1 % loop through each variable - % read data type for each variable and store - [~, datatype(idx+1), ~, ~] = netcdf.inqVar(FileID,idx); -end - -%% display data types -DataInFile = DataTypes(datatype)' - -%% find character data types -FindText = strcmp('NC_Char', DataInFile); - -%% print results -fprintf('Testing file: %s\n', FileName) -if any(FindText) - fprintf('Error, text variables present:\n') -else - fprintf('All data is numeric, continue analysis.\n') -end - -%% ##### - -%% Test File with Errors -%% Set file to test - FileName = 'TestFileText.nc'; % define our test file - - Contents = ncinfo(FileName); % Store the file content information in a variable. - FileID = netcdf.open(FileName,'NC_NOWRITE'); % open file read only and create handle - - for idx = 0:size(Contents.Variables,2)-1 % loop through each variable - % read data type for each variable and store - [~, datatype(idx+1), ~, ~] = netcdf.inqVar(FileID,idx); - end - - %% display data types - DataInFile = DataTypes(datatype)' - - %% find character data types - FindText = strcmp('NC_Char', DataInFile); - - %% print results - fprintf('Testing file: %s\n', FileName) - if any(FindText) - fprintf('Error, text variables present:\n') - else - fprintf('All data is numeric, continue analysis.\n') - end - diff --git a/6b Testing NaN/6b.pdf b/6b Testing NaN/6b.pdf new file mode 100644 index 0000000..daadf3f Binary files /dev/null and b/6b Testing NaN/6b.pdf differ diff --git a/6b Testing NaN/TestSolutions.m b/6b Testing NaN/TestSolutions.m index 0686f5e..ff43f33 100644 --- a/6b Testing NaN/TestSolutions.m +++ b/6b Testing NaN/TestSolutions.m @@ -9,7 +9,7 @@ close all %% Test File with Errors NaNErrors = 0; %% Set file to test -FileName = '../Model/TestFileNaN.nc'; % define our test file +FileName = 'TestFileNaN.nc'; % define our test file % FileName = '../Model/o3_surface_20180701000000.nc'; % un rem this line to see what happens with good data Contents = ncinfo(FileName); % Store the file content information in a variable. diff --git a/README.md b/README.md deleted file mode 100644 index b8b42ee..0000000 --- a/README.md +++ /dev/null @@ -1,2 +0,0 @@ -# 5011CEM -Trial 2 for creating a correct repository