diff --git a/tracy/tracy/src/soleillib.cc b/tracy/tracy/src/soleillib.cc index 8acb94ebbfe38dbef72b668ade7ea84ecac91c78..35922a71e39a8e1a833d24b69ff044d1a5a2ad9d 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);