Finished first working version

Schulik · Oct 15, 2020 · 739bef3 · 739bef3
1 parent 9cdf180
commit 739bef3
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 13 deletions.
diff --git a/aiolos.h b/aiolos.h
@@ -195,8 +195,9 @@ class hydro_run
     double rs_time;
     int    init_static_atmosphere;
     int    static_atmosphere_tempprofile;
+
     double gamma_adiabat;           //ratio of specific heats
-    double ggminusone;
+    //double ggminusone;
     double mdot;
     double cv;
     double const_T;

diff --git a/helpers.cpp b/helpers.cpp
@@ -92,7 +92,7 @@ std::vector<double> np_zeros(int size) {
 //
 // Return a 1-D array of one, identical to the numpy function
 //
-std::vector<double> nnp_ones(int size) {
+std::vector<double> np_ones(int size) {
 
     return std::vector<double>(size, 1.0) ;
 }

diff --git a/init_and_bounds.cpp b/init_and_bounds.cpp
@@ -123,16 +123,6 @@ hydro_run::hydro_run(string filename, double debug_) {
         //finalplotnumber = 1
         solver = 0;
 
-        ////~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-        //
-        // Physical
-        //
-        ////~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-        gamma_adiabat   = read_parameter_from_file<double>(filename,"PARI_GAMMA", debug).value; //ratio of specific heats
-        ggminusone      = gamma_adiabat*(gamma_adiabat-1.);
-        const_T         = read_parameter_from_file<double>(filename,"PARI_CONST_TEMP",  debug).value;
-        T_increment     = read_parameter_from_file<double>(filename,"PARI_TEMP_INCR", debug).value;
 
         ////~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
         //
@@ -276,6 +266,23 @@ hydro_run::hydro_run(string filename, double debug_) {
         source          = init_AOS(num_cells+2);  //Parabolic Variables: gravitational potential
         source_pressure = init_AOS(num_cells+2);  //Parabolic Variables: gravitational potential
         flux            = init_AOS(num_cells+1);
+
+
+        ////~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+        //
+        // Physical
+        //
+        ////~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+        //double const_gamma_adiabat = read_parameter_from_file<double>(filename,"PARI_GAMMA", debug).value; //ratio of specific heats
+        gamma_adiabat   = read_parameter_from_file<double>(filename,"PARI_GAMMA", debug).value;
+        //double const_cv = read_parameter_from_file<double>(filename,"PARI_CV", debug).value; //ratio of specific heats
+        cv   =  1; 
+        const_T         = read_parameter_from_file<double>(filename,"PARI_CONST_TEMP",  debug).value;
+        T_increment     = read_parameter_from_file<double>(filename,"PARI_TEMP_INCR", debug).value;
+
+
+
         //left_ghost = AOS(0,0,0);
         //right_ghost= AOS(0,0,0);
 
@@ -411,7 +418,7 @@ hydro_run::hydro_run(string filename, double debug_) {
 void hydro_run::initialize_hydrostatic_atmosphere_nonuniform() {
 
     cout<<"ATTENTION: Initializing nonuniform hydrostatic atmosphere and overwriting prior initial values."<<endl;
-    cv      = 1.;
+    //cv      = 1.;
 
     long double temp_rhofinal;
     long double factor_inner, factor_outer;