Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[Carpet] branch, master, updated. carpet-6-init-349-g1d493b9
by Carpet git repositories 15 Aug '13

15 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 1d493b9a1e1792eee4697d6d4985770cdb0522f8 (commit) from 27461a762da51d0c3151e7a55f13719e393ebded (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 1d493b9a1e1792eee4697d6d4985770cdb0522f8 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Aug 15 14:08:20 2013 -0600 LoopControl: Initialize fine thread communicators ahead of time ----------------------------------------------------------------------- Summary of changes: Carpet/LoopControl/src/loopcontrol.cc | 25 ++++++------------------- 1 files changed, 6 insertions(+), 19 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, master, updated. carpet-6-init-348-g27461a7
by Carpet git repositories 15 Aug '13

15 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 27461a762da51d0c3151e7a55f13719e393ebded (commit) from 86ef2ebd9b2be15a67133625e960c8b2c7e7c57f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 27461a762da51d0c3151e7a55f13719e393ebded Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Aug 15 13:14:28 2013 -0600 LoopControl: Add debug output to help track down assertion failure ----------------------------------------------------------------------- Summary of changes: Carpet/LoopControl/src/loopcontrol.cc | 15 +++++++++++---- 1 files changed, 11 insertions(+), 4 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, master, updated. carpet-6-init-347-g86ef2eb
by Carpet git repositories 15 Aug '13

15 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via 86ef2ebd9b2be15a67133625e960c8b2c7e7c57f (commit) from ee44d002712e9ba9e703e1bb22a626e8c58c1603 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 86ef2ebd9b2be15a67133625e960c8b2c7e7c57f Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Aug 15 11:28:05 2013 -0600 LoopControl: Explicitly check for consistent loop arguments from the caller ----------------------------------------------------------------------- Summary of changes: Carpet/LoopControl/src/loopcontrol.cc | 34 +++++++++++++++++++++++++++++++++ 1 files changed, 34 insertions(+), 0 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[Carpet] branch, master, updated. carpet-6-init-346-gee44d00
by Carpet git repositories 15 Aug '13

15 Aug '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>". The branch, master has been updated via ee44d002712e9ba9e703e1bb22a626e8c58c1603 (commit) from fdadb2cfc19a42ada49fc91c12e56646848ca8b9 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit ee44d002712e9ba9e703e1bb22a626e8c58c1603 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Thu Aug 15 09:20:12 2013 -0600 LoopControl: Initialize num_smt_threads explicitly during loop startup ----------------------------------------------------------------------- Summary of changes: Carpet/LoopControl/src/loopcontrol.cc | 21 ++++++++++----------- 1 files changed, 10 insertions(+), 11 deletions(-) hooks/post-receive -- Carpet — Adaptive Mesh Refinement for the Cactus Framework <http://carpetcode.org/>

1 0

[svn:einsteintoolkit] manifest/trunk/ (Rev. 245)
by rhaas＠tapir.caltech.edu 14 Aug '13

14 Aug '13

User: rhaas Date: 2013/08/14 07:56 PM Modified: /trunk/ einsteintoolkit.th Log: add Timers thorn (required by Carpet) File Changes: Directory: /trunk/ ================== File [modified]: einsteintoolkit.th Delta lines: +1 -0 =================================================================== --- trunk/einsteintoolkit.th 2013-08-02 08:35:14 UTC (rev 244) +++ trunk/einsteintoolkit.th 2013-08-15 00:56:53 UTC (rev 245) @@ -404,6 +404,7 @@ Carpet/CarpetTracker Carpet/CycleClock Carpet/LoopControl +Carpet/Timers

2 1

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 579)
by rhaas＠tapir.caltech.edu 13 Aug '13

13 Aug '13

User: rhaas Date: 2013/08/13 09:56 AM Modified: /trunk/src/ GRHydro_Prim2ConM.F90 Log: Adjust loops for Prim2Con call (needs to run in the ghost zones as well after being called from ZelmaniLeak). From: Philipp Moesta <pmoesta(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Prim2ConM.F90 Delta lines: +4 -4 =================================================================== --- trunk/src/GRHydro_Prim2ConM.F90 2013-08-13 14:56:43 UTC (rev 578) +++ trunk/src/GRHydro_Prim2ConM.F90 2013-08-13 14:56:46 UTC (rev 579) @@ -585,10 +585,10 @@ if(evolve_Y_e.ne.0) then !$OMP PARALLEL DO PRIVATE(i, j, k) - do k = GRHydro_stencil,cctk_lsh(3)-GRHydro_stencil+1 - do j = GRHydro_stencil,cctk_lsh(2)-GRHydro_stencil+1 - do i = GRHydro_stencil,cctk_lsh(1)-GRHydro_stencil+1 - Y_e_con(i,j,k) = Y_e(i,j,k) * dens(i,j,k) + do k = 1,cctk_lsh(3) + do j = 1,cctk_lsh(2) + do i = 1,cctk_lsh(1) + Y_e_con(i,j,k) = Y_e(i,j,k) * dens(i,j,k) enddo enddo enddo

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 578)
by rhaas＠tapir.caltech.edu 13 Aug '13

13 Aug '13

