From dab488759b96f7c04c6db47910c4a074938c82cd Mon Sep 17 00:00:00 2001 From: ignis Date: Thu, 12 Aug 2021 03:50:07 +0900 Subject: [PATCH] implemented binning 2nd order dervative --- binning_ddxc_d2dxc_given_c_from_raw.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/binning_ddxc_d2dxc_given_c_from_raw.py b/binning_ddxc_d2dxc_given_c_from_raw.py index da95073..d5c82d6 100644 --- a/binning_ddxc_d2dxc_given_c_from_raw.py +++ b/binning_ddxc_d2dxc_given_c_from_raw.py @@ -121,23 +121,21 @@ cs = CompactScheme(nx, ny, nz, False, True, True, 4, 2, 2) # c mean at sampling x coordinates (verification purpose) cmean_verify = np.zeros(len(x_indices)) -avg_objs_u = [ConditionalMeanBinning(name=str(xi)) for xi in x_indices] avg_objs_ddxc = [ConditionalMeanBinning(name=str(xi)) for xi in x_indices] -avg_objs_uddxc = [ConditionalMeanBinning(name=str(xi)) for xi in x_indices] +avg_objs_d2dxc = [ConditionalMeanBinning(name=str(xi)) for xi in x_indices] for i, fname in enumerate(case.data_files[:n_timestep]): print(datetime.datetime.now(), '{:5d}/{}'.format(i+1, n_timestep), fname) fpath = os.path.join(case.case_root, fname) - time, u = case.read_single_field(fpath, u_idx) time, y = case.read_single_field(fpath, y_idx) c = (1. - y) ddxc = cs.ddx(c) + d2dxc = cs.d2dx(c) for j, xi in enumerate(x_indices): - avg_objs_u[j].feed_samples(c[:,:,xi], u[:,:,xi]) avg_objs_ddxc[j].feed_samples(c[:,:,xi], ddxc[:,:,xi]) - avg_objs_uddxc[j].feed_samples(c[:,:,xi], u[:,:,xi]*ddxc[:,:,xi]) + avg_objs_d2dxc[j].feed_samples(c[:,:,xi], d2dxc[:,:,xi]) cmean_verify[j] += np.sum(c[:,:,xi]) print(datetime.datetime.now(), 'Finished') @@ -149,17 +147,12 @@ for xi_cmean_pair in zip(x_indices, cmean_verify): print() print("Save the result") -for j, xi in enumerate(x_indices): - filename = "cavg_u_c_{}_{}".format(casename, avg_objs_u[j].name) - np.savez(filename, **avg_objs_u[j].average()) - print("saved ", filename) - for j, xi in enumerate(x_indices): filename = "cavg_ddxc_c_{}_{}".format(casename, avg_objs_ddxc[j].name) np.savez(filename, **avg_objs_ddxc[j].average()) print("saved ", filename) for j, xi in enumerate(x_indices): - filename = "cavg_uddxc_c_{}_{}".format(casename, avg_objs_uddxc[j].name) - np.savez(filename, **avg_objs_uddxc[j].average()) + filename = "cavg_d2dxc_c_{}_{}".format(casename, avg_objs_d2dxc[j].name) + np.savez(filename, **avg_objs_d2dxc[j].average()) print("saved ", filename)