From fa7740b52a1b6aa739b66844b959b34b28b77518 Mon Sep 17 00:00:00 2001 From: nadolski <nadolski@9a6e40ed-f3a0-4838-9b4a-bf418f78e88d> Date: Sun, 27 Mar 2011 15:00:59 +0000 Subject: [PATCH] Bug rotation quad, add flag specific to quad and not dipole --- tracy/tracy/src/soleillib.cc | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/tracy/tracy/src/soleillib.cc b/tracy/tracy/src/soleillib.cc index 8acb94e..35922a7 100644 --- a/tracy/tracy/src/soleillib.cc +++ b/tracy/tracy/src/soleillib.cc @@ -328,9 +328,9 @@ void SetErr(long seed,double fac) for (i = 1L; i <= globval.Cell_nLoc; i++) { - if (Cell[i].Elem.Pkind == 2L) + if (Cell[i].Elem.Pkind == Mpole) { - if (Cell[i].Elem.M->Porder == 2L && Cell[i].dT[1] == 0) + if (Cell[i].Elem.M->n_design == 2L && Cell[i].dT[1] == 0) //Quads but exclude skew quads { theta = fac*normranf(); /* random error every 2 elements (quad split into 2) */ Cell[i].Elem.M->PBpar[HOMmax-2L] = -Cell[i].Elem.M->PBpar[HOMmax+2L]*sin(2.0*theta); @@ -401,15 +401,15 @@ void SetErr2(long seed,double fac) for (i = 1L; i <= globval.Cell_nLoc; i++) { - if (Cell[i].Elem.Pkind == 2L) + if (Cell[i].Elem.Pkind == Mpole) { - if (Cell[i].Elem.M->Porder == 2L && Cell[i].dT[1] == 0) + if (Cell[i].Elem.M->n_design == 2L && Cell[i].dT[1] == 0) // exclude skew quads { if ((pair%2)==0) theta = fac*normranf(); /* random error every 2 elements (quad split into 2) */ pair++; Cell[i].Elem.M->PBpar[HOMmax-2L] = -Cell[i].Elem.M->PBpar[HOMmax+2L]*sin(2.0*theta); Cell[i].Elem.M->PBpar[HOMmax+2L] = Cell[i].Elem.M->PBpar[HOMmax+2L]*cos(2.0*theta); - if (trace) printf("%6s % .5e % .5e % .5e\n",Cell[i].Elem.PName, + if (!trace) printf("%6s % .5e % .5e % .5e\n",Cell[i].Elem.PName, Cell[i].Elem.M->PBpar[HOMmax-2L], Cell[i].Elem.M->PBpar[HOMmax+2L],theta); Mpole_SetPB(Cell[i].Fnum, Cell[i].Knum, -2L); -- GitLab