GRHydro: disable warnings in Prim2ConM and only set mask in Con2PrimM

We don't abort in ptwise C2P call with MHD so that we can check for the
mask and abort if necessary.

git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEvolve/GRHydro/trunk@638 c83d129a-5a75-4d5a-9c4d-ed3a5855bf45

3 files changed, 41 insertions, 63 deletions

diff --git a/src/GRHydro_Con2PrimM.F90 b/src/GRHydro_Con2PrimM.F90
index 8a5c93b..fe496b3 100644
--- a/src/GRHydro_Con2PrimM.F90
+++ b/src/GRHydro_Con2PrimM.F90
@@ -542,7 +542,7 @@ subroutine Conservative2PrimitiveM(CCTK_ARGUMENTS)
                      write(warnline,"(1P10E15.6)") rho(i,j,k),dens(i,j,k),eps(i,j,k),&
                           temperature(i,j,k),y_e(i,j,k)
                      call CCTK_WARN(1,warnline)
-                     call CCTK_WARN(0,"Aborting!!!")
+              !       call CCTK_WARN(0,"Aborting!!!")
                   endif
                   !$OMP END CRITICAL
                 endif
diff --git a/src/GRHydro_Con2PrimM_pt_EOSOmni.c b/src/GRHydro_Con2PrimM_pt_EOSOmni.c
index 3fdb282..1fc555b 100644
--- a/src/GRHydro_Con2PrimM_pt_EOSOmni.c
+++ b/src/GRHydro_Con2PrimM_pt_EOSOmni.c
@@ -504,44 +504,46 @@ void CCTK_FCALL CCTK_FNAME(GRHydro_Con2PrimM_pt)  (
   /* Problem with solver, so return denoting error before doing anything further */
   if( ((*retval) != 0.) || (W == FAIL_VAL) ) {
     *retval = *retval*100.+1.;
-  fprintf(stdout," *retval      = %26.16e \n", *retval      );
-  fprintf(stdout," *dens        = %26.16e \n", *dens_in         );
-  fprintf(stdout," *sx          = %26.16e \n", *sx_in     );    
-  fprintf(stdout," *sy          = %26.16e \n", *sy_in     );    
-  fprintf(stdout," *sz          = %26.16e \n", *sz_in     );    
-  fprintf(stdout," *tau         = %26.16e \n", *tau_in    );    
-  fprintf(stdout," *Bconsx      = %26.16e \n", *Bconsx_in );    
-  fprintf(stdout," *Bconsy      = %26.16e \n", *Bconsy_in );    
-  fprintf(stdout," *Bconsz      = %26.16e \n", *Bconsz_in );    
-  fprintf(stdout," *rho         = %26.16e \n", *rho       );    
-  fprintf(stdout," *velx        = %26.16e \n", *velx      );    
-  fprintf(stdout," *vely        = %26.16e \n", *vely      );    
-  fprintf(stdout," *velz        = %26.16e \n", *velz      );    
-  fprintf(stdout," *epsilon     = %26.16e \n", *epsilon     );
-  fprintf(stdout," *temp_in     = %26.16e \n", *temp_in     );
-  fprintf(stdout," *y_e_in     = %26.16e \n", *y_e_in     );
-  fprintf(stdout," *pressure    = %26.16e \n", *pressure    );
-  fprintf(stdout," *Bx          = %26.16e \n", *Bx        );    
-  fprintf(stdout," *By          = %26.16e \n", *By        );    
-  fprintf(stdout," *Bz          = %26.16e \n", *Bz        );    
-  fprintf(stdout," *bsq         = %26.16e \n", *bsq       );    
-  fprintf(stdout," *w_lorentz   = %26.16e \n", *w_lorentz   );
-  fprintf(stdout," *gxx         = %26.16e \n", *gxx       );    
-  fprintf(stdout," *gxy         = %26.16e \n", *gxy       );    
-  fprintf(stdout," *gxz         = %26.16e \n", *gxz       );    
-  fprintf(stdout," *gyy         = %26.16e \n", *gyy       );    
-  fprintf(stdout," *gyz         = %26.16e \n", *gyz       );    
-  fprintf(stdout," *gzz         = %26.16e \n", *gzz       );    
-  fprintf(stdout," *uxx         = %26.16e \n", *uxx       );    
-  fprintf(stdout," *uxy         = %26.16e \n", *uxy       );    
-  fprintf(stdout," *uxz         = %26.16e \n", *uxz       );    
-  fprintf(stdout," *uyy         = %26.16e \n", *uyy       );    
-  fprintf(stdout," *uyz         = %26.16e \n", *uyz       );    
-  fprintf(stdout," *uzz         = %26.16e \n", *uzz       );    
-  fprintf(stdout," *sdet        = %26.16e \n", *sdet       );    
-  fprintf(stdout," *epsnegative = %10d    \n", *epsnegative );
-  fprintf(stdout," *retval      = %26.16e \n", *retval      );
-  fflush(stdout);
+#if(DEBUG_CON2PRIMM)
+    fprintf(stdout," *retval      = %26.16e \n", *retval      );
+    fprintf(stdout," *dens        = %26.16e \n", *dens_in         );
+    fprintf(stdout," *sx          = %26.16e \n", *sx_in     );
+    fprintf(stdout," *sy          = %26.16e \n", *sy_in     );
+    fprintf(stdout," *sz          = %26.16e \n", *sz_in     );
+    fprintf(stdout," *tau         = %26.16e \n", *tau_in    );
+    fprintf(stdout," *Bconsx      = %26.16e \n", *Bconsx_in );
+    fprintf(stdout," *Bconsy      = %26.16e \n", *Bconsy_in );
+    fprintf(stdout," *Bconsz      = %26.16e \n", *Bconsz_in );
+    fprintf(stdout," *rho         = %26.16e \n", *rho       );
+    fprintf(stdout," *velx        = %26.16e \n", *velx      );
+    fprintf(stdout," *vely        = %26.16e \n", *vely      );
+    fprintf(stdout," *velz        = %26.16e \n", *velz      );
+    fprintf(stdout," *epsilon     = %26.16e \n", *epsilon     );
+    fprintf(stdout," *temp_in     = %26.16e \n", *temp_in     );
+    fprintf(stdout," *y_e_in     = %26.16e \n", *y_e_in     );
+    fprintf(stdout," *pressure    = %26.16e \n", *pressure    );
+    fprintf(stdout," *Bx          = %26.16e \n", *Bx        );
+    fprintf(stdout," *By          = %26.16e \n", *By        );
+    fprintf(stdout," *Bz          = %26.16e \n", *Bz        );
+    fprintf(stdout," *bsq         = %26.16e \n", *bsq       );
+    fprintf(stdout," *w_lorentz   = %26.16e \n", *w_lorentz   );
+    fprintf(stdout," *gxx         = %26.16e \n", *gxx       );
+    fprintf(stdout," *gxy         = %26.16e \n", *gxy       );
+    fprintf(stdout," *gxz         = %26.16e \n", *gxz       );
+    fprintf(stdout," *gyy         = %26.16e \n", *gyy       );
+    fprintf(stdout," *gyz         = %26.16e \n", *gyz       );
+    fprintf(stdout," *gzz         = %26.16e \n", *gzz       );
+    fprintf(stdout," *uxx         = %26.16e \n", *uxx       );
+    fprintf(stdout," *uxy         = %26.16e \n", *uxy       );
+    fprintf(stdout," *uxz         = %26.16e \n", *uxz       );
+    fprintf(stdout," *uyy         = %26.16e \n", *uyy       );
+    fprintf(stdout," *uyz         = %26.16e \n", *uyz       );
+    fprintf(stdout," *uzz         = %26.16e \n", *uzz       );
+    fprintf(stdout," *sdet        = %26.16e \n", *sdet       );
+    fprintf(stdout," *epsnegative = %10d    \n", *epsnegative );
+    fprintf(stdout," *retval      = %26.16e \n", *retval      );
+    fflush(stdout);
+#endif
     return;
   }
   else{
diff --git a/src/GRHydro_Prim2ConM.F90 b/src/GRHydro_Prim2ConM.F90
index 19f1d2f..e330ef0 100644
--- a/src/GRHydro_Prim2ConM.F90
+++ b/src/GRHydro_Prim2ConM.F90
@@ -289,34 +289,10 @@ subroutine prim2conM_hot(handle, GRHydro_reflevel, ii, jj, kk, &
         call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,&
              drho,deps,temp,ye,dpress,keyerr,anyerr)  
         keytemp=reconstruct_temper
-        if(anyerr.ne.0) then
-           !$OMP CRITICAL
-           call CCTK_WARN(1,"EOS error in prim2con_hot: lev 2")
-           write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
-           call CCTK_WARN(1,warnline)
-           write(warnline,"(1P10E15.6)") drho,deps,temp,ye,yein
-           call CCTK_WARN(1,warnline)
-           write(warnline,"(A7,i8)") "code: ",keyerr(1)
-           call CCTK_WARN(1,warnline)
-           write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
-           call CCTK_WARN(1,warnline)
-           !$OMP END CRITICAL
-        endif
      else
         ! This is a way of recovering even on finer refinement levels:
         ! Use the average temperature at the interface instead of the
         ! reconstructed specific internal energy.
-        !$OMP CRITICAL
-        call CCTK_WARN(1,"EOS error in prim2con_hot: NOW using averaged temp!")
-        write(warnline,"(3i5,1P10E15.6)") ii,jj,kk,x,y,z
-        call CCTK_WARN(1,warnline)
-        write(warnline,"(1P10E15.6)") drho,deps,temp0,ye
-        call CCTK_WARN(1,warnline)
-        write(warnline,"(A7,i8)") "code: ",keyerr(1)
-        call CCTK_WARN(1,warnline)
-        write(warnline,"(A10,i5)") "reflevel: ", GRHydro_reflevel
-        call CCTK_WARN(1,warnline)
-        !$OMP END CRITICAL
         keytemp=1-reconstruct_temper
         temp = temp0
         call EOS_Omni_press(handle,keytemp,GRHydro_eos_rf_prec,n,&