Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] GRHydro/branches/hot_and_MHD_temp_dev/src/ (Rev. 174)
by knarf＠cct.lsu.edu 13 Nov '10

13 Nov '10

User: knarf Date: 2010/11/13 11:15 PM Modified: /branches/hot_and_MHD_temp_dev/src/ GRHydro_Con2Prim.F90 Log: fix type of GRHydro_C2P_failed: this is a CCTK_REAL File Changes: Directory: /branches/hot_and_MHD_temp_dev/src/ ============================================== File [modified]: GRHydro_Con2Prim.F90 Delta lines: +4 -2 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_Con2Prim.F90 2010-11-11 23:05:07 UTC (rev 173) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_Con2Prim.F90 2010-11-14 05:15:59 UTC (rev 174) @@ -264,7 +264,8 @@ y, z, r, GRHydro_rho_min CCTK_REAL s2, c0, c1, c2, c3, c4, f, df, ftol, v2, w, vlowx, vlowy, vlowz - CCTK_INT count, i, handle, GRHydro_reflevel, GRHydro_C2P_failed + CCTK_INT count, i, handle, GRHydro_reflevel + CCTK_REAL GRHydro_C2P_failed CCTK_REAL udens, usx, usy, usz, utau, pold, pnew, epsold, epsnew, w2, & w2mhalf, temp1, drhobydpress, depsbydpress, dpressbydeps, dpressbydrho, pmin, epsmin character(len=200) warnline @@ -486,7 +487,8 @@ y, z, r, GRHydro_rho_min CCTK_REAL temp, ye CCTK_REAL s2, c0, c1, c2, c3, c4, f, df, ftol, v2, w, vlowx, vlowy, vlowz - CCTK_INT ii,jj,kk,count, i, handle, GRHydro_reflevel, GRHydro_C2P_failed + CCTK_INT ii,jj,kk,count, i, handle, GRHydro_reflevel + CCTK_REAL GRHydro_C2P_failed CCTK_REAL udens, usx, usy, usz, utau, pold, pnew, epsold, epsnew, w2, & w2mhalf, temp1, drhobydpress, depsbydpress, dpressbydeps, dpressbydrho, pmin, epsmin character(len=200) warnline

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/src/nuc_eos/ (Rev. 18)
by knarf＠cct.lsu.edu 13 Nov '10

13 Nov '10

User: knarf Date: 2010/11/13 11:04 PM Modified: /EOS_Omni/src/nuc_eos/ bisection.F90 Log: correct compile error File Changes: Directory: /EOS_Omni/src/nuc_eos/ ================================= File [modified]: bisection.F90 Delta lines: +1 -1 =================================================================== --- EOS_Omni/src/nuc_eos/bisection.F90 2010-11-13 04:13:28 UTC (rev 17) +++ EOS_Omni/src/nuc_eos/bisection.F90 2010-11-14 05:04:22 UTC (rev 18) @@ -19,7 +19,7 @@ integer bcount,i,itmax,maxbcount - real*8 bivar + real*8 bivar(*) bcount = 0 maxbcount = 80

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/src/ (Rev. 17)
by cott＠tapir.caltech.edu 12 Nov '10

12 Nov '10

