|
|
|
@ -815,12 +815,12 @@ int ns_step_rkf45(
|
|
|
|
|
err+=(kx*kx+ky*ky)*cabs2((*delta)*(1./360*k1[klookup_sym(kx,ky,K2)]-128./4275*k3[klookup_sym(kx,ky,K2)]-2197./75240*k4[klookup_sym(kx,ky,K2)]+1./50*k5[klookup_sym(kx,ky,K2)]+2./55*k6[klookup_sym(kx,ky,K2)]));
|
|
|
|
|
// next step
|
|
|
|
|
tmp[klookup_sym(kx,ky,K2)]=(*delta)*(25./216*k1[klookup_sym(kx,ky,K2)]+1408./2565*k3[klookup_sym(kx,ky,K2)]+2197./4104*k4[klookup_sym(kx,ky,K2)]-1./5*k5[klookup_sym(kx,ky,K2)]);
|
|
|
|
|
sumU+=(kx*kx+ky*ky)*cabs2((*delta)*(16./135*k1[klookup_sym(kx,ky,K2)]+6656./12825*k3[klookup_sym(kx,ky,K2)]+28561./56430*k4[klookup_sym(kx,ky,K2)]-9./50*k5[klookup_sym(kx,ky,K2)]+2./55*k6[klookup_sym(kx,ky,K2)]));
|
|
|
|
|
sumU+=(kx*kx+ky*ky)*cabs2(u[klookup_sym(kx,ky,K2)]+(*delta)*(16./135*k1[klookup_sym(kx,ky,K2)]+6656./12825*k3[klookup_sym(kx,ky,K2)]+28561./56430*k4[klookup_sym(kx,ky,K2)]-9./50*k5[klookup_sym(kx,ky,K2)]+2./55*k6[klookup_sym(kx,ky,K2)]));
|
|
|
|
|
sumu+=(kx*kx+ky*ky)*cabs2(u[klookup_sym(kx,ky,K2)]+tmp[klookup_sym(kx,ky,K2)]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
err=sqrt(err);
|
|
|
|
|
relative=pow((sqrt(sumu)+sqrt(sumU))/sumu, 1./3);
|
|
|
|
|
relative=(sqrt(sumu)+sqrt(sumU))/sumu;
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
fprintf(stderr,"bug: unknown norm: %u, contact ian.jauslin@rutgers.edu\n", adaptive_norm);
|
|
|
|
@ -961,12 +961,12 @@ int ns_step_rkbs32(
|
|
|
|
|
for(kx=0;kx<=K1;kx++){
|
|
|
|
|
for(ky=(kx>0 ? -K2 : 1);ky<=K2;ky++){
|
|
|
|
|
err+=(kx*kx+ky*ky)*cabs2((*delta)*(5./72*(*k1)[klookup_sym(kx,ky,K2)]-1./12*k2[klookup_sym(kx,ky,K2)]-1./9*k3[klookup_sym(kx,ky,K2)]+1./8*(*k4)[klookup_sym(kx,ky,K2)]));
|
|
|
|
|
sumU+=(kx*kx+ky*ky)*cabs2((*delta)*(7./24*(*k1)[klookup_sym(kx,ky,K2)]+1./4*k2[klookup_sym(kx,ky,K2)]+1./3*k3[klookup_sym(kx,ky,K2)]+1./8*(*k4)[klookup_sym(kx,ky,K2)]));
|
|
|
|
|
sumU+=(kx*kx+ky*ky)*cabs2(u[klookup_sym(kx,ky,K2)]+(*delta)*(7./24*(*k1)[klookup_sym(kx,ky,K2)]+1./4*k2[klookup_sym(kx,ky,K2)]+1./3*k3[klookup_sym(kx,ky,K2)]+1./8*(*k4)[klookup_sym(kx,ky,K2)]));
|
|
|
|
|
sumu+=(kx*kx+ky*ky)*cabs2(tmp[klookup_sym(kx,ky,K2)]);
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
err=sqrt(err);
|
|
|
|
|
relative=pow((sqrt(sumu)+sqrt(sumU))/sumu, 1./3);
|
|
|
|
|
relative=(sqrt(sumu)+sqrt(sumU))/sumu;
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
fprintf(stderr,"bug: unknown norm: %u, contact ian.jauslin@rutgers,edu\n", adaptive_norm);
|
|
|
|
@ -1143,7 +1143,7 @@ int ns_step_rkdp54(
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
err=sqrt(err);
|
|
|
|
|
relative=pow((sqrt(sumu)+sqrt(sumU))/sumu, 1./3);
|
|
|
|
|
relative=(sqrt(sumu)+sqrt(sumU))/sumu;
|
|
|
|
|
}
|
|
|
|
|
else{
|
|
|
|
|
fprintf(stderr,"bug: unknown norm: %u, contact ian.jauslin@rutgers,edu\n", adaptive_norm);
|
|
|
|
|