Changeset 28013 for issm/trunk/src/m/contrib/chenggong/dataprocessing/integrateOverDomain.m

Timestamp:

11/15/23 12:14:04 (16 months ago)

Author:

Mathieu Morlighem

Message:

merged trunk-jpl and trunk for revision 28011

Location:

issm/trunk

Files:

• . (modified) (1 prop)
• src (modified) (1 prop)
• src/m/contrib/chenggong/dataprocessing/integrateOverDomain.m (modified) (2 diffs)

issm/trunk/src/m/contrib/chenggong/dataprocessing/integrateOverDomain.m

@@ -8 +8 @@
         weights = ones(size(data));
         if nargin<3
-                masked = [];
+                masked = logical(zeros(size(data)));
         end
 end
 
+masked = masked | isnan(data) | isnan(weights);
 % Set the area with masked=1 to nan
 data(masked) = nan;
 weights(masked) =nan;
+
 
 % get the mesh
@@ -28 +30 @@
 eleAreas = 1/3*eleAreas.*(weights(elements(:,1),:)+weights(elements(:,2),:)+weights(elements(:,3),:));
 
-intData = sum(eleData(:),'omitnan');
-areas = sum(eleAreas(:),'omitnan');
-meanData = intData / areas;
+intData = sum(eleData, 1, 'omitnan');
+areas = sum(eleAreas, 1, 'omitnan');
+meanData = intData ./ areas;