From 7ea2ce4ca23f2187ef391ab3450ae3d1d37782ed Mon Sep 17 00:00:00 2001 From: "U-C23000099\\pcnj6" Date: Fri, 5 Jan 2024 17:25:38 +0000 Subject: [PATCH] uv assembly returning only maatrix triplets tested --- TestParallelAssemblyOptions.m | 6 +++--- uvMatrixAssemblySSTREAMpartitionTriplets.m | 9 ++++++++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/TestParallelAssemblyOptions.m b/TestParallelAssemblyOptions.m index cfa247ac..7d74e1d2 100755 --- a/TestParallelAssemblyOptions.m +++ b/TestParallelAssemblyOptions.m @@ -44,7 +44,7 @@ %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; @@ -52,8 +52,8 @@ 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 index a10a07d4..24e370c6 100644 --- 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