Skip to content

Commit

Permalink
Merge pull request #207 from NREL/bnb/cond_mom_simplification
Browse files Browse the repository at this point in the history
combined conditional moments and wind conditional moments.
  • Loading branch information
bnb32 authored Apr 8, 2024
2 parents c754191 + 491cdec commit 8c124ae
Show file tree
Hide file tree
Showing 3 changed files with 33 additions and 406 deletions.
8 changes: 6 additions & 2 deletions sup3r/preprocessing/conditional_moment_batch_handling.py
Original file line number Diff line number Diff line change
Expand Up @@ -416,7 +416,9 @@ def make_output(
HR is high-res and LR is low-res
"""
# Remove first moment from HR and square it
out = model_mom1._tf_generate(low_res).numpy()
exo_data = model_mom1.get_high_res_exo_input(high_res)
out = model_mom1._tf_generate(low_res, exo_data).numpy()
out = model_mom1._combine_loss_input(high_res, out)
return (high_res - out) ** 2


Expand Down Expand Up @@ -530,7 +532,9 @@ def make_output(
SF = HR - LR
"""
# Remove LR and first moment from HR and square it
out = model_mom1._tf_generate(low_res).numpy()
exo_data = model_mom1.get_high_res_exo_input(high_res)
out = model_mom1._tf_generate(low_res, exo_data).numpy()
out = model_mom1._combine_loss_input(high_res, out)
enhanced_lr = spatial_simple_enhancing(low_res, s_enhance=s_enhance)
enhanced_lr = temporal_simple_enhancing(
enhanced_lr, t_enhance=t_enhance, mode=t_enhance_mode
Expand Down
377 changes: 0 additions & 377 deletions sup3r/preprocessing/wind_conditional_moment_batch_handling.py

This file was deleted.

Loading

0 comments on commit 8c124ae

Please sign in to comment.