Commits

commits@lists.einsteintoolkit.org

2 participants
6997 discussions

[svn:einsteintoolkit] EOS_Omni/trunk/src/ (Rev. 94)
by rhaas＠tapir.caltech.edu 12 Mar '14

12 Mar '14

User: rhaas Date: 2014/03/12 10:01 PM Removed: /trunk/src/ make.code.deps /trunk/src/nuc_eos_cxx/ make.code.deps Log: EOS_Omni: remove unnecessary make.code.deps Cactus tracks dependencies on include files on its own using calls to the C compiler From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/nuc_eos_cxx/ ================================== File [removed]: make.code.deps Delta lines: +0 -18 =================================================================== --- trunk/src/nuc_eos_cxx/make.code.deps 2014-03-13 03:01:27 UTC (rev 93) +++ trunk/src/nuc_eos_cxx/make.code.deps 2014-03-13 03:01:30 UTC (rev 94) @@ -1,18 +0,0 @@ -nuc_eos_dpdrhoe_dpderho.cc: nuc_eos.hh -nuc_eos.cc: nuc_eos.hh -nuc_eos_press.cc: nuc_eos.hh -nuc_eos_press_cs2.cc: nuc_eos.hh -nuc_eos_short.cc: nuc_eos.hh -nuc_eos_full.cc: nuc_eos.hh -readtable.cc: nuc_eos.hh -nuc_eos_dpdrhoe_dpderho.cc: helpers.hh -nuc_eos.cc: helpers.hh -nuc_eos_press.cc: helpers.hh -nuc_eos_press_cs2.cc: helpers.hh -nuc_eos_short.cc: helpers.hh -nuc_eos_full.cc: helpers.hh -readtable.cc: helpers.hh - - - - Directory: /trunk/src/ ====================== File [removed]: make.code.deps Delta lines: +0 -1 =================================================================== --- trunk/src/make.code.deps 2014-03-13 03:01:27 UTC (rev 93) +++ trunk/src/make.code.deps 2014-03-13 03:01:30 UTC (rev 94) @@ -1 +0,0 @@ -EOS_Omni_Startup.F90: EOS_Omni_Module.o

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/src/ (Rev. 93)
by rhaas＠tapir.caltech.edu 12 Mar '14

12 Mar '14

