ECC-1467: Make grib_power() a template function

2023-06-13 14:09:52 +00:00 · 2023-06-13 14:09:52 +00:00 · e8e4beb5c7
parent a12e9114a8
commit e8e4beb5c7
30 changed files with 33 additions and 32 deletions
--- a/src/functions.cc
+++ b/src/functions.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"

 long grib_op_eq(long a, long b)
--- a/src/grib_accessor_class_apply_operators.cc
+++ b/src/grib_accessor_class_apply_operators.cc
@ -8,8 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-
-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"
 /*
 This is used by make_class.pl
--- a/src/grib_accessor_class_bufr_data_array.cc
+++ b/src/grib_accessor_class_bufr_data_array.cc
@ -7,7 +7,7 @@
 * In applying this licence, ECMWF does not waive the privileges and immunities granted to it by
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */
-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"

 /*
--- a/src/grib_accessor_class_bufr_elements_table.cc
+++ b/src/grib_accessor_class_bufr_elements_table.cc
@ -12,7 +12,7 @@
 *  Enrico Fucile
 ****************************************/

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"

 #if GRIB_PTHREADS
--- a/src/grib_accessor_class_data_2order_packing.cc
+++ b/src/grib_accessor_class_data_2order_packing.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"

 /*
--- a/src/grib_accessor_class_data_apply_bitmap.cc
+++ b/src/grib_accessor_class_data_apply_bitmap.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_value.h"

 /*
   This is used by make_class.pl
--- a/src/grib_accessor_class_data_ccsds_packing.cc
+++ b/src/grib_accessor_class_data_ccsds_packing.cc
@ -8,7 +8,8 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_bits_any_endian_simple.h"
+#include "grib_scaling.h"

 /*
   This is used by make_class.pl
--- a/src/grib_accessor_class_data_complex_packing.cc
+++ b/src/grib_accessor_class_data_complex_packing.cc
@ -8,8 +8,8 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_cpp.h"
-#include "grib_api_internal_cpp.h"
+#include "grib_ieeefloat.h"
+#include "grib_scaling.h"
 #include <math.h>
 /*
   This is used by make_class.pl
--- a/src/grib_accessor_class_data_g1second_order_constant_width_packing.cc
+++ b/src/grib_accessor_class_data_g1second_order_constant_width_packing.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"

 /*
--- a/src/grib_accessor_class_data_g1second_order_general_extended_packing.cc
+++ b/src/grib_accessor_class_data_g1second_order_general_extended_packing.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"
 #include "grib_optimize_decimal_factor.h"

--- a/src/grib_accessor_class_data_g1second_order_general_packing.cc
+++ b/src/grib_accessor_class_data_g1second_order_general_packing.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"
 #include <type_traits>

--- a/src/grib_accessor_class_data_g1second_order_row_by_row_packing.cc
+++ b/src/grib_accessor_class_data_g1second_order_row_by_row_packing.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"

 /*
--- a/src/grib_accessor_class_data_g1simple_packing.cc
+++ b/src/grib_accessor_class_data_g1simple_packing.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"

 /*
--- a/src/grib_accessor_class_data_g22order_packing.cc
+++ b/src/grib_accessor_class_data_g22order_packing.cc
@ -9,7 +9,7 @@
 */


-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"
 #include <type_traits>

--- a/src/grib_accessor_class_data_g2bifourier_packing.cc
+++ b/src/grib_accessor_class_data_g2bifourier_packing.cc
@ -12,7 +12,7 @@
 *   philippe.marguinaud@meteo.fr
 *******************************/

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"
 #include "grib_optimize_decimal_factor.h"
 #include <math.h>
--- a/src/grib_accessor_class_data_g2simple_packing.cc
+++ b/src/grib_accessor_class_data_g2simple_packing.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"

 /*
--- a/src/grib_accessor_class_data_jpeg2000_packing.cc
+++ b/src/grib_accessor_class_data_jpeg2000_packing.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"

 /*
--- a/src/grib_accessor_class_data_png_packing.cc
+++ b/src/grib_accessor_class_data_png_packing.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"
 #define PNG_ANYBITS

--- a/src/grib_accessor_class_data_raw_packing.cc
+++ b/src/grib_accessor_class_data_raw_packing.cc
@ -11,7 +11,7 @@
 *  Enrico Fucile
 ****************************/

-#include "grib_api_internal_cpp.h"
+#include "grib_ieeefloat.h"

 #define PRE_PROCESSING_NONE 0
 #define PRE_PROCESSING_DIFFERENCE 1
--- a/src/grib_accessor_class_data_run_length_packing.cc
+++ b/src/grib_accessor_class_data_run_length_packing.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"

 /*
--- a/src/grib_accessor_class_data_sh_packed.cc
+++ b/src/grib_accessor_class_data_sh_packed.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"
 #include <math.h>
 /*
--- a/src/grib_accessor_class_data_sh_unpacked.cc
+++ b/src/grib_accessor_class_data_sh_unpacked.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"
 #include <math.h>
 /*
--- a/src/grib_accessor_class_data_simple_packing.cc
+++ b/src/grib_accessor_class_data_simple_packing.cc
@ -8,7 +8,8 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
+#include "grib_bits_any_endian_simple.h"
 #include "grib_optimize_decimal_factor.h"
 #include <float.h>

--- a/src/grib_accessor_class_expanded_descriptors.cc
+++ b/src/grib_accessor_class_expanded_descriptors.cc
@ -15,7 +15,7 @@
   can appear
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"
 /*
 This is used by make_class.pl
--- a/src/grib_accessor_class_gen.cc
+++ b/src/grib_accessor_class_gen.cc
@ -14,9 +14,9 @@
 *   Shahram Najm                                                          *
 ***************************************************************************/
 #include "grib_api_internal.h"
+#include "grib_value.h"
 #include <limits>
 #include <cassert>
-#include "grib_api_internal_cpp.h"

 /*
   This is used by make_class.pl
--- a/src/grib_accessor_class_second_order_bits_per_value.cc
+++ b/src/grib_accessor_class_second_order_bits_per_value.cc
@ -12,7 +12,7 @@
 *  Enrico Fucile
 **********************************/

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"
 /*
   This is used by make_class.pl
--- a/src/grib_accessor_class_simple_packing_error.cc
+++ b/src/grib_accessor_class_simple_packing_error.cc
@ -13,7 +13,7 @@
 **************************************/


-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"
 /*
   This is used by make_class.pl
--- a/src/grib_bufr_descriptor.cc
+++ b/src/grib_bufr_descriptor.cc
@ -9,7 +9,7 @@
 */


-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"

 bufr_descriptor* grib_bufr_descriptor_new(grib_accessor* tables_accessor, int code, int silent, int* err)
--- a/src/grib_optimize_decimal_factor.cc
+++ b/src/grib_optimize_decimal_factor.cc
@ -8,7 +8,7 @@
 * virtue of its status as an intergovernmental organisation nor does it submit to any jurisdiction.
 */

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"
 #include "grib_optimize_decimal_factor.h"
 #include <math.h>
--- a/src/grib_scaling.cc
+++ b/src/grib_scaling.cc
@ -12,7 +12,7 @@
 *  Enrico Fucile
 **************************************/

-#include "grib_api_internal_cpp.h"
+#include "grib_scaling.h"
 #include "grib_api_internal.h"

 long grib_get_binary_scale_fact(double max, double min, long bpval, int* ret)