Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update QBO amplitude calculation #816

Closed
wants to merge 1 commit into from
Closed

Update QBO amplitude calculation #816

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 10 additions & 9 deletions e3sm_diags/driver/qbo_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,12 +129,12 @@ def get_psd_from_deseason(xraw, period_new):
# Calculate the period as a function of frequency
period0 = 1 / sampling_frequency
L0 = len(xraw)
NFFT0 = 2 ** ceil_log2(L0)
NFFT0 = L0

# Apply fft on x_deseasoned with n = NFFT
x0 = scipy.fftpack.fft(x_deseasoned, n=NFFT0) / L0
# Frequency (cycles/month). Frequency will be increasing.
frequency0 = sampling_frequency * np.arange(0, (NFFT0 / 2 + 1)) / NFFT0
frequency0 = (sampling_frequency/2)*np.linspace(0, 1, int(NFFT0 / 2)+1)
# Period (months/cycle). Calculate as a function of frequency. Thus, period will be decreasing.
period0 = 1 / frequency0

Expand All @@ -151,9 +151,12 @@ def get_psd_from_deseason(xraw, period_new):
amplitude0_flipped = amplitude0[::-1]
psd_x0_flipped = psd_x0[::-1]

amplitude_new0 = np.interp(
period_new, period0_flipped[:-1], amplitude0_flipped[:-1]
)
amplitude_new0 = np.zeros(len(period_new))
for i in range(len(period0_flipped)):
for j in range(len(period_new)):
if (period_new[j]>=period0_flipped[i]-1) and (period_new[j]<period0_flipped[i]+1):
amplitude_new0[j]=amplitude_new0[j]+amplitude0_flipped[i]

psd_x_new0 = np.interp(period_new, period0_flipped[:-1], psd_x0_flipped[:-1])
return psd_x_new0, amplitude_new0

Expand Down Expand Up @@ -204,9 +207,7 @@ def run_diag(parameter: QboParameter) -> QboParameter:
x_test = process_u_for_power_spectral_density(test_region)
x_ref = process_u_for_power_spectral_density(ref_region)
# Calculate the PSD and interpolate to period_new. Specify periods to plot
period_new = np.concatenate(
(np.arange(2.0, 33.0), np.arange(34.0, 100.0, 2.0)), axis=0
)
period_new = np.arange(2,51,2)
test["psd_x_new"], test["amplitude_new"] = get_psd_from_deseason(
x_test, period_new
)
Expand Down Expand Up @@ -263,7 +264,7 @@ def run_diag(parameter: QboParameter) -> QboParameter:
json_dict = test_json
else:
json_dict = ref_json
json.dump(json_dict, outfile)
json.dump(json_dict, outfile, default=str)
# Get the file name that the user has passed in and display that.
json_output_file_name = os.path.join(
utils.general.get_output_dir(parameter.current_set, parameter),
Expand Down
Loading