User: cott Date: 2010/11/12 10:13 PM Modified: /EOS_Omni/src/ EOS_Omni_SingleVarCalls.F90 /EOS_Omni/src/nuc_eos/ nuc_eos.F90 Log: * small optimization: introduce call to nuc_eos that just returns the pressure (and eps) File Changes: Directory: /EOS_Omni/src/nuc_eos/ ================================= File [modified]: nuc_eos.F90 Delta lines: +101 -0 =================================================================== --- EOS_Omni/src/nuc_eos/nuc_eos.F90 2010-11-12 00:35:41 UTC (rev 16) +++ EOS_Omni/src/nuc_eos/nuc_eos.F90 2010-11-13 04:13:28 UTC (rev 17) @@ -264,6 +264,87 @@ end subroutine nuc_eos_short + +subroutine nuc_eos_press_eps(xrho,xtemp,xye,xenr,xprs,& + keytemp,keyerr,rfeps) + + use eosmodule + implicit none + + real*8, intent(in) :: xrho,xye + real*8, intent(inout) :: xtemp,xenr + real*8, intent(in) :: rfeps + real*8, intent(out) :: xprs + integer, intent(in) :: keytemp + integer, intent(out) :: keyerr + + ! local variables + real*8 :: xcs2,xdpderho,xdpdrhoe + real*8 :: lr,lt,y,xx,xeps,leps,xs + real*8 :: d1,d2,d3,ff(8) + integer :: keyerrt = 0 + + if(xrho.gt.eos_rhomax) then + stop "nuc_eos: rho > rhomax" + endif + + if(xrho.lt.eos_rhomin*1.2d0) then + call nuc_low_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) + return + endif + + if(xye.gt.eos_yemax) then + stop "nuc_eos: ye > yemax" + endif + + if(xye.lt.eos_yemin) then + stop "nuc_eos: ye < yemin" + endif + + if(keytemp.eq.1) then + if(xtemp.gt.eos_tempmax) then + stop "nuc_eos: temp > tempmax" + endif + + if(xtemp.lt.eos_tempmin) then + call nuc_low_eos(xrho,xenr,xprs,xcs2,xdpderho,xdpdrhoe,keytemp) + return + endif + endif + + lr = log10(xrho) + lt = log10(xtemp) + y = xye + xeps = xenr + energy_shift + leps = log10(max(xeps,1.0d0)) + + keyerr = 0 + + if(keytemp.eq.0) then + !need to find temperature based on xeps + call findtemp(lr,lt,y,leps,keyerrt,rfeps) + if(keyerrt.ne.0) then + keyerr = keyerrt + return + endif + xtemp = 10.0d0**lt + + elseif(keytemp.eq.2) then + stop "eos_nuc_press does not support keytemp.eq.2" + endif + + ! have temperature, proceed: + call findall_press_eps(lr,lt,y,ff) + xprs = 10.0d0**ff(1) + + xeps = 10.0d0**ff(2) - energy_shift + if((keytemp.eq.1).or.(keytemp.eq.2)) then + xenr = xeps + endif + +end subroutine nuc_eos_press_eps + + subroutine findthis(lr,lt,y,value,array,d1,d2,d3) use eosmodule @@ -321,3 +402,23 @@ ff(:) = ffx(:,1) end subroutine findall_short + + +subroutine findall_press_eps(lr,lt,y,ff) + + use eosmodule + implicit none + + real*8 ffx(8,1) + real*8 ff(8) + real*8 lr,lt,y + integer i + integer :: nvarsx = 2 + + +! Ewald's interpolator + call intp3d_many(lr,lt,y,ffx,1,alltables(:,:,:,1:2), & + nrho,ntemp,nye,nvarsx,logrho,logtemp,ye) + ff(:) = ffx(:,1) + +end subroutine findall_press_eps Directory: /EOS_Omni/src/ ========================= File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +1 -2 =================================================================== --- EOS_Omni/src/EOS_Omni_SingleVarCalls.F90 2010-11-12 00:35:41 UTC (rev 16) +++ EOS_Omni/src/EOS_Omni_SingleVarCalls.F90 2010-11-13 04:13:28 UTC (rev 17) @@ -96,8 +96,7 @@ xtemp = temp(i) xye = ye(i) xenr = eps(i) * inv_eps_gf - call nuc_eos_short(xrho,xtemp,xye,xenr,xprs,& - xent,xcs2,xdedt,xdpderho,xdpdrhoe,xmunu,& + call nuc_eos_press_eps(xrho,xtemp,xye,xenr,xprs,& keytemp,keyerr(i),rf_precision) if(keyerr(i).ne.0) then

