diff options
| author | rhaas <rhaas@8e189c6b-2ab8-4400-aa02-70a9cfce18b9> | 2014-03-13 03:01:16 +0000 |
|---|---|---|
| committer | rhaas <rhaas@8e189c6b-2ab8-4400-aa02-70a9cfce18b9> | 2014-03-13 03:01:16 +0000 |
| commit | 1d37648f3182259577c95aab2d51be0665dec30b (patch) | |
| tree | e24c1021acbde975aa0905e895a5a206dc490454 | |
| parent | 1ba33bdf9cbd0c5059e59412156f9239b133be5f (diff) | |
* improved checking of keytemp
From: Christian Ott <cott@tapir.caltech.edu>
git-svn-id: http://svn.einsteintoolkit.org/cactus/EinsteinEOS/EOS_Omni/trunk@92 8e189c6b-2ab8-4400-aa02-70a9cfce18b9
| -rw-r--r-- | src/EOS_Omni_MultiVarCalls.F90 | 4 | ||||
| -rw-r--r-- | src/EOS_Omni_SingleVarCalls.F90 | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/src/EOS_Omni_MultiVarCalls.F90 b/src/EOS_Omni_MultiVarCalls.F90 index a0042b7..84cfb71 100644 --- a/src/EOS_Omni_MultiVarCalls.F90 +++ b/src/EOS_Omni_MultiVarCalls.F90 @@ -223,8 +223,8 @@ subroutine EOS_Omni_EOS_dpderho_dpdrhoe(eoskey,keytemp,rf_precision,npoints,& 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,& diff --git a/src/EOS_Omni_SingleVarCalls.F90 b/src/EOS_Omni_SingleVarCalls.F90 index c1dfb42..b82aeb0 100644 --- a/src/EOS_Omni_SingleVarCalls.F90 +++ b/src/EOS_Omni_SingleVarCalls.F90 @@ -98,9 +98,11 @@ subroutine EOS_Omni_EOS_Press(eoskey,keytemp,rf_precision,npoints,& 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 @@ subroutine EOS_Omni_EOS_DPressByDRho(eoskey,keytemp,rf_precision,npoints,& 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 @@ subroutine EOS_Omni_EOS_DPressByDEps(eoskey,keytemp,rf_precision,npoints,& 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 @@ subroutine EOS_Omni_EOS_cs2(eoskey,keytemp,rf_precision,npoints,& 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 |