uv assembly returning only maatrix triplets tested

GHilmarG · Jan 5, 2024 · 7ea2ce4 · 7ea2ce4
1 parent 7acd2af
commit 7ea2ce4
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 4 deletions.
diff --git a/TestParallelAssemblyOptions.m b/TestParallelAssemblyOptions.m
@@ -44,16 +44,16 @@
 
 %load(UserVar.InverseRestartFileDirectory+"InverseRestartFile-Joughin-Ca1-Cs100000-Aa1-As100000-5km-Alim-Clim-.mat","CtrlVarInRestartFile","RunInfo","MUA","F","BCs","l")
 
-load(UserVar.InverseRestartFileDirectory+"InverseRestartFile-Cornford-Ca1-Cs100000-Aa1-As100000-2k5km-Alim-Clim-.mat","CtrlVarInRestartFile","RunInfo","MUA","F","BCs","l")
+load(UserVar.InverseRestartFileDirectory+"InverseRestartFile-Cornford-Ca1-Cs100000-Aa1-As100000-10km-Alim-Clim-.mat","CtrlVarInRestartFile","RunInfo","MUA","F","BCs","l")
 
 CtrlVar=CtrlVarInRestartFile;
 CtrlVar.InfoLevelNonLinIt=1;  CtrlVar.InfoLevel=1;
 CtrlVar.uvGroupAssembly=false;
 CtrlVar.uvhGroupAssembly=false;
 CtrlVar.Parallel.isTest=true; CtrlVar.Parallel.uvAssembly.spmd.nWorkers=[]; 
 
-CtrlVar.Parallel.uvAssembly.spmd.isOn=true; 
-CtrlVar.Parallel.uvAssembly.parfeval.isOn=false;
+CtrlVar.Parallel.uvAssembly.spmd.isOn=false; 
+CtrlVar.Parallel.uvAssembly.parfeval.isOn=true;
 
 CtrlVar.etaZero=10; 
 

diff --git a/uvMatrixAssemblySSTREAMpartitionTriplets.m b/uvMatrixAssemblySSTREAMpartitionTriplets.m
@@ -1,3 +1,9 @@
+
+
+
+
+
+
 function [iK,jK,Kval,iR,jR,Tval,Fval]=uvMatrixAssemblySSTREAMpartitionTriplets(CtrlVar,MUA,F,Partition)
 
 %
@@ -10,7 +16,6 @@
 
 %%  I'm guessing that it is best to do the partition here when using the parfeval option
 MUA.connectivity=MUA.connectivity(Partition,:) ;
-MUA.connectivity=MUA.connectivity(Partition,:);
 MUA.Nele=numel(Partition);
 MUA.Deriv=MUA.Deriv(Partition,:,:,:);
 MUA.DetJ=MUA.DetJ(Partition,:);
@@ -451,6 +456,8 @@
     Tval(istak+1:istak+MUA.Nele)=Ty(:,Inod);
     Fval(istak+1:istak+MUA.Nele)=Fy(:,Inod);
 
+    istak=istak+MUA.Nele;
+
 
 end