User: rhaas Date: 2013/08/13 09:56 AM Modified: /trunk/src/ GRHydro_Con2PrimM_pt_EOSOmni.c Log: Get rid of old heat injection in C2P MHD From: Philipp Moesta <pmoesta(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Con2PrimM_pt_EOSOmni.c Delta lines: +175 -175 =================================================================== --- trunk/src/GRHydro_Con2PrimM_pt_EOSOmni.c 2013-08-13 14:56:40 UTC (rev 577) +++ trunk/src/GRHydro_Con2PrimM_pt_EOSOmni.c 2013-08-13 14:56:43 UTC (rev 578) @@ -411,66 +411,66 @@ // fprintf(stdout,"rho0=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); // fprintf(stdout,"keyerr=%d, anyerr=%d \n", eosvars.eoskeyerr[0], eosvars.eosanyerr[0]); // #pragma omp critical - if (eosvars.eosanyerr[0] != 0) { - fprintf(stdout,"inside 1: anyerr=%d\n",eosvars.eosanyerr[0]); - if (eosvars.eosrl >= GRHydro_c2p_warn_from_reflevel) { - fprintf(stdout,"inside 2: anyerr=%d\n",eosvars.eosanyerr[0]); - if(eosvars.eoskeyerr[0] == 667 && GRHydro_eos_hot_eps_fix != 0) { - fprintf(stdout,"inside 3: anyerr=%d, keyerr=%d\n",eosvars.eosanyerr[0],eosvars.eoskeyerr[0]); - // Handling of the case when no new temperature can be - // found for a given epsilon. The amount of times - // we get to this place should be monitored, as this - // 'failsafe' mode creates artificial heat. +// if (eosvars.eosanyerr[0] != 0) { +// fprintf(stdout,"inside 1: anyerr=%d\n",eosvars.eosanyerr[0]); +// if (eosvars.eosrl >= GRHydro_c2p_warn_from_reflevel) { +// fprintf(stdout,"inside 2: anyerr=%d\n",eosvars.eosanyerr[0]); +// if(eosvars.eoskeyerr[0] == 667 && GRHydro_eos_hot_eps_fix != 0) { +// fprintf(stdout,"inside 3: anyerr=%d, keyerr=%d\n",eosvars.eosanyerr[0],eosvars.eoskeyerr[0]); +// // Handling of the case when no new temperature can be +// // found for a given epsilon. The amount of times +// // we get to this place should be monitored, as this +// // 'failsafe' mode creates artificial heat. +// +// nf = 0; +// while(eosvars.eosanyerr[0] != 0 && nf<= nfudgemax) { +// eosvars.eosanyerr[0] = 0; +// tau = tau + rho0*abs((*epsilon))*0.05*w*w; +// *epsilon = (*epsilon) + abs((*epsilon))*0.05; +// u = (*epsilon) * rho0; +// EOS_Omni_press(eosvars.eoshandle,eosvars.eoskeytemp,eosvars.eosprec,1, +// &rho0,epsilon,eosvars.eos_temp, +// eosvars.eos_y_e,&p,eosvars.eoskeyerr,eosvars.eosanyerr); +// nf = nf + 1; +// } +// fprintf(stdout, "Iterations of heat injection: %d \n",nf); +// fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); +// if(nf >= nfudgemax) { +// if(GRHydro_c2p_reset_eps_tau_hot_eos != 1) { +// CCTK_WARN(failinfomode,"EOS error in c2p 0: injected heat too many times"); +// fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); +// //CCTK_WARN(failinfomode,warnline); +// fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); +// //call CCTK_WARN(failinfomode,warnline) +// fprintf(stdout,"code=%d\n",eosvars.eoskeyerr[0]); +// //call CCTK_WARN(failinfomode,warnline) +// CCTK_WARN(failwarnmode,"Aborting!!!"); +// } +// else { +// CCTK_WARN(failinfomode,"EOS error in c2p 0: LAST RESORT -- reset eps and tau based on old temp"); +// fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); +// fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); +// eosvars.eoskeytemp =1; +// EOS_Omni_press(eosvars.eoshandle,eosvars.eoskeytemp,eosvars.eosprec,1, +// &rho0,epsilon,eosvars.eos_temp,eosvars.eos_y_e,&p,eosvars.eoskeyerr,eosvars.eosanyerr); +// tau = (rho0 + rho0*(*epsilon) + lg.bsq + p)*w*w - (p + lg.bsq/2.0) - w*w*lg.VdotBsq - rho0*w; +// u = (*epsilon) * rho0; +// //tau = ( (rho + rho*epsilon) + xpress ) * w_lorentz**2 - xpress - rho*w_lorentz; +// fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); +// eosvars.eoskeytemp =0; +// } +// } +// } +// else { +// CCTK_WARN(failinfomode,"EOS error in c2p 0"); +// fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); +// fprintf(stdout,"rho=%f, dens=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,dens,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); +// fprintf(stdout,"code=%d\n",eosvars.eoskeyerr[0]); +// CCTK_WARN(failwarnmode,"Aborting!!!"); +// } +// } +// } - nf = 0; - while(eosvars.eosanyerr[0] != 0 && nf<= nfudgemax) { - eosvars.eosanyerr[0] = 0; - tau = tau + rho0*abs((*epsilon))*0.05*w*w; - *epsilon = (*epsilon) + abs((*epsilon))*0.05; - u = (*epsilon) * rho0; - EOS_Omni_press(eosvars.eoshandle,eosvars.eoskeytemp,eosvars.eosprec,1, - &rho0,epsilon,eosvars.eos_temp, - eosvars.eos_y_e,&p,eosvars.eoskeyerr,eosvars.eosanyerr); - nf = nf + 1; - } - fprintf(stdout, "Iterations of heat injection: %d \n",nf); - fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); - if(nf >= nfudgemax) { - if(GRHydro_c2p_reset_eps_tau_hot_eos != 1) { - CCTK_WARN(failinfomode,"EOS error in c2p 0: injected heat too many times"); - fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); - //CCTK_WARN(failinfomode,warnline); - fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); - //call CCTK_WARN(failinfomode,warnline) - fprintf(stdout,"code=%d\n",eosvars.eoskeyerr[0]); - //call CCTK_WARN(failinfomode,warnline) - CCTK_WARN(failwarnmode,"Aborting!!!"); - } - else { - CCTK_WARN(failinfomode,"EOS error in c2p 0: LAST RESORT -- reset eps and tau based on old temp"); - fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); - fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); - eosvars.eoskeytemp =1; - EOS_Omni_press(eosvars.eoshandle,eosvars.eoskeytemp,eosvars.eosprec,1, - &rho0,epsilon,eosvars.eos_temp,eosvars.eos_y_e,&p,eosvars.eoskeyerr,eosvars.eosanyerr); - tau = (rho0 + rho0*(*epsilon) + lg.bsq + p)*w*w - (p + lg.bsq/2.0) - w*w*lg.VdotBsq - rho0*w; - u = (*epsilon) * rho0; - //tau = ( (rho + rho*epsilon) + xpress ) * w_lorentz**2 - xpress - rho*w_lorentz; - fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); - eosvars.eoskeytemp =0; - } - } - } - else { - CCTK_WARN(failinfomode,"EOS error in c2p 0"); - fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); - fprintf(stdout,"rho=%f, dens=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,dens,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); - fprintf(stdout,"code=%d\n",eosvars.eoskeyerr[0]); - CCTK_WARN(failwarnmode,"Aborting!!!"); - } - } - } - lg.tau = tau; //fprintf(stdout," p = %26.16e \n", p ); @@ -585,63 +585,63 @@ p = pressure_rho0_eps_eosomni(rho0,*epsilon,&dum1,&dum2,&eosvars) ; // EOSOMNI // #pragma omp critical - if (eosvars.eosanyerr[0] != 0) { - fprintf(stdout,"inside 4: anyerr=%d\n",eosvars.eosanyerr[0]); - if (eosvars.eosrl >= GRHydro_c2p_warn_from_reflevel) { - if(eosvars.eoskeyerr[0] == 667 && GRHydro_eos_hot_eps_fix != 0) { - // Handling of the case when no new temperature can be - // found for a given epsilon. The amount of times - // we get to this place should be monitored, as this - // 'failsafe' mode creates artificial heat. - nf = 0; - while(eosvars.eosanyerr[0] != 0 && nf<= nfudgemax) { - eosvars.eosanyerr[0] = 0; - tau = tau + rho0*abs((*epsilon))*0.05*w*w; - *epsilon = (*epsilon) + abs((*epsilon))*0.05; - u = (*epsilon) * rho0; - EOS_Omni_press(eosvars.eoshandle,eosvars.eoskeytemp,eosvars.eosprec,1, - &rho0,epsilon,eosvars.eos_temp, - eosvars.eos_y_e,&p,eosvars.eoskeyerr,eosvars.eosanyerr); - nf = nf + 1; - } - fprintf(stdout, "Iterations of heat injection: %d \n",nf); - fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); - if(nf >= nfudgemax) { - if(GRHydro_c2p_reset_eps_tau_hot_eos != 1) { - CCTK_WARN(failinfomode,"EOS error in c2p 0: injected heat too many times"); - fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); - //CCTK_WARN(failinfomode,warnline); - fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); - //call CCTK_WARN(failinfomode,warnline) - fprintf(stdout,"code=%d\n",eosvars.eoskeyerr[0]); - //call CCTK_WARN(failinfomode,warnline) - CCTK_WARN(failwarnmode,"Aborting!!!"); - } - else { - CCTK_WARN(failinfomode,"EOS error in c2p 0: LAST RESORT -- reset eps and tau based on old temp"); - fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); - fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); - eosvars.eoskeytemp =1; - EOS_Omni_press(eosvars.eoshandle,eosvars.eoskeytemp,eosvars.eosprec,1, - &rho0,epsilon,eosvars.eos_temp,eosvars.eos_y_e,&p,eosvars.eoskeyerr,eosvars.eosanyerr); - // tau = (rho0 + rho0*(*epsilon) + lg.bsq + p)*w*w - (p + lg.bsq/2.0) - rho0*w; - tau = (rho0 + rho0*(*epsilon) + lg.bsq + p)*w*w - (p + lg.bsq/2.0) - w*w*lg.VdotBsq - rho0*w; - u = (*epsilon) * rho0; - //tau = ( (rho + rho*epsilon) + xpress ) * w_lorentz**2 - xpress - rho*w_lorentz; - //fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); - eosvars.eoskeytemp =0; - } - } - } - else { - CCTK_WARN(failinfomode,"EOS error in c2p 0"); - fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); - fprintf(stdout,"rho=%f, dens=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,dens,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); - fprintf(stdout,"code=%d\n",eosvars.eoskeyerr[0]); - CCTK_WARN(0,"Aborting!!!"); - } - } - } +// if (eosvars.eosanyerr[0] != 0) { +// fprintf(stdout,"inside 4: anyerr=%d\n",eosvars.eosanyerr[0]); +// if (eosvars.eosrl >= GRHydro_c2p_warn_from_reflevel) { +// if(eosvars.eoskeyerr[0] == 667 && GRHydro_eos_hot_eps_fix != 0) { +// // Handling of the case when no new temperature can be +// // found for a given epsilon. The amount of times +// // we get to this place should be monitored, as this +// // 'failsafe' mode creates artificial heat. +// nf = 0; +// while(eosvars.eosanyerr[0] != 0 && nf<= nfudgemax) { +// eosvars.eosanyerr[0] = 0; +// tau = tau + rho0*abs((*epsilon))*0.05*w*w; +// *epsilon = (*epsilon) + abs((*epsilon))*0.05; +// u = (*epsilon) * rho0; +// EOS_Omni_press(eosvars.eoshandle,eosvars.eoskeytemp,eosvars.eosprec,1, +// &rho0,epsilon,eosvars.eos_temp, +// eosvars.eos_y_e,&p,eosvars.eoskeyerr,eosvars.eosanyerr); +// nf = nf + 1; +// } +// fprintf(stdout, "Iterations of heat injection: %d \n",nf); +// fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); +// if(nf >= nfudgemax) { +// if(GRHydro_c2p_reset_eps_tau_hot_eos != 1) { +// CCTK_WARN(failinfomode,"EOS error in c2p 0: injected heat too many times"); +// fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); +// //CCTK_WARN(failinfomode,warnline); +// fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); +// //call CCTK_WARN(failinfomode,warnline) +// fprintf(stdout,"code=%d\n",eosvars.eoskeyerr[0]); +// //call CCTK_WARN(failinfomode,warnline) +// CCTK_WARN(failwarnmode,"Aborting!!!"); +// } +// else { +// CCTK_WARN(failinfomode,"EOS error in c2p 0: LAST RESORT -- reset eps and tau based on old temp"); +// fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); +// fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); +// eosvars.eoskeytemp =1; +// EOS_Omni_press(eosvars.eoshandle,eosvars.eoskeytemp,eosvars.eosprec,1, +// &rho0,epsilon,eosvars.eos_temp,eosvars.eos_y_e,&p,eosvars.eoskeyerr,eosvars.eosanyerr); +// // tau = (rho0 + rho0*(*epsilon) + lg.bsq + p)*w*w - (p + lg.bsq/2.0) - rho0*w; +// tau = (rho0 + rho0*(*epsilon) + lg.bsq + p)*w*w - (p + lg.bsq/2.0) - w*w*lg.VdotBsq - rho0*w; +// u = (*epsilon) * rho0; +// //tau = ( (rho + rho*epsilon) + xpress ) * w_lorentz**2 - xpress - rho*w_lorentz; +// //fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); +// eosvars.eoskeytemp =0; +// } +// } +// } +// else { +// CCTK_WARN(failinfomode,"EOS error in c2p 0"); +// fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars.eosit,eosvars.eosrl,eosvars.eosi,eosvars.eosj,eosvars.eosk,eosvars.eosx,eosvars.eosy,eosvars.eosz); +// fprintf(stdout,"rho=%f, dens=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,dens,*epsilon,eosvars.eos_temp[0],eosvars.eos_y_e[0]); +// fprintf(stdout,"code=%d\n",eosvars.eoskeyerr[0]); +// CCTK_WARN(0,"Aborting!!!"); +// } +// } +// } // printf("%g %g %g %g\n",rho0,u,*epsilon,p); } @@ -1173,65 +1173,65 @@ // fprintf(stdout,"vsq: keyerr=%d, eosrl = %d, anyerr = %d \n",eosvars->eoskeyerr[0],eosvars->eosrl, eosvars->eosanyerr[0]); // fprintf(stdout,"vsq: rho0=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,epsilon,eosvars->eos_temp[0],eosvars->eos_y_e[0]); - #pragma omp critical - if (eosvars->eosanyerr[0] != 0) { - fprintf(stdout,"inside vsq_omni: anyerr=%d rl=%d\n",eosvars->eosanyerr[0], eosvars->eosrl); - if (eosvars->eosrl >= GRHydro_c2p_warn_from_reflevel) { - if(eosvars->eoskeyerr[0] == 667 && GRHydro_eos_hot_eps_fix != 0) { - // Handling of the case when no new temperature can be - // found for a given epsilon. The amount of times - // we get to this place should be monitored, as this - // 'failsafe' mode creates artificial heat. - nf = 0; - while(eosvars->eosanyerr[0] != 0 && nf<= nfudgemax) { - eosvars->eosanyerr[0] = 0; - lgp->tau = lgp->tau + rho0*abs(epsilon)*0.05*Lor*Lor; - epsilon = epsilon + abs(epsilon)*0.05; - u = epsilon*rho0; - CCTK_WARN(failwarnmode,"Injecting heat inside vsq_omni without resetting tau"); - fprintf(stdout,"Injecting heat inside vsq_omni without resetting tau: anyerr=%d\n",eosvars->eosanyerr[0]); - EOS_Omni_press(eosvars->eoshandle,eosvars->eoskeytemp,eosvars->eosprec,1, - &rho0,&epsilon,eosvars->eos_temp, - eosvars->eos_y_e,&p_tmp,eosvars->eoskeyerr,eosvars->eosanyerr); - nf = nf + 1; - } - fprintf(stdout, "Iterations of heat injection: %d \n",nf); - fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars->eosit,eosvars->eosrl,eosvars->eosi,eosvars->eosj,eosvars->eosk,eosvars->eosx,eosvars->eosy,eosvars->eosz); - if(nf >= nfudgemax) { - if(GRHydro_c2p_reset_eps_tau_hot_eos != 1) { - CCTK_WARN(failinfomode,"EOS error in c2p 0: injected heat too many times"); - fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars->eosit,eosvars->eosrl,eosvars->eosi,eosvars->eosj,eosvars->eosk,eosvars->eosx,eosvars->eosy,eosvars->eosz); - //CCTK_WARN(failinfomode,warnline); - fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,epsilon,eosvars->eos_temp[0],eosvars->eos_y_e[0]); - //call CCTK_WARN(failinfomode,warnline) - fprintf(stdout,"code=%d\n",eosvars->eoskeyerr[0]); - //call CCTK_WARN(failinfomode,warnline) - CCTK_WARN(failwarnmode,"Aborting!!!"); - } - else { - CCTK_WARN(failinfomode,"EOS error in c2p 0: LAST RESORT -- reset eps and tau based on old temp"); - fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars->eosit,eosvars->eosrl,eosvars->eosi,eosvars->eosj,eosvars->eosk,eosvars->eosx,eosvars->eosy,eosvars->eosz); - fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,epsilon,eosvars->eos_temp[0],eosvars->eos_y_e[0]); - eosvars->eoskeytemp =1; - EOS_Omni_press(eosvars->eoshandle,eosvars->eoskeytemp,eosvars->eosprec,1, - &rho0,&epsilon,eosvars->eos_temp,eosvars->eos_y_e,&p_tmp,eosvars->eoskeyerr,eosvars->eosanyerr); - //tau = (rho0 + rho0*(*epsilon) + lg.bsq + p)*w*w - (p + lg.bsq/2.0) - w*w*lg.VdotBsq - rho0*w; - lgp->tau = (rho0 + rho0*epsilon + lgp->bsq + p_tmp)*Lor*Lor - (p_tmp + lgp->bsq/2.0) - Lor*Lor*lgp->VdotBsq - rho0*Lor; - u = epsilon*rho0; - eosvars->eoskeytemp = 0; - fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,epsilon,eosvars->eos_temp[0],eosvars->eos_y_e[0]); - } - } - } - else { - CCTK_WARN(failinfomode,"EOS error in c2p 0"); - fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars->eosit,eosvars->eosrl,eosvars->eosi,eosvars->eosj,eosvars->eosk,eosvars->eosx,eosvars->eosy,eosvars->eosz); - fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,epsilon,eosvars->eos_temp[0],eosvars->eos_y_e[0]); - fprintf(stdout,"code=%d\n",eosvars->eoskeyerr[0]); - CCTK_WARN(failwarnmode,"Aborting!!!"); - } - } - } +// #pragma omp critical +// if (eosvars->eosanyerr[0] != 0) { +// fprintf(stdout,"inside vsq_omni: anyerr=%d rl=%d\n",eosvars->eosanyerr[0], eosvars->eosrl); +// if (eosvars->eosrl >= GRHydro_c2p_warn_from_reflevel) { +// if(eosvars->eoskeyerr[0] == 667 && GRHydro_eos_hot_eps_fix != 0) { +// // Handling of the case when no new temperature can be +// // found for a given epsilon. The amount of times +// // we get to this place should be monitored, as this +// // 'failsafe' mode creates artificial heat. +// nf = 0; +// while(eosvars->eosanyerr[0] != 0 && nf<= nfudgemax) { +// eosvars->eosanyerr[0] = 0; +// lgp->tau = lgp->tau + rho0*abs(epsilon)*0.05*Lor*Lor; +// epsilon = epsilon + abs(epsilon)*0.05; +// u = epsilon*rho0; +// CCTK_WARN(failwarnmode,"Injecting heat inside vsq_omni without resetting tau"); +// fprintf(stdout,"Injecting heat inside vsq_omni without resetting tau: anyerr=%d\n",eosvars->eosanyerr[0]); +// EOS_Omni_press(eosvars->eoshandle,eosvars->eoskeytemp,eosvars->eosprec,1, +// &rho0,&epsilon,eosvars->eos_temp, +// eosvars->eos_y_e,&p_tmp,eosvars->eoskeyerr,eosvars->eosanyerr); +// nf = nf + 1; +// } +// fprintf(stdout, "Iterations of heat injection: %d \n",nf); +// fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars->eosit,eosvars->eosrl,eosvars->eosi,eosvars->eosj,eosvars->eosk,eosvars->eosx,eosvars->eosy,eosvars->eosz); +// if(nf >= nfudgemax) { +// if(GRHydro_c2p_reset_eps_tau_hot_eos != 1) { +// CCTK_WARN(failinfomode,"EOS error in c2p 0: injected heat too many times"); +// fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars->eosit,eosvars->eosrl,eosvars->eosi,eosvars->eosj,eosvars->eosk,eosvars->eosx,eosvars->eosy,eosvars->eosz); +// //CCTK_WARN(failinfomode,warnline); +// fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,epsilon,eosvars->eos_temp[0],eosvars->eos_y_e[0]); +// //call CCTK_WARN(failinfomode,warnline) +// fprintf(stdout,"code=%d\n",eosvars->eoskeyerr[0]); +// //call CCTK_WARN(failinfomode,warnline) +// CCTK_WARN(failwarnmode,"Aborting!!!"); +// } +// else { +// CCTK_WARN(failinfomode,"EOS error in c2p 0: LAST RESORT -- reset eps and tau based on old temp"); +// fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars->eosit,eosvars->eosrl,eosvars->eosi,eosvars->eosj,eosvars->eosk,eosvars->eosx,eosvars->eosy,eosvars->eosz); +// fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,epsilon,eosvars->eos_temp[0],eosvars->eos_y_e[0]); +// eosvars->eoskeytemp =1; +// EOS_Omni_press(eosvars->eoshandle,eosvars->eoskeytemp,eosvars->eosprec,1, +// &rho0,&epsilon,eosvars->eos_temp,eosvars->eos_y_e,&p_tmp,eosvars->eoskeyerr,eosvars->eosanyerr); +// //tau = (rho0 + rho0*(*epsilon) + lg.bsq + p)*w*w - (p + lg.bsq/2.0) - w*w*lg.VdotBsq - rho0*w; +// lgp->tau = (rho0 + rho0*epsilon + lgp->bsq + p_tmp)*Lor*Lor - (p_tmp + lgp->bsq/2.0) - Lor*Lor*lgp->VdotBsq - rho0*Lor; +// u = epsilon*rho0; +// eosvars->eoskeytemp = 0; +// fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,epsilon,eosvars->eos_temp[0],eosvars->eos_y_e[0]); +// } +// } +// } +// else { +// CCTK_WARN(failinfomode,"EOS error in c2p 0"); +// fprintf(stdout, "it=%d, rl=%d, i=%d, j=%d, k=%d, x=%f,y=%f,z=%f\n",eosvars->eosit,eosvars->eosrl,eosvars->eosi,eosvars->eosj,eosvars->eosk,eosvars->eosx,eosvars->eosy,eosvars->eosz); +// fprintf(stdout,"rho=%f, epsilon=%f, temp=%f, ye=%f\n", rho0,epsilon,eosvars->eos_temp[0],eosvars->eos_y_e[0]); +// fprintf(stdout,"code=%d\n",eosvars->eoskeyerr[0]); +// CCTK_WARN(failwarnmode,"Aborting!!!"); +// } +// } +// } lgp->Qdotn = -(lgp->tau + lgp->D); B2plusW = lgp->Bsq+W;

1 0

[svn:einsteintoolkit] GRHydro/trunk/doc/ (Rev. 577)
by rhaas＠tapir.caltech.edu 13 Aug '13

13 Aug '13

User: rhaas Date: 2013/08/13 09:56 AM Added: /trunk/doc/ staggering.tex Log: GRHydro: Notes on how to work out the stsggered A-field evolution From: Josh Faber <jfaberrit(a)jfaber3.local> File Changes: Directory: /trunk/doc/ ====================== File [added]: staggering.tex Delta lines: +31 -0 =================================================================== --- trunk/doc/staggering.tex (rev 0) +++ trunk/doc/staggering.tex 2013-08-13 14:56:40 UTC (rev 577) @@ -0,0 +1,31 @@ +\documentclass{article} +\begin{document} +In what follows, we assume second-order differencing. Adapt as necessary. + +For staggered $A$-field evolution we know the values of the $A$ field at edges: +\begin{equation} +A_x(i,j+\frac{1}{2},k+\frac{1}{2});~A_y(i+\frac{1}{2},j,k+\frac{1}{2});~A_z(i+\frac{1}{2},j+\frac{1}{2},k) +\end{equation} + +From these, we calculate directly the values of the $B$-fields at faces: +\begin{equation} +B_{face}^x(i+\frac{1}{2},j,k) =\frac{A_z(i+\frac{1}{2},j+\frac{1}{2},k)-A_z(i+\frac{1}{2},j-\frac{1}{2},k)}{\Delta y}- +\frac{A_y(i+\frac{1}{2},j,k+\frac{1}{2})-A_z(i+\frac{1}{2},j,k-\frac{1}{2})}{\Delta z} +\end{equation} +and the values of the $B$-field at cell centers by averaging +\begin{equation} +B_{cent}^x(i,j,k)=\frac{B_{face}^x(i+\frac{1}{2},j,k)+B_{face}^x(i-\frac{1}{2},j,k)}{2} +\end{equation} +These can be calculated at the end of the timestep. + +To update the $A$-field, we calculate +\begin{eqnarray} +\partial_t A_x(i,j+\frac{1}{2},k+\frac{1}{2})& =& -E^x(i,j+\frac{1}{2},k+\frac{1}{2})\\ +&=&[v^y B^z-v^z B^y](i,j+\frac{1}{2},k+\frac{1}{2})^{LLF/HLL} +\end{eqnarray} +The values of $B$ need to be reconstructed an ``extra'' time, to the pairs of edges perpendicular to their direction. The $v$-fields need to be reconstructed twice, once parallel to their direction and once perpendicular (but never doubly perpendicular). We can minimize work and reuse our previous reconstructed, as suggested by Etienne et al. and originally Del Zanna et al. if we assume reconstruction happens in the perpendicular direction first for the velocities. Note that to get the wavespeeds at the edges, all primitives need to be reconstructed twice. To establish the notation in the code, one can try the following: for all primitives except the $B$-field, one reconstructs in the flux-direction, turns either in the right-handed direction (positive cycle through $x-y-z$) or the left-handed direction (cycle in the order $x-z-y$), and then reconstructs either in the plus or minus sense again. Thus, we have the following, for the example that {\tt flux\_direction}=1, the $y$-direction.\\ + +{\tt rhop\_r\_m}: Reconstruct rho in the $+y$ direction, cycle to the right, and then move in the minus ($-z$) direction, resulting in $\rho(i,j+\frac{1}{2},k-\frac{1}{2})$. + +Note that since we require reconstruction, the source term for $\partial_t A_x$ is actually calcuated during {\tt FluxTerms}, and we zero out the contribution in {\tt GRHydro\_SourceAM.F90}. +\end{document} \ No newline at end of file

1 0

[svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 576)
by rhaas＠tapir.caltech.edu 13 Aug '13

13 Aug '13

User: rhaas Date: 2013/08/13 09:56 AM Modified: /trunk/src/ GRHydro_Reconstruct.F90 Log: GRHydro: use C prim2con routine From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_Reconstruct.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_Reconstruct.F90 2013-08-13 14:56:34 UTC (rev 575) +++ trunk/src/GRHydro_Reconstruct.F90 2013-08-13 14:56:37 UTC (rev 576) @@ -280,8 +280,8 @@ if(evolve_mhd.ne.0) then call primitive2conservativeM(CCTK_PASS_FTOF) else - call primitive2conservative(CCTK_PASS_FTOF) -! call Primitive2ConservativeCforF(cctkGH) +! call primitive2conservative(CCTK_PASS_FTOF) + call Primitive2ConservativeCforF(cctkGH) endif else if (CCTK_EQUALS(recon_vars,"conservative")) then if(evolve_mhd.ne.0) then

1 0

[svn:einsteintoolkit] GRHydro/trunk/ (Rev. 575)
by rhaas＠tapir.caltech.edu 13 Aug '13

13 Aug '13

User: rhaas Date: 2013/08/13 09:56 AM Modified: /trunk/ param.ccl /trunk/src/ GRHydro_PPM.cc, GRHydro_PPMReconstruct_drv_opt.cc, GRHydro_PPM_opt.h, GRHydro_Reconstruct.F90, make.code.defn Log: GRHydro: finish up call for templated C++ PPM routine activated by paramater use_optimized_PPM From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: GRHydro_PPM.cc Delta lines: +2 -2 =================================================================== --- trunk/src/GRHydro_PPM.cc 2013-08-13 14:56:31 UTC (rev 574) +++ trunk/src/GRHydro_PPM.cc 2013-08-13 14:56:34 UTC (rev 575) @@ -69,7 +69,7 @@ template<bool do_temp, bool do_ye, bool do_mhd, bool dc_flag, bool do_ppm_detect> -static void ppm1d_cxx(const int nx, +void GRHydro_ppm1d_cxx(const int nx, const double dx, const double* restrict rho, const double* restrict velx, @@ -343,7 +343,7 @@ //template template<bool do_temp, bool do_ye, bool do_mhd, bool dc_flag, bool do_ppm_detect> #define INSTANTIATE(do_temp,do_ye,do_mhd,dc_flag,do_ppm_detect) \ -template static void ppm1d_cxx<do_temp,do_ye,do_mhd,dc_flag,do_ppm_detect>(const int nx, \ +template void GRHydro_ppm1d_cxx<do_temp,do_ye,do_mhd,dc_flag,do_ppm_detect>(const int nx, \ const double dx, \ const double* restrict rho, \ const double* restrict velx, \ File [modified]: GRHydro_PPMReconstruct_drv_opt.cc Delta lines: +95 -29 =================================================================== --- trunk/src/GRHydro_PPMReconstruct_drv_opt.cc 2013-08-13 14:56:31 UTC (rev 574) +++ trunk/src/GRHydro_PPMReconstruct_drv_opt.cc 2013-08-13 14:56:34 UTC (rev 575) @@ -22,14 +22,14 @@ extern "C" CCTK_INT GRHydro_UseGeneralCoordinates(const cGH * cctkGH); -void oned_slice(int npt,int nstart,int nstride,CCTK_REAL* vec3d,vector<CCTK_REAL> vec1d) +static void oned_slice(int npt,int nstart,int nstride,CCTK_REAL* vec3d,vector<CCTK_REAL> vec1d) { int i; for (i=0; i<npt; i++)vec1d[i] = vec3d[nstart+i*nstride]; return; } -void oned_unslice(int npt,int nstart,int nstride,vector<CCTK_REAL> vec1d,CCTK_REAL* vec3d) +static void oned_unslice(int npt,int nstart,int nstride,vector<CCTK_REAL> vec1d,CCTK_REAL* vec3d) { int i; for (i=0; i<npt; i++)vec3d[nstart+i*nstride]=vec1d[i]; @@ -49,38 +49,18 @@ * with or without divergence cleaning */ -void GRHydro_PPMReconstruct_drv(CCTK_ARGUMENTS) +extern "C" +void CCTK_FNAME(GRHydro_PPMReconstruct_drv_opt)(cGH const * const restrict & restrict cctkGH) { DECLARE_CCTK_ARGUMENTS; DECLARE_CCTK_PARAMETERS; - CCTK_REAL * restrict g11, * restrict g12, *restrict g13; - CCTK_REAL * restrict g22, * restrict g23, *restrict g33; - CCTK_REAL * restrict beta1, * restrict beta2, * restrict beta3; CCTK_REAL * restrict vup; //Multipatch related pointers if(GRHydro_UseGeneralCoordinates(cctkGH)) { - g11=gaa; - g12=gab; - g13=gac; - g22=gbb; - g23=gbc; - g33=gcc; - beta1=betaa; - beta2=betab; - beta3=betac; vup=lvel; } else { - g11=gxx; - g12=gxy; - g13=gxz; - g22=gyy; - g23=gyz; - g33=gzz; - beta1=betax; - beta2=betay; - beta3=betaz; vup=vel; } @@ -159,8 +139,95 @@ vector<CCTK_REAL> Bvcz1d_minus(nmax_xyz); vector<CCTK_REAL> psidc1d_minus(nmax_xyz); - int npt,nstart,nstride; + int nstart; + typedef + void (*ppm1d_cxx_ptr_t)(const int nx, \ + const double dx, \ + const double* restrict rho, \ + const double* restrict velx, \ + const double* restrict vely, \ + const double* restrict velz, \ + const double* restrict eps, \ + const double* restrict press, \ + const double* restrict temp, \ + const double* restrict ye, \ + const double* restrict Bvcx, \ + const double* restrict Bvcy, \ + const double* restrict Bvcz, \ + const double* restrict psidc, \ + double* restrict rhominus, \ + double* restrict velxminus, \ + double* restrict velyminus, \ + double* restrict velzminus, \ + double* restrict epsminus, \ + double* restrict tempminus, \ + double* restrict yeminus, \ + double* restrict Bvcxminus, \ + double* restrict Bvcyminus, \ + double* restrict Bvczminus, \ + double* restrict psidcminus, \ + double* restrict rhoplus, \ + double* restrict velxplus, \ + double* restrict velyplus, \ + double* restrict velzplus, \ + double* restrict epsplus, \ + double* restrict tempplus, \ + double* restrict yeplus, \ + double* restrict Bvcxplus, \ + double* restrict Bvcyplus, \ + double* restrict Bvczplus, \ + double* restrict psidcplus); + static ppm1d_cxx_ptr_t ppm1d_cxx_funcs[32]; + ppm1d_cxx_ptr_t ppm1d_cxx_func; + + #define MKINDEX(do_temp,do_ye,do_mhd,dc_flag,do_ppm_detect) ((do_temp<<4)|(do_ye<<3)|(do_mhd<<2)|(dc_flag<<1)|(do_ppm_detect)) + #define SETPOINTER(do_temp,do_ye,do_mhd,dc_flag,do_ppm_detect) \ + ppm1d_cxx_funcs[MKINDEX(do_temp,do_ye,do_mhd,dc_flag,do_ppm_detect)] = \ + GRHydro_ppm1d_cxx<do_temp,do_ye,do_mhd,dc_flag,do_ppm_detect> + + // first stuff without MHD + SETPOINTER(false,false,false,false,false); + SETPOINTER(false,false,false,false,true); + // do_temp can only be true of do_ye is also true + SETPOINTER(true,true,false,false,false); + SETPOINTER(true,true,false,false,true); + // but do_ye can be true and do_temp can be false + SETPOINTER(false,true,false,false,false); + SETPOINTER(false,true,false,false,true); + + // with MHD, but dc_flag false + SETPOINTER(false,false,true,false,false); + SETPOINTER(false,false,true,false,true); + // do_temp can only be true of do_ye is also true + SETPOINTER(true,true,true,false,false); + SETPOINTER(true,true,true,false,true); + // but do_ye can be true and do_temp can be false + SETPOINTER(false,true,true,false,false); + SETPOINTER(false,true,true,false,true); + + // with MHD, dc_flag true + SETPOINTER(false,false,true,true,false); + SETPOINTER(false,false,true,true,true); + // do_temp can only be true of do_ye is also true + SETPOINTER(true,true,true,true,false); + SETPOINTER(true,true,true,true,true); + // but do_ye can be true and do_temp can be false + SETPOINTER(false,true,true,true,false); + SETPOINTER(false,true,true,true,true); + + const bool do_temp = *evolve_temper; + const bool do_ye = *evolve_Y_e; + const bool do_mhd = *evolve_MHD; + const bool dc_flag = clean_divergence; + const bool do_ppm_detect = ppm_detect; + ppm1d_cxx_func = ppm1d_cxx_funcs[MKINDEX(do_temp,do_ye,do_mhd,dc_flag,do_ppm_detect)]; + if(ppm1d_cxx_func == NULL) { + CCTK_VError(__LINE__, __FILE__, CCTK_THORNSTRING, + "Combination do_temp = %d do_ye = %d do_mhd = %d dc_flag = %d do_ppm_detect = %d is not supported for PPM. Please instatate the respective template", + do_temp, do_ye, do_mhd, dc_flag, do_ppm_detect); + } + //index = i + j*nx + k*nx*ny; // !!$ PPM starts: @@ -205,8 +272,7 @@ //WE'll need booleans arguments corresponding to the following //ppm1d_cxx<do_temp,do_ye,do_mhd,clean_divergence,ppm_detect> - ppm1d_cxx<true,true,true,true,true> - (nx,CCTK_DELTA_SPACE(0), + ppm1d_cxx_func(nx,CCTK_DELTA_SPACE(0), &rho1d[0],&velx1d[0],&vely1d[0],&velz1d[0],&eps1d[0],&press1d[0],&temp1d[0], &ye1d[0],&Bvcx1d[0],&Bvcy1d[0],&Bvcz1d[0],&psidc1d[0], &rho1d_minus[0],&velx1d_minus[0],&vely1d_minus[0],&velz1d_minus[0],&eps1d_minus[0],&temp1d_minus[0], @@ -296,7 +362,7 @@ //WE'll need booleans arguments corresponding to the following //ppm1d_cxx<do_temp,do_ye,do_mhd,clean_divergence,ppm_detect> - ppm1d_cxx<true,true,true,true,true> + ppm1d_cxx_func (ny,CCTK_DELTA_SPACE(1), &rho1d[0],&vely1d[0],&velz1d[0],&velx1d[0],&eps1d[0],&press1d[0],&temp1d[0], &ye1d[0],&Bvcy1d[0],&Bvcz1d[0],&Bvcx1d[0],&psidc1d[0], @@ -388,7 +454,7 @@ //WE'll need booleans arguments corresponding to the following //ppm1d_cxx<do_temp,do_ye,do_mhd,clean_divergence,ppm_detect> - ppm1d_cxx<true,true,true,true,true> + ppm1d_cxx_func (ny,CCTK_DELTA_SPACE(1), &rho1d[0],&velz1d[0],&velx1d[0],&vely1d[0],&eps1d[0],&press1d[0],&temp1d[0], &ye1d[0],&Bvcz1d[0],&Bvcx1d[0],&Bvcy1d[0],&psidc1d[0], File [modified]: GRHydro_PPM_opt.h Delta lines: +1 -1 =================================================================== --- trunk/src/GRHydro_PPM_opt.h 2013-08-13 14:56:31 UTC (rev 574) +++ trunk/src/GRHydro_PPM_opt.h 2013-08-13 14:56:34 UTC (rev 575) @@ -1,6 +1,6 @@ template<bool do_temp, bool do_ye, bool do_mhd, bool dc_flag, bool do_ppm_detect> -static void ppm1d_cxx(const int nx, +void GRHydro_ppm1d_cxx(const int nx, const double dx, const double* restrict rho, const double* restrict velx, File [modified]: GRHydro_Reconstruct.F90 Delta lines: +9 -5 =================================================================== --- trunk/src/GRHydro_Reconstruct.F90 2013-08-13 14:56:31 UTC (rev 574) +++ trunk/src/GRHydro_Reconstruct.F90 2013-08-13 14:56:34 UTC (rev 575) @@ -125,11 +125,15 @@ else if (CCTK_EQUALS(recon_method,"ppm")) then - if(evolve_mhd.ne.0) then - call GRHydro_PPMMReconstruct_drv(CCTK_PASS_FTOF) - else - call GRHydro_PPMReconstruct_drv(CCTK_PASS_FTOF) - end if + if(use_optimized_ppm.eq.0) then + if(evolve_mhd.ne.0) then + call GRHydro_PPMMReconstruct_drv(CCTK_PASS_FTOF) + else + call GRHydro_PPMReconstruct_drv(CCTK_PASS_FTOF) + end if + else + call GRHydro_PPMReconstruct_drv_opt(cctkGH) + end if else if (CCTK_EQUALS(recon_method,"eno")) then ! this handles MHD and non-MHD File [modified]: make.code.defn Delta lines: +1 -0 =================================================================== --- trunk/src/make.code.defn 2013-08-13 14:56:31 UTC (rev 574) +++ trunk/src/make.code.defn 2013-08-13 14:56:34 UTC (rev 575) @@ -83,6 +83,7 @@ Con2PrimM_fortran_interfaces.F90 \ GRHydro_Prim2Con.c \ GRHydro_PPM.cc \ + GRHydro_PPMReconstruct_drv_opt.cc \ GRHydro_Wrappers.F90 # Subdirectories containing source files Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +4 -0 =================================================================== --- trunk/param.ccl 2013-08-13 14:56:31 UTC (rev 574) +++ trunk/param.ccl 2013-08-13 14:56:34 UTC (rev 575) @@ -173,6 +173,10 @@ 0.0: :: "Must be positive" } 1.e-10 +boolean use_optimized_ppm "use C++ templated version of PPM. Experimental" +{ +} "no" + boolean ppm_detect "Should the PPM solver use shock detection?" { } "no"

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits