From 78875071c21d0ce0d590da40cfed8795eda4cfb4 Mon Sep 17 00:00:00 2001 From: David Date: Wed, 2 Dec 2015 09:39:46 -0600 Subject: [PATCH] changes since UIUC move --- CMakeLists.txt | 0 FindMatplotlib.cmake | 0 FindPyQt4.cmake | 0 README.md | 0 cube27.pos | 0 cyl3000fvp5.pos | 0 cylslab3000.pos | 0 etaGold.txt | 0 etaSilver.txt | 0 etaSilverAnalytic.txt | 0 etaSilverPalik.txt | 0 mpidefs-parallel.f90 | 0 mpidefs-serial.f90 | 0 msinput.inp | 0 mstm-generic-main-v2.2.f90 | 0 mstm-gui.py | 11 ++++------- mstm-intrinsics.f90 | 0 mstm-main-v2.2.f90 | 0 mstm-manual-2011-v2.2.pdf | Bin 1946171 -> 0 bytes mstm-modules-v2.2.f90 | 0 mstm_gallery.pdf | Bin 26747347 -> 0 bytes mstm_guiwindow.ui | 0 mstm_materials.py | 0 mstm_parameters.py | 0 mstm_simparser.py | 219 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---------------------------------------------------------------------------------------------------------- spectralOut.txt | 0 26 files changed, 117 insertions(+), 113 deletions(-) mode change 100755 => 100644 CMakeLists.txt mode change 100755 => 100644 FindMatplotlib.cmake mode change 100755 => 100644 FindPyQt4.cmake mode change 100755 => 100644 README.md mode change 100755 => 100644 cube27.pos mode change 100755 => 100644 cyl3000fvp5.pos mode change 100755 => 100644 cylslab3000.pos mode change 100755 => 100644 etaGold.txt mode change 100755 => 100644 etaSilver.txt mode change 100755 => 100644 etaSilverAnalytic.txt mode change 100755 => 100644 etaSilverPalik.txt mode change 100755 => 100644 mpidefs-parallel.f90 mode change 100755 => 100644 mpidefs-serial.f90 mode change 100755 => 100644 msinput.inp mode change 100755 => 100644 mstm-generic-main-v2.2.f90 mode change 100755 => 100644 mstm-gui.py mode change 100755 => 100644 mstm-intrinsics.f90 mode change 100755 => 100644 mstm-main-v2.2.f90 mode change 100755 => 100644 mstm-manual-2011-v2.2.pdf mode change 100755 => 100644 mstm-modules-v2.2.f90 mode change 100755 => 100644 mstm_gallery.pdf mode change 100755 => 100644 mstm_guiwindow.ui mode change 100755 => 100644 mstm_materials.py mode change 100755 => 100644 mstm_parameters.py mode change 100755 => 100644 mstm_simparser.py mode change 100755 => 100644 spectralOut.txt diff --git a/CMakeLists.txt b/CMakeLists.txt old mode 100755 new mode 100644 index e3fc7d0..e3fc7d0 --- a/CMakeLists.txt +++ b/CMakeLists.txt diff --git a/FindMatplotlib.cmake b/FindMatplotlib.cmake old mode 100755 new mode 100644 index dff486f..dff486f --- a/FindMatplotlib.cmake +++ b/FindMatplotlib.cmake diff --git a/FindPyQt4.cmake b/FindPyQt4.cmake old mode 100755 new mode 100644 index 37f645e..37f645e --- a/FindPyQt4.cmake +++ b/FindPyQt4.cmake diff --git a/README.md b/README.md old mode 100755 new mode 100644 index 010696a..010696a --- a/README.md +++ b/README.md diff --git a/cube27.pos b/cube27.pos old mode 100755 new mode 100644 index 24cb00d..24cb00d --- a/cube27.pos +++ b/cube27.pos diff --git a/cyl3000fvp5.pos b/cyl3000fvp5.pos old mode 100755 new mode 100644 index b5c5b14..b5c5b14 --- a/cyl3000fvp5.pos +++ b/cyl3000fvp5.pos diff --git a/cylslab3000.pos b/cylslab3000.pos old mode 100755 new mode 100644 index b5c5b14..b5c5b14 --- a/cylslab3000.pos +++ b/cylslab3000.pos diff --git a/etaGold.txt b/etaGold.txt old mode 100755 new mode 100644 index d657cc1..d657cc1 --- a/etaGold.txt +++ b/etaGold.txt diff --git a/etaSilver.txt b/etaSilver.txt old mode 100755 new mode 100644 index 95894d0..95894d0 --- a/etaSilver.txt +++ b/etaSilver.txt diff --git a/etaSilverAnalytic.txt b/etaSilverAnalytic.txt old mode 100755 new mode 100644 index 75e28cf..75e28cf --- a/etaSilverAnalytic.txt +++ b/etaSilverAnalytic.txt diff --git a/etaSilverPalik.txt b/etaSilverPalik.txt old mode 100755 new mode 100644 index 2ffcab2..2ffcab2 --- a/etaSilverPalik.txt +++ b/etaSilverPalik.txt diff --git a/mpidefs-parallel.f90 b/mpidefs-parallel.f90 old mode 100755 new mode 100644 index 6f3bf02..6f3bf02 --- a/mpidefs-parallel.f90 +++ b/mpidefs-parallel.f90 diff --git a/mpidefs-serial.f90 b/mpidefs-serial.f90 old mode 100755 new mode 100644 index 454f11d..454f11d --- a/mpidefs-serial.f90 +++ b/mpidefs-serial.f90 diff --git a/msinput.inp b/msinput.inp old mode 100755 new mode 100644 index 6abca35..6abca35 --- a/msinput.inp +++ b/msinput.inp diff --git a/mstm-generic-main-v2.2.f90 b/mstm-generic-main-v2.2.f90 old mode 100755 new mode 100644 index 6ead9a5..6ead9a5 --- a/mstm-generic-main-v2.2.f90 +++ b/mstm-generic-main-v2.2.f90 diff --git a/mstm-gui.py b/mstm-gui.py old mode 100755 new mode 100644 index 04f787e..83ced7a --- a/mstm-gui.py +++ b/mstm-gui.py @@ -42,6 +42,7 @@ class GuiWindow(QtGui.QMainWindow): self.ui.spinRadius.setValue(self.params.a) def getParams(self): + #get the parameters from the GUI and store them in the params structure self.params.minLambda = self.ui.spinStartLambda.value() self.params.maxLambda = self.ui.spinEndLambda.value() self.params.snapshotLambda = self.ui.spinNearFieldLambda.value() @@ -276,15 +277,11 @@ def RunSimulation(spectralSim = True): parameters['real_ref_index_scale_factor'] = n.real parameters['imag_ref_index_scale_factor'] = n.imag parameters['length_scale_factor'] = (2.0 * 3.14159)/l + #parameters['length_scale_factor'] = 1.0/l parameters['scattering_plane_angle_deg'] = gamma; parameters['near_field_output_data'] = 0 #parameters['number_spheres'] = 1 - #a = parameters.a; - #d = parameters.d; - #parameters.clearSpheres() - #parameters.addSphere(a, -(d + 2*a)/2, 0, 0) - #parameters.addSphere(a, (d + 2*a)/2, 0, 0) #save the scripted input file parameters.saveFile(l, 'scriptParams.inp') @@ -303,8 +300,8 @@ def RunSimulation(spectralSim = True): if parameters['calculate_near_field']: results.parseNearField('nf-temp.dat') - #get the scattering amplitude matrix - results.calcScatteringAmp() + #get the scattering amplitude matrix + results.calcScatteringAmp() #update the progress bar diff --git a/mstm-intrinsics.f90 b/mstm-intrinsics.f90 old mode 100755 new mode 100644 index f63abab..f63abab --- a/mstm-intrinsics.f90 +++ b/mstm-intrinsics.f90 diff --git a/mstm-main-v2.2.f90 b/mstm-main-v2.2.f90 old mode 100755 new mode 100644 index 0f68fbb..0f68fbb --- a/mstm-main-v2.2.f90 +++ b/mstm-main-v2.2.f90 diff --git a/mstm-manual-2011-v2.2.pdf b/mstm-manual-2011-v2.2.pdf old mode 100755 new mode 100644 index f0456ae..f0456ae Binary files a/mstm-manual-2011-v2.2.pdf and b/mstm-manual-2011-v2.2.pdf differ diff --git a/mstm-modules-v2.2.f90 b/mstm-modules-v2.2.f90 old mode 100755 new mode 100644 index 0c34d6b..0c34d6b --- a/mstm-modules-v2.2.f90 +++ b/mstm-modules-v2.2.f90 diff --git a/mstm_gallery.pdf b/mstm_gallery.pdf old mode 100755 new mode 100644 index ab6b60e..ab6b60e Binary files a/mstm_gallery.pdf and b/mstm_gallery.pdf differ diff --git a/mstm_guiwindow.ui b/mstm_guiwindow.ui old mode 100755 new mode 100644 index aed2101..aed2101 --- a/mstm_guiwindow.ui +++ b/mstm_guiwindow.ui diff --git a/mstm_materials.py b/mstm_materials.py old mode 100755 new mode 100644 index 712e5fe..712e5fe --- a/mstm_materials.py +++ b/mstm_materials.py diff --git a/mstm_parameters.py b/mstm_parameters.py old mode 100755 new mode 100644 index 89bd3bc..89bd3bc --- a/mstm_parameters.py +++ b/mstm_parameters.py diff --git a/mstm_simparser.py b/mstm_simparser.py old mode 100755 new mode 100644 index 5fd282e..c0b9837 --- a/mstm_simparser.py +++ b/mstm_simparser.py @@ -3,49 +3,49 @@ from pylab import * class SimParserClass: - simResults = dict() - - sxNearField = 0 - syNearField = 0 - intersectedNearField = 0 - - #near field data - gridNearField = [] - maxNearField = [] - - #the stokes matrix is read from the output - stokesMatrix = [] - scatAmpMatrix = [] - + simResults = dict() + + sxNearField = 0 + syNearField = 0 + intersectedNearField = 0 + + #near field data + gridNearField = [] + maxNearField = [] + + #the stokes matrix is read from the output + stokesMatrix = [] + scatAmpMatrix = [] + - def __init__(self, parameters): - - self.params = parameters; - - self.simResults['lambda'] = list() + def __init__(self, parameters): + + self.params = parameters; + + self.simResults['lambda'] = list() - self.simResults['extinction_unpolarized'] = list() - self.simResults['extinction_parallel'] = list() - self.simResults['extinction_perpendicular'] = list() - self.simResults['extinction_total'] = list() - self.simResults['detector_field'] = list() - - self.gridNearField = [] - self.maxNearField = [] - - - def parseSimFile(self, l, fileName): - self.simResults['lambda'].append(l) - inFile = open(fileName, 'r') + self.simResults['extinction_unpolarized'] = list() + self.simResults['extinction_parallel'] = list() + self.simResults['extinction_perpendicular'] = list() + self.simResults['extinction_total'] = list() + self.simResults['detector_field'] = list() + + self.gridNearField = [] + self.maxNearField = [] + + + def parseSimFile(self, l, fileName): + self.simResults['lambda'].append(l) + inFile = open(fileName, 'r') - - while True: - - line = inFile.readline().strip() + + while True: + + line = inFile.readline().strip() #if the simulation is for a single plane wave - if int(self.params['fixed_or_random_orientation']) == 0: - if line == 'scattering matrix elements': + if int(self.params['fixed_or_random_orientation']) == 0: + if line == 'scattering matrix elements': #empty the stokes matrix self.stokesMatrix = [] inFile.readline() @@ -53,53 +53,54 @@ class SimParserClass: values = map(float, inFile.readline().strip().split()) self.stokesMatrix.append(values) break; - elif line == 'unpolarized total ext, abs, scat efficiencies, w.r.t. xv, and asym. parm': - values = inFile.readline().strip().split(' ') - self.simResults['extinction_unpolarized'].append(values[0]) - elif line == 'parallel total ext, abs, scat efficiencies': - values = inFile.readline().strip().split(' ') - self.simResults['extinction_parallel'].append(values[0]) - elif line == 'perpendicular total ext, abs, scat efficiencies': - values = inFile.readline().strip().split(' ') - self.simResults['extinction_perpendicular'].append(values[0]) - - #if the simulation is for random orientations - else: - if line == 'scattering matrix elements': - break - elif line == 'total ext, abs, scat efficiencies, w.r.t. xv, and asym. parm': - values = inFile.readline().strip().split(' ') - self.simResults['extinction_total'].append(values[0]) - - def parseNearField(self, fileName): - - inFile = open(fileName, 'r') - - #get the size of the near field grid - line = inFile.readline().strip() - self.sxNearField, self.syNearField = map(int, line.split()) - - #get the number of spheres that are intersected - line = inFile.readline().strip() - self.intersectedNearField = int(line) - - #process intersections here----------- - + elif line == 'unpolarized total ext, abs, scat efficiencies, w.r.t. xv, and asym. parm': + values = inFile.readline().strip().split(' ') + self.simResults['extinction_unpolarized'].append(values[0]) + elif line == 'parallel total ext, abs, scat efficiencies': + values = inFile.readline().strip().split(' ') + self.simResults['extinction_parallel'].append(values[0]) + elif line == 'perpendicular total ext, abs, scat efficiencies': + values = inFile.readline().strip().split(' ') + self.simResults['extinction_perpendicular'].append(values[0]) + + #if the simulation is for random orientations + else: + if line == 'scattering matrix elements': + break + elif line == 'total ext, abs, scat efficiencies, w.r.t. xv, and asym. parm': + values = inFile.readline().strip().split(' ') + self.simResults['extinction_total'].append(values[0]) + + def parseNearField(self, fileName): + + inFile = open(fileName, 'r') + + #get the size of the near field grid + line = inFile.readline().strip() + self.sxNearField, self.syNearField = map(int, line.split()) + + #get the number of spheres that are intersected + line = inFile.readline().strip() + self.intersectedNearField = int(line) + + #process intersections here----------- + - #get the field values - self.gridNearField = [] - for y in range(self.syNearField): - self.gridNearField.append([]) - for x in range(self.sxNearField): - line = inFile.readline().strip() - values = map(float, line.split()) - self.gridNearField[y].append(values[2]) - - E = array(self.gridNearField) - self.maxNearField.append(abs(E).max()) - - #calculate and return the scattering amplitude matrix - def calcScatteringAmp(self): + #get the field values + self.gridNearField = [] + for y in range(self.syNearField): + self.gridNearField.append([]) + for x in range(self.sxNearField): + line = inFile.readline().strip() + values = map(float, line.split()) + self.gridNearField[y].append(values[2]) + + E = array(self.gridNearField) + #the enhancement is E^4 (so (E^2)^2) + self.maxNearField.append(pow(abs(E).max(), 2)) + + #calculate and return the scattering amplitude matrix + def calcScatteringAmp(self): #compute the number of entries in the stokes matrix nEntries = len(self.stokesMatrix) @@ -122,29 +123,35 @@ class SimParserClass: E = [S[0], S[2]] self.simResults['detector_field'].append(E) print(E) - + - def saveFile(self, fileName): - outFile = open(fileName, 'w') - outFile.write(str(self)) - outFile.close() + def saveFile(self, fileName): + outFile = open(fileName, 'w') + outFile.write(str(self)) + outFile.close() - def __getitem__(self, key): - return self.simResults[key]; + def __getitem__(self, key): + return self.simResults[key]; - def __str__(self): - result = ''; + def __str__(self): + result = ''; - for i in range(len(self.simResults['lambda'])): - result += str(self.simResults['lambda'][i]) - result += '\t' + str(self.simResults['extinction_unpolarized'][i]) - result += '\t' + str(self.simResults['extinction_parallel'][i]) - result += '\t' + str(self.simResults['extinction_perpendicular'][i]) - result += '\t' + str(self.simResults['detector_field'][i][0]) + '\t' + str(self.simResults['detector_field'][i][1]) - - #parse the near field if it is included in the simulation - #if int(parameters['calculate_near_field']) == 1: - # result += '\t' + str(maxNearField) - - result += '\n' - return result + for i in range(len(self.simResults['lambda'])): + result += str(self.simResults['lambda'][i]) + if int(self.params['fixed_or_random_orientation']) == 0: + result += '\t' + str(self.simResults['extinction_unpolarized'][i]) + result += '\t' + str(self.simResults['extinction_parallel'][i]) + result += '\t' + str(self.simResults['extinction_perpendicular'][i]) + else: + result += '\t' + str(self.simResults['extinction_total'][i]) + + #result += '\t' + str(self.simResults['detector_field'][i][0]) + '\t' + str(self.simResults['detector_field'][i][1]) + + + + #parse the near field if it is included in the simulation + #if int(parameters['calculate_near_field']) == 1: + # result += '\t' + str(maxNearField) + + result += '\n' + return result diff --git a/spectralOut.txt b/spectralOut.txt old mode 100755 new mode 100644 index e69de29..e69de29 --- a/spectralOut.txt +++ b/spectralOut.txt -- libgit2 0.21.4