Commit b1dc5fd4 authored by Daniel Brown's avatar Daniel Brown
Browse files

setting default nc order for ROQ to be 8 for now

parent 3fcf2ac0
......@@ -74,15 +74,15 @@ a = aperturemap("flat", (N,N), (dx,dx), R)
smap = read_map(mapname)
smap.interpolate(x, x)
smap.data *= 0
mm = mergedmap("flat", (N,N), (halfMapSamples,halfMapSamples), (dx,dx), 1)
mm.addMap(a)
#mm.addMap(a)
mm.addMap(smap)
NCs = [0, 1, 4, 10]
NCs = [0, 1, 5, 10]
w = {}
ww = {}
for NCo in NCs:
w[NCo] = mm.generateROMWeights("%s.p" % EIFilename, verbose=True, newtonCotesOrder=NCo)
......@@ -90,15 +90,16 @@ for NCo in NCs:
qx = pykat.beam_param(w0=w0.mean(), z=z.mean())
qy = qx
mode_i = (14,14)
mode_o = (14,14)
mode_i = (0,0)
mode_o = (0,0)
for NCo in NCs:
fwx = newton_weights(x, NCo)
fw_xy = np.outer(fwx, fwx) * mm.z_xy()
k = square_aperture_HG_knm(mode_i, mode_o, qx, R)
ROQ = ROM_HG_knm(w[NCo], mode_i, mode_o, qx, qx, qy, qy)
NC = dx**2 * np.einsum('ij,ij', fw_xy, np.outer(u_star_u_mm(qx.z, qx.w0, mode_i[0], mode_o[0], x), u_star_u_mm(qy.z, qy.w0, mode_i[1], mode_o[1], x)))
print(NCo, abs(ROQ-NC))
print(NCo, k, ROQ, NC, abs(ROQ-k), abs(NC-k), abs(ROQ-NC))
......@@ -385,7 +385,7 @@ class mergedmap:
else:
return z_xy * self.weighting
def generateROMWeights(self, EIxFilename, EIyFilename=None, verbose=False, interpolate=False, newtonCotesOrder=0):
def generateROMWeights(self, EIxFilename, EIyFilename=None, verbose=False, interpolate=False, newtonCotesOrder=8):
if interpolate == True:
# Use EI nodes to interpolate if we
with open(EIxFilename, 'rb') as f:
......@@ -408,6 +408,7 @@ class mergedmap:
self.interpolate(nx, ny)
self._rom_weights = makeWeightsNew(self, EIxFilename, EIyFilename, verbose=verbose, newtonCotesOrderMapWeight=newtonCotesOrder)
return self.ROMWeights
def interpolate(self, nx, ny, **kwargs):
......
......@@ -799,7 +799,7 @@ def MakeROMFromHDF5(hdf5Filename, greedyFilename=None, EIFilename=None, tol=1e-1
return EI
def makeWeightsNew(smap, EIxFilename, EIyFilename=None, verbose=True, newtonCotesOrderMapWeight=1):
def makeWeightsNew(smap, EIxFilename, EIyFilename=None, verbose=True, newtonCotesOrderMapWeight=8):
with open("%s" % EIxFilename, 'rb') as f:
EIx = pickle.load(f)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment