[Commits] [svn:einsteintoolkit] GRHydro/trunk/src/ (Rev. 649)

rhaas at tapir.caltech.edu rhaas at tapir.caltech.edu
Mon Apr 28 15:01:13 CDT 2014


User: rhaas
Date: 2014/04/28 03:01 PM

Modified:
 /trunk/src/
  GRHydro_HLLE.cc

Log:
 GRHydro: fix bug handling tivial_rp in C++ HLLE solver
 
 as far as I can tell this would never have triggered though since the C++ code
 currently always setst the not_trivial bits

File Changes:

Directory: /trunk/src/
======================

File [modified]: GRHydro_HLLE.cc
Delta lines: +5 -5
===================================================================
--- trunk/src/GRHydro_HLLE.cc	2014-04-25 20:34:22 UTC (rev 648)
+++ trunk/src/GRHydro_HLLE.cc	2014-04-28 20:01:13 UTC (rev 649)
@@ -473,19 +473,19 @@
 
             if (fdir==1)
               num_x_fluxM_cc(consp[0],consp[1],consp[2],consp[3],consp[4],consp[5],consp[6],consp[7],
-                          fplus[0],fplus[1],fplus[2],fplus[3],fplus[4],fplus[5],fplus[6],fplus[7],
+                          f1[0],f1[1],f1[2],f1[3],f1[4],f1[5],f1[6],f1[7],
                           velxplus[idx],velyplus[idx],velzplus[idx],
                           pressplus[idx],savg_detr,
                           avg_alp,avg_betax,avg_betay,avg_betaz,blowxp,blowyp,blowzp,b2p,ab0p,wp);
             else if(fdir==2)
               num_x_fluxM_cc(consp[0],consp[2],consp[3],consp[1],consp[4],consp[6],consp[7],consp[5],
-                          fplus[0],fplus[2],fplus[3],fplus[1],fplus[4],fplus[6],fplus[7],fplus[5],
+                          f1[0],f1[2],f1[3],f1[1],f1[4],f1[6],f1[7],f1[5],
                           velyplus[idx],velzplus[idx],velxplus[idx],
                           pressplus[idx],savg_detr,
                           avg_alp,avg_betay,avg_betaz,avg_betax,blowyp,blowzp,blowxp,b2p,ab0p,wp);
             else
               num_x_fluxM_cc(consp[0],consp[3],consp[1],consp[2],consp[4],consp[7],consp[5],consp[6],
-                          fplus[0],fplus[3],fplus[1],fplus[2],fplus[4],fplus[7],fplus[5],fplus[6],
+                          f1[0],f1[3],f1[1],f1[2],f1[4],f1[7],f1[5],f1[6],
                           velzplus[idx],velxplus[idx],velyplus[idx],
                           pressplus[idx],savg_detr,
                           avg_alp,avg_betaz,avg_betax,avg_betay,blowzp,blowxp,blowyp,b2p,ab0p,wp);
@@ -977,13 +977,13 @@
 	}
       } // for
     if(anyerr) {
-      for(int i=0;i<n;i++) {
+      for(size_t i=0;i<n;i++) {
 	if(keyerr[i] != 0) {
 #pragma omp critical
 	  {
 	    CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING,
 		       "rl: %d i,x,y,z: %d %15.6E %15.6E %15.6E, keyerr: %d",
-		       *GRHydro_reflevel, i, x[i], y[i], z[i], keyerr[i]);
+		       *GRHydro_reflevel, int(i), x[i], y[i], z[i], keyerr[i]);
 	    CCTK_VWarn(1, __LINE__, __FILE__, CCTK_THORNSTRING,
 		       "rl: %d r,t,ye: %15.6E %15.6E %15.6E, keyerr: %d",
 		       *GRHydro_reflevel, rho[i], temperature[i], Y_e[i], keyerr[i]);



More information about the Commits mailing list