Merger makefiles etc

data/bufr/CMakeLists.txt

@@ -0,0 +1,152 @@
+# Download all the BUFR grib data from website
+#
+set(bufr_files_to_download
+   aaen_55.bufr
+   aben_55.bufr
+   ahws_139.bufr
+   airc_142.bufr
+   airc_144.bufr
+   airs_57.bufr
+   alws_139.bufr
+   amda_144.bufr
+   amsa_55.bufr
+   amsb_55.bufr
+   amse_55.bufr
+   amsu_55.bufr
+   amv2_87.bufr
+   amv3_87.bufr
+   asbh_139.bufr
+   asbl_139.bufr
+   asca_139.bufr
+   asch_139.bufr
+   ascs_139.bufr
+   aseh_139.bufr
+   asel_139.bufr
+   ashs_139.bufr
+   atap_55.bufr
+   ateu_155.bufr
+   atms_201.bufr
+   atov_55.bufr
+   avhm_87.bufr
+   avhn_87.bufr
+   avhr_58.bufr
+   b002_95.bufr
+   b002_96.bufr
+   b003_56.bufr
+   b004_145.bufr
+   b005_87.bufr
+   b005_89.bufr
+   b006_96.bufr
+   b007_31.bufr
+   bssh_170.bufr
+   bssh_176.bufr
+   bssh_178.bufr
+   bssh_180.bufr
+   btem_109.bufr
+   buoy_27.bufr
+   cmwi_87.bufr
+   cmwn_87.bufr
+   cnow_28.bufr
+   cori_156.bufr
+   crit_202.bufr
+   csrh_189.bufr
+   emsg_189.bufr
+   emsg_87.bufr
+   euwv_87.bufr
+   fy3a_154.bufr
+   fy3b_154.bufr
+   g2nd_208.bufr
+   g2to_206.bufr
+   go15_87.bufr
+   goee_87.bufr
+   goes_87.bufr
+   goga_89.bufr
+   gosat.bufr
+   grst_26.bufr
+   gsd1_208.bufr
+   gsd2_208.bufr
+   gsd3_208.bufr
+   gst4_26.bufr
+   hirb_55.bufr
+   hirs_55.bufr
+   ias1_240.bufr
+   iasi_241.bufr
+   ifco_208.bufr
+   ikco_217.bufr
+   itrg_208.bufr
+   itwt_233.bufr
+   j2eo_216.bufr
+   j2nb_216.bufr
+   jaso_214.bufr
+   kond_209.bufr
+   maer_207.bufr
+   meta_140.bufr
+   mhen_55.bufr
+   mhsa_55.bufr
+   mhsb_55.bufr
+   mhse_55.bufr
+   mloz_206.bufr
+   modi_87.bufr
+   modw_87.bufr
+   monw_87.bufr
+   nomi_206.bufr
+   nos1_208.bufr
+   nos2_208.bufr
+   nos3_208.bufr
+   nos4_208.bufr
+   nos5_208.bufr
+   nos6_208.bufr
+   nos7_208.bufr
+   nos8_208.bufr
+   ocea_131.bufr
+   ocea_132.bufr
+   ocea_133.bufr
+   ocea_21.bufr
+   pgps_110.bufr
+   pilo_91.bufr
+   rada_250.bufr
+   rado_250.bufr
+   s4kn_165.bufr
+   sb19_206.bufr
+   sbu8_206.bufr
+   ship_11.bufr
+   ship_12.bufr
+   ship_13.bufr
+   ship_14.bufr
+   ship_19.bufr
+   ship_9.bufr
+   smin_49.bufr
+   smis_49.bufr
+   smiu_49.bufr
+   smos_203.bufr
+   sn4k_165.bufr
+   soil_7.bufr
+   ssbt_127.bufr
+   stuk_7.bufr
+   syno_1.bufr
+   syno_2.bufr
+   syno_3.bufr
+   syno_4.bufr
+   temp_101.bufr
+   temp_102.bufr
+   temp_106.bufr
+   tmr7_129.bufr
+   tros_31.bufr
+   wavb_134.bufr
+)
+
+foreach (f ${bufr_files_to_download})
+  set(tgt bufr_data_${f})
+  # Download the file and create a dummy target for it
+  ecbuild_get_test_data(TARGET "${tgt}"
+                        NAME   "${f}"
+                        DIRNAME ${PROJECT_NAME}/data/bufr
+                        NOCHECK)
+  
+  # Add to list of targets
+  LIST(APPEND tgts "${tgt}")
+endforeach()
+
+add_custom_target( get_bufr_gribs DEPENDS ${tgts} )
+add_dependencies( check get_bufr_gribs )
+

src/Makefile.am

@@ -35,11 +35,6 @@ libgrib_api_la_prototypes= \
 	action_class_when.c \
 	action_class_concept.c \
     action_class_hash_array.c \
-	action_class_assert.c \
-	action_class_template.c \
-	action_class_trigger.c \
-	action_class_when.c \
-	action_class_hash_array.c \
 	action_class_set.c \
 	action_class_set_darray.c \
 	action_class_set_iarray.c \

src/grib_api_prototypes.h

@@ -81,13 +81,6 @@ int grib_concept_apply(grib_handle *h, grib_action *act, const char *name);
 grib_action *grib_action_create_hash_array(grib_context *context, const char *name, grib_hash_array_value *hash_array, const char *basename, const char *name_space, const char *defaultkey, const char *masterDir, const char *localDir, const char *ecmfDir, int flags, int nofail);
 grib_hash_array_value *get_hash_array(grib_handle *h, grib_action *a);
 
-/* action_class_assert.c */
-grib_action *grib_action_create_assert(grib_context *context, grib_expression *expression);
-
-/* action_class_template.c */
-grib_action *grib_action_create_template(grib_context *context, int nofail, const char *name, const char *arg1);
-GRIB_INLINE grib_action *get_empty_template(grib_context *c, int *err);
-
 /* action_class_trigger.c */
 grib_action *grib_action_create_trigger(grib_context *context, grib_arguments *args, grib_action *block);