From 6df84ec93f4205910f5ccfe490592aa42e1263df Mon Sep 17 00:00:00 2001 From: tduretz Date: Thu, 5 Dec 2024 17:12:43 +0100 Subject: [PATCH] fix CI --- MDLIB/StokesAssemblyDecoupled.c | 30 ------------------------------ 1 file changed, 30 deletions(-) diff --git a/MDLIB/StokesAssemblyDecoupled.c b/MDLIB/StokesAssemblyDecoupled.c index 520bf6c4..71913e27 100755 --- a/MDLIB/StokesAssemblyDecoupled.c +++ b/MDLIB/StokesAssemblyDecoupled.c @@ -918,36 +918,6 @@ void Zjacobian_InnerNodesDecoupled3( SparseMat *Stokes, SparseMat *StokesA, Spar pSE = (-D34E*inE*inSEc*wE/dx); pNW = (D34W*inNWc*inW*wW/dx); pNE = (-D34E*inE*inNEc*wE/dx); - - - -vW = (1.0/24.0)*(-SzzBCN*(6*D23S*RegW*dx*pow(inW, 2) + 12*D33W*RegW*dz*inW - dx*(inNWc - inSWc)*(D31W*OOP*comp + D32W*(OOP*comp - 3))) + SzzBCS*(6*D23N*RegW*dx*pow(inW, 2) - 12*D33W*RegW*dz*inW + dx*(inNWc - inSWc)*(D31W*OOP*comp + D32W*(OOP*comp - 3))) - 2*(SzzBCN + SzzBCS - 1)*(-12*D33W*RegW*dz*inW + 3*RegW*dx*pow(inW, 2)*(D23N - D23S) + dx*(inNWc - inSWc)*(D31W*OOP*comp + D32W*(OOP*comp - 3))))/(pow(dx, 2)*dz); -vC = (1.0/24.0)*(SzzBCN*(2*dx*(3*D23S*dz*(-pow(inE, 2)*(2*DirE + RegE) + pow(inW, 2)*(2*DirW + RegW)) + 4*dx*(-D21S*OOP*comp + D22S*(-OOP*comp + 3))) + dz*(-dx*(inN - inS)*(D31E*OOP*comp - D31W*OOP*comp + D32E*(OOP*comp - 3) - D32W*(OOP*comp - 3)) + 12*dz*(D33E*inE*(2*DirE + RegE) + D33W*inW*(2*DirW + RegW)))) - SzzBCS*(2*dx*(-3*D23N*dz*(pow(inE, 2)*(2*DirE + RegE) - pow(inW, 2)*(2*DirW + RegW)) + 4*dx*(D21N*OOP*comp + D22N*(OOP*comp - 3))) - dz*(dx*(inN - inS)*(-D31E*OOP*comp + D31W*OOP*comp - D32E*(OOP*comp - 3) + D32W*(OOP*comp - 3)) + 12*dz*(D33E*inE*(2*DirE + RegE) + D33W*inW*(2*DirW + RegW)))) + 2*(dx*(4*dx*(D21N*OOP*comp + D21S*OOP*comp + D22N*(OOP*comp - 3) + D22S*(OOP*comp - 3)) + 3*dz*(-D23N + D23S)*(pow(inE, 2)*(2*DirE + RegE) - pow(inW, 2)*(2*DirW + RegW))) - dz*(dx*(inN - inS)*(-D31E*OOP*comp + D31W*OOP*comp - D32E*(OOP*comp - 3) + D32W*(OOP*comp - 3)) + 12*dz*(D33E*inE*(2*DirE + RegE) + D33W*inW*(2*DirW + RegW))))*(SzzBCN + SzzBCS - 1))/(pow(dx, 2)*pow(dz, 2)); -vE = (1.0/24.0)*(SzzBCN*(6*D23S*RegE*dx*pow(inE, 2) - 12*D33E*RegE*dz*inE - dx*(inNEc - inSEc)*(D31E*OOP*comp + D32E*(OOP*comp - 3))) - SzzBCS*(6*D23N*RegE*dx*pow(inE, 2) + 12*D33E*RegE*dz*inE + dx*(inNEc - inSEc)*(D31E*OOP*comp + D32E*(OOP*comp - 3))) + 2*(SzzBCN + SzzBCS - 1)*(12*D33E*RegE*dz*inE + 3*RegE*dx*pow(inE, 2)*(D23N - D23S) + dx*(inNEc - inSEc)*(D31E*OOP*comp + D32E*(OOP*comp - 3))))/(pow(dx, 2)*dz); -vS = (1.0/24.0)*(SzzBCN*(6*D23S*dz*(-inSEv + inSWv) + 8*dx*(D21S*OOP*comp + D22S*(OOP*comp - 3)) + dz*inS*(-D31E*OOP*comp + D31W*OOP*comp - D32E*(OOP*comp - 3) + D32W*(OOP*comp - 3))) - SzzBCS*dz*inS*(D31E*OOP*comp - D31W*OOP*comp + D32E*(OOP*comp - 3) - D32W*(OOP*comp - 3)) - 2*(SzzBCN + SzzBCS - 1)*(3*D23S*dz*(-inSEv + inSWv) + 4*dx*(D21S*OOP*comp + D22S*(OOP*comp - 3)) + dz*inS*(-D31E*OOP*comp + D31W*OOP*comp - D32E*(OOP*comp - 3) + D32W*(OOP*comp - 3))))/(dx*pow(dz, 2)); -vN = (1.0/24.0)*(SzzBCN*dz*inN*(D31E*OOP*comp - D31W*OOP*comp + D32E*(OOP*comp - 3) - D32W*(OOP*comp - 3)) + SzzBCS*(6*D23N*dz*(inNEv - inNWv) + 8*dx*(D21N*OOP*comp + D22N*(OOP*comp - 3)) + dz*inN*(D31E*OOP*comp - D31W*OOP*comp + D32E*(OOP*comp - 3) - D32W*(OOP*comp - 3))) - 2*(SzzBCN + SzzBCS - 1)*(3*D23N*dz*(inNEv - inNWv) + 4*dx*(D21N*OOP*comp + D22N*(OOP*comp - 3)) + dz*inN*(D31E*OOP*comp - D31W*OOP*comp + D32E*(OOP*comp - 3) - D32W*(OOP*comp - 3))))/(dx*pow(dz, 2)); -uSW = (1.0/24.0)*(SzzBCN*(2*dx*(3*D23S*dx*(inSWv + pow(inW, 2)*(-2*DirNW*SzzBCN + SzzBCN + SzzBCS - 1)) + 4*dz*(D21S*(OOP*comp - 3) + D22S*OOP*comp)) + dz*(12*D33W*dx*inW*(-2*DirNW*SzzBCN + SzzBCN + SzzBCS - 1) + dz*(-D31E*inS*(OOP*comp - 3) + D31W*(inS*(OOP*comp - 3) + inSWc*(-OOP*comp + 3)) - D32E*OOP*comp*inS + D32W*OOP*comp*(inS - inSWc)))) + SzzBCS*(6*D23N*pow(dx, 2)*pow(inW, 2)*(2*DirNW*SzzBCN - SzzBCN - SzzBCS + 1) + dz*(12*D33W*dx*inW*(-2*DirNW*SzzBCN + SzzBCN + SzzBCS - 1) + dz*(-D31E*inS*(OOP*comp - 3) + D31W*(inS*(OOP*comp - 3) + inSWc*(-OOP*comp + 3)) - D32E*OOP*comp*inS + D32W*OOP*comp*(inS - inSWc)))) - 2*(dx*(3*dx*(-D23N*pow(inW, 2)*(-2*DirNW*SzzBCN + SzzBCN + SzzBCS - 1) + D23S*(inSWv + pow(inW, 2)*(-2*DirNW*SzzBCN + SzzBCN + SzzBCS - 1))) + 4*dz*(D21S*(OOP*comp - 3) + D22S*OOP*comp)) + dz*(12*D33W*dx*inW*(-2*DirNW*SzzBCN + SzzBCN + SzzBCS - 1) + dz*(-D31E*inS*(OOP*comp - 3) + D31W*(inS*(OOP*comp - 3) + inSWc*(-OOP*comp + 3)) - D32E*OOP*comp*inS + D32W*OOP*comp*(inS - inSWc))))*(SzzBCN + SzzBCS - 1))/(pow(dx, 2)*pow(dz, 2)); -uSE = (1.0/24.0)*(SzzBCN*(2*dx*(3*D23S*dx*(pow(inE, 2)*(-2*DirNE*SzzBCN + SzzBCN + SzzBCS - 1) + inSEv) + 4*dz*(D21S*(-OOP*comp + 3) - D22S*OOP*comp)) + dz*(12*D33E*dx*inE*(2*DirNE*SzzBCN - SzzBCN - SzzBCS + 1) - dz*(D31E*(-inS + inSEc)*(OOP*comp - 3) + D31W*inS*(OOP*comp - 3) - D32E*OOP*comp*(inS - inSEc) + D32W*OOP*comp*inS))) + SzzBCS*(6*D23N*pow(dx, 2)*pow(inE, 2)*(2*DirNE*SzzBCN - SzzBCN - SzzBCS + 1) + dz*(12*D33E*dx*inE*(2*DirNE*SzzBCN - SzzBCN - SzzBCS + 1) - dz*(D31E*(-inS + inSEc)*(OOP*comp - 3) + D31W*inS*(OOP*comp - 3) - D32E*OOP*comp*(inS - inSEc) + D32W*OOP*comp*inS))) - 2*(dx*(3*dx*(-D23N*pow(inE, 2)*(-2*DirNE*SzzBCN + SzzBCN + SzzBCS - 1) + D23S*(pow(inE, 2)*(-2*DirNE*SzzBCN + SzzBCN + SzzBCS - 1) + inSEv)) + 4*dz*(D21S*(-OOP*comp + 3) - D22S*OOP*comp)) + dz*(12*D33E*dx*inE*(2*DirNE*SzzBCN - SzzBCN - SzzBCS + 1) - dz*(D31E*(-inS + inSEc)*(OOP*comp - 3) + D31W*inS*(OOP*comp - 3) - D32E*OOP*comp*(inS - inSEc) + D32W*OOP*comp*inS)))*(SzzBCN + SzzBCS - 1))/(pow(dx, 2)*pow(dz, 2)); -uNW = (1.0/24.0)*(SzzBCN*(6*D23S*pow(dx, 2)*pow(inW, 2)*(2*DirSW*SzzBCS - SzzBCN - SzzBCS + 1) + dz*(12*D33W*dx*inW*(2*DirSW*SzzBCS - SzzBCN - SzzBCS + 1) + dz*(-D31E*inN*(OOP*comp - 3) + D31W*(inN - inNWc)*(OOP*comp - 3) - D32E*OOP*comp*inN + D32W*OOP*comp*(inN - inNWc)))) - SzzBCS*(2*dx*(3*D23N*dx*(-inNWv + pow(inW, 2)*(2*DirSW*SzzBCS - SzzBCN - SzzBCS + 1)) + 4*dz*(D21N*(OOP*comp - 3) + D22N*OOP*comp)) - dz*(12*D33W*dx*inW*(2*DirSW*SzzBCS - SzzBCN - SzzBCS + 1) + dz*(-D31E*inN*(OOP*comp - 3) + D31W*(inN - inNWc)*(OOP*comp - 3) - D32E*OOP*comp*inN + D32W*OOP*comp*(inN - inNWc)))) + 2*(dx*(3*dx*(D23N*(-inNWv + pow(inW, 2)*(2*DirSW*SzzBCS - SzzBCN - SzzBCS + 1)) - D23S*pow(inW, 2)*(2*DirSW*SzzBCS - SzzBCN - SzzBCS + 1)) + 4*dz*(D21N*(OOP*comp - 3) + D22N*OOP*comp)) - dz*(12*D33W*dx*inW*(2*DirSW*SzzBCS - SzzBCN - SzzBCS + 1) + dz*(-D31E*inN*(OOP*comp - 3) + D31W*(inN - inNWc)*(OOP*comp - 3) - D32E*OOP*comp*inN + D32W*OOP*comp*(inN - inNWc))))*(SzzBCN + SzzBCS - 1))/(pow(dx, 2)*pow(dz, 2)); -uNE = (1.0/24.0)*(SzzBCN*(6*D23S*pow(dx, 2)*pow(inE, 2)*(2*DirSE*SzzBCS - SzzBCN - SzzBCS + 1) - dz*(12*D33E*dx*inE*(2*DirSE*SzzBCS - SzzBCN - SzzBCS + 1) + dz*(-D31E*(inN - inNEc)*(OOP*comp - 3) + D31W*inN*(OOP*comp - 3) - D32E*OOP*comp*(inN - inNEc) + D32W*OOP*comp*inN))) + SzzBCS*(2*dx*(-3*D23N*dx*(pow(inE, 2)*(2*DirSE*SzzBCS - SzzBCN - SzzBCS + 1) - inNEv) + 4*dz*(D21N*(OOP*comp - 3) + D22N*OOP*comp)) - dz*(12*D33E*dx*inE*(2*DirSE*SzzBCS - SzzBCN - SzzBCS + 1) + dz*(-D31E*(inN - inNEc)*(OOP*comp - 3) + D31W*inN*(OOP*comp - 3) - D32E*OOP*comp*(inN - inNEc) + D32W*OOP*comp*inN))) - 2*(dx*(3*dx*(-D23N*(pow(inE, 2)*(2*DirSE*SzzBCS - SzzBCN - SzzBCS + 1) - inNEv) + D23S*pow(inE, 2)*(2*DirSE*SzzBCS - SzzBCN - SzzBCS + 1)) + 4*dz*(D21N*(OOP*comp - 3) + D22N*OOP*comp)) - dz*(12*D33E*dx*inE*(2*DirSE*SzzBCS - SzzBCN - SzzBCS + 1) + dz*(-D31E*(inN - inNEc)*(OOP*comp - 3) + D31W*inN*(OOP*comp - 3) - D32E*OOP*comp*(inN - inNEc) + D32W*OOP*comp*inN)))*(SzzBCN + SzzBCS - 1))/(pow(dx, 2)*pow(dz, 2)); -vSW = (1.0/24.0)*(-SzzBCN*(6*D23S*inSWv - D31W*OOP*comp*inSWc - D32W*inSWc*(OOP*comp - 3)) + SzzBCS*inSWc*(D31W*OOP*comp + D32W*(OOP*comp - 3)) + 2*(SzzBCN + SzzBCS - 1)*(3*D23S*inSWv - D31W*OOP*comp*inSWc - D32W*inSWc*(OOP*comp - 3)))/(dx*dz); -vSE = (1.0/24.0)*(SzzBCN*(6*D23S*inSEv - D31E*OOP*comp*inSEc - D32E*inSEc*(OOP*comp - 3)) - SzzBCS*inSEc*(D31E*OOP*comp + D32E*(OOP*comp - 3)) - 2*(SzzBCN + SzzBCS - 1)*(3*D23S*inSEv - D31E*OOP*comp*inSEc - D32E*inSEc*(OOP*comp - 3)))/(dx*dz); -vNW = (1.0/24.0)*(-SzzBCN*inNWc*(D31W*OOP*comp + D32W*(OOP*comp - 3)) + SzzBCS*(6*D23N*inNWv - D31W*OOP*comp*inNWc - D32W*inNWc*(OOP*comp - 3)) - 2*(SzzBCN + SzzBCS - 1)*(3*D23N*inNWv - D31W*OOP*comp*inNWc - D32W*inNWc*(OOP*comp - 3)))/(dx*dz); -vNE = (1.0/24.0)*(SzzBCN*inNEc*(D31E*OOP*comp + D32E*(OOP*comp - 3)) - SzzBCS*(6*D23N*inNEv - D31E*OOP*comp*inNEc - D32E*inNEc*(OOP*comp - 3)) + 2*(SzzBCN + SzzBCS - 1)*(3*D23N*inNEv - D31E*OOP*comp*inNEc - D32E*inNEc*(OOP*comp - 3)))/(dx*dz); -uSWW = (1.0/24.0)*inSWc*(D31W*(OOP*comp - 3) + D32W*OOP*comp)*(-SzzBCN - SzzBCS + 2)/pow(dx, 2); -uSEE = (1.0/24.0)*inSEc*(D31E*(OOP*comp - 3) + D32E*OOP*comp)*(-SzzBCN - SzzBCS + 2)/pow(dx, 2); -uNWW = (1.0/24.0)*inNWc*(D31W*(OOP*comp - 3) + D32W*OOP*comp)*(-SzzBCN - SzzBCS + 2)/pow(dx, 2); -uNEE = (1.0/24.0)*inNEc*(D31E*(OOP*comp - 3) + D32E*OOP*comp)*(-SzzBCN - SzzBCS + 2)/pow(dx, 2); -uSSW = (1.0/4.0)*D23S*inSWv*(SzzBCS - 1)/pow(dz, 2); -uSSE = (1.0/4.0)*D23S*inSEv*(SzzBCS - 1)/pow(dz, 2); -uNNW = (1.0/4.0)*D23N*inNWv*(SzzBCN - 1)/pow(dz, 2); -uNNE = (1.0/4.0)*D23N*inNEv*(SzzBCN - 1)/pow(dz, 2); -pS = (1.0/8.0)*(SzzBCN*(8*dx*(D24S - 1) + dz*inS*(-D34E + D34W)) - SzzBCS*dz*inS*(D34E - D34W) + 2*(4*dx*(1 - D24S) + dz*inS*(D34E - D34W))*(SzzBCN + SzzBCS - 1))/(dx*dz); -pN = (1.0/8.0)*(-SzzBCN*dz*inN*(D34E - D34W) - SzzBCS*(8*dx*(D24N - 1) + dz*inN*(D34E - D34W)) + 2*(4*dx*(D24N - 1) + dz*inN*(D34E - D34W))*(SzzBCN + SzzBCS - 1))/(dx*dz); -pSW = (1.0/8.0)*D34W*inSWc*(-SzzBCN - SzzBCS + 2)/dx; -pSE = (1.0/8.0)*D34E*inSEc*(SzzBCN + SzzBCS - 2)/dx; -pNW = (1.0/8.0)*D34W*inNWc*(-SzzBCN - SzzBCS + 2)/dx; -pNE = (1.0/8.0)*D34E*inNEc*(SzzBCN + SzzBCS - 2)/dx; // Stabilisation with density gradients if ( stab==1 ) {