JETSCAPE/external_packages/freestream-milne-external-params.patch

0001 Subject: [PATCH] External parameter control
0002
0003 ---
0004  src/FileIO.cpp          |  6 ++----
0005  src/FreestreamMilne.cpp | 27 ++++++++++++++++++---------
0006  2 files changed, 20 insertions(+), 13 deletions(-)
0007
0008 diff --git src/FileIO.cpp src/FileIO.cpp
0009 index 58c6acf..d72db3c 100644
0010 --- src/FileIO.cpp
0011 +++ src/FileIO.cpp
0012 @@ -163,7 +163,7 @@ void readDensityFile(float *density, char name[255], parameters params)
0013    infile.close();
0014  }
0015
0016 -void readInParameters(struct parameters &params)
0017 +void readInParameters(const char *filename, struct parameters &params)
0018  {
0019    char dummyChar[255];
0020    int dummyInt;
0021 @@ -171,9 +171,7 @@ void readInParameters(struct parameters &params)
0022    float dummyFloat;
0023
0024    FILE *fileIn;
0025 -  std::stringstream paramsStream;
0026 -  paramsStream << "freestream_input";
0027 -  fileIn = fopen(paramsStream.str().c_str(),"r");
0028 +  fileIn = fopen(filename,"r");
0029
0030    if (fileIn == NULL)
0031    {
0032 diff --git src/FreestreamMilne.cpp src/FreestreamMilne.cpp
0033 index 3bb12bc..7128164 100644
0034 --- src/FreestreamMilne.cpp
0035 +++ src/FreestreamMilne.cpp
0036 @@ -34,6 +34,10 @@ class FREESTREAMMILNE {
0037
0038      int run_freestream_milne();
0039
0040 +    struct parameters params;
0041 +
0042 +    parameters * configure(const char * = "freestream_input");
0043 +
0044      // IS THIS VARIABLE NECESSARY
0045      int gridSize; //the total number of grid points in x, y, and eta : used for vector memory allocation
0046
0047 @@ -135,15 +139,9 @@ void FREESTREAMMILNE::output_to_vectors(std::vector<double> &energy_density_out,
0048    Pi_out = final_Pi;
0049  }
0050
0051 -//where the magic happens
0052 -int FREESTREAMMILNE::run_freestream_milne() {
0053 -
0054 -float hbarc = 0.197326938;
0055 -
0056 -if(PRINT_SCREEN) printf("Welcome to freestream-milne\n");
0057 -
0058 +parameters * FREESTREAMMILNE::configure(const char *filename) {
0059  //declare parameter struct
0060 -struct parameters params;
0061 +//struct parameters params;
0062
0063  //set default parameters in case of missing freestream_input file
0064  params.OUTPUTFORMAT = 2;
0065 @@ -171,7 +169,18 @@ params.VISCOUS_MATCHING = 1;
0066  params.E_DEP_FS = 0;
0067
0068  //read in chosen parameters from freestream_input if such a file exists
0069 -readInParameters(params);
0070 +readInParameters(filename,params);
0071 +
0072 +return &params;
0073 +
0074 +}
0075 +
0076 +//where the magic happens
0077 +int FREESTREAMMILNE::run_freestream_milne() {
0078 +
0079 +float hbarc = 0.197326938;
0080 +
0081 +if(PRINT_SCREEN) printf("Welcome to freestream-milne\n");
0082
0083  //define some useful combinations
0084  params.DIM = params.DIM_X * params.DIM_Y * params.DIM_ETA;
0085 --
0086 2.28.0
0087