Add a better range of tests:

    - The number of nodes and elements in the returned arrays against the reference arrays.
    - The number of time steps in the returned arrays.
    - The range of values in the arrays (both nodal and element arrays).

tests/utilities/test_grid2fvcom.m

 % Unit test for grid2fvcom.
+%
+% DESCRIPTION:
+%   Currently checks against a reference data set for the following:
+%       - number of nodes in the output
+%       - number of elements in the output
+%       - number of time steps in the output
+%       - range of values in the node arrays
+%       - range of values in the element arrays
+%
+% It uses some NCEP data for the Irish Sea as the base input. This data is
+% from January, 2001. This includes an unstructured grid object (Mobj), the
+% NCEP forcing data struct (forcing) and a 'known good' result
+% (forcing_interp) for comparison against the new result.
+%
+% Author(s):
+%   Pierre Cazenave (Plymouth Marine Laboratory)
+%
+% Revision history:
+%   2013-05-17 First version.
+%
+%==========================================================================
 
-% Check we always produce the same interpolated values.
+matlabrc
+close all
+clc
+
+addpath('/users/modellers/pica/Code/fvcom-toolbox/utilities')
+addpath('/users/modellers/pica/Code/fvcom-toolbox/fvcom_prepro/')
+
+% Temporary paths when on Riqui's machine
+addpath('/tmp/pica/fvcom-toolbox/fvcom_prepro/')
+addpath('/tmp/pica/fvcom-toolbox/utilities/')
 