1 0

[svn:einsteintoolkit] www/release-info/ (Rev. 401)
by knarf＠cct.lsu.edu 12 Nov '10

12 Nov '10

User: knarf Date: 2010/11/12 03:25 PM Modified: /release-info/ numrel-gcc__1.log, numrel-gcc__2.log, numrel__1.log, numrel__2.log Log: update numrel File Changes: Directory: /release-info/ ========================= File [modified]: numrel-gcc__1.log Delta lines: +5 -6 =================================================================== --- release-info/numrel-gcc__1.log 2010-11-08 04:03:02 UTC (rev 400) +++ release-info/numrel-gcc__1.log 2010-11-12 21:25:14 UTC (rev 401) @@ -1016,7 +1016,7 @@ WaveToyFreeF90: test_rad Success: 6 files compared, 1 differ in the last digits WeylScal4: teukolsky - Failure: 8 files compared, 8 differ, 6 differ significantly + Success: 8 files compared, 6 differ in the last digits WeylScal4: teukolskyID Success: 8 files compared, 5 differ in the last digits @@ -1025,7 +1025,7 @@ Summary for configuration gcc - Time -> Thu Nov 4 22:57:01 CDT 2010 + Time -> Fri Nov 12 13:29:22 CST 2010 Host -> numrel07.cct.lsu.edu User -> knarf @@ -1034,17 +1034,16 @@ Runnable tests -> 132 Total number of thorns -> 157 Number of tested thorns -> 39 - Number of tests passed -> 128 + Number of tests passed -> 129 Number passed only to - set tolerance -> 76 - Number failed -> 4 + set tolerance -> 77 + Number failed -> 3 Tests failed: halfsphere_pugh_ppm (from Hydro_InitExcision) x_flip_pugh_ppm (from Hydro_InitExcision) x_pugh_ppm (from Hydro_InitExcision) - teukolsky (from WeylScal4) ======================================================================== File [modified]: numrel-gcc__2.log Delta lines: +1 -1 =================================================================== --- release-info/numrel-gcc__2.log 2010-11-08 04:03:02 UTC (rev 400) +++ release-info/numrel-gcc__2.log 2010-11-12 21:25:14 UTC (rev 401) @@ -1016,7 +1016,7 @@ Summary for configuration gcc - Time -> Thu Nov 4 23:17:13 CDT 2010 + Time -> Fri Nov 12 13:48:47 CST 2010 Host -> numrel07.cct.lsu.edu User -> knarf File [modified]: numrel__1.log Delta lines: +5 -9 =================================================================== --- release-info/numrel__1.log 2010-11-08 04:03:02 UTC (rev 400) +++ release-info/numrel__1.log 2010-11-12 21:25:14 UTC (rev 401) @@ -1016,7 +1016,7 @@ WaveToyFreeF90: test_rad Success: 6 files compared, 1 differ in the last digits WeylScal4: teukolsky - Failure: 8 files compared, 8 differ, 6 differ significantly + Success: 8 files compared, 6 differ in the last digits WeylScal4: teukolskyID Success: 8 files compared, 6 differ in the last digits @@ -1025,7 +1025,7 @@ Summary for configuration sim - Time -> Thu Nov 4 22:56:07 CDT 2010 + Time -> Fri Nov 12 13:28:00 CST 2010 Host -> numrel07.cct.lsu.edu User -> knarf @@ -1034,14 +1034,10 @@ Runnable tests -> 132 Total number of thorns -> 157 Number of tested thorns -> 39 - Number of tests passed -> 131 + Number of tests passed -> 132 Number passed only to - set tolerance -> 78 - Number failed -> 1 + set tolerance -> 79 + Number failed -> 0 - Tests failed: - - teukolsky (from WeylScal4) - ======================================================================== File [modified]: numrel__2.log Delta lines: +1 -1 =================================================================== --- release-info/numrel__2.log 2010-11-08 04:03:02 UTC (rev 400) +++ release-info/numrel__2.log 2010-11-12 21:25:14 UTC (rev 401) @@ -1016,7 +1016,7 @@ Summary for configuration sim - Time -> Thu Nov 4 23:16:32 CDT 2010 + Time -> Fri Nov 12 13:47:38 CST 2010 Host -> numrel07.cct.lsu.edu User -> knarf

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/ (Rev. 16)
by cott＠tapir.caltech.edu 11 Nov '10

