Commit 043e20d5 authored by Ding, Lijie's avatar Ding, Lijie
Browse files

change q range to match 0.5 to 5 R0, use 10000 config

parent 054d4ea7

analyze/main_ML_analyze.py

+2 −2
Original line number Diff line number Diff line
@@ -10,9 +10,9 @@ import time 
def main():



    print("analyzing data using ML model")

    folder = "../data/20241125_rand"

    folder = "../data/20241126_rand"

    rand_num = 4000

    rand_max = 3000

    rand_max = 4000

    parameters = []

    for i in range(rand_num):

        filename = f"{folder}/obs_random_run{i}.csv"

code/main.cpp

+3 −2
Original line number Diff line number Diff line
@@ -48,7 +48,8 @@ int main(int argc, char const *argv[]) 


        std::string finfo = "n" + std::string(argv[1]) + "_Rmu" + std::string(argv[2]) + "_sigma" + std::string(argv[3]) + "_sqrtD" + std::string(argv[4]) + "_gxy" + std::string(argv[5]);



        int number_of_config = 4000;



        int number_of_config = 10000; // 2000 for local test

        int bnum_r = 100;

        int bnum_phi = 101;
@@ -66,7 +67,7 @@ int main(int argc, char const *argv[]) 
        suspension gas_2d(R0, 1.0*R0, 100, 0.0, 1.0, 0.0, true);

        std::string finfo = "random_run" + std::to_string(run_num);



        int number_of_config = 4000;

        int number_of_config = 10000; // 2000 for local test

        int bnum_r = 100;

        int bnum_phi = 101;

        gas_2d.run_simulation(number_of_config, bnum_r, bnum_phi, folder, finfo);

code/suspension

(94.5 KiB)

File changed.

No diff preview for this file type.

View original file
View changed file

code/suspension.cpp

+9 −5
Original line number Diff line number Diff line
@@ -31,9 +31,10 @@ suspension::suspension(double R0_, double Rmu_, int n_, double sigma_, double sq 
    {

        std::cout << "\nrandom_param" << std::endl;

        // gxx*gyy-gxy*gyx=1

        Rmu = (0.9+0.2*rand_uni(gen))*R0;

        //n = 100 + 100 * rand_uni(gen);

        n = 100;

        //Rmu = (0.9+0.2*rand_uni(gen))*R0;

        Rmu = 1.0*R0;

        n = 100 + 50 * rand_uni(gen);

        //n = 100;

        sigma = 0.0 + 0.5 * rand_uni(gen);

        sqrtD = (0.0 + 5 * rand_uni(gen)) * R0;

        gxy = (50 * rand_uni(gen)) * R0;
@@ -79,8 +80,8 @@ observable suspension::measure_observable(int bnum_r, int bnum_phi) 
    // measure the structure factor



    // 1. set up q vectors

    double qri = 300;

    double qrf = 3000;

    double qri = 0.5/R0;

    double qrf = 5/R0;

    obs.qr.resize(bnum_r);

    std::vector<double> qr(bnum_r, 0);

    for (int k = 0; k < bnum_r; k++)
@@ -442,6 +443,8 @@ void suspension::save_avg_observable_to_file(std::string filename) 
            }

        }



        // it's the same as Iq_2D on average

        /*

        for (int kr = 0; kr < avg_obs.Iq2D_af.size(); kr++)

        {

            f << "\nIq2D_af,NA,NA,NA,NA,NA";
@@ -451,6 +454,7 @@ void suspension::save_avg_observable_to_file(std::string filename) 
                f << "," << avg_obs.Iq2D_af[kr][kphi];

            }

        }

        */



        for (int kr = 0; kr < avg_obs.IqIq_af.size(); kr++)

        {