Merge pull request #84 from AFD-Illinois/dev

ipole 1.5

makefile

@@ -45,7 +45,7 @@ ifneq (,$(findstring stampede2,$(HOST)))
 	-include $(MAKEFILE_PATH)/machines/stampede2.make
 endif
 ifneq (,$(findstring frontera,$(HOST)))
-        -include $(MAKEFILE_PATH)/machines/frontera.make
+	-include $(MAKEFILE_PATH)/machines/frontera.make
 endif
 # Hack to check only whether host begins with bh*
 ifneq (,$(findstring beginsbh,begins$(HOST)))

model/analytic/model.c

@@ -16,10 +16,7 @@ double Te_unit;
 // This one is useful
 double RHO_unit;
 
-// Model parameters: public
-double rmax_geo = 1000.0;
 // Model parameters: private
-static double rmin_geo = 0;
 static double MBH_solar = 4.e6;
 static double RHO_unit_in = 0;
 
@@ -58,7 +55,7 @@ void try_set_model_parameter(const char *word, const char *value)
   set_by_word_val(word, value, "model", &model, TYPE_INT);
   set_by_word_val(word, value, "MBH", &MBH_solar, TYPE_DBL);
   set_by_word_val(word, value, "rho_unit", &RHO_unit_in, TYPE_DBL);
-  // TODO NEED to move this into main parameters
+  // TODO move these calls into the main parameters
   set_by_word_val(word, value, "rmax_geo", &rmax_geo, TYPE_DBL);
   set_by_word_val(word, value, "rmin_geo", &rmin_geo, TYPE_DBL);
 
@@ -137,7 +134,8 @@ void set_units()
   Rh = 1 + sqrt(1. - a * a);
   Rin = Rh;
   Rout = 1000.0;
-  // Limit rmax_geo?
+  rmin_geo = 1.;
+  rmax_geo = 10000.;
 
   double z1 = 1. + pow(1. - a * a, 1. / 3.) * (pow(1. + a, 1. / 3.) + pow(1. - a, 1. / 3.));
   double z2 = sqrt(3. * a * a + z1 * z1);
@@ -317,8 +315,9 @@ int radiating_region(double X[NDIM])
 // Define these to specify a fluid model: e- density/temperature for
 // synchrotron radiation based on an energy distribution
 double get_model_thetae(double X[NDIM]) {return 0;}
-void get_model_powerlaw_vals(double X[NDIM], double *p, double *n,
-          double *gamma_min, double *gamma_max, double *gamma_cut) {return;}
-
+double get_model_sigma(double X[NDIM]) {return 0;}
+double get_model_beta(double X[NDIM]) {return 0;}
+void update_data(double *tA, double *tB) {return;}
+void update_data_until(double *tA, double *tB, double tgt) {return;}
 // This is only called for trace file output, and doesn't really apply to analytic models
 void get_model_primitives(double X[NDIM], double *p) {return;}

model/analytic/model_params.h

@@ -9,7 +9,4 @@
 
 #define THIN_DISK (0)
 
-// Necessary model parameters, can be used or not
-extern double rmax_geo;
-
 #endif /* MODEL_PARAMS_H */