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@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