From 3bf7d31dcd3b93d4bb6ae29f05d1bf4269d2c4fe Mon Sep 17 00:00:00 2001 From: Erik Schnetter Date: Mon, 3 Jan 2011 20:52:45 -0500 Subject: Don't define the (unused) upwinding differencing operators in the ADM constraints --- m/McLachlan_ADMConstraints.m | 78 +------------------------------------------- 1 file changed, 1 insertion(+), 77 deletions(-) (limited to 'm') diff --git a/m/McLachlan_ADMConstraints.m b/m/McLachlan_ADMConstraints.m index 325301b..2925af2 100644 --- a/m/McLachlan_ADMConstraints.m +++ b/m/McLachlan_ADMConstraints.m @@ -35,91 +35,15 @@ derivatives = PDstandardNth[i_] -> StandardCenteredDifferenceOperator[1,derivOrder/2,i], PDstandardNth[i_,i_] -> StandardCenteredDifferenceOperator[2,derivOrder/2,i], PDstandardNth[i_,j_] -> StandardCenteredDifferenceOperator[1,derivOrder/2,i] * - StandardCenteredDifferenceOperator[1,derivOrder/2,j], - -(* PD: These come from my mathematica notebook - "Upwind-Kranc-Convert.nb" that converts upwinding finite - differencing operators generated by - StandardUpwindDifferenceOperator into this form *) - - Switch[derivOrder, - 2, - PDupwindNth[1] -> (dir[1]*(-3 + 4*shift[1]^dir[1] - - shift[1]^(2*dir[1])))/(2*spacing[1]), - 4, - PDupwindNth[1] -> (dir[1]*(-10 - 3/shift[1]^dir[1] + 18*shift[1]^dir[1] - - 6*shift[1]^(2*dir[1]) + - shift[1]^(3*dir[1])))/(12*spacing[1]), - 6, - PDupwindNth[1] -> (dir[1]*(-35 + 2/shift[1]^(2*dir[1]) - - 24/shift[1]^dir[1] + 80*shift[1]^dir[1] - - 30*shift[1]^(2*dir[1]) + 8*shift[1]^(3*dir[1]) - - shift[1]^(4*dir[1])))/(60*spacing[1]), - 8, - PDupwindNth[1] -> (dir[1]*(-378 - 5/shift[1]^(3*dir[1]) + - 60/shift[1]^(2*dir[1]) - 420/shift[1]^dir[1] + - 1050*shift[1]^dir[1] - 420*shift[1]^(2*dir[1]) + - 140*shift[1]^(3*dir[1]) - 30*shift[1]^(4*dir[1]) + - 3*shift[1]^(5*dir[1])))/(840*spacing[1])], - Switch[derivOrder, - 2, - PDupwindNth[2] -> (dir[2]*(-3 + 4*shift[2]^dir[2] - - shift[2]^(2*dir[2])))/(2*spacing[2]), - 4, - PDupwindNth[2] -> (dir[2]*(-10 - 3/shift[2]^dir[2] + 18*shift[2]^dir[2] - - 6*shift[2]^(2*dir[2]) + - shift[2]^(3*dir[2])))/(12*spacing[2]), - 6, - PDupwindNth[2] -> (dir[2]*(-35 + 2/shift[2]^(2*dir[2]) - - 24/shift[2]^dir[2] + 80*shift[2]^dir[2] - - 30*shift[2]^(2*dir[2]) + 8*shift[2]^(3*dir[2]) - - shift[2]^(4*dir[2])))/(60*spacing[2]), - 8, - PDupwindNth[2] -> (dir[2]*(-378 - 5/shift[2]^(3*dir[2]) + - 60/shift[2]^(2*dir[2]) - 420/shift[2]^dir[2] + - 1050*shift[2]^dir[2] - 420*shift[2]^(2*dir[2]) + - 140*shift[2]^(3*dir[2]) - 30*shift[2]^(4*dir[2]) + - 3*shift[2]^(5*dir[2])))/(840*spacing[2])], - Switch[derivOrder, - 2, - PDupwindNth[3] -> (dir[3]*(-3 + 4*shift[3]^dir[3] - - shift[3]^(2*dir[3])))/(2*spacing[3]), - 4, - PDupwindNth[3] -> (dir[3]*(-10 - 3/shift[3]^dir[3] + 18*shift[3]^dir[3] - - 6*shift[3]^(2*dir[3]) + - shift[3]^(3*dir[3])))/(12*spacing[3]), - 6, - PDupwindNth[3] -> (dir[3]*(-35 + 2/shift[3]^(2*dir[3]) - - 24/shift[3]^dir[3] + 80*shift[3]^dir[3] - - 30*shift[3]^(2*dir[3]) + 8*shift[3]^(3*dir[3]) - - shift[3]^(4*dir[3])))/(60*spacing[3]), - 8, - PDupwindNth[3] -> (dir[3]*(-378 - 5/shift[3]^(3*dir[3]) + - 60/shift[3]^(2*dir[3]) - 420/shift[3]^dir[3] + - 1050*shift[3]^dir[3] - 420*shift[3]^(2*dir[3]) + - 140*shift[3]^(3*dir[3]) - 30*shift[3]^(4*dir[3]) + - 3*shift[3]^(5*dir[3])))/(840*spacing[3])], - - (* TODO: make these higher order stencils *) - PDonesided[1] -> dir[1] (-1 + shift[1]^dir[1]) / spacing[1], - PDonesided[2] -> dir[2] (-1 + shift[2]^dir[2]) / spacing[2], - PDonesided[3] -> dir[3] (-1 + shift[3]^dir[3]) / spacing[3] + StandardCenteredDifferenceOperator[1,derivOrder/2,j] }; FD = PDstandardNth; -FDu = PDupwindNth; -FDo = PDonesided; ResetJacobians; If [useGlobalDerivs, DefineJacobian[PD, FD, J, dJ], DefineJacobian[PD, FD, KD, Zero3]]; -If [useGlobalDerivs, - DefineJacobian[PDu, FDu, J, dJ], - DefineJacobian[PDu, FDu, KD, Zero3]]; -If [useGlobalDerivs, - DefineJacobian[PDo, FDo, J, dJ], - DefineJacobian[PDo, FDo, KD, Zero3]]; -- cgit v1.2.3