Commit 8d45f454 authored by Alain O' Miniussi's avatar Alain O' Miniussi
Browse files

Merge commit '0686e162' into 597-compile-with-cuda

Conflicts:
	src/diskPhysic.cpp
parents 31313a7e 0686e162
......@@ -791,7 +791,9 @@ namespace fargOCA {
real o1an = pow(o1, 2);
real o2an = pow(o2, 2);
// smoothed and continuous opacity law for regions 1, 2, and 3.
opacity=pow(pow(o1an*o2an/(o1an+o2an),2)+pow(o3/(1+1.e22/pow(temp,10)),4),0.25);
opacity = pow((pow(o1an*o2an/(o1an+o2an),2)
+pow(o3/(1+1.e22/pow(temp,10)),4)),
0.25);
} else if ( temp < t456*pow(rho,2.381e-2)){
// to avoid overflow
real ts4 = 1.e-4*temp;
......@@ -803,8 +805,8 @@ namespace fargOCA {
real o4an = pow(o4,4);
real o3an = pow(bk3*ts4,4);
// smoothed and continuous opacity law for regions 3, 4, and 5.
opacity = pow((o4an*o3an/(o4an+o3an))
+pow(o5/(1+6.561e-5/pow(ts4,8)),4),
opacity = pow(((o4an*o3an/(o4an+o3an))
+pow(o5/(1+6.561e-5/pow(ts4,8)),4)),
0.25);
} else if (temp < t678*pow(rho,2.267e-1) || rho <= 1.0e-10){
// to avoid overflow
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment