diff options
Diffstat (limited to 'Source/Utils')
-rw-r--r-- | Source/Utils/IonizationEnergiesTable.H | 138 | ||||
-rw-r--r-- | Source/Utils/NCIGodfreyTables.H | 400 | ||||
-rw-r--r-- | Source/Utils/WarpXMovingWindow.cpp | 2 | ||||
-rw-r--r-- | Source/Utils/WarpXUtil.H | 2 | ||||
-rw-r--r-- | Source/Utils/WarpXUtil.cpp | 6 | ||||
-rw-r--r-- | Source/Utils/utils_ES.F90 | 30 | ||||
-rw-r--r-- | Source/Utils/write_atomic_data_cpp.py | 2 |
7 files changed, 290 insertions, 290 deletions
diff --git a/Source/Utils/IonizationEnergiesTable.H b/Source/Utils/IonizationEnergiesTable.H index a7ab8210f..4c2898b91 100644 --- a/Source/Utils/IonizationEnergiesTable.H +++ b/Source/Utils/IonizationEnergiesTable.H @@ -32,105 +32,105 @@ std::map<std::string, int> ion_map_ids = { const int nelements = 22; const int ion_atomic_numbers[nelements] = { - 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, - 11, 12, 13, 14, 15, 16, 17, 18, 36, 37, + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, + 11, 12, 13, 14, 15, 16, 17, 18, 36, 37, 54, 86}; const int ion_energy_offsets[nelements] = { - 0, 1, 3, 6, 10, 15, 21, 28, 36, 45, - 55, 66, 78, 91, 105, 120, 136, 153, 171, 207, + 0, 1, 3, 6, 10, 15, 21, 28, 36, 45, + 55, 66, 78, 91, 105, 120, 136, 153, 171, 207, 244, 298}; const int energies_tab_length = 384; const amrex::Real table_ionization_energies[energies_tab_length]{ // H - 13.59843449, + 13.59843449, // He - 24.58738880, 54.4177650, + 24.58738880, 54.4177650, // Li - 5.39171495, 75.6400964, 122.4543581, + 5.39171495, 75.6400964, 122.4543581, // Be - 9.322699, 18.21115, 153.896203, 217.7185843, + 9.322699, 18.21115, 153.896203, 217.7185843, // B - 8.298019, 25.15483, 37.93058, 259.3715, 340.226020, + 8.298019, 25.15483, 37.93058, 259.3715, 340.226020, // C - 11.2602880, 24.383154, 47.88778, 64.49352, 392.090515, 489.993194, + 11.2602880, 24.383154, 47.88778, 64.49352, 392.090515, 489.993194, // N - 14.53413, 29.60125, 47.4453, 77.4735, 97.8901, 552.06732, 667.046116, + 14.53413, 29.60125, 47.4453, 77.4735, 97.8901, 552.06732, 667.046116, // O - 13.618055, 35.12112, 54.93554, 77.41350, 113.8990, 138.1189, 739.32682, - 871.40988, + 13.618055, 35.12112, 54.93554, 77.41350, 113.8990, 138.1189, 739.32682, + 871.40988, // F - 17.42282, 34.97081, 62.70798, 87.175, 114.249, 157.16311, 185.1868, - 953.89804, 1103.11747, + 17.42282, 34.97081, 62.70798, 87.175, 114.249, 157.16311, 185.1868, + 953.89804, 1103.11747, // Ne - 21.564540, 40.96297, 63.4233, 97.1900, 126.247, 157.934, 207.271, - 239.0970, 1195.80783, 1362.19915, + 21.564540, 40.96297, 63.4233, 97.1900, 126.247, 157.934, 207.271, + 239.0970, 1195.80783, 1362.19915, // Na - 5.1390769, 47.28636, 71.6200, 98.936, 138.404, 172.23, 208.504, - 264.192, 299.856, 1465.13449, 1648.70218, + 5.1390769, 47.28636, 71.6200, 98.936, 138.404, 172.23, 208.504, + 264.192, 299.856, 1465.13449, 1648.70218, // Mg - 7.646236, 15.035271, 80.1436, 109.2654, 141.33, 186.76, 225.02, - 265.924, 327.99, 367.489, 1761.80487, 1962.66365, + 7.646236, 15.035271, 80.1436, 109.2654, 141.33, 186.76, 225.02, + 265.924, 327.99, 367.489, 1761.80487, 1962.66365, // Al - 5.985769, 18.82855, 28.447642, 119.9924, 153.8252, 190.49, 241.76, - 284.64, 330.21, 398.65, 442.005, 2085.97700, 2304.14005, + 5.985769, 18.82855, 28.447642, 119.9924, 153.8252, 190.49, 241.76, + 284.64, 330.21, 398.65, 442.005, 2085.97700, 2304.14005, // Si - 8.15168, 16.34585, 33.49300, 45.14179, 166.767, 205.279, 246.57, - 303.59, 351.28, 401.38, 476.273, 523.415, 2437.65813, 2673.17753, + 8.15168, 16.34585, 33.49300, 45.14179, 166.767, 205.279, 246.57, + 303.59, 351.28, 401.38, 476.273, 523.415, 2437.65813, 2673.17753, // P - 10.486686, 19.76949, 30.20264, 51.44387, 65.02511, 220.430, 263.57, - 309.60, 372.31, 424.40, 479.44, 560.62, 611.741, 2816.90876, - 3069.8415, + 10.486686, 19.76949, 30.20264, 51.44387, 65.02511, 220.430, 263.57, + 309.60, 372.31, 424.40, 479.44, 560.62, 611.741, 2816.90876, + 3069.8415, // S - 10.36001, 23.33788, 34.86, 47.222, 72.5945, 88.0529, 280.954, - 328.794, 379.84, 447.7, 504.55, 564.41, 651.96, 706.994, - 3223.7807, 3494.1879, + 10.36001, 23.33788, 34.86, 47.222, 72.5945, 88.0529, 280.954, + 328.794, 379.84, 447.7, 504.55, 564.41, 651.96, 706.994, + 3223.7807, 3494.1879, // Cl - 12.967632, 23.81364, 39.80, 53.24, 67.68, 96.94, 114.2013, - 348.306, 400.851, 456.7, 530.0, 591.58, 656.30, 750.23, - 809.198, 3658.3437, 3946.2909, + 12.967632, 23.81364, 39.80, 53.24, 67.68, 96.94, 114.2013, + 348.306, 400.851, 456.7, 530.0, 591.58, 656.30, 750.23, + 809.198, 3658.3437, 3946.2909, // Ar - 15.7596117, 27.62967, 40.735, 59.58, 74.84, 91.290, 124.41, - 143.4567, 422.60, 479.76, 540.4, 619.0, 685.5, 755.13, - 855.5, 918.375, 4120.6656, 4426.2228, + 15.7596117, 27.62967, 40.735, 59.58, 74.84, 91.290, 124.41, + 143.4567, 422.60, 479.76, 540.4, 619.0, 685.5, 755.13, + 855.5, 918.375, 4120.6656, 4426.2228, // Kr - 13.9996053, 24.35984, 35.838, 50.85, 64.69, 78.49, 109.13, - 125.802, 233.0, 268, 308, 350, 391, 446, - 492, 540, 591, 640, 785, 831.6, 882.8, - 945, 999.0, 1042, 1155.0, 1205.23, 2928.9, 3072, - 3228, 3380, 3584, 3752.0, 3971, 4109.083, 17296.420, - 17936.209, + 13.9996053, 24.35984, 35.838, 50.85, 64.69, 78.49, 109.13, + 125.802, 233.0, 268, 308, 350, 391, 446, + 492, 540, 591, 640, 785, 831.6, 882.8, + 945, 999.0, 1042, 1155.0, 1205.23, 2928.9, 3072, + 3228, 3380, 3584, 3752.0, 3971, 4109.083, 17296.420, + 17936.209, // Rb - 4.1771280, 27.28954, 39.247, 52.20, 68.44, 82.9, 98.67, - 132.79, 150.628, 277.12, 313.1, 356.0, 400, 443, - 502, 550, 601, 654, 706.0, 857, 905.3, - 958.9, 1024, 1080, 1125, 1242.5, 1294.57, 3133.3, - 3281, 3443, 3600, 3815, 3988, 4214, 4356.865, - 18305.884, 18965.516, + 4.1771280, 27.28954, 39.247, 52.20, 68.44, 82.9, 98.67, + 132.79, 150.628, 277.12, 313.1, 356.0, 400, 443, + 502, 550, 601, 654, 706.0, 857, 905.3, + 958.9, 1024, 1080, 1125, 1242.5, 1294.57, 3133.3, + 3281, 3443, 3600, 3815, 3988, 4214, 4356.865, + 18305.884, 18965.516, // Xe - 12.1298436, 20.975, 31.05, 42.20, 54.1, 66.703, 91.6, - 105.9778, 179.84, 202.0, 229.02, 255.0, 281, 314, - 343, 374, 404, 434, 549, 582, 616, - 650, 700, 736, 818, 857.0, 1493, 1571, - 1653, 1742, 1826, 1919, 2023, 2113, 2209, - 2300, 2556, 2637, 2726, 2811, 2975, 3068, - 3243, 3333.8, 7660, 7889, 8144, 8382, 8971, - 9243, 9581, 9810.37, 40271.724, 41299.71, + 12.1298436, 20.975, 31.05, 42.20, 54.1, 66.703, 91.6, + 105.9778, 179.84, 202.0, 229.02, 255.0, 281, 314, + 343, 374, 404, 434, 549, 582, 616, + 650, 700, 736, 818, 857.0, 1493, 1571, + 1653, 1742, 1826, 1919, 2023, 2113, 2209, + 2300, 2556, 2637, 2726, 2811, 2975, 3068, + 3243, 3333.8, 7660, 7889, 8144, 8382, 8971, + 9243, 9581, 9810.37, 40271.724, 41299.71, // Rn - 10.74850, 21.4, 29.4, 36.9, 52.9, 64.0, 88.0, - 102.0, 154.0, 173.9, 195.0, 218.0, 240, 264, - 293, 317, 342, 367, 488, 520, 550, - 580, 640, 680, 760, 800, 850, 920, - 980, 1050, 1110, 1180, 1250, 1310, 1390, - 1460, 1520, 1590, 1660, 1720, 2033, 2094, - 2158, 2227, 2293, 2357, 2467, 2535, 2606, - 2674, 2944, 3010, 3082, 3149, 3433, 3510, - 3699, 3777, 6169, 6318, 6476, 6646, 6807, - 6964, 7283, 7450, 7630, 7800, 8260, 8410, - 8570, 8710, 9610, 9780, 10120, 10290, 21770, - 22160, 22600, 22990, 26310, 26830, 27490, 27903.1, + 10.74850, 21.4, 29.4, 36.9, 52.9, 64.0, 88.0, + 102.0, 154.0, 173.9, 195.0, 218.0, 240, 264, + 293, 317, 342, 367, 488, 520, 550, + 580, 640, 680, 760, 800, 850, 920, + 980, 1050, 1110, 1180, 1250, 1310, 1390, + 1460, 1520, 1590, 1660, 1720, 2033, 2094, + 2158, 2227, 2293, 2357, 2467, 2535, 2606, + 2674, 2944, 3010, 3082, 3149, 3433, 3510, + 3699, 3777, 6169, 6318, 6476, 6646, 6807, + 6964, 7283, 7450, 7630, 7800, 8260, 8410, + 8570, 8710, 9610, 9780, 10120, 10290, 21770, + 22160, 22600, 22990, 26310, 26830, 27490, 27903.1, 110842.0, 112843.7 }; #endif // #ifndef WARPX_IONIZATION_TABLE_H_ diff --git a/Source/Utils/NCIGodfreyTables.H b/Source/Utils/NCIGodfreyTables.H index 8cb105aa0..a3faf95a0 100644 --- a/Source/Utils/NCIGodfreyTables.H +++ b/Source/Utils/NCIGodfreyTables.H @@ -12,212 +12,212 @@ const int tab_length = 101; // Table of coefficient for Ex, Ey abd Bz // We typically interpolate between two lines const amrex::Real table_nci_godfrey_Ex_Ey_Bz[tab_length][tab_width]{ - -2.47536,2.04288,-0.598163,0.0314711, - -2.47536,2.04288,-0.598163,0.0314711, - -2.47545,2.04309,-0.598307,0.0315029, - -2.4756,2.04342,-0.598549,0.0315558, - -2.47581,2.0439,-0.598886,0.0316298, - -2.47608,2.0445,-0.59932,0.031725, - -2.47641,2.04525,-0.59985,0.0318412, - -2.4768,2.04612,-0.600477,0.0319785, - -2.47725,2.04714,-0.6012,0.0321367, - -2.47776,2.04829,-0.602019,0.0323158, - -2.47833,2.04957,-0.602934,0.0325158, - -2.47896,2.05099,-0.603944,0.0327364, - -2.47965,2.05254,-0.605051,0.0329777, - -2.4804,2.05423,-0.606253,0.0332396, - -2.48121,2.05606,-0.60755,0.0335218, - -2.48208,2.05802,-0.608942,0.0338243, - -2.48301,2.06012,-0.610429,0.0341469, - -2.48401,2.06235,-0.61201,0.0344895, - -2.48506,2.06471,-0.613685,0.0348519, - -2.48618,2.06721,-0.615453,0.0352339, - -2.48735,2.06984,-0.617314,0.0356353, - -2.48859,2.07261,-0.619268,0.0360559, - -2.48988,2.0755,-0.621312,0.0364954, - -2.49123,2.07853,-0.623447,0.0369536, - -2.49265,2.08169,-0.625672,0.0374302, - -2.49412,2.08498,-0.627986,0.0379248, - -2.49565,2.0884,-0.630386,0.0384372, - -2.49724,2.09194,-0.632873,0.0389669, - -2.49888,2.09561,-0.635443,0.0395135, - -2.50058,2.09939,-0.638096,0.0400766, - -2.50234,2.1033,-0.640829,0.0406557, - -2.50415,2.10732,-0.64364,0.0412502, - -2.50601,2.11145,-0.646526,0.0418594, - -2.50791,2.1157,-0.649485,0.0424828, - -2.50987,2.12004,-0.652512,0.0431196, - -2.51187,2.12448,-0.655604,0.0437688, - -2.51392,2.12901,-0.658756,0.0444297, - -2.516,2.13363,-0.661964,0.0451011, - -2.51812,2.13832,-0.665221,0.0457818, - -2.52027,2.14308,-0.668521,0.0464705, - -2.52244,2.14789,-0.671856,0.0471658, - -2.52464,2.15274,-0.675218,0.0478658, - -2.52684,2.15762,-0.678596,0.0485687, - -2.52906,2.16251,-0.68198,0.0492723, - -2.53126,2.16738,-0.685355,0.049974, - -2.53345,2.17222,-0.688706,0.0506708, - -2.53561,2.177,-0.692015,0.0513594, - -2.53773,2.18168,-0.69526,0.0520359, - -2.53978,2.18623,-0.698416,0.0526955, - -2.54175,2.19059,-0.701452,0.053333, - -2.5436,2.19471,-0.704331,0.0539417, - -2.54531,2.19852,-0.70701,0.0545141, - -2.54683,2.20193,-0.709433,0.0550409, - -2.5481,2.20483,-0.711533,0.0555106, - -2.54906,2.20709,-0.713224,0.0559094, - -2.54963,2.20852,-0.714397,0.0562198, - -2.54968,2.20888,-0.714907,0.0564196, - -2.54905,2.20785,-0.714562,0.0564797, - -2.54751,2.20496,-0.713094,0.0563618, - -2.54472,2.19955,-0.710118,0.0560124, - -2.54014,2.19058,-0.705048,0.0553544, - -2.53286,2.1763,-0.69693,0.0542684, - -2.52115,2.15344,-0.684027,0.05255, - -2.50098,2.11466,-0.66255,0.0497817, - -2.45797,2.03459,-0.620099,0.0446889, - -2.28371,1.72254,-0.465905,0.0283268, - -2.4885,2.04899,-0.599292,0.0390466, - -2.1433,1.36735,-0.220924,-0.00215633, - -2.4943,2.07019,-0.610552,0.035166, - -2.84529,2.77303,-1.00018,0.0724884, - -2.72242,2.51888,-0.847226,0.0509964, - -2.65633,2.3744,-0.750392,0.0326366, - -2.59601,2.23412,-0.646421,0.00868027, - -2.51477,2.0369,-0.491066,-0.0306397, - -2.35935,1.65155,-0.178971,-0.112713, - -1.84315,0.361693,0.876104,-0.393844, - -2.65422,2.39262,-0.789663,0.0516265, - -3.46529,4.42354,-2.45543,0.497097, - -3.15747,3.65311,-1.824,0.328432, - -3.04694,3.37613,-1.59668,0.267631, - -2.99205,3.23814,-1.48302,0.237103, - -2.96075,3.15894,-1.41733,0.219317, - -2.94172,3.11028,-1.37649,0.20811, - -2.92994,3.07962,-1.35025,0.200755, - -2.92283,3.06054,-1.33338,0.195859, - -2.91894,3.04938,-1.3229,0.192637, - -2.91736,3.04394,-1.31702,0.190612, - -2.91753,3.04278,-1.31456,0.189477, - -2.91905,3.04494,-1.31475,0.189026, - -2.92165,3.04973,-1.31705,0.189117, - -2.92512,3.05667,-1.32105,0.189646, - -2.92933,3.06539,-1.32646,0.190538, - -2.93416,3.07562,-1.33308,0.191735, - -2.93952,3.08715,-1.34072,0.193194, - -2.94535,3.09982,-1.34925,0.194881, - -2.95159,3.11349,-1.35858,0.196769, - -2.9582,3.12805,-1.36861,0.198838, - -2.96514,3.14342,-1.37929,0.201068, - -2.97239,3.15953,-1.39055,0.203448, - -2.97991,3.17632,-1.40234,0.205964, + -2.47536,2.04288,-0.598163,0.0314711, + -2.47536,2.04288,-0.598163,0.0314711, + -2.47545,2.04309,-0.598307,0.0315029, + -2.4756,2.04342,-0.598549,0.0315558, + -2.47581,2.0439,-0.598886,0.0316298, + -2.47608,2.0445,-0.59932,0.031725, + -2.47641,2.04525,-0.59985,0.0318412, + -2.4768,2.04612,-0.600477,0.0319785, + -2.47725,2.04714,-0.6012,0.0321367, + -2.47776,2.04829,-0.602019,0.0323158, + -2.47833,2.04957,-0.602934,0.0325158, + -2.47896,2.05099,-0.603944,0.0327364, + -2.47965,2.05254,-0.605051,0.0329777, + -2.4804,2.05423,-0.606253,0.0332396, + -2.48121,2.05606,-0.60755,0.0335218, + -2.48208,2.05802,-0.608942,0.0338243, + -2.48301,2.06012,-0.610429,0.0341469, + -2.48401,2.06235,-0.61201,0.0344895, + -2.48506,2.06471,-0.613685,0.0348519, + -2.48618,2.06721,-0.615453,0.0352339, + -2.48735,2.06984,-0.617314,0.0356353, + -2.48859,2.07261,-0.619268,0.0360559, + -2.48988,2.0755,-0.621312,0.0364954, + -2.49123,2.07853,-0.623447,0.0369536, + -2.49265,2.08169,-0.625672,0.0374302, + -2.49412,2.08498,-0.627986,0.0379248, + -2.49565,2.0884,-0.630386,0.0384372, + -2.49724,2.09194,-0.632873,0.0389669, + -2.49888,2.09561,-0.635443,0.0395135, + -2.50058,2.09939,-0.638096,0.0400766, + -2.50234,2.1033,-0.640829,0.0406557, + -2.50415,2.10732,-0.64364,0.0412502, + -2.50601,2.11145,-0.646526,0.0418594, + -2.50791,2.1157,-0.649485,0.0424828, + -2.50987,2.12004,-0.652512,0.0431196, + -2.51187,2.12448,-0.655604,0.0437688, + -2.51392,2.12901,-0.658756,0.0444297, + -2.516,2.13363,-0.661964,0.0451011, + -2.51812,2.13832,-0.665221,0.0457818, + -2.52027,2.14308,-0.668521,0.0464705, + -2.52244,2.14789,-0.671856,0.0471658, + -2.52464,2.15274,-0.675218,0.0478658, + -2.52684,2.15762,-0.678596,0.0485687, + -2.52906,2.16251,-0.68198,0.0492723, + -2.53126,2.16738,-0.685355,0.049974, + -2.53345,2.17222,-0.688706,0.0506708, + -2.53561,2.177,-0.692015,0.0513594, + -2.53773,2.18168,-0.69526,0.0520359, + -2.53978,2.18623,-0.698416,0.0526955, + -2.54175,2.19059,-0.701452,0.053333, + -2.5436,2.19471,-0.704331,0.0539417, + -2.54531,2.19852,-0.70701,0.0545141, + -2.54683,2.20193,-0.709433,0.0550409, + -2.5481,2.20483,-0.711533,0.0555106, + -2.54906,2.20709,-0.713224,0.0559094, + -2.54963,2.20852,-0.714397,0.0562198, + -2.54968,2.20888,-0.714907,0.0564196, + -2.54905,2.20785,-0.714562,0.0564797, + -2.54751,2.20496,-0.713094,0.0563618, + -2.54472,2.19955,-0.710118,0.0560124, + -2.54014,2.19058,-0.705048,0.0553544, + -2.53286,2.1763,-0.69693,0.0542684, + -2.52115,2.15344,-0.684027,0.05255, + -2.50098,2.11466,-0.66255,0.0497817, + -2.45797,2.03459,-0.620099,0.0446889, + -2.28371,1.72254,-0.465905,0.0283268, + -2.4885,2.04899,-0.599292,0.0390466, + -2.1433,1.36735,-0.220924,-0.00215633, + -2.4943,2.07019,-0.610552,0.035166, + -2.84529,2.77303,-1.00018,0.0724884, + -2.72242,2.51888,-0.847226,0.0509964, + -2.65633,2.3744,-0.750392,0.0326366, + -2.59601,2.23412,-0.646421,0.00868027, + -2.51477,2.0369,-0.491066,-0.0306397, + -2.35935,1.65155,-0.178971,-0.112713, + -1.84315,0.361693,0.876104,-0.393844, + -2.65422,2.39262,-0.789663,0.0516265, + -3.46529,4.42354,-2.45543,0.497097, + -3.15747,3.65311,-1.824,0.328432, + -3.04694,3.37613,-1.59668,0.267631, + -2.99205,3.23814,-1.48302,0.237103, + -2.96075,3.15894,-1.41733,0.219317, + -2.94172,3.11028,-1.37649,0.20811, + -2.92994,3.07962,-1.35025,0.200755, + -2.92283,3.06054,-1.33338,0.195859, + -2.91894,3.04938,-1.3229,0.192637, + -2.91736,3.04394,-1.31702,0.190612, + -2.91753,3.04278,-1.31456,0.189477, + -2.91905,3.04494,-1.31475,0.189026, + -2.92165,3.04973,-1.31705,0.189117, + -2.92512,3.05667,-1.32105,0.189646, + -2.92933,3.06539,-1.32646,0.190538, + -2.93416,3.07562,-1.33308,0.191735, + -2.93952,3.08715,-1.34072,0.193194, + -2.94535,3.09982,-1.34925,0.194881, + -2.95159,3.11349,-1.35858,0.196769, + -2.9582,3.12805,-1.36861,0.198838, + -2.96514,3.14342,-1.37929,0.201068, + -2.97239,3.15953,-1.39055,0.203448, + -2.97991,3.17632,-1.40234,0.205964, -2.98769,3.19374,-1.41463,0.208607 }; // Table of coefficient for Bx, By and Ez // We typically interpolate between two lines const amrex::Real table_nci_godfrey_Bx_By_Ez[tab_length][tab_width]{ - -2.80862,2.80104,-1.14615,0.154077, - -2.80862,2.80104,-1.14615,0.154077, - -2.80851,2.80078,-1.14595,0.154027, - -2.80832,2.80034,-1.14561,0.153945, - -2.80807,2.79973,-1.14514,0.153829, - -2.80774,2.79894,-1.14454,0.15368, - -2.80733,2.79798,-1.1438,0.153498, - -2.80685,2.79685,-1.14292,0.153284, - -2.8063,2.79554,-1.14192,0.153036, - -2.80568,2.79405,-1.14077,0.152756, - -2.80498,2.79239,-1.1395,0.152443, - -2.80421,2.79056,-1.13809,0.152098, - -2.80337,2.78856,-1.13656,0.151721, - -2.80246,2.78638,-1.13488,0.151312, - -2.80147,2.78404,-1.13308,0.150871, - -2.80041,2.78152,-1.13115,0.150397, - -2.79927,2.77882,-1.12908,0.149893, - -2.79807,2.77596,-1.12689,0.149356, - -2.79679,2.77292,-1.12456,0.148789, - -2.79543,2.76972,-1.12211,0.14819, - -2.79401,2.76634,-1.11953,0.14756, - -2.79251,2.76279,-1.11681,0.1469, - -2.79094,2.75907,-1.11397,0.146208, - -2.78929,2.75517,-1.111,0.145486, - -2.78757,2.7511,-1.10789,0.144733, - -2.78578,2.74686,-1.10466,0.14395, - -2.78391,2.74245,-1.1013,0.143137, - -2.78196,2.73786,-1.09781,0.142293, - -2.77994,2.73309,-1.09419,0.141419, - -2.77784,2.72814,-1.09043,0.140514, - -2.77566,2.72301,-1.08654,0.139578, - -2.7734,2.7177,-1.08252,0.138612, - -2.77106,2.7122,-1.07836,0.137614, - -2.76864,2.70651,-1.07406,0.136586, - -2.76613,2.70062,-1.06962,0.135525, - -2.76353,2.69453,-1.06503,0.134432, - -2.76084,2.68824,-1.0603,0.133307, - -2.75806,2.68173,-1.05541,0.132148, - -2.75518,2.675,-1.05037,0.130954, - -2.75219,2.66804,-1.04516,0.129725, - -2.7491,2.66084,-1.03978,0.12846, - -2.7459,2.65339,-1.03423,0.127156, - -2.74257,2.64566,-1.02848,0.125813, - -2.73912,2.63765,-1.02254,0.124428, - -2.73552,2.62934,-1.01638,0.122999, - -2.73178,2.62069,-1.01,0.121523, - -2.72787,2.61169,-1.00337,0.119996, - -2.72379,2.6023,-0.996479,0.118417, - -2.71951,2.59248,-0.989294,0.116778, - -2.71501,2.58218,-0.981786,0.115076, - -2.71026,2.57135,-0.97392,0.113303, - -2.70524,2.55991,-0.965651,0.111453, - -2.69989,2.54778,-0.956922,0.109514, - -2.69416,2.53484,-0.947666,0.107476, - -2.68799,2.52096,-0.937795,0.105324, - -2.68129,2.50596,-0.927197,0.103039, - -2.67394,2.48959,-0.915724,0.100597, - -2.66578,2.47153,-0.903179,0.097968, - -2.65657,2.4513,-0.889283,0.0951084, - -2.64598,2.42824,-0.873638,0.0919592, - -2.63347,2.40127,-0.855632,0.0884325, - -2.61813,2.36864,-0.834261,0.0843898, - -2.59821,2.32701,-0.807691,0.0795876, - -2.56971,2.26887,-0.77188,0.0735132, - -2.51823,2.16823,-0.713448,0.0645399, - -2.33537,1.8294,-0.533852,0.0409941, - -2.53143,2.14818,-0.670502,0.053982, - -2.17737,1.43641,-0.259095,0.00101255, - -2.51929,2.12931,-0.654743,0.0452381, - -2.86122,2.82221,-1.05039,0.0894636, - -2.72908,2.54506,-0.87834,0.0626188, - -2.6536,2.37954,-0.7665,0.0409117, - -2.58374,2.21923,-0.649738,0.0146791, - -2.49284,2.00346,-0.48457,-0.0255348, - -2.32762,1.60337,-0.1698,-0.105287, - -1.80149,0.316787,0.855414,-0.369652, - -2.60242,2.28418,-0.721378,0.040091, - -3.40335,4.25157,-2.29817,0.449834, - -3.0852,3.47341,-1.67791,0.28982, - -2.9642,3.17856,-1.44399,0.229852, - -2.89872,3.01966,-1.31861,0.197945, - -2.85668,2.91811,-1.23894,0.17783, - -2.82679,2.84621,-1.18287,0.163785, - -2.80401,2.79167,-1.14058,0.153278, - -2.78577,2.74819,-1.10706,0.145015, - -2.77061,2.7122,-1.07946,0.138267, - -2.75764,2.68152,-1.05606,0.132589, - -2.74627,2.65475,-1.03575,0.127695, - -2.73612,2.63093,-1.01777,0.123395, - -2.72692,2.6094,-1.00159,0.119553, - -2.71846,2.58968,-0.986841,0.116074, - -2.71061,2.57142,-0.973239,0.112887, - -2.70323,2.55434,-0.960573,0.109937, - -2.69626,2.53824,-0.948678,0.107185, - -2.68962,2.52294,-0.937429,0.104598, - -2.68327,2.50833,-0.926722,0.102151, - -2.67714,2.4943,-0.916477,0.0998223, - -2.67122,2.48076,-0.906627,0.0975966, - -2.66546,2.46764,-0.897118,0.0954599, - -2.65985,2.45489,-0.887903,0.0934011, + -2.80862,2.80104,-1.14615,0.154077, + -2.80862,2.80104,-1.14615,0.154077, + -2.80851,2.80078,-1.14595,0.154027, + -2.80832,2.80034,-1.14561,0.153945, + -2.80807,2.79973,-1.14514,0.153829, + -2.80774,2.79894,-1.14454,0.15368, + -2.80733,2.79798,-1.1438,0.153498, + -2.80685,2.79685,-1.14292,0.153284, + -2.8063,2.79554,-1.14192,0.153036, + -2.80568,2.79405,-1.14077,0.152756, + -2.80498,2.79239,-1.1395,0.152443, + -2.80421,2.79056,-1.13809,0.152098, + -2.80337,2.78856,-1.13656,0.151721, + -2.80246,2.78638,-1.13488,0.151312, + -2.80147,2.78404,-1.13308,0.150871, + -2.80041,2.78152,-1.13115,0.150397, + -2.79927,2.77882,-1.12908,0.149893, + -2.79807,2.77596,-1.12689,0.149356, + -2.79679,2.77292,-1.12456,0.148789, + -2.79543,2.76972,-1.12211,0.14819, + -2.79401,2.76634,-1.11953,0.14756, + -2.79251,2.76279,-1.11681,0.1469, + -2.79094,2.75907,-1.11397,0.146208, + -2.78929,2.75517,-1.111,0.145486, + -2.78757,2.7511,-1.10789,0.144733, + -2.78578,2.74686,-1.10466,0.14395, + -2.78391,2.74245,-1.1013,0.143137, + -2.78196,2.73786,-1.09781,0.142293, + -2.77994,2.73309,-1.09419,0.141419, + -2.77784,2.72814,-1.09043,0.140514, + -2.77566,2.72301,-1.08654,0.139578, + -2.7734,2.7177,-1.08252,0.138612, + -2.77106,2.7122,-1.07836,0.137614, + -2.76864,2.70651,-1.07406,0.136586, + -2.76613,2.70062,-1.06962,0.135525, + -2.76353,2.69453,-1.06503,0.134432, + -2.76084,2.68824,-1.0603,0.133307, + -2.75806,2.68173,-1.05541,0.132148, + -2.75518,2.675,-1.05037,0.130954, + -2.75219,2.66804,-1.04516,0.129725, + -2.7491,2.66084,-1.03978,0.12846, + -2.7459,2.65339,-1.03423,0.127156, + -2.74257,2.64566,-1.02848,0.125813, + -2.73912,2.63765,-1.02254,0.124428, + -2.73552,2.62934,-1.01638,0.122999, + -2.73178,2.62069,-1.01,0.121523, + -2.72787,2.61169,-1.00337,0.119996, + -2.72379,2.6023,-0.996479,0.118417, + -2.71951,2.59248,-0.989294,0.116778, + -2.71501,2.58218,-0.981786,0.115076, + -2.71026,2.57135,-0.97392,0.113303, + -2.70524,2.55991,-0.965651,0.111453, + -2.69989,2.54778,-0.956922,0.109514, + -2.69416,2.53484,-0.947666,0.107476, + -2.68799,2.52096,-0.937795,0.105324, + -2.68129,2.50596,-0.927197,0.103039, + -2.67394,2.48959,-0.915724,0.100597, + -2.66578,2.47153,-0.903179,0.097968, + -2.65657,2.4513,-0.889283,0.0951084, + -2.64598,2.42824,-0.873638,0.0919592, + -2.63347,2.40127,-0.855632,0.0884325, + -2.61813,2.36864,-0.834261,0.0843898, + -2.59821,2.32701,-0.807691,0.0795876, + -2.56971,2.26887,-0.77188,0.0735132, + -2.51823,2.16823,-0.713448,0.0645399, + -2.33537,1.8294,-0.533852,0.0409941, + -2.53143,2.14818,-0.670502,0.053982, + -2.17737,1.43641,-0.259095,0.00101255, + -2.51929,2.12931,-0.654743,0.0452381, + -2.86122,2.82221,-1.05039,0.0894636, + -2.72908,2.54506,-0.87834,0.0626188, + -2.6536,2.37954,-0.7665,0.0409117, + -2.58374,2.21923,-0.649738,0.0146791, + -2.49284,2.00346,-0.48457,-0.0255348, + -2.32762,1.60337,-0.1698,-0.105287, + -1.80149,0.316787,0.855414,-0.369652, + -2.60242,2.28418,-0.721378,0.040091, + -3.40335,4.25157,-2.29817,0.449834, + -3.0852,3.47341,-1.67791,0.28982, + -2.9642,3.17856,-1.44399,0.229852, + -2.89872,3.01966,-1.31861,0.197945, + -2.85668,2.91811,-1.23894,0.17783, + -2.82679,2.84621,-1.18287,0.163785, + -2.80401,2.79167,-1.14058,0.153278, + -2.78577,2.74819,-1.10706,0.145015, + -2.77061,2.7122,-1.07946,0.138267, + -2.75764,2.68152,-1.05606,0.132589, + -2.74627,2.65475,-1.03575,0.127695, + -2.73612,2.63093,-1.01777,0.123395, + -2.72692,2.6094,-1.00159,0.119553, + -2.71846,2.58968,-0.986841,0.116074, + -2.71061,2.57142,-0.973239,0.112887, + -2.70323,2.55434,-0.960573,0.109937, + -2.69626,2.53824,-0.948678,0.107185, + -2.68962,2.52294,-0.937429,0.104598, + -2.68327,2.50833,-0.926722,0.102151, + -2.67714,2.4943,-0.916477,0.0998223, + -2.67122,2.48076,-0.906627,0.0975966, + -2.66546,2.46764,-0.897118,0.0954599, + -2.65985,2.45489,-0.887903,0.0934011, -2.65437,2.44244,-0.878945,0.0914107 }; diff --git a/Source/Utils/WarpXMovingWindow.cpp b/Source/Utils/WarpXMovingWindow.cpp index a5ab7b18c..f84701a02 100644 --- a/Source/Utils/WarpXMovingWindow.cpp +++ b/Source/Utils/WarpXMovingWindow.cpp @@ -76,7 +76,7 @@ WarpX::MoveWindow (bool move_j) new_slice_lo[i] = current_slice_lo[i]; new_slice_hi[i] = current_slice_hi[i]; } - int num_shift_base_slice = static_cast<int> ((moving_window_x - + int num_shift_base_slice = static_cast<int> ((moving_window_x - current_slice_lo[dir]) / cdx[dir]); new_slice_lo[dir] = current_slice_lo[dir] + num_shift_base_slice*cdx[dir]; new_slice_hi[dir] = current_slice_hi[dir] + num_shift_base_slice*cdx[dir]; diff --git a/Source/Utils/WarpXUtil.H b/Source/Utils/WarpXUtil.H index 39fded8e8..fd6e72dc6 100644 --- a/Source/Utils/WarpXUtil.H +++ b/Source/Utils/WarpXUtil.H @@ -7,5 +7,5 @@ void ReadBoostedFrameParameters(amrex::Real& gamma_boost, amrex::Real& beta_boos void ConvertLabParamsToBoost(); -void NullifyMF(amrex::MultiFab& mf, int lev, amrex::Real zmin, +void NullifyMF(amrex::MultiFab& mf, int lev, amrex::Real zmin, amrex::Real zmax); diff --git a/Source/Utils/WarpXUtil.cpp b/Source/Utils/WarpXUtil.cpp index 19e898208..4b11eb69d 100644 --- a/Source/Utils/WarpXUtil.cpp +++ b/Source/Utils/WarpXUtil.cpp @@ -68,7 +68,7 @@ void ConvertLabParamsToBoost() BL_ASSERT(slice_lo.size() == AMREX_SPACEDIM); pp_slice.queryarr("dom_hi",slice_hi,0,AMREX_SPACEDIM); BL_ASSERT(slice_hi.size() == AMREX_SPACEDIM); - + pp_amr.query("max_level", max_level); if (max_level > 0){ @@ -113,7 +113,7 @@ void ConvertLabParamsToBoost() } -/* \brief Function that sets the value of MultiFab MF to zero for z between +/* \brief Function that sets the value of MultiFab MF to zero for z between * zmin and zmax. */ void NullifyMF(amrex::MultiFab& mf, int lev, amrex::Real zmin, amrex::Real zmax){ @@ -143,7 +143,7 @@ void NullifyMF(amrex::MultiFab& mf, int lev, amrex::Real zmin, amrex::Real zmax) const Real z_gridpoint = zmin_box+(k-lo_ind)*dz; #else const Real z_gridpoint = zmin_box+(j-lo_ind)*dz; -#endif +#endif if ( (z_gridpoint >= zmin) && (z_gridpoint < zmax) ) { arr(i,j,k) = 0.; }; diff --git a/Source/Utils/utils_ES.F90 b/Source/Utils/utils_ES.F90 index 887a5ef15..ce143bb94 100644 --- a/Source/Utils/utils_ES.F90 +++ b/Source/Utils/utils_ES.F90 @@ -16,9 +16,9 @@ contains integer, intent(in) :: lrat(3) real(amrex_real), intent(inout) :: crse(clo(1):chi(1),clo(2):chi(2),clo(3):chi(3)) real(amrex_real), intent(in) :: fine(flo(1):fhi(1),flo(2):fhi(2),flo(3):fhi(3)) - + integer :: i, j, k, ii, jj, kk - + do k = lo(3), hi(3) kk = k * lrat(3) do j = lo(2), hi(2) @@ -27,7 +27,7 @@ contains ii = i * lrat(1) crse(i,j,k) = fine(ii,jj,kk) + & ! These six fine nodes are shared by two coarse nodes... - 0.5d0 * (fine(ii-1,jj,kk) + fine(ii+1,jj,kk) + & + 0.5d0 * (fine(ii-1,jj,kk) + fine(ii+1,jj,kk) + & fine(ii,jj-1,kk) + fine(ii,jj+1,kk) + & fine(ii,jj,kk-1) + fine(ii,jj,kk+1)) + & ! ... these twelve are shared by four... @@ -59,16 +59,16 @@ contains integer, intent(in) :: lrat(2) real(amrex_real), intent(inout) :: crse(clo(1):chi(1),clo(2):chi(2)) real(amrex_real), intent(in) :: fine(flo(1):fhi(1),flo(2):fhi(2)) - + integer :: i, j, ii, jj - + do j = lo(2), hi(2) jj = j * lrat(2) do i = lo(1), hi(1) ii = i * lrat(1) crse(i,j) = fine(ii,jj) + & ! These four fine nodes are shared by two coarse nodes... - 0.5d0 * (fine(ii-1,jj) + fine(ii+1,jj) + & + 0.5d0 * (fine(ii-1,jj) + fine(ii+1,jj) + & fine(ii,jj-1) + fine(ii,jj+1)) + & ! ... and these four are shared by four... 0.25d0 * (fine(ii-1,jj-1) + fine(ii-1,jj+1) + & @@ -87,12 +87,12 @@ contains double precision, intent(inout) :: input_data(lo(1):hi(1),lo(2):hi(2),lo(3):hi(3)) double precision, intent(inout) :: bndry_data(lo(1)-1:hi(1)+1,lo(2)-1:hi(2)+1,lo(3)-1:hi(3)+1) integer(c_int), intent(in ) :: mask (lo(1):hi(1),lo(2):hi(2),lo(3):hi(3)) - + integer :: i, j, k - + do k = lo(3), hi(3) do j = lo(2), hi(2) - do i = lo(1), hi(1) + do i = lo(1), hi(1) if (mask(i,j,k) .eq. 1) then bndry_data(i,j,k) = input_data(i,j,k) input_data(i,j,k) = 0.d0 @@ -110,11 +110,11 @@ contains double precision, intent(inout) :: input_data(lo(1):hi(1),lo(2):hi(2)) double precision, intent(inout) :: bndry_data(lo(1)-1:hi(1)+1,lo(2)-1:hi(2)+1) integer(c_int), intent(in ) :: mask (lo(1):hi(1),lo(2):hi(2)) - + integer :: i, j - + do j = lo(2), hi(2) - do i = lo(1), hi(1) + do i = lo(1), hi(1) if (mask(i,j) .eq. 1) then bndry_data(i,j) = input_data(i,j) input_data(i,j) = 0.d0 @@ -145,7 +145,7 @@ contains end do end do end do - + if (total .gt. 0) then mask(i,j,k) = 1 else @@ -169,14 +169,14 @@ contains do j = lo(2), hi(2) do i = lo(1), hi(1) - + total = 0 do ii = i-ncells, i+ncells do jj = j-ncells, j+ncells total = total + tmp_mask(ii, jj) end do end do - + if (total .gt. 0) then mask(i,j) = 1 else diff --git a/Source/Utils/write_atomic_data_cpp.py b/Source/Utils/write_atomic_data_cpp.py index b085d50eb..1c85fa32c 100644 --- a/Source/Utils/write_atomic_data_cpp.py +++ b/Source/Utils/write_atomic_data_cpp.py @@ -60,7 +60,7 @@ for element in ion_names: '\n\s+(\d+)\s+\|\s+%s\s+\w+\s+\|\s+\+*(\d+)\s+\|\s+\(*\[*(\d+\.*\d*)' \ %element list_of_tuples = re.findall( regex_command, text_data ) - for count, energy in enumerate([x[2] for x in list_of_tuples]): + for count, energy in enumerate([x[2] for x in list_of_tuples]): if count%7==0: cpp_string += '\n ' cpp_string += energy + ', ' cpp_string = cpp_string[:-2] |