User: rhaas Date: 2014/03/12 10:01 PM Modified: /trunk/src/ EOS_Omni_BarotropicReadTable.F90, EOS_Omni_ColdEOSReadTable.F90, EOS_Omni_MultiVarCalls.F90, EOS_Omni_SingleVarCalls.F90, EOS_Omni_SingleVarCalls_harm.F90 Log: EOS_Omni: use CCTK_ERROR, add STOP after CCTK_ERROR From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: EOS_Omni_BarotropicReadTable.F90 Delta lines: +2 -1 =================================================================== --- trunk/src/EOS_Omni_BarotropicReadTable.F90 2014-03-13 03:01:16 UTC (rev 92) +++ trunk/src/EOS_Omni_BarotropicReadTable.F90 2014-03-13 03:01:27 UTC (rev 93) @@ -30,7 +30,8 @@ if(.not.tablethere) then write(warnline,"(A10,A,A15)") "EOS file ", trim(adjustl(eosfilename)), " does not exist!" - call CCTK_WARN(0,warnline) + call CCTK_ERROR(warnline) + STOP endif ! read header File [modified]: EOS_Omni_ColdEOSReadTable.F90 Delta lines: +8 -4 =================================================================== --- trunk/src/EOS_Omni_ColdEOSReadTable.F90 2014-03-13 03:01:16 UTC (rev 92) +++ trunk/src/EOS_Omni_ColdEOSReadTable.F90 2014-03-13 03:01:27 UTC (rev 93) @@ -31,7 +31,8 @@ if(.not.tablethere) then write(warnline,"(A10,A,A15)") "EOS file ", trim(adjustl(eosfilename)), " does not exist!" - call CCTK_WARN(0,warnline) + call CCTK_ERROR(warnline) + STOP endif ! read header @@ -39,12 +40,14 @@ read(667,"(A)") buffer1 ! check if okay if(.not. (trim(adjustl(buffer1)).eq."EoSType = Tabulated")) then - call CCTK_WARN(0,"Wrong EOS table format -- check header") + call CCTK_ERROR("Wrong EOS table format -- check header") + STOP endif ! now read number of rho entries read(667,"(A7,i7,A6,i6,A5,i6)") buffer1,lnrho,buffer2,lnye,buffer3,lntemp if(lnye.ne.1.or.lntemp.ne.1) then - call CCTK_WARN(0,"Wrong EOS table format -- cannot handle Nye!=1 or NT!=`") + call CCTK_ERROR("Wrong EOS table format -- cannot handle Nye!=1 or NT!=`") + STOP endif coldeos_nrho = lnrho @@ -80,7 +83,8 @@ ! make sure density is in log spacing read(667,"(A30)") buffer1 if(.not.(trim(adjustl(buffer1)).eq."RhoSpacing = Log")) then - call CCTK_WARN(0,"Density spacing not log? Check table format!") + call CCTK_ERROR("Density spacing not log? Check table format!") + STOP endif ! now read everything File [modified]: EOS_Omni_MultiVarCalls.F90 Delta lines: +20 -15 =================================================================== --- trunk/src/EOS_Omni_MultiVarCalls.F90 2014-03-13 03:01:16 UTC (rev 92) +++ trunk/src/EOS_Omni_MultiVarCalls.F90 2014-03-13 03:01:27 UTC (rev 93) @@ -33,19 +33,17 @@ 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 + ! CRITICAL is not really required but might prevent multiple threads from + ! outputting error messages at the same time and cluttering the log file + !$OMP CRITICAL write(warnstring,"(A8,i5)") "eoskey: ", eoskey - !$OMP CRITICAL call CCTK_WARN(1,warnstring) - call CCTK_WARN(0,"EOS_Omni_EOS_short currently does not work for this eoskey") + call CCTK_ERROR("EOS_Omni_EOS_short currently does not work for this eoskey") !$OMP END CRITICAL + STOP endif anyerr = 0 @@ -64,8 +62,9 @@ keyerr,anyerr) else !$OMP CRITICAL - call CCTK_WARN(0,"This keytemp is not supported") + call CCTK_ERROR("This keytemp is not supported") !$OMP END CRITICAL + STOP endif end subroutine EOS_Omni_EOS_short @@ -106,11 +105,12 @@ character(256) :: warnstring if(eoskey.ne.4) then + !$OMP CRITICAL write(warnstring,"(A8,i5)") "eoskey: ", eoskey - !$OMP CRITICAL call CCTK_WARN(1,warnstring) - call CCTK_WARN(0,"EOS_Omni_EOS_full currently does not work for this eoskey") + call CCTK_ERROR("EOS_Omni_EOS_full currently does not work for this eoskey") !$OMP END CRITICAL + STOP endif anyerr = 0 @@ -127,8 +127,9 @@ keyerr,anyerr) else !$OMP CRITICAL - call CCTK_WARN(0,"This keytemp is not supported") + call CCTK_ERROR("This keytemp is not supported") !$OMP END CRITICAL + STOP endif end subroutine EOS_Omni_EOS_full @@ -224,7 +225,8 @@ enddo case (4) if(keytemp.ne.0) then - call CCTK_WARN(0,"Keytemp other than 0 not supported for dpdrhoe, dpderho") + call CCTK_ERROR("Keytemp other than 0 not supported for dpdrhoe, dpderho") + STOP else call nuc_eos_m_kt0_dpdrhoe_dpderho(npoints,& rho,temp,ye,eps,dpdrhoe,dpderho,rf_precision,& @@ -232,7 +234,8 @@ endif case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_dpderho_dpdrhoe @@ -330,10 +333,12 @@ enddo case (4) write(warnstring,*) "depsdrho and depsdpress not implemented yet for hot nuclear EOS" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_DEpsByDRho_DEpsByDPress File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +48 -24 =================================================================== --- trunk/src/EOS_Omni_SingleVarCalls.F90 2014-03-13 03:01:16 UTC (rev 92) +++ trunk/src/EOS_Omni_SingleVarCalls.F90 2014-03-13 03:01:27 UTC (rev 93) @@ -102,7 +102,8 @@ call nuc_eos_m_kt0_press(npoints,rho,temp,ye,eps,press,& rf_precision,keyerr,anyerr) else - call CCTK_WARN(0,"This keytemp is not suppported!") + call CCTK_ERROR("This keytemp is not suppported!") + STOP endif case (5) ! cold tabular EOS with gamma law @@ -190,7 +191,8 @@ case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_Press @@ -424,7 +426,8 @@ case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_PressOMP @@ -530,7 +533,8 @@ eps,xprs,xent,xcs2,xdedt,xdpderho,dpdrhoe,xmunu,rf_precision,& keyerr,anyerr) else - call CCTK_WARN(0,"This keytemp is not supported!") + call CCTK_ERROR("This keytemp is not supported!") + STOP endif case (5) @@ -583,7 +587,8 @@ case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_DPressByDRho @@ -658,7 +663,8 @@ eps,xprs,xent,xcs2,xdedt,dpdepsrho,xdpdrhoe,xmunu,rf_precision,& keyerr,anyerr) else - call CCTK_WARN(0,"This keytemp is not supported!") + call CCTK_ERROR("This keytemp is not supported!") + STOP endif case (5) ! with the cold eos we have to assume P = P(rho), so @@ -692,7 +698,8 @@ enddo case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_DPressByDEps @@ -798,7 +805,8 @@ call nuc_eos_m_kt0_press_cs2(npoints,rho,temp,ye,& eps,xprs,cs2,rf_precision,keyerr,anyerr) else - call CCTK_WARN(0,"This keytemp is not supported!") + call CCTK_ERROR("This keytemp is not supported!") + STOP endif case (5) ! with the cold eos we have to assume P = P(rho), so @@ -856,7 +864,8 @@ case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_cs2 @@ -907,14 +916,17 @@ case (3) ! hybrid EOS write(warnstring,*) "EOS_Omni_EpsFromPress call not supported for hybrid EOS" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP case (4) ! nuc EOS write(warnstring,*) "EOS_Omni_EpsFromPress call not supported for nuc_eos yet" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_eps_from_press @@ -980,18 +992,22 @@ case (3) ! hybrid EOS write(warnstring,*) "EOS_Omni_RestMassDensityFromPressEpsTemp not supported for hybrid EOS" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP case (4) ! nuc EOS if(ikeytemp.eq.2) then - call CCTK_WARN(0,"This function does not work yet when coming in with entropy") + call CCTK_ERROR("This function does not work yet when coming in with entropy") + STOP else if(ikeytemp.eq.1) then keytemp = 1 else - call CCTK_WARN(0,"This function does not work yet when coming in with this keytemp") + call CCTK_ERROR("This function does not work yet when coming in with this keytemp") + STOP endif - call CCTK_WARN(0,"This routine does not work with the new nuc_eos_cxx [yet]") + call CCTK_ERROR("This routine does not work with the new nuc_eos_cxx [yet]") + STOP keytemp = 1 do i=1,npoints @@ -1018,8 +1034,9 @@ !$OMP CRITICAL write(warnstring,"(A25,1P10E15.6)") "Issue with table, dpdrho.lt.0",& rho_guess,xtemp,xye - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) !$OMP END CRITICAL + STOP endif if (abs(1.0d0-press_guess/xprs).lt.rf_precision) then @@ -1050,7 +1067,8 @@ ! cold tabulated EOS ! deal only with case in which thermal pressure is zero if(keytemp.ne.1) then - call CCTK_WARN(0,"finding rho(press) for tabulated cold EOS only possible if keytemp=1") + call CCTK_ERROR("finding rho(press) for tabulated cold EOS only possible if keytemp=1") + STOP endif do i=1,npoints @@ -1110,8 +1128,9 @@ !$OMP CRITICAL write(warnstring,"(A25,1P10E15.6)") "Issue with table, dpdrho.lt.0",& rho_guess,rho_guess2 - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) !$OMP END CRITICAL + STOP endif if (abs(1.0d0-press_guess/xprs).lt.rf_precision) then @@ -1145,7 +1164,8 @@ ! barotropic tabulated EOS ! deal only with case in which thermal pressure is zero if(keytemp.ne.1) then - call CCTK_WARN(0,"finding rho(press) for tabulated barotropic EOS only possible if keytemp=1") + call CCTK_ERROR("finding rho(press) for tabulated barotropic EOS only possible if keytemp=1") + STOP endif do i=1,npoints @@ -1206,8 +1226,9 @@ !$OMP CRITICAL write(warnstring,"(A25,1P10E15.6)") "Issue with table, dpdrho.lt.0",& rho_guess,rho_guess2 - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) !$OMP END CRITICAL + STOP endif if (abs(1.0d0-press_guess/press(i)).lt.rf_precision) then @@ -1232,7 +1253,8 @@ if (rho_guess.lt.1.0d-15.or.counter.gt.100000) then ! !$OMP CRITICAL ! write(warnstring,"(A25,1P10E15.6)") "rho(p) issue", rho_guess,press(i),press_guess -! call CCTK_WARN(0,warnstring) +! call CCTK_ERROR(warnstring) +! STOP ! !$OMP END CRITICAL keyerr(i) = 473 anyerr = 1 @@ -1244,7 +1266,8 @@ case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_RhoFromPressEpsTempEnt @@ -1332,7 +1355,8 @@ case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented for EOS_Omni_EOS_PressEpsTempYe_from_Rho!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_PressEpsTempYe_from_Rho File [modified]: EOS_Omni_SingleVarCalls_harm.F90 Delta lines: +24 -12 =================================================================== --- trunk/src/EOS_Omni_SingleVarCalls_harm.F90 2014-03-13 03:01:16 UTC (rev 92) +++ trunk/src/EOS_Omni_SingleVarCalls_harm.F90 2014-03-13 03:01:27 UTC (rev 93) @@ -40,11 +40,13 @@ select case (eoskey) case (1) ! polytropic EOS - call CCTK_WARN(0,"Polytropic EOS not implemented for press_f_hro_v2_rhoW") + call CCTK_ERROR("Polytropic EOS not implemented for press_f_hro_v2_rhoW") + STOP case (2) ! gamma-law EOS if(keytemp.eq.1) then - call CCTK_WARN(0,"keytemp.eq.1 not implemented for press_f_hro_v2_rhoW") + call CCTK_ERROR("keytemp.eq.1 not implemented for press_f_hro_v2_rhoW") + STOP endif do i=1,npoints gtmp1 = 1.0d0 - v2(i) @@ -55,11 +57,13 @@ enddo case (3) ! hybrid EOS - call CCTK_WARN(0,"Hybrid EOS not implemented for press_f_hro_v2_rhoW") + call CCTK_ERROR("Hybrid EOS not implemented for press_f_hro_v2_rhoW") + STOP case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_Press_f_hrho_v2_rhoW @@ -95,22 +99,26 @@ select case (eoskey) case (1) ! polytropic EOS - call CCTK_WARN(0,"Polytropic EOS not implemented for press_f_hro_v2_rhoW") + call CCTK_ERROR("Polytropic EOS not implemented for press_f_hro_v2_rhoW") + STOP case (2) ! gamma-law EOS if(keytemp.eq.1) then - call CCTK_WARN(0,"keytemp.eq.1 not implemented for press_f_hro_v2_rhoW") + call CCTK_ERROR("keytemp.eq.1 not implemented for press_f_hro_v2_rhoW") + STOP endif do i=1,npoints dpdhrho(i) = (gl_gamma - 1.0d0) * (1.0d0 - v2(i)) / (gl_gamma) enddo case (3) ! hybrid EOS - call CCTK_WARN(0,"Hybrid EOS not implemented for press_f_hro_v2_rhoW") + call CCTK_ERROR("Hybrid EOS not implemented for press_f_hro_v2_rhoW") + STOP case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_dpdhrho_f_hrho_v2_rhoW @@ -146,11 +154,13 @@ select case (eoskey) case (1) ! polytropic EOS - call CCTK_WARN(0,"Polytropic EOS not implemented for press_f_hro_v2_rhoW") + call CCTK_ERROR("Polytropic EOS not implemented for press_f_hro_v2_rhoW") + STOP case (2) ! gamma-law EOS if(keytemp.eq.1) then - call CCTK_WARN(0,"keytemp.eq.1 not implemented for press_f_hro_v2_rhoW") + call CCTK_ERROR("keytemp.eq.1 not implemented for press_f_hro_v2_rhoW") + STOP endif do i=1,npoints dpdv2(i) = (gl_gamma - 1.0d0) * (0.5d0 * rhoW(i) & @@ -158,11 +168,13 @@ enddo case (3) ! hybrid EOS - call CCTK_WARN(0,"Hybrid EOS not implemented for press_f_hro_v2_rhoW") + call CCTK_ERROR("Hybrid EOS not implemented for press_f_hro_v2_rhoW") + STOP case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" - call CCTK_WARN(0,warnstring) + call CCTK_ERROR(warnstring) + STOP end select end subroutine EOS_Omni_EOS_dpdv2_f_hrho_v2_rhoW

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/src/ (Rev. 92)
by rhaas＠tapir.caltech.edu 12 Mar '14

12 Mar '14

User: rhaas Date: 2014/03/12 10:01 PM Modified: /trunk/src/ EOS_Omni_MultiVarCalls.F90, EOS_Omni_SingleVarCalls.F90 Log: * improved checking of keytemp From: Christian Ott <cott(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: EOS_Omni_MultiVarCalls.F90 Delta lines: +2 -2 =================================================================== --- trunk/src/EOS_Omni_MultiVarCalls.F90 2014-03-13 03:01:12 UTC (rev 91) +++ trunk/src/EOS_Omni_MultiVarCalls.F90 2014-03-13 03:01:16 UTC (rev 92) @@ -223,8 +223,8 @@ dpderho(i) = (hybrid_gamma_th - 1.0d0) * rho(i) enddo case (4) - if(keytemp.eq.1) then - call CCTK_WARN(0,"keytemp=1 not supported for dpdrhoe, dpderho") + if(keytemp.ne.0) then + call CCTK_WARN(0,"Keytemp other than 0 not supported for dpdrhoe, dpderho") else call nuc_eos_m_kt0_dpdrhoe_dpderho(npoints,& rho,temp,ye,eps,dpdrhoe,dpderho,rf_precision,& File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +12 -4 =================================================================== --- trunk/src/EOS_Omni_SingleVarCalls.F90 2014-03-13 03:01:12 UTC (rev 91) +++ trunk/src/EOS_Omni_SingleVarCalls.F90 2014-03-13 03:01:16 UTC (rev 92) @@ -98,9 +98,11 @@ if(keytemp.eq.1) then call nuc_eos_m_kt1_press_eps(npoints,rho,temp,ye,& eps,press,keyerr,anyerr) - else + else if(keytemp.eq.0) then call nuc_eos_m_kt0_press(npoints,rho,temp,ye,eps,press,& rf_precision,keyerr,anyerr) + else + call CCTK_WARN(0,"This keytemp is not suppported!") endif case (5) ! cold tabular EOS with gamma law @@ -523,10 +525,12 @@ call nuc_eos_m_kt1_short(npoints,rho,temp,ye,& eps,xprs,xent,xcs2,xdedt,xdpderho,dpdrhoe,xmunu,& keyerr,anyerr) - else + else if(keytemp.eq.0) then call nuc_eos_m_kt0_short(npoints,rho,temp,ye,& eps,xprs,xent,xcs2,xdedt,xdpderho,dpdrhoe,xmunu,rf_precision,& keyerr,anyerr) + else + call CCTK_WARN(0,"This keytemp is not supported!") endif case (5) @@ -649,10 +653,12 @@ call nuc_eos_m_kt1_short(npoints,rho,temp,ye,& eps,xprs,xent,xcs2,xdedt,dpdepsrho,xdpdrhoe,xmunu,& keyerr,anyerr) - else + else if(keytemp.eq.0) then call nuc_eos_m_kt0_short(npoints,rho,temp,ye,& eps,xprs,xent,xcs2,xdedt,dpdepsrho,xdpdrhoe,xmunu,rf_precision,& keyerr,anyerr) + else + call CCTK_WARN(0,"This keytemp is not supported!") endif case (5) ! with the cold eos we have to assume P = P(rho), so @@ -788,9 +794,11 @@ if(keytemp.eq.1) then call nuc_eos_m_kt1_press_eps_cs2(npoints,rho,temp,ye,& eps,xprs,cs2,keyerr,anyerr) - else + else if(keytemp.eq.0) then call nuc_eos_m_kt0_press_cs2(npoints,rho,temp,ye,& eps,xprs,cs2,rf_precision,keyerr,anyerr) + else + call CCTK_WARN(0,"This keytemp is not supported!") endif case (5) ! with the cold eos we have to assume P = P(rho), so

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/ (Rev. 91)
by rhaas＠tapir.caltech.edu 12 Mar '14

12 Mar '14

User: rhaas Date: 2014/03/12 10:01 PM Added: /trunk/src/ make.code.deps /trunk/src/nuc_eos_cxx/ helpers.hh, make.code.defn, make.code.deps, nuc_eos.hh, nuc_eos_dpdrhoe_dpderho.cc, nuc_eos_full.cc, nuc_eos_press.cc, nuc_eos_press_cs2.cc, nuc_eos_short.cc, readtable.cc, readtable_cactus_wrapper.cc Removed: /trunk/src/nuc_eos/ bisection.F90, dumpASCIItable.F90, eosmodule.F90, findrho.F90, findtemp.F90, linterp.F, linterp_many.F90, make.code.defn, make.code.deps, nuc_eos.F90, readtable.c Modified: /trunk/ interface.ccl, schedule.ccl /trunk/src/ EOS_Omni_Module.F90, EOS_Omni_MultiVarCalls.F90, EOS_Omni_SingleVarCalls.F90, EOS_Omni_Startup.F90, make.code.defn Log: * new nuc_eos backend (in c++) From: Christian Ott <cott(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/nuc_eos/ ============================== File [removed]: bisection.F90 Delta lines: <Unavailable> File [removed]: dumpASCIItable.F90 Delta lines: <Unavailable> File [removed]: eosmodule.F90 Delta lines: <Unavailable> File [removed]: findrho.F90 Delta lines: <Unavailable> File [removed]: findtemp.F90 Delta lines: <Unavailable> File [removed]: linterp.F Delta lines: <Unavailable> File [removed]: linterp_many.F90 Delta lines: <Unavailable> File [removed]: make.code.defn Delta lines: <Unavailable> File [removed]: make.code.deps Delta lines: <Unavailable> File [removed]: nuc_eos.F90 Delta lines: <Unavailable> File [removed]: readtable.c Delta lines: <Unavailable> Directory: /trunk/src/nuc_eos_cxx/ ================================== File [added]: helpers.hh Delta lines: <Unavailable> File [added]: make.code.defn Delta lines: <Unavailable> File [added]: make.code.deps Delta lines: <Unavailable> File [added]: nuc_eos.hh Delta lines: <Unavailable> File [added]: nuc_eos_dpdrhoe_dpderho.cc Delta lines: <Unavailable> File [added]: nuc_eos_full.cc Delta lines: <Unavailable> File [added]: nuc_eos_press.cc Delta lines: <Unavailable> File [added]: nuc_eos_press_cs2.cc Delta lines: <Unavailable> File [added]: nuc_eos_short.cc Delta lines: <Unavailable> File [added]: readtable.cc Delta lines: <Unavailable> File [added]: readtable_cactus_wrapper.cc Delta lines: <Unavailable> Directory: /trunk/src/ ====================== File [modified]: EOS_Omni_Module.F90 Delta lines: <Unavailable> File [modified]: EOS_Omni_MultiVarCalls.F90 Delta lines: <Unavailable> File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: <Unavailable> File [modified]: EOS_Omni_Startup.F90 Delta lines: <Unavailable> File [modified]: make.code.defn Delta lines: <Unavailable> File [added]: make.code.deps Delta lines: <Unavailable> Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: <Unavailable> File [modified]: schedule.ccl Delta lines: <Unavailable>

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/ (Rev. 90)
by rhaas＠tapir.caltech.edu 12 Mar '14

12 Mar '14

User: rhaas Date: 2014/03/12 10:01 PM Modified: /trunk/ param.ccl /trunk/src/ EOS_Omni_Module.F90, EOS_Omni_MultiVarCalls.F90, EOS_Omni_SingleVarCalls.F90, EOS_Omni_Startup.F90 Log: EOS_Omni: re-add poly_gamma_initial From: Roland Haas <rhaas(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [modified]: EOS_Omni_Module.F90 Delta lines: +9 -0 =================================================================== --- trunk/src/EOS_Omni_Module.F90 2014-03-13 03:01:00 UTC (rev 89) +++ trunk/src/EOS_Omni_Module.F90 2014-03-13 03:01:05 UTC (rev 90) @@ -26,7 +26,13 @@ ! These values are set by EOS_Omni_Startup real*8 :: hybrid_k2 = 0.0d0 + real*8 :: poly_k_cgs = 0.0d0 + real*8 :: gl_k_cgs = 0.0d0 + + real*8 :: hybrid_k1_cgs = 0.0d0 + real*8 :: hybrid_k2_cgs = 0.0d0 + ! stuff for the cold, tabulated EOS with a gamma law ! set by the reader routine integer :: coldeos_nrho = 0 @@ -63,4 +69,7 @@ real*8, allocatable :: barotropiceos_temp(:) real*8, allocatable :: barotropiceos_ye(:) + ! actual poly_gamma_ini used when using different EOS for initial data and run + real*8 :: poly_gamma_ini + end module EOS_Omni_Module File [modified]: EOS_Omni_MultiVarCalls.F90 Delta lines: +32 -32 =================================================================== --- trunk/src/EOS_Omni_MultiVarCalls.F90 2014-03-13 03:01:00 UTC (rev 89) +++ trunk/src/EOS_Omni_MultiVarCalls.F90 2014-03-13 03:01:05 UTC (rev 90) @@ -104,7 +104,7 @@ integer :: i character(256) :: warnstring real*8 :: hybrid_local_gamma - real*8 :: hybrid_local_k + real*8 :: hybrid_local_k_cgs real*8 :: hybrid_dp_poly,hybrid_dp_th1,hybrid_dp_th2 ! temporary vars for nuc_eos real*8 :: xrho,xye,xtemp,xenr,xent @@ -119,23 +119,23 @@ ! polytropic EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = poly_k * & - rho(i)**(poly_gamma) / & + eps(i) = press_gf * poly_k_cgs * & + (rho(i)*inv_rho_gf)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo endif do i=1,npoints - dpdrhoe(i) = poly_k * & - poly_gamma * & - rho(i) ** (poly_gamma - 1.d0) + dpdrhoe(i) = press_gf * poly_k_cgs * & + poly_gamma * inv_rho_gf * & + (rho(i)*inv_rho_gf) ** (poly_gamma - 1.d0) dpderho(i) = 0.0d0 enddo case (2) ! gamma-law EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = gl_k * & - rho(i)**(gl_gamma) / & + eps(i) = press_gf * gl_k_cgs * & + (rho(i)*inv_rho_gf)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo endif @@ -150,23 +150,23 @@ do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 - hybrid_local_k = hybrid_k2 + hybrid_local_k_cgs = hybrid_k2_cgs else hybrid_local_gamma = hybrid_gamma1 - hybrid_local_k = hybrid_k1 + hybrid_local_k_cgs = hybrid_k1_cgs endif - hybrid_dp_poly = hybrid_local_gamma * & - hybrid_local_k * rho(i)**(hybrid_local_gamma - 1.0d0) - + hybrid_dp_poly = hybrid_local_gamma * press_gf * & + hybrid_local_k_cgs * rho(i)**(hybrid_local_gamma - 1.0d0) * & + inv_rho_gf**hybrid_local_gamma - hybrid_dp_th1 = - hybrid_local_gamma * hybrid_local_k * & + hybrid_dp_th1 = - hybrid_local_gamma * press_gf * hybrid_local_k_cgs * & (hybrid_gamma_th - 1.d0) / (hybrid_local_gamma - 1.d0) * & - rho(i)**(hybrid_local_gamma - 1.d0) + rho(i)**(hybrid_local_gamma - 1.d0) * inv_rho_gf**hybrid_local_gamma hybrid_dp_th2 = (hybrid_gamma_th - 1.d0) * eps(i) & - (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) / & (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) * & - hybrid_k1 * & + press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 * & hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) dpdrhoe(i) = hybrid_dp_poly + hybrid_dp_th1 + hybrid_dp_th2 @@ -223,7 +223,7 @@ integer :: i character(256) :: warnstring real*8 :: hybrid_local_gamma - real*8 :: hybrid_local_k + real*8 :: hybrid_local_k_cgs real*8 :: hybrid_dp_poly,hybrid_dp_th1,hybrid_dp_th2 ! temporary vars for nuc_eos real*8 :: xrho,xye,xtemp,xenr,xent @@ -239,23 +239,23 @@ ! polytropic EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = poly_k * & - rho(i)**(poly_gamma) / & + eps(i) = press_gf * poly_k_cgs * & + (rho(i)*inv_rho_gf)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo endif do i=1,npoints depsdpress(i) = 1.0d0/(poly_gamma - 1.0d0)/rho(i) - depsdrho(i) = depsdpress(i) * poly_k * & - poly_gamma * & - rho(i) ** (poly_gamma - 1.d0) + depsdrho(i) = depsdpress(i) * press_gf * poly_k_cgs * & + poly_gamma * inv_rho_gf * & + (rho(i)*inv_rho_gf) ** (poly_gamma - 1.d0) enddo case (2) ! gamma-law EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = gl_k * & - rho(i)**(gl_gamma) / & + eps(i) = press_gf * gl_k_cgs * & + (rho(i)*inv_rho_gf)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo endif @@ -269,23 +269,23 @@ do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 - hybrid_local_k = hybrid_k2 + hybrid_local_k_cgs = hybrid_k2_cgs else hybrid_local_gamma = hybrid_gamma1 - hybrid_local_k = hybrid_k1 + hybrid_local_k_cgs = hybrid_k1_cgs endif - hybrid_dp_poly = hybrid_local_gamma * & - hybrid_local_k * rho(i)**(hybrid_local_gamma - 1.0d0) - + hybrid_dp_poly = hybrid_local_gamma * press_gf * & + hybrid_local_k_cgs * rho(i)**(hybrid_local_gamma - 1.0d0) * & + inv_rho_gf**hybrid_local_gamma - hybrid_dp_th1 = - hybrid_local_gamma * hybrid_local_k * & + hybrid_dp_th1 = - hybrid_local_gamma * press_gf * hybrid_local_k_cgs * & (hybrid_gamma_th - 1.d0) / (hybrid_local_gamma - 1.d0) * & - rho(i)**(hybrid_local_gamma - 1.d0) + rho(i)**(hybrid_local_gamma - 1.d0) * inv_rho_gf**hybrid_local_gamma hybrid_dp_th2 = (hybrid_gamma_th - 1.d0) * eps(i) & - (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) / & (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) * & - hybrid_k1 * & + press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 * & hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) xdpdrhoe = hybrid_dp_poly + hybrid_dp_th1 + hybrid_dp_th2 File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +63 -63 =================================================================== --- trunk/src/EOS_Omni_SingleVarCalls.F90 2014-03-13 03:01:00 UTC (rev 89) +++ trunk/src/EOS_Omni_SingleVarCalls.F90 2014-03-13 03:01:05 UTC (rev 90) @@ -27,7 +27,7 @@ ! local vars integer :: i character(256) :: warnstring - real*8 :: hybrid_local_gamma, hybrid_local_k, & + real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & hybrid_p_poly, hybrid_p_th real*8,parameter :: zero = 0.0d0 ! temporary vars for nuc_eos @@ -48,21 +48,21 @@ ! polytropic EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = poly_k * & - rho(i)**(poly_gamma) / & + eps(i) = press_gf * poly_k_cgs * & + (rho(i)*inv_rho_gf)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo endif do i=1,npoints - press(i) = poly_k * & - rho(i)**poly_gamma + press(i) = press_gf * poly_k_cgs * & + (rho(i)*inv_rho_gf)**poly_gamma enddo case (2) ! gamma-law EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = gl_k * & - rho(i)**(gl_gamma) / & + eps(i) = press_gf * gl_k_cgs * & + (rho(i)*inv_rho_gf)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo endif @@ -75,19 +75,19 @@ do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 - hybrid_local_k = hybrid_k2 + hybrid_local_k_cgs = hybrid_k2_cgs else hybrid_local_gamma = hybrid_gamma1 - hybrid_local_k = hybrid_k1 + hybrid_local_k_cgs = hybrid_k1_cgs endif - hybrid_p_poly = hybrid_local_k * & - rho(i)**hybrid_local_gamma - hybrid_p_th = - hybrid_local_k * (hybrid_gamma_th - 1.d0) / & - (hybrid_local_gamma - 1.0d0) * rho(i)**hybrid_local_gamma + & + hybrid_p_poly = press_gf * hybrid_local_k_cgs * & + (rho(i) * inv_rho_gf)**hybrid_local_gamma + hybrid_p_th = - press_gf * hybrid_local_k_cgs * (hybrid_gamma_th - 1.d0) / & + (hybrid_local_gamma - 1.0d0) * (rho(i) * inv_rho_gf)**hybrid_local_gamma + & (hybrid_gamma_th - 1.0d0) * rho(i) * eps(i) - & (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) / & (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) * & - hybrid_k1 * & + press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 * & hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) * rho(i) hybrid_p_th = max(zero, hybrid_p_th) press(i) = hybrid_p_poly + hybrid_p_th @@ -225,7 +225,7 @@ ! local vars integer :: i character(256) :: warnstring - real*8 :: hybrid_local_gamma, hybrid_local_k, & + real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & hybrid_p_poly, hybrid_p_th real*8,parameter :: zero = 0.0d0 ! temporary vars for nuc_eos @@ -247,16 +247,16 @@ if(keytemp.eq.1) then !$OMP PARALLEL DO do i=1,npoints - eps(i) = poly_k * & - rho(i)**(poly_gamma) / & + eps(i) = press_gf * poly_k_cgs * & + (rho(i)*inv_rho_gf)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo !$OMP END PARALLEL DO endif !$OMP PARALLEL DO do i=1,npoints - press(i) = poly_k * & - rho(i)**poly_gamma + press(i) = press_gf * poly_k_cgs * & + (rho(i)*inv_rho_gf)**poly_gamma enddo !$OMP END PARALLEL DO case (2) @@ -264,8 +264,8 @@ if(keytemp.eq.1) then !$OMP PARALLEL DO do i=1,npoints - eps(i) = gl_k * & - rho(i)**(gl_gamma) / & + eps(i) = press_gf * gl_k_cgs * & + (rho(i)*inv_rho_gf)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo !$OMP END PARALLEL DO @@ -278,24 +278,24 @@ case (3) ! hybrid EOS - !$OMP PARALLEL DO PRIVATE(hybrid_local_gamma,hybrid_local_k,& + !$OMP PARALLEL DO PRIVATE(hybrid_local_gamma,hybrid_local_k_cgs,& !$OMP hybrid_p_poly, hybrid_p_th) do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 - hybrid_local_k = hybrid_k2 + hybrid_local_k_cgs = hybrid_k2_cgs else hybrid_local_gamma = hybrid_gamma1 - hybrid_local_k = hybrid_k1 + hybrid_local_k_cgs = hybrid_k1_cgs endif - hybrid_p_poly = hybrid_local_k * & - rho(i)**hybrid_local_gamma - hybrid_p_th = - hybrid_local_k * (hybrid_gamma_th - 1.d0) / & - (hybrid_local_gamma - 1.0d0) * rho(i)**hybrid_local_gamma + & + hybrid_p_poly = press_gf * hybrid_local_k_cgs * & + (rho(i) * inv_rho_gf)**hybrid_local_gamma + hybrid_p_th = - press_gf * hybrid_local_k_cgs * (hybrid_gamma_th - 1.d0) / & + (hybrid_local_gamma - 1.0d0) * (rho(i) * inv_rho_gf)**hybrid_local_gamma + & (hybrid_gamma_th - 1.0d0) * rho(i) * eps(i) - & (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) / & (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) * & - hybrid_k1 * & + press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 * & hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) * rho(i) hybrid_p_th = max(zero, hybrid_p_th) press(i) = hybrid_p_poly + hybrid_p_th @@ -448,7 +448,7 @@ ! local vars integer :: i character(256) :: warnstring - real*8 :: hybrid_local_gamma, hybrid_local_k, & + real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & hybrid_dp_poly, hybrid_dp_th1, hybrid_dp_th2 real*8,parameter :: zero = 0.0d0 ! temporary vars for nuc_eos @@ -469,22 +469,22 @@ ! polytropic EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = poly_k * & - rho(i)**(poly_gamma) / & + eps(i) = press_gf * poly_k_cgs * & + (rho(i)*inv_rho_gf)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo endif do i=1,npoints - dpdrhoe(i) = poly_k * & - poly_gamma * & - rho(i) ** (poly_gamma - 1.d0) + dpdrhoe(i) = press_gf * poly_k_cgs * & + poly_gamma * inv_rho_gf * & + (rho(i)*inv_rho_gf) ** (poly_gamma - 1.d0) enddo case (2) ! gamma-law EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = gl_k * & - rho(i)**(gl_gamma) / & + eps(i) = press_gf * gl_k_cgs * & + (rho(i)*inv_rho_gf)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo endif @@ -497,23 +497,23 @@ do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 - hybrid_local_k = hybrid_k2 + hybrid_local_k_cgs = hybrid_k2_cgs else hybrid_local_gamma = hybrid_gamma1 - hybrid_local_k = hybrid_k1 + hybrid_local_k_cgs = hybrid_k1_cgs endif - hybrid_dp_poly = hybrid_local_gamma * & - hybrid_local_k * rho(i)**(hybrid_local_gamma - 1.0d0) - + hybrid_dp_poly = hybrid_local_gamma * press_gf * & + hybrid_local_k_cgs * rho(i)**(hybrid_local_gamma - 1.0d0) * & + inv_rho_gf**hybrid_local_gamma - hybrid_dp_th1 = - hybrid_local_gamma * hybrid_local_k * & + hybrid_dp_th1 = - hybrid_local_gamma * press_gf * hybrid_local_k_cgs * & (hybrid_gamma_th - 1.d0) / (hybrid_local_gamma - 1.d0) * & - rho(i)**(hybrid_local_gamma - 1.d0) + rho(i)**(hybrid_local_gamma - 1.d0) * inv_rho_gf**hybrid_local_gamma hybrid_dp_th2 = (hybrid_gamma_th - 1.d0) * eps(i) & - (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) / & (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) * & - hybrid_k1 * & + press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 * & hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) dpdrhoe(i) = hybrid_dp_poly + max(0.0d0,hybrid_dp_th1 + hybrid_dp_th2) @@ -632,8 +632,8 @@ ! polytropic EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = poly_k * & - rho(i)**(poly_gamma) / & + eps(i) = press_gf * poly_k_cgs * & + (rho(i)*inv_rho_gf)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo endif @@ -644,8 +644,8 @@ ! gamma-law EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = gl_k * & - rho(i)**(gl_gamma) / & + eps(i) = press_gf * gl_k_cgs * & + (rho(i)*inv_rho_gf)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo endif @@ -741,7 +741,7 @@ integer :: i character(256) :: warnstring real*8 :: xpress,xdpdrhoe,xdpderho - real*8 :: hybrid_local_gamma, hybrid_local_k, & + real*8 :: hybrid_local_gamma, hybrid_local_k_cgs, & hybrid_p_poly, hybrid_p_th real*8,parameter :: zero = 0.0d0 ! temporary vars for nuc_eos @@ -762,14 +762,14 @@ ! polytropic EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = poly_k * & - rho(i)**(poly_gamma) / & + eps(i) = press_gf * poly_k_cgs * & + (rho(i)*inv_rho_gf)**(poly_gamma) / & (poly_gamma - 1.0d0) / rho(i) enddo endif do i=1,npoints - xpress = poly_k * & - rho(i)**(poly_gamma) + xpress = press_gf*poly_k_cgs * & + (rho(i)*inv_rho_gf)**(poly_gamma) cs2(i) = poly_gamma * xpress / rho(i) / & (1 + eps(i) + xpress/rho(i)) enddo @@ -777,8 +777,8 @@ ! gamma-law EOS if(keytemp.eq.1) then do i=1,npoints - eps(i) = gl_k * & - rho(i)**(gl_gamma) / & + eps(i) = press_gf * gl_k_cgs * & + (rho(i)*inv_rho_gf)**(gl_gamma) / & (gl_gamma - 1.0d0) / rho(i) enddo endif @@ -794,20 +794,20 @@ do i=1,npoints if(rho(i).gt.hybrid_rho_nuc) then hybrid_local_gamma = hybrid_gamma2 - hybrid_local_k = hybrid_k2 + hybrid_local_k_cgs = hybrid_k2_cgs else hybrid_local_gamma = hybrid_gamma1 - hybrid_local_k = hybrid_k1 + hybrid_local_k_cgs = hybrid_k1_cgs endif ! first calculate the pressure - hybrid_p_poly = hybrid_local_k * & - rho(i)**hybrid_local_gamma - hybrid_p_th = - hybrid_local_k * (hybrid_gamma_th - 1.d0) / & - (hybrid_local_gamma - 1.0d0) * rho(i)**hybrid_local_gamma + & + hybrid_p_poly = press_gf * hybrid_local_k_cgs * & + (rho(i) * inv_rho_gf)**hybrid_local_gamma + hybrid_p_th = - press_gf * hybrid_local_k_cgs * (hybrid_gamma_th - 1.d0) / & + (hybrid_local_gamma - 1.0d0) * (rho(i) * inv_rho_gf)**hybrid_local_gamma + & (hybrid_gamma_th - 1.0d0) * rho(i) * eps(i) - & (hybrid_gamma_th - 1.d0) * (hybrid_local_gamma - hybrid_gamma1) / & (hybrid_gamma1 - 1.d0) / (hybrid_gamma2 - 1.d0) * & - hybrid_k1 * & + press_gf * hybrid_k1_cgs * inv_rho_gf**hybrid_gamma1 * & hybrid_rho_nuc**(hybrid_gamma1 - 1.d0) * rho(i) hybrid_p_th = max(zero, hybrid_p_th) xpress = hybrid_p_poly + hybrid_p_th File [modified]: EOS_Omni_Startup.F90 Delta lines: +14 -2 =================================================================== --- trunk/src/EOS_Omni_Startup.F90 2014-03-13 03:01:00 UTC (rev 89) +++ trunk/src/EOS_Omni_Startup.F90 2014-03-13 03:01:05 UTC (rev 90) @@ -11,7 +11,19 @@ DECLARE_CCTK_PARAMETERS DECLARE_CCTK_ARGUMENTS - hybrid_k2 = hybrid_k1 * & - hybrid_rho_nuc**(hybrid_gamma1-hybrid_gamma2) + if(poly_gamma_initial .gt. 0d0) then + poly_gamma_ini = poly_gamma_initial + else + poly_gamma_ini = poly_gamma + end if + poly_k_cgs = poly_k * rho_gf**poly_gamma_ini / press_gf + + gl_k_cgs = gl_k * rho_gf**poly_gamma_ini / press_gf + + hybrid_k1_cgs = hybrid_k1 * rho_gf**poly_gamma_ini / press_gf + + hybrid_k2_cgs = hybrid_k1_cgs * & + (hybrid_rho_nuc * inv_rho_gf)**(hybrid_gamma1-hybrid_gamma2) + end subroutine EOS_Omni_Startup Directory: /trunk/ ================== File [modified]: param.ccl Delta lines: +7 -0 =================================================================== --- trunk/param.ccl 2014-03-13 03:01:00 UTC (rev 89) +++ trunk/param.ccl 2014-03-13 03:01:05 UTC (rev 90) @@ -9,6 +9,13 @@ : :: "" } 2.0 + +REAL poly_gamma_initial "Initial Adiabatic Index for poly EOS" STEERABLE=RECOVER +{ + -1 :: "use poly_gamma, ie no change in gamma during ID" + (0:* :: "assume that ID used this adiabiatic index, keep poly_k constant in cgs units" +} -1 + REAL poly_k "Polytropic constant in c=G=Msun=1" STEERABLE=RECOVER { : :: ""

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/src/nuc_eos/ (Rev. 89)
by rhaas＠tapir.caltech.edu 12 Mar '14

12 Mar '14

User: rhaas Date: 2014/03/12 10:01 PM Modified: /trunk/src/nuc_eos/ eosmodule.F90, findtemp.F90, linterp.F, linterp_many.F90, nuc_eos.F90 Log: * Major bug fix in EOS_Omni/nuc_eos. In the code (before the fix), offending specific internal energies where limited and the EOS returned seemingly fine, but thermodynamically inconsistent data. This has been fixed. This fix also makes isolated microphysical NS simulations not work anymore. Why this is the case, we are still investigating From: Christian Ott <cott(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/nuc_eos/ ============================== File [modified]: eosmodule.F90 Delta lines: +4 -0 =================================================================== --- trunk/src/nuc_eos/eosmodule.F90 2014-03-13 03:00:46 UTC (rev 88) +++ trunk/src/nuc_eos/eosmodule.F90 2014-03-13 03:01:00 UTC (rev 89) @@ -25,6 +25,7 @@ ! basics integer, parameter :: nvars = 19 real*8,pointer :: alltables(:,:,:,:) + real*8,allocatable :: epstable(:,:,:) ! index variable mapping: ! 1 -> logpress ! 2 -> logenergy @@ -87,6 +88,8 @@ logtemp => logtemp_ ye => ye_ + allocate(epstable(nrho,ntemp,nye)) + epstable(1:nrho,1:ntemp,1:nye) = 10.0d0**alltables(1:nrho,1:ntemp,1:nye,2) energy_shift = energy_shift_ if(do_energy_shift.ne.1) then @@ -103,5 +106,6 @@ eos_tempmin = 10.0d0**logtemp(1) eos_tempmax = 10.0d0**logtemp(ntemp) + end subroutine setup_eosmodule File [modified]: findtemp.F90 Delta lines: +126 -65 =================================================================== --- trunk/src/nuc_eos/findtemp.F90 2014-03-13 03:00:46 UTC (rev 88) +++ trunk/src/nuc_eos/findtemp.F90 2014-03-13 03:01:00 UTC (rev 89) @@ -1,3 +1,107 @@ +subroutine findtemp_deb(lr,lt0,y,epsin,keyerrt,rfeps) + + use eosmodule + + implicit none + + real*8 lr,lt0,y,epsin + real*8 eps,lt,ldt + real*8 tol + real*8 d1,d2,d3 + real*8 eps0,eps1,lt1 + + real*8 ltn,ltmax,ltmin + real*8 tinput,rfeps + + integer :: rl = 0 + integer itmax,i,keyerrt + integer ii,jj,kk + + keyerrt=0 + + tol=rfeps ! precision to which we need to find temp + itmax=20 ! use at most 20 iterations, then bomb + + lt=lt0 + lt1=lt + + eps0=epsin + eps1=eps0 + + ltmax=logtemp(ntemp) + ltmin=logtemp(1) + + ! Note: We are using Ewald's Lagrangian interpolator here! + + !preconditioning 1: do we already have the right temperature? + call findthis(lr,lt,y,eps,alltables(:,:,:,2),d1,d2,d3) + if (abs(eps-eps0).lt.tol*abs(eps0)) then + return + endif + lt1=lt + eps1=eps + + do i=1,itmax + !d2 is the derivative deps/dlogtemp; + ldt = -(eps - eps0)/d2 + ltn = lt+ldt + ltn = min(ltn,ltmax) + ltn = max(ltn,ltmin) + lt1=lt + lt=ltn + eps1=eps + call findthis(lr,lt,y,eps,alltables(:,:,:,2),d1,d2,d3) + if (abs(eps - eps0).lt.tol*abs(eps0)) then + exit + endif + !setup new d2 + + ! if we are closer than 10^-2 to the + ! root (eps-eps0)=0, we are switching to + ! the secant method, since the table is rather coarse and the + ! derivatives may be garbage. + if(abs(eps-eps0).lt.1.0d-3*abs(eps0)) then + d2 = (eps-eps1)/(lt-lt1) + endif + enddo + + + if(i.ge.itmax) then + keyerrt=667 + call bisection(lr,lt0,y,eps0,lt,alltables(:,:,:,2),keyerrt,1) + if(keyerrt.eq.667) then + if(lt.ge.log10(t_max_hack)) then + ! handling for too high temperatures + lt = log10(t_max_hack) + keyerrt=0 + goto 12 + else if(abs(lt-log10(t_max_hack))/log10(t_max_hack).lt.0.025d0) then + lt0 = min(lt,log10(t_max_hack)) + keyerrt=0 + goto 12 + else +#if 0 + ! total failure + write(*,*) "EOS: Did not converge in findtemp!" + write(*,*) "rl,logrho,logtemp0,ye,lt,eps,eps0,abs(eps-eps0)/eps0" + write(*,"(i4,i4,1P10E19.10)") i,rl,lr,lt0,y,lt,eps,eps0,abs(eps-eps0)/eps0 + write(*,*) "Tried calling bisection... didn't help... :-/" + write(*,*) "Bisection error: ",keyerrt +#endif + endif + endif + + lt0=min(lt,log10(t_max_hack)) + return + endif + +12 continue + + lt0=min(lt,log10(t_max_hack)) + + +end subroutine findtemp_deb + subroutine findtemp(lr,lt0,y,epsin,keyerrt,rfeps) use eosmodule @@ -206,77 +310,34 @@ implicit none - real*8 lr,t0,y,epsin - real*8 eps,t,dt - real*8 tol - real*8 dlepsdt - real*8 eps0,eps1,t1 + real*8 lr,t0,y,epsin,rfeps,dlepsdt + integer :: keyerrt - real*8 tn,tmin,tmax - real*8 tinput,rfeps - integer :: rl = 0 - integer itmax,i,keyerrt - integer ii,jj,kk - - keyerrt=0 + real*8 :: eps2, eps1 + real*8 :: t2, t1 + real*8 :: m - tol=rfeps ! need to find energy to less than 1 in 10^-10 - itmax=100 ! use at most 20 iterations, then bomb + keyerrt = 0 + t2 = 10.0d0**logtemp(2) + t1 = 10.0d0**logtemp(1) - t=t0 - t1=t + call intp3d_linearTlow(lr,t2,y,eps2,1,epstable,nrho,& + ntemp,nye,logrho,logtemp,ye,dlepsdt) - eps0=epsin - eps1=eps0 - - tmax=10.0d0**logtemp(2) - tmin=-20.0d0 + call intp3d_linearTlow(lr,t1,y,eps1,1,epstable,nrho,& + ntemp,nye,logrho,logtemp,ye,dlepsdt) - !preconditioning 1: do we already have the right temperature? - call intp3d_linearTlow(lr,t,y,eps,1,alltables(:,:,:,2),nrho,& - ntemp,nye,logrho,logtemp,ye,dlepsdt) + m = (t2-t1)/(eps2-eps1) + t0 = (epsin-eps1) * m + t1 - if (abs(eps-eps0).lt.tol*abs(eps0)) then - return - endif - t1=t - eps1=eps - - do i=1,itmax - dt = -(eps - eps0)/dlepsdt - tn = t+dt - if(tn >= tmax) then - tn = tmax*0.9d0 - endif - tn = min(tn,tmax) - tn = max(tn,tmin) - t1=t - t=tn - eps1=eps +#if 0 + !$OMP CRITICAL + write(6,*) t0,epsin,eps2,eps1 + call intp3d_linearTlow(lr,t0,y,eps2,1,epstable,nrho,& + ntemp,nye,logrho,logtemp,ye,dlepsdt) + write(6,"(1P10E15.6)") abs(epsin-eps2)/epsin + !$OMP END CRITICAL +#endif - call intp3d_linearTlow(lr,t,y,eps,1,alltables(:,:,:,2),nrho,& - ntemp,nye,logrho,logtemp,ye,dlepsdt) - - if (abs(eps - eps0).lt.tol*abs(eps0)) then - exit - endif - - ! if we are closer than 10^-2 to the - ! root (eps-eps0)=0, we are switching to - ! the secant method, since the table is rather coarse and the - ! derivatives may be garbage. - if(abs(eps-eps0).lt.1.0d-3*abs(eps0)) then - dlepsdt = (eps-eps1)/(t-t1) - endif - enddo - - t0 = t - - if(i.ge.itmax) then - keyerrt=667 - return - endif - - end subroutine findtemp_low File [modified]: linterp.F Delta lines: +3 -3 =================================================================== --- trunk/src/nuc_eos/linterp.F 2014-03-13 03:00:46 UTC (rev 88) +++ trunk/src/nuc_eos/linterp.F 2014-03-13 03:01:00 UTC (rev 89) @@ -61,9 +61,9 @@ dy = (yt(ny) - yt(1)) / FLOAT(ny-1) dz = (zt(nz) - zt(1)) / FLOAT(nz-1) c - dxi = 1. / dx - dyi = 1. / dy - dzi = 1. / dz + dxi = 1.0d0 / dx + dyi = 1.0d0 / dy + dzi = 1.0d0 / dz c dxyi = dxi * dyi dxzi = dxi * dzi File [modified]: linterp_many.F90 Delta lines: +9 -9 =================================================================== --- trunk/src/nuc_eos/linterp_many.F90 2014-03-13 03:00:46 UTC (rev 88) +++ trunk/src/nuc_eos/linterp_many.F90 2014-03-13 03:01:00 UTC (rev 89) @@ -54,9 +54,9 @@ dy = (yt(ny) - yt(1)) / FLOAT(ny-1) dz = (zt(nz) - zt(1)) / FLOAT(nz-1) ! - dxi = 1. / dx - dyi = 1. / dy - dzi = 1. / dz + dxi = 1.0d0 / dx + dyi = 1.0d0 / dy + dzi = 1.0d0 / dz ! dxyi = dxi * dyi dxzi = dxi * dzi @@ -181,9 +181,9 @@ dy = 10.0d0**yt(2) - 10.0d0**yt(1) dz = (zt(nz) - zt(1)) / FLOAT(nz-1) ! - dxi = 1. / dx - dyi = 1. / dy - dzi = 1. / dz + dxi = 1.0d0 / dx + dyi = 1.0d0 / dy + dzi = 1.0d0 / dz ! dxyi = dxi * dyi dxzi = dxi * dzi @@ -304,9 +304,9 @@ dy = 10.0d0**yt(2) - 10.0d0**yt(1) dz = (zt(nz) - zt(1)) / FLOAT(nz-1) ! - dxi = 1. / dx - dyi = 1. / dy - dzi = 1. / dz + dxi = 1.0d0 / dx + dyi = 1.0d0 / dy + dzi = 1.0d0 / dz ! dxyi = dxi * dyi dxzi = dxi * dzi File [modified]: nuc_eos.F90 Delta lines: +48 -15 =================================================================== --- trunk/src/nuc_eos/nuc_eos.F90 2014-03-13 03:00:46 UTC (rev 88) +++ trunk/src/nuc_eos/nuc_eos.F90 2014-03-13 03:01:00 UTC (rev 89) @@ -83,13 +83,17 @@ lt = log10(max(xtemp,eos_tempmin)) 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(xeps .gt. 0.0d0) then + leps = log10(xeps) + call findtemp(lr,lt,y,leps,keyerrt,rfeps) + else + keyerrt = 667 + endif if(keyerrt.ne.0) then call CCTK_WARN (0, "Did not find temperature") endif @@ -272,18 +276,23 @@ if(keytemp.eq.0) then !need to find temperature based on xeps xeps = xenr + energy_shift - leps = log10(max(xeps,1.0d0)) - call findtemp(lr,lt,y,leps,keyerrt,rfeps) - if(keyerrt.eq.667 .and. lt .lt. 10.0d0) then + if(xeps .gt. 0.0d0) then + leps = log10(xeps) + call findtemp(lr,lt,y,leps,keyerrt,rfeps) + else + keyerrt = 667 + endif + if(keyerrt.eq.667) then ! turns out, we can still converge, but ! too a bogus, possibly negative temperature xt = xtemp - call findtemp_low(lr,xt,y,leps,keyerrt,rfeps) + call findtemp_low(lr,xt,y,xeps,keyerrt,rfeps) if(keyerrt.eq.0) then keyerrt = 668 xtemp = xt else keyerrt = 667 + keyerr = keyerrt return endif keyerr = keyerrt @@ -365,6 +374,7 @@ real*8 :: lr,lt,y,xt,xx,xeps,leps,xs real*8 :: d1,d2,d3,ff(8) integer :: keyerrt + character(len=256) :: warnline keyerrt = 0 @@ -411,20 +421,38 @@ if(keytemp.eq.0) then !need to find temperature based on xeps xeps = xenr + energy_shift - leps = log10(max(xeps,1.0d0)) - call findtemp(lr,lt,y,leps,keyerrt,rfeps) - if(keyerrt.eq.667 .and. lt .lt. 10.0d0) then + if(xeps .gt. 0.0d0) then + leps = log10(xeps) + call findtemp(lr,lt,y,leps,keyerrt,rfeps) + else + keyerrt = 667 + endif +! if(xenr .lt. -9.00725347549139d20) then +! if(xenr.lt.-2.28659899d20) then +! write(warnline,"(A4,i5,1P10E15.6)") "UGGx",keyerrt,lr,lt,xt,xtemp,y,xeps,xenr +! call CCTK_WARN(1,warnline) +! endif + if(keyerrt.eq.667) then ! turns out, we can still converge, but ! too a bogus, possibly negative temperature xt = xtemp - call findtemp_low(lr,xt,y,leps,keyerrt,rfeps) + call findtemp_low(lr,xt,y,xeps,keyerrt,rfeps) if(keyerrt.eq.0) then keyerrt = 668 + if(xeps.lt.0.0d0) then + keyerrt = 668 ! impossible to do anything + endif xtemp = xt else keyerrt = 667 + keyerr = keyerrt return endif +! if(xenr .lt. -9.00725347549139d20) then +! if(xenr.lt.-2.28659899d20) then +! write(warnline,"(A4,i5,1P10E15.6)") "UGG",keyerrt,lr,lt,xt,xtemp,y,xeps,xenr +! call CCTK_WARN(0,warnline) +! endif keyerr = keyerrt else xtemp = 10.0d0**lt @@ -502,20 +530,25 @@ if(keytemp.eq.0) then !need to find temperature based on xeps xeps = xenr + energy_shift - leps = log10(max(xeps,1.0d0)) - call findtemp(lr,lt,y,leps,keyerrt,rfeps) - if(keyerrt.eq.667 .and. lt .lt. 10.0d0) then + if(xeps .gt. 0.0d0) then + leps = log10(xeps) + call findtemp(lr,lt,y,leps,keyerrt,rfeps) + else + keyerrt = 667 + endif + if(keyerrt.eq.667) then ! turns out, we can still converge, but ! too a bogus, possibly negative temperature xt = xtemp - call findtemp_low(lr,xt,y,leps,keyerrt,rfeps) + call findtemp_low(lr,xt,y,xeps,keyerrt,rfeps) if(keyerrt.eq.0) then keyerrt = 668 xtemp = xt else keyerrt = 667 + keyerr = keyerrt return - endif + endif keyerr = keyerrt else xtemp = 10.0d0**lt

1 0

[svn:einsteintoolkit] EOS_Omni/trunk/ (Rev. 88)
by rhaas＠tapir.caltech.edu 12 Mar '14

12 Mar '14

User: rhaas Date: 2014/03/12 10:00 PM Added: /trunk/src/ EOS_Omni_BarotropicReadTable.F90 Modified: /trunk/ interface.ccl, param.ccl, schedule.ccl /trunk/src/ EOS_Omni_Handles.c, EOS_Omni_Module.F90, EOS_Omni_SingleVarCalls.F90, make.code.defn Log: add barotropic tabular EOS functionality for initial data using eosDriver.py output From: Christian Ott <cott(a)tapir.caltech.edu> File Changes: Directory: /trunk/src/ ====================== File [added]: EOS_Omni_BarotropicReadTable.F90 Delta lines: +93 -0 =================================================================== --- trunk/src/EOS_Omni_BarotropicReadTable.F90 (rev 0) +++ trunk/src/EOS_Omni_BarotropicReadTable.F90 2014-03-13 03:00:46 UTC (rev 88) @@ -0,0 +1,93 @@ +#include "cctk.h" +#include "cctk_Parameters.h" +#include "cctk_Arguments.h" +#include "cctk_Functions.h" + + +subroutine EOS_Omni_BarotropicReadTable(CCTK_ARGUMENTS) + + use EOS_Omni_Module + implicit none + + DECLARE_CCTK_ARGUMENTS + DECLARE_CCTK_PARAMETERS + DECLARE_CCTK_FUNCTIONS + + character(len=512) :: warnline + character(len=256) :: eosfilename + CCTK_INT :: slength, count + LOGICAL :: tablethere + CCTK_INT :: lnrho,lnye,lntemp + CCTK_REAL :: temp_press, buffer1 + integer :: i, iostatus + + ! convert file name to fortran string + call CCTK_FortranString ( slength, barotropiceos_table_name, & + eosfilename ) + + ! read and parse EOS table file + inquire(file=trim(adjustl(eosfilename)),exist=tablethere) + + if(.not.tablethere) then + write(warnline,"(A10,A,A15)") "EOS file ", trim(adjustl(eosfilename)), " does not exist!" + call CCTK_WARN(0,warnline) + endif + + ! read header + open(unit=667,file=trim(adjustl(eosfilename)),form="formatted") + read(667,*) buffer1 + + barotropiceos_energyshift = buffer1*eps_gf + + if(barotropiceos_use_thermal_gamma_law.ne.1) then + barotropiceos_thfac = 0.0d0 + endif + + ! figure out how many entries we have + count = 0 + do + read(667,*,iostat=iostatus) buffer1 + if(iostatus .ne. 0) exit + count = count + 1 + enddo + close(667) + barotropiceos_nrho = count + + allocate(barotropiceos_logrho(barotropiceos_nrho)) + allocate(barotropiceos_logpress(barotropiceos_nrho)) + allocate(barotropiceos_logeps(barotropiceos_nrho)) + allocate(barotropiceos_temp(barotropiceos_nrho)) + allocate(barotropiceos_ye(barotropiceos_nrho)) + + ! now read everything + open(unit=667,file=trim(adjustl(eosfilename)),form="formatted") + read(667,*) buffer1 + do i=1,barotropiceos_nrho + read(667,*) barotropiceos_logrho(i), & + barotropiceos_logpress(i),barotropiceos_logeps(i),barotropiceos_ye(i),& + barotropiceos_temp(i) +! read(667,"(E23.14,E23.14,E23.14)") barotropiceos_logrho(i), & +! barotropiceos_logpress(i),barotropiceos_logeps(i),barotropiceos_temp(i),& +! barotropiceos_ye(i) + enddo + close(667) + + + barotropiceos_logrho(:) = log10(10.0d0**barotropiceos_logrho(:) * rho_gf) + + barotropiceos_rhomax = 10.0**barotropiceos_logrho(barotropiceos_nrho) + barotropiceos_rhomin = 10.0**barotropiceos_logrho(1) + + ! set up drhos + barotropiceos_dlrho = barotropiceos_logrho(2)-barotropiceos_logrho(1) + barotropiceos_dlrhoi = 1.0d0/barotropiceos_dlrho + + ! set up low_kappa to be able to extrapolate to very low densities + ! we are using gamma=2 + barotropiceos_low_gamma = 2.0d0 + temp_press = 10.0**barotropiceos_logpress(1) + barotropiceos_low_kappa = temp_press / & + ((10.0d0**barotropiceos_logrho(1))**barotropiceos_low_gamma) + + +end subroutine EOS_Omni_BarotropicReadTable File [modified]: EOS_Omni_Handles.c Delta lines: +2 -0 =================================================================== --- trunk/src/EOS_Omni_Handles.c 2014-01-14 04:04:21 UTC (rev 87) +++ trunk/src/EOS_Omni_Handles.c 2014-03-13 03:00:46 UTC (rev 88) @@ -14,6 +14,8 @@ return 4; if (CCTK_EQUALS(name, "cold_tabulated")) return 5; + if (CCTK_EQUALS(name, "barotropic_tabulated")) + return 6; return 0; } File [modified]: EOS_Omni_Module.F90 Delta lines: +19 -0 =================================================================== --- trunk/src/EOS_Omni_Module.F90 2014-01-14 04:04:21 UTC (rev 87) +++ trunk/src/EOS_Omni_Module.F90 2014-03-13 03:00:46 UTC (rev 88) @@ -44,4 +44,23 @@ real*8, allocatable :: coldeos_gamma(:) real*8, allocatable :: coldeos_cs2(:) + + ! stuff for the barotropic tabulated EOS with a gamma law + ! set by the reader routine + integer :: barotropiceos_nrho = 0 + real*8 :: barotropiceos_rhomin = 0.0d0 + real*8 :: barotropiceos_rhomax = 0.0d0 + real*8 :: barotropiceos_low_kappa = 0.0d0 + real*8 :: barotropiceos_low_gamma = 0.0d0 + real*8 :: barotropiceos_kappa = 0.0d0 + real*8 :: barotropiceos_thfac = 1.0d0 + real*8 :: barotropiceos_dlrho = 1.0d0 + real*8 :: barotropiceos_dlrhoi = 1.0d0 + real*8 :: barotropiceos_energyshift = 0.0d0 + real*8, allocatable :: barotropiceos_logrho(:) + real*8, allocatable :: barotropiceos_logpress(:) + real*8, allocatable :: barotropiceos_logeps(:) + real*8, allocatable :: barotropiceos_temp(:) + real*8, allocatable :: barotropiceos_ye(:) + end module EOS_Omni_Module File [modified]: EOS_Omni_SingleVarCalls.F90 Delta lines: +290 -1 =================================================================== --- trunk/src/EOS_Omni_SingleVarCalls.F90 2014-01-14 04:04:21 UTC (rev 87) +++ trunk/src/EOS_Omni_SingleVarCalls.F90 2014-03-13 03:00:46 UTC (rev 88) @@ -152,6 +152,54 @@ press(i) = press_cold + press_th enddo + case (6) + ! barotropic tabular EOS with gamma law + do i=1,npoints + if(rho(i).lt.barotropiceos_rhomin) then + press(i) = barotropiceos_low_kappa * rho(i)**barotropiceos_low_gamma + eps(i) = press(i) / (barotropiceos_low_gamma - 1.0) / rho(i) + cycle + else if(rho(i).gt.barotropiceos_rhomax) then + keyerr(i) = 103 + anyerr = 1 + else + xrho = log10(rho(i)) + ir = 2 + & + INT( (xrho - barotropiceos_logrho(1) - 1.0d-10) & + * barotropiceos_dlrhoi ) + endif + ir = max(2, min(ir,barotropiceos_nrho)) + + xprs = (barotropiceos_logpress(ir) - barotropiceos_logpress(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_logpress(ir-1) + + xenr = (barotropiceos_logeps(ir) - barotropiceos_logeps(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_logeps(ir-1) + + xtemp = (barotropiceos_temp(ir) - barotropiceos_temp(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_temp(ir-1) + + xye = (barotropiceos_ye(ir) - barotropiceos_ye(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_ye(ir-1) + + press_cold = 10.0**xprs + eps_cold = 10.0**xenr - barotropiceos_energyshift + + if(keytemp.eq.0) then + eps_th = max(0.0d0,eps(i) - eps_cold) + else if (keytemp.eq.1) then + eps_th = 0.0d0 + eps(i) = eps_cold + endif + press_th = coldeos_thfac*(barotropiceos_gammath - 1.0d0)*rho(i)*eps_th + press(i) = press_cold + press_th + + enddo + case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" call CCTK_WARN(0,warnstring) @@ -322,6 +370,58 @@ enddo !$OMP END PARALLEL DO + case (6) + ! barotropic tabular EOS with gamma law + !$OMP PARALLEL DO PRIVATE(xrho,xprs,xenr,xye,ir, & + !$OMP press_cold,eps_cold,eps_th,press_th) + do i=1,npoints + if(rho(i).lt.barotropiceos_rhomin) then + press(i) = barotropiceos_low_kappa * rho(i)**barotropiceos_low_gamma + eps(i) = press(i) / (barotropiceos_low_gamma - 1.0) / rho(i) + cycle + else if(rho(i).gt.barotropiceos_rhomax) then + keyerr(i) = 103 + anyerr = 1 + else + xrho = log10(rho(i)) + ir = 2 + & + INT( (xrho - barotropiceos_logrho(1) - 1.0d-10) & + * barotropiceos_dlrhoi ) + endif + ir = max(2, min(ir,barotropiceos_nrho)) + + xprs = (barotropiceos_logpress(ir) - barotropiceos_logpress(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_logpress(ir-1) + + xenr = (barotropiceos_logeps(ir) - barotropiceos_logeps(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_logeps(ir-1) + + xtemp = (barotropiceos_temp(ir) - barotropiceos_temp(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_temp(ir-1) + + xye = (barotropiceos_ye(ir) - barotropiceos_ye(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_ye(ir-1) + + press_cold = 10.0**xprs + eps_cold = 10.0**xenr - barotropiceos_energyshift + + if(keytemp.eq.0) then + eps_th = max(0.0d0,eps(i) - eps_cold) + else if (keytemp.eq.1) then + eps_th = 0.0d0 + eps(i) = eps_cold + endif + press_th = coldeos_thfac*(barotropiceos_gammath - 1.0d0)*rho(i)*eps_th + press(i) = press_cold + press_th + + enddo + !$OMP END PARALLEL DO + + case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" call CCTK_WARN(0,warnstring) @@ -987,7 +1087,7 @@ enddo case (5) - ! cold tabulate EOS + ! cold tabulated EOS ! deal only with case in which thermal pressure is zero if(keytemp.ne.1) then call CCTK_WARN(0,"finding rho(press) for tabulated cold EOS only possible if keytemp=1") @@ -1081,9 +1181,198 @@ enddo + case (6) + ! barotropic tabulated EOS + ! deal only with case in which thermal pressure is zero + if(keytemp.ne.1) then + call CCTK_WARN(0,"finding rho(press) for tabulated barotropic EOS only possible if keytemp=1") + endif + + do i=1,npoints + fac = 1.0d0 + counter = 0 + cont = .true. + xprs = press(i) + press_guess = xprs + rho_guess = rho(i) + do while(cont) + counter = counter + 1 + rho_guess2 = rho_guess * 1.0001d0 + + ! press 2 + if(rho_guess2.lt.barotropiceos_rhomin) then + keyerr(i) = 104 + anyerr = 1 + else if(rho_guess2.gt.barotropiceos_rhomax) then + keyerr(i) = 103 + anyerr = 1 + else + xrho = log10(rho_guess2) + ir = 2 + INT( (xrho - barotropiceos_logrho(1) - 1.0d-10) * barotropiceos_dlrhoi ) + endif + ir = max(2, min(ir,barotropiceos_nrho)) + + xprs = (barotropiceos_logpress(ir) - barotropiceos_logpress(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_logpress(ir-1) + + press_guess2 = 10.0d0**xprs + ! end press 2 + ! press 1 + if(rho_guess.lt.barotropiceos_rhomin) then + keyerr(i) = 104 + anyerr = 1 + else if(rho_guess.gt.barotropiceos_rhomax) then + keyerr(i) = 103 + anyerr = 1 + else + xrho = log10(rho_guess) + ir = 2 + INT( (xrho - barotropiceos_logrho(1) - 1.0d-10) * barotropiceos_dlrhoi ) + endif + ir = max(2, min(ir,barotropiceos_nrho)) + + xprs = (barotropiceos_logpress(ir) - barotropiceos_logpress(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_logpress(ir-1) + + press_guess = 10.0d0**xprs + ! end press 1 + + ! write(6,"(i7,1P10E15.6)") counter, rho_guess, press_guess, press_guess2, press(i) + + ! derivative + mydpdrho = (press_guess2-press_guess)/(rho_guess2-rho_guess) + if (mydpdrho.lt.0.0d0) then + !$OMP CRITICAL + write(warnstring,"(A25,1P10E15.6)") "Issue with table, dpdrho.lt.0",& + rho_guess,rho_guess2 + call CCTK_WARN(0,warnstring) + !$OMP END CRITICAL + endif + + if (abs(1.0d0-press_guess/press(i)).lt.rf_precision) then + cont = .false. + rho(i) = rho_guess + xenr = (barotropiceos_logeps(ir) - barotropiceos_logeps(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_logeps(ir-1) + eps(i) = 10.0d0**xenr - barotropiceos_energyshift + else + if (fac*(press(i)-press_guess)/mydpdrho/rho_guess.gt.0.1d0) then + rho_guess = 0.99d0*rho_guess + else + rho_guess = rho_guess + fac*(press(i)-press_guess)/mydpdrho + endif + endif + + if (counter.gt.100) then + fac = 0.01d0 + endif + + if (rho_guess.lt.1.0d-15.or.counter.gt.100000) then +! !$OMP CRITICAL +! write(warnstring,"(A25,1P10E15.6)") "rho(p) issue", rho_guess,press(i),press_guess +! call CCTK_WARN(0,warnstring) +! !$OMP END CRITICAL + keyerr(i) = 473 + anyerr = 1 + return + endif + enddo + + enddo + case DEFAULT write(warnstring,*) "eoskey ",eoskey," not implemented!" call CCTK_WARN(0,warnstring) end select end subroutine EOS_Omni_EOS_RhoFromPressEpsTempEnt + + +subroutine EOS_Omni_EOS_PressEpsTempYe_from_Rho(eoskey,keytemp,rf_precision,npoints,& + rho,eps,temp,ye,press,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) + CCTK_REAL, intent(out) :: eps(npoints), ye(npoints) + CCTK_REAL, intent(out) :: temp(npoints),press(npoints) + + ! local vars + integer :: i + character(256) :: warnstring + ! temporary vars for nuc_eos + real*8 :: xrho,xye,xtemp,xenr + real*8 :: xprs + integer :: ir + real*8 :: press_cold, press_th + real*8 :: eps_cold, eps_th + + anyerr = 0 + keyerr(:) = 0 + + select case (eoskey) + case (6) + ! barotropic tabular EOS with gamma law + do i=1,npoints + if(rho(i).lt.barotropiceos_rhomin) then + press(i) = barotropiceos_low_kappa * rho(i)**barotropiceos_low_gamma + eps(i) = press(i) / (barotropiceos_low_gamma - 1.0) / rho(i) + cycle + else if(rho(i).gt.barotropiceos_rhomax) then + keyerr(i) = 103 + anyerr = 1 + else + xrho = log10(rho(i)) + ir = 2 + & + INT( (xrho - barotropiceos_logrho(1) - 1.0d-10) & + * barotropiceos_dlrhoi ) + endif + ir = max(2, min(ir,barotropiceos_nrho)) + + xprs = (barotropiceos_logpress(ir) - barotropiceos_logpress(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_logpress(ir-1) + + xenr = (barotropiceos_logeps(ir) - barotropiceos_logeps(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_logeps(ir-1) + + xtemp = (barotropiceos_temp(ir) - barotropiceos_temp(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_temp(ir-1) + + xye = (barotropiceos_ye(ir) - barotropiceos_ye(ir-1)) / & + (barotropiceos_logrho(ir) - barotropiceos_logrho(ir-1)) * & + (xrho - barotropiceos_logrho(ir-1)) + barotropiceos_ye(ir-1) + + press_cold = 10.0**xprs + eps_cold = 10.0**xenr - barotropiceos_energyshift + + if(keytemp.eq.0) then + eps_th = max(0.0d0,eps(i) - eps_cold) + else if (keytemp.eq.1) then + eps_th = 0.0d0 + eps(i) = eps_cold + endif + press_th = coldeos_thfac*(barotropiceos_gammath - 1.0d0)*rho(i)*eps_th + press(i) = press_cold + press_th + + temp(i) = xtemp + ye(i) = xye + + enddo + + case DEFAULT + write(warnstring,*) "eoskey ",eoskey," not implemented for EOS_Omni_EOS_PressEpsTempYe_from_Rho!" + call CCTK_WARN(0,warnstring) + end select + + end subroutine EOS_Omni_EOS_PressEpsTempYe_from_Rho File [modified]: make.code.defn Delta lines: +2 -1 =================================================================== --- trunk/src/make.code.defn 2014-01-14 04:04:21 UTC (rev 87) +++ trunk/src/make.code.defn 2014-03-13 03:00:46 UTC (rev 88) @@ -3,7 +3,8 @@ # Source files in this directory SRCS = EOS_Omni_Module.F90 EOS_Omni_Startup.F90 EOS_Omni_SingleVarCalls.F90 \ EOS_Omni_SingleVarCalls_harm.F90 EOS_Omni_Handles.c \ - EOS_Omni_MultiVarCalls.F90 EOS_Omni_ColdEOSReadTable.F90 + EOS_Omni_MultiVarCalls.F90 EOS_Omni_ColdEOSReadTable.F90 \ + EOS_Omni_BarotropicReadTable.F90 # Subdirectories containing source files SUBDIRS = nuc_eos Directory: /trunk/ ================== File [modified]: interface.ccl Delta lines: +15 -0 =================================================================== --- trunk/interface.ccl 2014-01-14 04:04:21 UTC (rev 87) +++ trunk/interface.ccl 2014-03-13 03:00:46 UTC (rev 88) @@ -129,6 +129,21 @@ PROVIDES FUNCTION EOS_Omni_RhoFromPressEpsTempEnt WITH EOS_Omni_EOS_RhoFromPressEpsTempEnt LANGUAGE Fortran +void FUNCTION EOS_Omni_PressEpsTempYe_from_Rho(CCTK_INT IN eoskey, \ + CCTK_INT IN havetemp, \ + CCTK_REAL IN rf_precision, \ + CCTK_INT IN npoints, \ + CCTK_REAL IN ARRAY rho, \ + CCTK_REAL OUT ARRAY eps, \ + CCTK_REAL OUT ARRAY temp, \ + CCTK_REAL OUT ARRAY ye, \ + CCTK_REAL OUT ARRAY press, \ + CCTK_INT OUT ARRAY keyerr, \ + CCTK_INT OUT anyerr) + +PROVIDES FUNCTION EOS_Omni_PressEpsTempYe_from_Rho WITH EOS_Omni_EOS_PressEpsTempYe_from_Rho LANGUAGE Fortran + + ################################################################################ # short and long and specific calls File [modified]: param.ccl Delta lines: +20 -0 =================================================================== --- trunk/param.ccl 2014-01-14 04:04:21 UTC (rev 87) +++ trunk/param.ccl 2014-03-13 03:00:46 UTC (rev 88) @@ -66,6 +66,26 @@ { } "Yes" +################ barotropic tabulated EOS + gamma-Law + +STRING barotropiceos_table_name "table name for barotropic EOS (ASCII)" +{ + .* :: "Can be anything" +} "blah.asc" + +BOOLEAN barotropiceos_read_table "Read in barotropic EOS table?" +{ +} "No" + +BOOLEAN barotropiceos_use_thermal_gamma_law "use an additional thermal gamma?" +{ +} "Yes" + +REAL barotropiceos_gammath "thermal gamma for barotropic EOS" +{ + 1.0:* :: "something" +} 2.0 + ################ Finite-Temperature Nuclear EOS BOOLEAN nuceos_read_table "Read in EOS table?" STEERABLE=RECOVER File [modified]: schedule.ccl Delta lines: +9 -0 =================================================================== --- trunk/schedule.ccl 2014-01-14 04:04:21 UTC (rev 87) +++ trunk/schedule.ccl 2014-03-13 03:00:46 UTC (rev 88) @@ -34,3 +34,12 @@ OPTIONS: global } "Read Cold EOS ASCII table" } + +if (barotropiceos_read_table) +{ + SCHEDULE EOS_OMNI_BarotropicReadTable AT CCTK_BASEGRID + { + LANG: Fortran + OPTIONS: global + } "Read barotropic EOS ASCII table" +}

1 0

[McLachlan]McLachlan branch, dgfe2, updated. 75a09aafd77e08d5dc809fbfdb627dfc82e120a7
by Carpet git repositories 12 Mar '14

12 Mar '14

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 "McLachlan". The branch, dgfe2 has been updated via 75a09aafd77e08d5dc809fbfdb627dfc82e120a7 (commit) from f720d079e498964caf6ba4079925e56753fb1b4f (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 75a09aafd77e08d5dc809fbfdb627dfc82e120a7 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Wed Mar 12 22:56:17 2014 -0400 Rename examples ----------------------------------------------------------------------- Summary of changes: ...dg4_sinex_distorted.par => wavetoy_fo_dg4_distorted_sinex.par} | 5 ++--- ...fd4_sinex_distorted.par => wavetoy_fo_fd4_distorted_sinex.par} | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) rename par/{wavetoy_fo_dg4_sinex_distorted.par => wavetoy_fo_dg4_distorted_sinex.par} (95%) rename par/{wavetoy_fo_fd4_sinex_distorted.par => wavetoy_fo_fd4_distorted_sinex.par} (95%) hooks/post-receive -- McLachlan

1 0

[McLachlan]McLachlan branch, dgfe2, updated. f720d079e498964caf6ba4079925e56753fb1b4f
by Carpet git repositories 12 Mar '14

12 Mar '14

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 "McLachlan". The branch, dgfe2 has been updated via f720d079e498964caf6ba4079925e56753fb1b4f (commit) via 395b21b046df5b6a4bcfe354b4865a41e64aead3 (commit) from 87151a90132dea2c209e2444d30a3278ec9286f3 (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 f720d079e498964caf6ba4079925e56753fb1b4f Author: Erik Schnetter <schnetter(a)gmail.com> Date: Wed Mar 12 22:55:26 2014 -0400 Regenerate code commit 395b21b046df5b6a4bcfe354b4865a41e64aead3 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Wed Mar 12 22:55:08 2014 -0400 Correct Gaussian analytic solution ----------------------------------------------------------------------- Summary of changes: ML_WaveToy_DG4/doc/OperationCounts.txt | 6 +- ML_WaveToy_DG4/src/ML_Coordinates.cc | 3 - .../src/ML_WaveToy_DG4_BoundaryGaussian.cc | 135 +++++++++++++++----- ML_WaveToy_DG4/src/ML_WaveToy_DG4_ErrorGaussian.cc | 135 +++++++++++++++----- .../src/ML_WaveToy_DG4_InitialGaussian.cc | 135 +++++++++++++++----- ML_WaveToy_DG8/doc/OperationCounts.txt | 6 +- ML_WaveToy_DG8/src/ML_Coordinates.cc | 3 - .../src/ML_WaveToy_DG8_BoundaryGaussian.cc | 135 +++++++++++++++----- ML_WaveToy_DG8/src/ML_WaveToy_DG8_ErrorGaussian.cc | 135 +++++++++++++++----- .../src/ML_WaveToy_DG8_InitialGaussian.cc | 135 +++++++++++++++----- ML_WaveToy_FD4/doc/OperationCounts.txt | 6 +- ML_WaveToy_FD4/src/ML_Coordinates.cc | 3 - .../src/ML_WaveToy_FD4_BoundaryGaussian.cc | 135 +++++++++++++++----- ML_WaveToy_FD4/src/ML_WaveToy_FD4_ErrorGaussian.cc | 135 +++++++++++++++----- .../src/ML_WaveToy_FD4_InitialGaussian.cc | 135 +++++++++++++++----- ML_WaveToy_FD8/doc/OperationCounts.txt | 6 +- ML_WaveToy_FD8/src/ML_Coordinates.cc | 3 - .../src/ML_WaveToy_FD8_BoundaryGaussian.cc | 135 +++++++++++++++----- ML_WaveToy_FD8/src/ML_WaveToy_FD8_ErrorGaussian.cc | 135 +++++++++++++++----- .../src/ML_WaveToy_FD8_InitialGaussian.cc | 135 +++++++++++++++----- m/WaveToy.m | 54 +++++--- 21 files changed, 1260 insertions(+), 450 deletions(-) hooks/post-receive -- McLachlan

1 0

[McLachlan]McLachlan branch, dgfe2, updated. 87151a90132dea2c209e2444d30a3278ec9286f3
by Carpet git repositories 12 Mar '14

12 Mar '14

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 "McLachlan". The branch, dgfe2 has been updated via 87151a90132dea2c209e2444d30a3278ec9286f3 (commit) from c40f01708ae0929ce84d0f51176d7124b6fd44f4 (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 87151a90132dea2c209e2444d30a3278ec9286f3 Author: Erik Schnetter <schnetter(a)gmail.com> Date: Wed Mar 12 18:43:03 2014 -0400 Make tests work with multi-block ----------------------------------------------------------------------- Summary of changes: ML_Test_DG4/interface.ccl | 17 + ML_Test_DG4/schedule.ccl | 19 +- .../src/ML_Coordinates.cc | 5 +- ML_Test_DG4/src/ML_Test_DG4_DPolyCalc.cc | 2641 ++++++++++++++++---- ML_Test_DG4/src/ML_Test_DG4_SetupCoordinates.cc | 9 +- ML_Test_DG4/src/make.code.defn | 1 + ML_Test_FD4/interface.ccl | 17 + ML_Test_FD4/schedule.ccl | 14 + .../src/ML_Coordinates.cc | 5 +- ML_Test_FD4/src/ML_Test_FD4_DPolyCalc.cc | 394 ++- ML_Test_FD4/src/make.code.defn | 1 + m/Test.m | 31 +- m/{WaveToy.merge => Test.merge}/interface.ccl | 0 m/Test.merge/schedule.ccl | 14 + .../src/ML_Coordinates.cc | 3 - m/Test.merge/src/make.code.defn | 1 + m/WaveToy.m | 5 +- m/WaveToy.merge/src/ML_Coordinates.cc | 3 - ...estpoly_dg4.par => testpoly_dg4_sixpatches.par} | 83 +- 19 files changed, 2557 insertions(+), 706 deletions(-) copy {m/WaveToy.merge => ML_Test_DG4}/src/ML_Coordinates.cc (94%) copy {m/WaveToy.merge => ML_Test_FD4}/src/ML_Coordinates.cc (94%) copy m/{WaveToy.merge => Test.merge}/interface.ccl (100%) create mode 100644 m/Test.merge/schedule.ccl copy m/{WaveToy.merge => Test.merge}/src/ML_Coordinates.cc (97%) create mode 100644 m/Test.merge/src/make.code.defn copy par/{testpoly_dg4.par => testpoly_dg4_sixpatches.par} (58%) hooks/post-receive -- McLachlan

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

Commits