-% Use some NCEP data for the Irish Sea as the base input. This data is from
-% around January, 2001. This includes an unstructured grid object (Mobj),
-% the NCEP forcing data struct (forcing) and a 'known good' result
-% (forcing_interp) for comparison against the new result.
 load('/tmp/pica/fvcom-toolbox/tests/mat/grid2fvcom_data.mat');
 
 interpfields = {'uwnd', 'vwnd', 'slp', 'nshf', 'nlwrs', 'nswrs', 'P_E', ...
@@ -15,16 +41,196 @@ interpfields = {'uwnd', 'vwnd', 'slp', 'nshf', 'nlwrs', 'nswrs', 'P_E', ...
 % the same.
 forcing_interp_new = grid2fvcom(Mobj, interpfields, forcing);
 
-% Now we have the new results, compare the ranges of values in the old and
-% the new to make sure they're the same.
+% Check we have the same number of fields (if we don't, we can't go any
+% further).
 fnames = fieldnames(forcing_interp);
+if length(fnames) ~= length(fieldnames(forcing_interp_new))
+    error(['The number of reference struct field names (%d) does', ...
+        ' not equal the number in the new struct (%d)'], ...
+        length(fnames), length(fieldnames(forcing_interp_new)))
+end
+
+%%
+
+results = struct();
+
 for ff = 1:length(fnames)
-    node_diff = forcing_interp.(fnames{ff}).node - ...
-        forcing_interp_new.(fnames{ff}).node;
-    elem_diff = forcing_interp.(fnames{ff}).data - ...
-        forcing_interp_new.(fnames{ff}).data;
 
-    fprintf('%s min/max of node differences: %f\n', min(node_diff), max(node_diff))
-    fprintf('%s min/max of element differences: %f\n', min(elem_diff), max(elem_diff))
+    results.(fnames{ff}) = struct();
+
+    switch fnames{ff}
+        case {'time', 'lon', 'lat', 'x', 'y'}
+
+            results.(fnames{ff}).vectorValues = 'FAIL';
+
+            results.(fnames{ff}).check = ...
+                forcing_interp.(fnames{ff}) - forcing_interp_new.(fnames{ff});
+            checkDiff = max(results.(fnames{ff}).check) - ...
+                min(results.(fnames{ff}).check);
+            if checkDiff == 0
+                results.(fnames{ff}).vectorValues = 'PASS';
+            end
+
+        otherwise
+
+            %--------------------------------------------------------------
+            % Set the pass/fail flags for the tests. Assume fail and only
+            % change if proven otherwise.
+            %--------------------------------------------------------------
+            results.(fnames{ff}).nodeNumber = 'FAIL';
+            results.(fnames{ff}).elementNumber = 'FAIL';
+            results.(fnames{ff}).numNodeTimes = 'FAIL';
+            results.(fnames{ff}).numElementTimes = 'FAIL';
+            results.(fnames{ff}).nodeValues = 'FAIL';
+            results.(fnames{ff}).elementValues = 'FAIL';
+
+            %--------------------------------------------------------------
+            % Check we have the same number of points and time steps in the
+            % new interpolation as in the original.
+            %--------------------------------------------------------------
+            [~, results.(fnames{ff}).origNodeTimes] = ...
+                size(forcing_interp.(fnames{ff}).node);
+            [~, results.(fnames{ff}).origElementTimes] = ...
+                size(forcing_interp.(fnames{ff}).data);
+            [results.(fnames{ff}).nNodes, ...
+                results.(fnames{ff}).nNodeTimes] = ...
+                size(forcing_interp_new.(fnames{ff}).node);
+            [results.(fnames{ff}).nElems, ...
+                results.(fnames{ff}).nElementTimes] = ...
+                size(forcing_interp_new.(fnames{ff}).data);
+
+            if results.(fnames{ff}).nNodes == Mobj.nVerts
+                results.(fnames{ff}).nodeNumber = 'PASS';
+            end
+            if results.(fnames{ff}).nElems == Mobj.nElems
+                results.(fnames{ff}).elementNumber = 'PASS';
+            end
+            if results.(fnames{ff}).nNodeTimes == ...
+                    results.(fnames{ff}).origNodeTimes
+                results.(fnames{ff}).numNodeTimes = 'PASS'
+            end
+            if results.(fnames{ff}).nElementTimes == ...
+                    results.(fnames{ff}).origElementTimes
+                results.(fnames{ff}).numElementTimes = 'PASS';
+            end
+
+            %--------------------------------------------------------------
+            % Check the values in the node and element arrays match to
+            % reference values.
+            %--------------------------------------------------------------
+            results.(fnames{ff}).nodeDiff = ...
+                forcing_interp.(fnames{ff}).node - ...
+                forcing_interp_new.(fnames{ff}).node;
+            results.(fnames{ff}).elemDiff = ...
+                forcing_interp.(fnames{ff}).data - ...
+                forcing_interp_new.(fnames{ff}).data;
+
+            results.(fnames{ff}).nodeRange = max(nodeDiff(:)) - min(nodeDiff(:));
+            results.(fnames{ff}).elemRange = max(elemDiff(:)) - min(elemDiff(:));
 
+            if nodeRange == 0
+                results.(fnames{ff}).nodeValues = 'PASS';
+            end
+            if elemRange == 0;
+                results.(fnames{ff}).elementValues = 'PASS';
+            end
+    end
 end
+
+%%
+%--------------------------------------------------------------------------
+% Print a summary of the testing
+%--------------------------------------------------------------------------
+totalTests = 0;
+totalPasses = 0;
+
+for ff = 1:length(fnames)
+    resultnames = fieldnames(results.(fnames{ff}));
+    numRes = length(resultnames);
+
+    for fi = 1:numRes
+
+        % Skip if the field is not a string (we're only interested in
+        % pass/fail really.
+        if ~ischar(results.(fnames{ff}).(resultnames{fi}))
+            continue
+        else
+            % Increment the number of tests performed.
+            totalTests = totalTests + 1;
+        end
+
+        % Get the total number of PASSed tests.
+        if strcmp(results.(fnames{ff}).(resultnames{fi}), 'PASS')
+            totalPasses = totalPasses + 1;
+        end
+
+        S = results.(fnames{ff}).(resultnames{fi});
+
+        switch resultnames{fi}
+            case 'vectorValues'
+                fprintf('%s %s values test\n', S, fnames{ff})
+                if strcmp(S, 'FAIL')
+                    fprintf('\tmin/max of %s range: %f, %f\n', ...
+                        fnames{ff}, ...
+                        min(results.(fnames{ff}).check), ...
+                        max(results.(fnames{ff}).check))
+                end
+
+            case 'nodeNumber'
+                fprintf('%s %s node number test\n', S, fnames{ff})
+                if strcmp(S, 'FAIL')
+                    fprintf('\toriginal/new number of %s nodes: %d, %d\n', ...
+                        fnames{ff}, ...
+                        Mobj.nVerts, ...
+                        results.(fnames{ff}).nNodes)
+                end
+
+            case 'elementNumber'
+                fprintf('%s %s element number test\n', S, fnames{ff})
+                if strcmp(S, 'FAIL')
+                    fprintf('\toriginal/new number of %s elements: %d, %d\n', ...
+                        fnames{ff}, ...
+                        Mobj.nElems, ...
+                        results.(fnames{ff}).nElems)
+                end
+
+            case 'numNodeTimes'
+                fprintf('%s %s node time steps test\n', S, fnames{ff})
+                if strcmp(S, 'FAIL')
+                    fprintf('\toriginal/new number of %s node times: %d, %d\n', ...
+                        fnames{ff}, ...
+                        results.(fnames{ff}).origNodeTimes, ...
+                        results.(fnames{ff}).nNodeTimes)
+                end
+
+            case 'numElementTimes'
+                fprintf('%s %s element time steps test\n', S, fnames{ff})
+                if strcmp(S, 'FAIL')
+                    fprintf('\toriginal/new number of %s element times: %d, %d\n', ...
+                        fnames{ff}, ...
+                        results.(fnames{ff}).origElementTimes, ...
+                        results.(fnames{ff}).nElementTimes)
+                end
+
+            case 'nodeValues'
+                fprintf('%s %s node values test\n', S, fnames{ff})
+                if strcmp(S, 'FAIL')
+                    fprintf('\trange of %s node values: %d\n', ...
+                        fnames{ff}, ...
+                        results.(fnames{ff}).nodeRange)
+                end
+
+            case 'elementValues'
+                fprintf('%s %s element values test\n', S, fnames{ff})
+                if strcmp(S, 'FAIL')
+                    fprintf('\trange of %s element values: %d\n', ...
+                        fnames{ff}, ...
+                        results.(fnames{ff}).elemRange)
+                end
+        end
+    end
+end
+
+fprintf('\n------------------SUMMARY------------------\n')
+fprintf('           %d of %d tests passed', totalPasses, totalTests)
+fprintf('\n-------------------------------------------\n')