11 Nov '10

User: cott Date: 2010/11/11 06:35 PM Modified: /EOS_Omni/ interface.ccl /EOS_Omni/src/ EOS_Omni_MultiVarCalls.F90 /EOS_Omni/src/nuc_eos/ nuc_eos.F90 Log: * fix a bug in call with entropy File Changes: Directory: /EOS_Omni/ ===================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- EOS_Omni/interface.ccl 2010-11-11 06:07:33 UTC (rev 15) +++ EOS_Omni/interface.ccl 2010-11-12 00:35:41 UTC (rev 16) @@ -110,7 +110,7 @@ CCTK_REAL INOUT ARRAY temp, \ CCTK_REAL IN ARRAY ye, \ CCTK_REAL OUT ARRAY press, \ - CCTK_REAL OUT ARRAY entropy, \ + CCTK_REAL INOUT ARRAY entropy, \ CCTK_REAL OUT ARRAY cs2, \ CCTK_REAL OUT ARRAY dedt, \ CCTK_REAL OUT ARRAY dpderho, \ Directory: /EOS_Omni/src/nuc_eos/ ================================= File [modified]: nuc_eos.F90 Delta lines: +1 -0 =================================================================== --- EOS_Omni/src/nuc_eos/nuc_eos.F90 2010-11-11 06:07:33 UTC (rev 15) +++ EOS_Omni/src/nuc_eos/nuc_eos.F90 2010-11-12 00:35:41 UTC (rev 16) @@ -236,6 +236,7 @@ return endif xtemp = 10.0d0**lt + endif ! have temperature, proceed: Directory: /EOS_Omni/src/ ========================= File [modified]: EOS_Omni_MultiVarCalls.F90 Delta lines: +2 -2 =================================================================== --- EOS_Omni/src/EOS_Omni_MultiVarCalls.F90 2010-11-11 06:07:33 UTC (rev 15) +++ EOS_Omni/src/EOS_Omni_MultiVarCalls.F90 2010-11-12 00:35:41 UTC (rev 16) @@ -25,7 +25,7 @@ CCTK_REAL, intent(in) :: rho(npoints),ye(npoints) CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) CCTK_REAL, intent(out) :: press(npoints) - CCTK_REAL, intent(out) :: entropy(npoints) + CCTK_REAL, intent(inout) :: entropy(npoints) CCTK_REAL, intent(out) :: cs2(npoints) CCTK_REAL, intent(out) :: dedt(npoints) CCTK_REAL, intent(out) :: dpderho(npoints) @@ -40,7 +40,6 @@ real*8 :: xprs,xmunu,xcs2 real*8 :: xdedt,xdpderho,xdpdrhoe - if(eoskey.ne.4) then call CCTK_WARN(0,"EOS_Omni_EOS_short currently does not work for this eoskey") endif @@ -54,6 +53,7 @@ xtemp = temp(i) xye = ye(i) xenr = eps(i) * inv_eps_gf + xent = entropy(i) call nuc_eos_short(xrho,xtemp,xye,xenr,xprs,& xent,xcs2,xdedt,xdpderho,xdpdrhoe,xmunu,& keytemp,keyerr(i),rf_precision)

1 0

[svn:einsteintoolkit] HydroBase/trunk/ (Rev. 33)
by cott＠tapir.caltech.edu 11 Nov '10

11 Nov '10

