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

[rhaas at tapir.caltech.edu]

User: rhaas
Date: 2012/07/05 12:36 AM

Modified:
 /trunk/src/
  GRHydro_Con2Prim.F90

Log:
 * improve error message formatting in hot con2prim

File Changes:

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

File [modified]: GRHydro_Con2Prim.F90
Delta lines: +11 -11
===================================================================
--- trunk/src/GRHydro_Con2Prim.F90	2012-07-05 05:36:42 UTC (rev 381)
+++ trunk/src/GRHydro_Con2Prim.F90	2012-07-05 05:36:43 UTC (rev 382)
@@ -697,23 +697,23 @@
            enddo
            write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf
            call CCTK_WARN(failinfomode,warnline)
-           write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_Reflevel,ii,jj,kk,x,y,z
+           write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_Reflevel,ii,jj,kk,x,y,z
            call CCTK_WARN(failinfomode,warnline)
            if(nf.gt.nfudgemax) then
               if(GRHydro_c2p_reset_eps_tau_hot_eos.ne.1) then
                  call CCTK_WARN(failinfomode,"EOS error in c2p 0: injected heat too many times")
-                 write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z
+                 write(warnline,"(i8.4i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z
                  call CCTK_WARN(failinfomode,warnline)
                  write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye
                  call CCTK_WARN(failinfomode,warnline)
                  write(warnline,"(A7,i8)") "code: ",keyerr(1)
                  call CCTK_WARN(failinfomode,warnline)
-                 write(warnline,"(A10,i5,i5)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration
+                 write(warnline,"(A10,i5,i8)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration
                  call CCTK_WARN(failinfomode,warnline)
                  call CCTK_WARN(failwarnmode,"Aborting!!!")
               else
                  call CCTK_WARN(failinfomode,"EOS error in c2p 0: LAST RESORT -- reset eps and tau based on old temp")
-                 write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z
+                 write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z
                  call CCTK_WARN(failinfomode,warnline)
                  write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye
                  call CCTK_WARN(failinfomode,warnline)
@@ -790,23 +790,23 @@
            enddo
            write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf
            call CCTK_WARN(failinfomode,warnline)
-           write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_Reflevel,ii,jj,kk,x,y,z
+           write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_Reflevel,ii,jj,kk,x,y,z
            call CCTK_WARN(failinfomode,warnline)
            if(nf.gt.nfudgemax) then
               if(GRHydro_c2p_reset_eps_tau_hot_eos.ne.1) then
                  call CCTK_WARN(failinfomode,"EOS error in c2p 1: injected heat too many times")
-                 write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z
+                 write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z
                  call CCTK_WARN(failinfomode,warnline)
                  write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye
                  call CCTK_WARN(failinfomode,warnline)
                  write(warnline,"(A7,i8)") "code: ",keyerr(1)
                  call CCTK_WARN(failinfomode,warnline)
-                 write(warnline,"(A10,i5,i5)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration
+                 write(warnline,"(A10,i5,i8)") "reflevel, iteration: ", GRHydro_reflevel, cctk_iteration
                  call CCTK_WARN(failinfomode,warnline)
                  call CCTK_WARN(failwarnmode,"Aborting!!!")
               else
                  call CCTK_WARN(failinfomode,"EOS error in c2p 1: LAST RESORT -- reset eps and tau based on old temp")
-                 write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z
+                 write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z
                  call CCTK_WARN(failinfomode,warnline)
                  write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye
                  call CCTK_WARN(failinfomode,warnline)
@@ -938,12 +938,12 @@
              enddo
              write(warnline,"(A30,i5)") "Iterations of heat injection: ",nf
              call CCTK_WARN(failinfomode,warnline)
-             write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_Reflevel,ii,jj,kk,x,y,z
+             write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_Reflevel,ii,jj,kk,x,y,z
              call CCTK_WARN(failinfomode,warnline)
              if(nf.gt.nfudgemax) then
                 if(GRHydro_c2p_reset_eps_tau_hot_eos.ne.1) then
                    call CCTK_WARN(failinfomode,"EOS error in c2p 2: injected heat too many times")
-                   write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z
+                   write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z
                    call CCTK_WARN(failinfomode,warnline)
                    write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye
                    call CCTK_WARN(failinfomode,warnline)
@@ -954,7 +954,7 @@
                    call CCTK_WARN(failwarnmode,"Aborting!!!")
                 else
                    call CCTK_WARN(failinfomode,"EOS error in c2p 2: LAST RESORT -- reset eps and tau based on old temp")
-                   write(warnline,"(5i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z
+                   write(warnline,"(i8,4i5,1P10E15.6)") cctk_iteration,GRHydro_reflevel,ii,jj,kk,x,y,z
                    call CCTK_WARN(failinfomode,warnline)
                    write(warnline,"(1P10E15.6)") rho,epsilon,temp,ye
                    call CCTK_WARN(failinfomode,warnline)