diff --git a/Exercise sheet 9/latticescalar.py b/Exercise sheet 9/latticescalar.py index 475a65b..71b073f 100644 --- a/Exercise sheet 9/latticescalar.py +++ b/Exercise sheet 9/latticescalar.py @@ -91,18 +91,7 @@ def main(): else: output_filename = args.f - # Measure - # TODO: Does mean_magn need to be a list? - mean_magn = [] - phi_state = np.zeros((width,width,width,width)) - run_scalar_MH(phi_state,lamb,kappa,delta,equil_sweeps * num_sites) - magnetizations = np.empty(measurements) - for i in range(measurements): - run_scalar_MH(phi_state,lamb,kappa,delta,measure_sweeps * num_sites) - magnetizations[i] = np.mean(phi_state) - mean, err = batch_estimate(np.abs(magnetizations),lambda x:np.mean(x),10) - mean_magn.append([mean,err]) - + last_output_time = time.time() with h5py.File(output_filename,'a') as f: if not "mean-magn" in f: dataset = f.create_dataset("mean-magn", chunks=True, data=mean_magn) @@ -118,5 +107,17 @@ def main(): dataset.attrs["start time"] = starttime dataset.attrs["stop time"] = time.asctime() + # Measure + # TODO: Does mean_magn need to be a list? + mean_magn = [] + phi_state = np.zeros((width,width,width,width)) + run_scalar_MH(phi_state,lamb,kappa,delta,equil_sweeps * num_sites) + magnetizations = np.empty(measurements) + for i in range(measurements): + run_scalar_MH(phi_state,lamb,kappa,delta,measure_sweeps * num_sites) + magnetizations[i] = np.mean(phi_state) + mean, err = batch_estimate(np.abs(magnetizations),lambda x:np.mean(x),10) + mean_magn.append([mean,err]) + if __name__ == "__main__": main()