User: cott Date: 2010/11/11 05:05 PM Modified: /trunk/ param.ccl Log: * change temp_and_ent_evolution_method to temperature_evolution_method File Changes: Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +1 -1 =================================================================== --- trunk/param.ccl 2010-11-01 05:58:34 UTC (rev 32) +++ trunk/param.ccl 2010-11-11 23:05:32 UTC (rev 33) @@ -41,7 +41,7 @@ "none" :: "Evolution for Y_e is disabled" } "none" -KEYWORD temp_and_ent_evolution_method "Evolution method for temperature and entropy" +KEYWORD temperature_evolution_method "Evolution method for temperature and entropy" { "none" :: "Evolution for temperature and entropy is disabled" } "none"

1 0

[svn:einsteintoolkit] GRHydro/branches/hot_and_MHD_temp_dev/ (Rev. 173)
by cott＠tapir.caltech.edu 11 Nov '10

11 Nov '10

User: cott Date: 2010/11/11 05:05 PM Modified: /branches/hot_and_MHD_temp_dev/ param.ccl Log: -> temperature_evolution_method File Changes: Directory: /branches/hot_and_MHD_temp_dev/ ========================================== File [modified]: param.ccl Delta lines: +1 -1 =================================================================== --- branches/hot_and_MHD_temp_dev/param.ccl 2010-11-11 23:04:55 UTC (rev 172) +++ branches/hot_and_MHD_temp_dev/param.ccl 2010-11-11 23:05:07 UTC (rev 173) @@ -38,7 +38,7 @@ { "GRHydro" :: "Use GRHydro to evolve Y_e" } -EXTENDS KEYWORD temp_and_ent_evolution_method "" +EXTENDS KEYWORD temperature_evolution_method "" { "GRHydro" :: "Use GRHydro to evolve temperature and entropy" }

1 0

[svn:einsteintoolkit] GRHydro/branches/hot_and_MHD_temp_dev/src/ (Rev. 172)
by cott＠tapir.caltech.edu 11 Nov '10

11 Nov '10

User: cott Date: 2010/11/11 05:04 PM Modified: /branches/hot_and_MHD_temp_dev/src/ GRHydro_ParamCheck.F90 Log: * -> temperature_evolution_method File Changes: Directory: /branches/hot_and_MHD_temp_dev/src/ ============================================== File [modified]: GRHydro_ParamCheck.F90 Delta lines: +1 -1 =================================================================== --- branches/hot_and_MHD_temp_dev/src/GRHydro_ParamCheck.F90 2010-11-03 16:50:43 UTC (rev 171) +++ branches/hot_and_MHD_temp_dev/src/GRHydro_ParamCheck.F90 2010-11-11 23:04:55 UTC (rev 172) @@ -98,7 +98,7 @@ evolve_Y_e = 0 endif - if (CCTK_EQUALS(temp_and_ent_evolution_method,"GRHydro")) then + if (CCTK_EQUALS(temperature_evolution_method,"GRHydro")) then evolve_temper = 1 else evolve_temper = 0

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/ (Rev. 15)
by cott＠tapir.caltech.edu 11 Nov '10

11 Nov '10

User: cott Date: 2010/11/11 12:07 AM Modified: /EOS_Omni/ interface.ccl Log: * small fix to EOS_Omni_short call File Changes: Directory: /EOS_Omni/ ===================== File [modified]: interface.ccl Delta lines: +1 -1 =================================================================== --- EOS_Omni/interface.ccl 2010-11-11 06:02:12 UTC (rev 14) +++ EOS_Omni/interface.ccl 2010-11-11 06:07:33 UTC (rev 15) @@ -119,7 +119,7 @@ CCTK_INT OUT ARRAY keyerr, \ CCTK_INT OUT anyerr) -PROVIDES FUNCTION EOS_Omni_cs2 WITH EOS_Omni_EOS_short LANGUAGE Fortran +PROVIDES FUNCTION EOS_Omni_short WITH EOS_Omni_EOS_short LANGUAGE Fortran

