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

WIP implement teca_vertical_integral #354

Open
wants to merge 13 commits into
base: develop
Choose a base branch
from
Open

WIP implement teca_vertical_integral #354

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
ce7847f
Added initial draft of teca_vertical_integral. The vertical integrat…
taobrienlbl May 7, 2020
73c1b18
Merge branch 'develop' into wip_vertical_integral_alg
taobrienlbl May 8, 2020
137af36
Added some notes following a conversation w/ Burlen
taobrienlbl May 18, 2020
62d8fc9
Merge branch 'develop' into wip_vertical_integral_alg
taobrienlbl May 18, 2020
9d1b583
Merge branch 'wip_vertical_integral_alg' of https://github.com/LBL-EE…
taobrienlbl May 18, 2020
fb2b7b8
Added teca_vertical_integral.cxx to CMakeLists.txt; fixed a few TODOs…
taobrienlbl May 20, 2020
5edd479
Added variables to requests; created python binding
taobrienlbl Jun 9, 2020
8794989
Merge branch 'develop' into wip_vertical_integral_alg
taobrienlbl Jun 9, 2020
ebdf978
Further work on implementation; compiles, but fails w/ std::bad_cast;…
taobrienlbl Jun 10, 2020
9c8ce67
Uncommented vertical integration code; accidently left commented on l…
taobrienlbl Jun 10, 2020
f1aa90d
Fixed a number of segfaults; fixed cerr/endl namespace issues in a nu…
taobrienlbl Jun 10, 2020
1987147
Fixed request metadata bug; fixed array/netcdf type mismatch bug; val…
taobrienlbl Jun 11, 2020
bc96bd1
WIP - updated vertical integral for pressure levels
taobrienlbl Jul 27, 2020
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
1 change: 1 addition & 0 deletions alg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ set(teca_alg_cxx_srcs
teca_tc_wind_radii.cxx
teca_tc_trajectory.cxx
teca_temporal_average.cxx
teca_vertical_integral.cxx
teca_variant_array_operand.cxx
teca_vorticity.cxx
teca_dataset_diff.cxx
Expand Down
12 changes: 6 additions & 6 deletions alg/teca_2d_component_area.cxx
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,8 +163,8 @@ teca_metadata teca_2d_component_area::get_output_metadata(
const std::vector<teca_metadata> &input_md)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_2d_component_area::get_output_metadata" << endl;
std::cerr << teca_parallel_id()
<< "teca_2d_component_area::get_output_metadata" << std::endl;
#endif
(void) port;

Expand All @@ -179,8 +179,8 @@ std::vector<teca_metadata> teca_2d_component_area::get_upstream_request(
const teca_metadata &request)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_2d_component_area::get_upstream_request" << endl;
std::cerr << teca_parallel_id()
<< "teca_2d_component_area::get_upstream_request" << std::endl;
#endif
(void) port;
(void) input_md;
Expand Down Expand Up @@ -218,8 +218,8 @@ const_p_teca_dataset teca_2d_component_area::execute(
const teca_metadata &request)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_2d_component_area::execute" << endl;
std::cerr << teca_parallel_id()
<< "teca_2d_component_area::execute" << std::endl;
#endif
(void)port;
(void)request;
Expand Down
10 changes: 5 additions & 5 deletions alg/teca_bayesian_ar_detect.cxx
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -638,8 +638,8 @@ teca_metadata teca_bayesian_ar_detect::get_output_metadata(
unsigned int port, const std::vector<teca_metadata> &input_md)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_bayesian_ar_detect::get_output_metadata" << endl;
std::cerr << teca_parallel_id()
<< "teca_bayesian_ar_detect::get_output_metadata" << std::endl;
#endif
(void)port;

Expand Down Expand Up @@ -788,8 +788,8 @@ std::vector<teca_metadata> teca_bayesian_ar_detect::get_upstream_request(
const teca_metadata &request)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_bayesian_ar_detect::get_upstream_request" << endl;
std::cerr << teca_parallel_id()
<< "teca_bayesian_ar_detect::get_upstream_request" << std::endl;
#endif
(void) port;
(void) input_md;
Expand Down Expand Up @@ -830,7 +830,7 @@ const_p_teca_dataset teca_bayesian_ar_detect::execute(
const teca_metadata &request)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id() << "teca_bayesian_ar_detect::execute" << endl;
std::cerr << teca_parallel_id() << "teca_bayesian_ar_detect::execute" << std::endl;
#endif
(void)port;
(void)request;
Expand Down
8 changes: 4 additions & 4 deletions alg/teca_bayesian_ar_detect_parameters.cxx
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1001,8 +1001,8 @@ teca_metadata teca_bayesian_ar_detect_parameters::get_output_metadata(
unsigned int port, const std::vector<teca_metadata> &input_md)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_bayesian_ar_detect_parameters::get_output_metadata" << endl;
std::cerr << teca_parallel_id()
<< "teca_bayesian_ar_detect_parameters::get_output_metadata" << std::endl;
#endif
(void)port;
(void)input_md;
Expand All @@ -1016,8 +1016,8 @@ const_p_teca_dataset teca_bayesian_ar_detect_parameters::execute(unsigned int po
const teca_metadata &request)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_bayesian_ar_detect_parameters::execute" << endl;
std::cerr << teca_parallel_id()
<< "teca_bayesian_ar_detect_parameters::execute" << std::endl;
#endif
(void)port;
(void)input_data;
Expand Down
16 changes: 8 additions & 8 deletions alg/teca_binary_segmentation.cxx
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,8 +114,8 @@ void percentile_threshold(out_t *output, const in_t *input,
// compute high percentile
double high_percentile = (y1 - y0)*t_high + y0;

/*std::cerr << q_low << "th percentile is " << std::setprecision(10) << low_percentile << std::endl
<< q_high << "th percentile is " << std::setprecision(9) << high_percentile << std::endl;*/
/*std::std::cerr << q_low << "th percentile is " << std::setprecision(10) << low_percentile << std::std::endl
<< q_high << "th percentile is " << std::setprecision(9) << high_percentile << std::std::endl;*/

// apply thresholds
for (size_t i = 0; i < n_vals; ++i)
Expand Down Expand Up @@ -181,8 +181,8 @@ teca_metadata teca_binary_segmentation::get_output_metadata(
const std::vector<teca_metadata> &input_md)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_binary_segmentation::get_output_metadata" << endl;
std::cerr << teca_parallel_id()
<< "teca_binary_segmentation::get_output_metadata" << std::endl;
#endif
(void) port;

Expand Down Expand Up @@ -233,8 +233,8 @@ std::vector<teca_metadata> teca_binary_segmentation::get_upstream_request(
const teca_metadata &request)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_binary_segmentation::get_upstream_request" << endl;
std::cerr << teca_parallel_id()
<< "teca_binary_segmentation::get_upstream_request" << std::endl;
#endif
(void) port;
(void) input_md;
Expand Down Expand Up @@ -276,8 +276,8 @@ const_p_teca_dataset teca_binary_segmentation::execute(
const teca_metadata &request)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_binary_segmentation::execute" << endl;
std::cerr << teca_parallel_id()
<< "teca_binary_segmentation::execute" << std::endl;
#endif
(void)port;

Expand Down
12 changes: 6 additions & 6 deletions alg/teca_component_area_filter.cxx
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131,8 +131,8 @@ teca_metadata teca_component_area_filter::get_output_metadata(
const std::vector<teca_metadata> &input_md)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_component_area_filter::get_output_metadata" << endl;
std::cerr << teca_parallel_id()
<< "teca_component_area_filter::get_output_metadata" << std::endl;
#endif
(void) port;

Expand All @@ -156,8 +156,8 @@ std::vector<teca_metadata> teca_component_area_filter::get_upstream_request(
const teca_metadata &request)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_component_area_filter::get_upstream_request" << endl;
std::cerr << teca_parallel_id()
<< "teca_component_area_filter::get_upstream_request" << std::endl;
#endif
(void) port;
(void) input_md;
Expand Down Expand Up @@ -202,8 +202,8 @@ const_p_teca_dataset teca_component_area_filter::execute(
const teca_metadata &request)
{
#ifdef TECA_DEBUG
cerr << teca_parallel_id()
<< "teca_component_area_filter::execute" << endl;
std::cerr << teca_parallel_id()
<< "teca_component_area_filter::execute" << std::endl;
#endif
(void)port;

Expand Down
Loading