fixed radiation compilation issues

achael · Mar 12, 2024 · af5fa10 · af5fa10
1 parent 8b910c7
commit af5fa10
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 15 deletions.
diff --git a/PROBLEMS/RADSURVEY/define.h b/PROBLEMS/RADSURVEY/define.h
@@ -125,7 +125,7 @@
 /************************************/
 //radiation choices
 /************************************/
-//#define RADIATION
+#define RADIATION
 #ifdef RADIATION
 
 #define EVOLVEPHOTONNUMBER
@@ -192,7 +192,7 @@
 /************************************/
 //electron choices
 /************************************/
-//#define EVOLVEELECTRONS
+#define EVOLVEELECTRONS
 #ifdef EVOLVEELECTRONS
 
 #define CONSISTENTGAMMA

diff --git a/postproc.c b/postproc.c
@@ -1332,16 +1332,16 @@ int calc_scalars(ldouble *scalars,ldouble t)
   #endif
   int ix;
   for(ix=0;ix<NX;ix++)
-    {
-      get_xx(ix,0,0,xx);
-      #ifdef PRECOMPUTE_MY2OUT
-      get_xxout(ix, 0, 0, xxBL);
-      #else
-      coco_N(xx,xxBL,MYCOORDS,OUTCOORDS);
-      #endif
+  {
+    get_xx(ix,0,0,xx);
+    #ifdef PRECOMPUTE_MY2OUT
+    get_xxout(ix, 0, 0, xxBL);
+    #else
+    coco_N(xx,xxBL,MYCOORDS,OUTCOORDS);
+    #endif
 
-      if(xxBL[1]>radius) break;
-    }
+    if(xxBL[1]>radius) break;
+  }
 
   double totlum;
   calc_local_lum(ix,NCCORRECTPOLAR+1,0,&radlum,&totlum);

diff --git a/problem.h b/problem.h
@@ -154,7 +154,7 @@
 //if you are using a problem older than 100 with a different kappa defined in kappa.c
 //make sure your kappa.c ends with (kappa=(.....)) NOT (return kappa)!!
 
-#define PROBLEM 145
+#define PROBLEM 140
 
 #if(PROBLEM==146)
 

diff --git a/rad.c b/rad.c
@@ -5219,7 +5219,7 @@ test_solve_implicit_lab()
       params[6]=0; //ifelectron
       solve_implicit_lab_4dprim(uu0,pp0,&geom,dt,verbose,params,pp);
       print_primitives(pp);
-      printf("gas temp: %e\nrad temp: %e\n",calc_PEQ_Tfromurho(pp[UU],pp[RHO]),calc_LTE_TfromE(pp[EE]));
+      printf("gas temp: %e\nrad temp: %e\n",calc_PEQ_Tfromurho(pp[UU],pp[RHO],geom.ix,geom.iy,geom.iz),calc_LTE_TfromE(pp[EE]));
     }
 #endif
   exit(1);

diff --git a/silo.c b/silo.c
@@ -666,7 +666,7 @@ int fprint_silofile(ldouble time, int num, char* folder, char* prefix)
 	 #endif
 
 	 //electrons
-	 ne=calc_thermal_ne(pp); 
+	 ldouble ne=calc_thermal_ne(pp); 
 	 tempeloc=pe/K_BOLTZ/ne;
 	 ldouble gammae=GAMMAE;
 	 #ifdef CONSISTENTGAMMA

diff --git a/u2p.c b/u2p.c
@@ -383,7 +383,7 @@ u2p(ldouble *uu0, ldouble *pp, void *ggg, int corrected[3], int fixups[2], int t
 #ifdef RADIATION  
 
   //Do the radiative inversion from u2p_rad.c
-  u2p_rad(uu,pp,geom,&radcor)
+  u2p_rad(uu,pp,geom,&radcor);
   if(radcor>0)   //rad fixups only for critical failure in implicit    
   {
     fixups[1]=1;