1 0

[svn:einsteintoolkit] incoming/EOS_Omni/src/ (Rev. 14)
by cott＠tapir.caltech.edu 11 Nov '10

11 Nov '10

User: cott Date: 2010/11/11 12:02 AM Added: /EOS_Omni/src/ EOS_Omni_MultiVarCalls.F90 Log: * add a multi-var call File Changes: Directory: /EOS_Omni/src/ ========================= File [added]: EOS_Omni_MultiVarCalls.F90 Delta lines: +84 -0 =================================================================== --- EOS_Omni/src/EOS_Omni_MultiVarCalls.F90 (rev 0) +++ EOS_Omni/src/EOS_Omni_MultiVarCalls.F90 2010-11-11 06:02:12 UTC (rev 14) @@ -0,0 +1,84 @@ +#include "cctk.h" +#include "cctk_Parameters.h" +#include "cctk_Arguments.h" +#include "cctk_Functions.h" + +! eoskey: +! 1 --- polytropic EOS +! 2 --- gamma-law EOS +! 3 --- hybrid EOS +! 4 --- finite-T microphysical NSE EOS + + +subroutine EOS_Omni_EOS_short(eoskey,keytemp,rf_precision,npoints,& + rho,eps,temp,ye,press,entropy,cs2,dedt,dpderho,dpdrhoe,munu,& + keyerr,anyerr) + + use EOS_Omni_Module + implicit none + DECLARE_CCTK_PARAMETERS + + CCTK_INT, intent(in) :: eoskey,keytemp,npoints + CCTK_INT, intent(out) :: keyerr(npoints) + CCTK_INT, intent(out) :: anyerr + CCTK_REAL, intent(in) :: rf_precision + CCTK_REAL, intent(in) :: rho(npoints),ye(npoints) + CCTK_REAL, intent(inout) :: eps(npoints), temp(npoints) + CCTK_REAL, intent(out) :: press(npoints) + CCTK_REAL, intent(out) :: entropy(npoints) + CCTK_REAL, intent(out) :: cs2(npoints) + CCTK_REAL, intent(out) :: dedt(npoints) + CCTK_REAL, intent(out) :: dpderho(npoints) + CCTK_REAL, intent(out) :: dpdrhoe(npoints) + CCTK_REAL, intent(out) :: munu(npoints) + + ! local vars + integer :: i + character(256) :: warnstring + ! temporary vars for nuc_eos + real*8 :: xrho,xye,xtemp,xenr,xent + real*8 :: xprs,xmunu,xcs2 + real*8 :: xdedt,xdpderho,xdpdrhoe + + + if(eoskey.ne.4) then + call CCTK_WARN(0,"EOS_Omni_EOS_short currently does not work for this eoskey") + endif + + anyerr = 0 + keyerr(:) = 0 + + do i=1,npoints + + xrho = rho(i) * inv_rho_gf + xtemp = temp(i) + xye = ye(i) + xenr = eps(i) * inv_eps_gf + call nuc_eos_short(xrho,xtemp,xye,xenr,xprs,& + xent,xcs2,xdedt,xdpderho,xdpdrhoe,xmunu,& + keytemp,keyerr(i),rf_precision) + + if(keyerr(i).ne.0) then + anyerr = 1 + endif + + if(keytemp.eq.1.or.keytemp.eq.2) then + eps(i) = xenr * eps_gf + else if(keytemp.eq.2) then + eps(i) = xenr * eps_gf + temp(i) = xtemp + else + temp(i) = xtemp + endif + + press(i) = xprs * press_gf + entropy(i) = xent + cs2(i) = xcs2 + dedt(i) = xdedt * eps_gf + dpderho(i) = xdpderho * press_gf * inv_eps_gf + dpdrhoe(i) = xdpdrhoe * press_gf * inv_rho_gf + munu(i) = xmunu + + enddo + +end subroutine EOS_Omni_EOS_short

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits