From 85238529ef0b696e9e32a583b242055648f07aef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Thu, 31 Jan 2013 15:39:40 +0100 Subject: [PATCH] Build system fixes to handle new Ert version p4#: 20319 --- ThirdParty/Ert/README | 273 ++++ .../devel/CMake/Modules/UseMultiArch.cmake | 42 + ThirdParty/Ert/devel/CMake/ert_check.cmake | 109 ++ ThirdParty/Ert/devel/CMake/ert_find.cmake | 68 + ThirdParty/Ert/devel/CMake/python.cmake | 20 + ThirdParty/Ert/devel/CMakeLists.txt | 289 +--- ThirdParty/Ert/devel/debian/README.Debian | 11 +- ThirdParty/Ert/devel/debian/README.source | 9 - ThirdParty/Ert/devel/debian/changelog | 2 +- ThirdParty/Ert/devel/debian/control | 12 +- ThirdParty/Ert/devel/debian/copyright | 28 +- ThirdParty/Ert/devel/debian/docs | 1 - .../Ert/devel/debian/libert-dev.install | 1 - .../{libert-dev.dirs => libert.ecl-dev.dirs} | 0 .../Ert/devel/debian/libert.ecl-dev.install | 2 + .../debian/{libert1.dirs => libert.ecl1.dirs} | 0 .../Ert/devel/debian/libert.ecl1.install | 1 + ThirdParty/Ert/devel/debian/libert1.install | 1 - .../Ert/devel/libanalysis/CMakeLists.txt | 12 +- .../ert/analysis}/analysis_module.h | 2 +- .../ert/analysis}/analysis_table.h | 4 +- .../{src => include/ert/analysis}/cv_enkf.h | 4 +- .../ert/analysis}/enkf_linalg.h | 6 +- .../ert/analysis}/fwd_step_enkf.h | 4 +- .../ert/analysis}/rml_enkf_common.h | 0 .../{src => include/ert/analysis}/std_enkf.h | 4 +- .../Ert/devel/libanalysis/src/CMakeLists.txt | 12 +- .../Ert/devel/libanalysis/src/SConscript | 48 - .../devel/libanalysis/src/analysis_module.c | 11 +- .../devel/libanalysis/src/bootstrap_enkf.c | 20 +- .../Ert/devel/libanalysis/src/cv_enkf.c | 18 +- .../Ert/devel/libanalysis/src/enkf_linalg.c | 10 +- .../Ert/devel/libanalysis/src/ert_module | 6 +- .../Ert/devel/libanalysis/src/fwd_step_enkf.c | 22 +- .../Ert/devel/libanalysis/src/null_enkf.c | 18 +- .../Ert/devel/libanalysis/src/rml_enkf.c | 20 +- .../devel/libanalysis/src/rml_enkf_common.c | 16 +- .../devel/libanalysis/src/rml_enkf_imodel.c | 20 +- .../Ert/devel/libanalysis/src/sqrt_enkf.c | 16 +- .../Ert/devel/libanalysis/src/std_enkf.c | 16 +- ThirdParty/Ert/devel/libconfig/CMakeLists.txt | 4 - .../{src => include/ert/config}/conf.h | 19 +- .../{src => include/ert/config}/conf_data.h | 0 .../{src => include/ert/config}/conf_util.h | 0 .../{src => include/ert/config}/config.h | 5 +- .../Ert/devel/libconfig/src/CMakeLists.txt | 12 +- ThirdParty/Ert/devel/libconfig/src/conf.c | 15 +- .../Ert/devel/libconfig/src/conf_data.c | 8 +- .../Ert/devel/libconfig/src/conf_util.c | 8 +- ThirdParty/Ert/devel/libconfig/src/config.c | 18 +- .../Ert/devel/libconfig/src/dependencies | 5 - ThirdParty/Ert/devel/libecl/CMakeLists.txt | 15 +- .../devel/libecl/applications/CMakeLists.txt | 111 +- .../Ert/devel/libecl/applications/convert.c | 12 +- .../Ert/devel/libecl/applications/ecl_pack.c | 15 +- .../devel/libecl/applications/ecl_quantile.c | 18 +- .../Ert/devel/libecl/applications/ens_plot.c | 36 +- .../devel/libecl/applications/grdecl_grid.c | 9 +- .../devel/libecl/applications/grdecl_test.c | 6 +- .../Ert/devel/libecl/applications/grid_dump.c | 4 +- .../libecl/applications/grid_dump_ascii.c | 4 +- .../Ert/devel/libecl/applications/grid_info.c | 6 +- .../devel/libecl/applications/kw_extract.c | 25 +- .../Ert/devel/libecl/applications/kw_list.c | 9 +- .../Ert/devel/libecl/applications/load_test.c | 6 +- .../Ert/devel/libecl/applications/make_grid.c | 4 +- .../devel/libecl/applications/select_test.c | 6 +- .../Ert/devel/libecl/applications/sum_write.c | 12 +- .../devel/libecl/applications/summary2csv.c | 6 +- .../devel/libecl/applications/view_summary.c | 8 +- .../Ert/devel/libecl/cxx/src/CMakeLists.txt | 2 +- .../libecl/{src => include/ert/ecl}/ecl_box.h | 8 +- .../ert/ecl}/ecl_coarse_cell.h | 0 .../ert/ecl}/ecl_endian_flip.h | 0 .../{src => include/ert/ecl}/ecl_file.h | 8 +- .../{src => include/ert/ecl}/ecl_file_kw.h | 4 +- .../{src => include/ert/ecl}/ecl_grav.h | 6 +- .../{src => include/ert/ecl}/ecl_grav_calc.h | 6 +- .../ert/ecl}/ecl_grav_common.h | 4 +- .../{src => include/ert/ecl}/ecl_grid.h | 10 +- .../{src => include/ert/ecl}/ecl_grid_cache.h | 2 +- .../{src => include/ert/ecl}/ecl_init_file.h | 6 +- .../{src => include/ert/ecl}/ecl_intehead.h | 3 +- .../{src => include/ert/ecl}/ecl_io_config.h | 0 .../libecl/{src => include/ert/ecl}/ecl_kw.h | 8 +- .../{src => include/ert/ecl}/ecl_kw_grdecl.h | 0 .../{src => include/ert/ecl}/ecl_kw_magic.h | 0 .../{src => include/ert/ecl}/ecl_region.h | 8 +- .../{src => include/ert/ecl}/ecl_rft_file.h | 8 +- .../{src => include/ert/ecl}/ecl_rft_node.h | 2 +- .../{src => include/ert/ecl}/ecl_rst_file.h | 0 .../{src => include/ert/ecl}/ecl_smspec.h | 6 +- .../{src => include/ert/ecl}/ecl_subsidence.h | 6 +- .../libecl/{src => include/ert/ecl}/ecl_sum.h | 12 +- .../{src => include/ert/ecl}/ecl_sum_data.h | 10 +- .../{src => include/ert/ecl}/ecl_sum_index.h | 0 .../{src => include/ert/ecl}/ecl_sum_tstep.h | 6 +- .../{src => include/ert/ecl}/ecl_util.h | 3 +- .../libecl/{src => include/ert/ecl}/fortio.h | 0 .../libecl/{src => include/ert/ecl}/point.h | 0 .../{src => include/ert/ecl}/smspec_node.h | 2 +- .../{src => include/ert/ecl}/tetrahedron.h | 0 .../Ert/devel/libecl/src/CMakeLists.txt | 15 +- ThirdParty/Ert/devel/libecl/src/ecl_box.c | 9 +- .../Ert/devel/libecl/src/ecl_coarse_cell.c | 10 +- ThirdParty/Ert/devel/libecl/src/ecl_file.c | 24 +- ThirdParty/Ert/devel/libecl/src/ecl_file_kw.c | 12 +- ThirdParty/Ert/devel/libecl/src/ecl_grav.c | 26 +- .../Ert/devel/libecl/src/ecl_grav_calc.c | 13 +- .../Ert/devel/libecl/src/ecl_grav_common.c | 14 +- ThirdParty/Ert/devel/libecl/src/ecl_grid.c | 67 +- .../Ert/devel/libecl/src/ecl_grid_cache.c | 12 +- .../Ert/devel/libecl/src/ecl_init_file.c | 10 +- .../Ert/devel/libecl/src/ecl_intehead.c | 10 +- .../Ert/devel/libecl/src/ecl_io_config.c | 9 +- ThirdParty/Ert/devel/libecl/src/ecl_kw.c | 12 +- .../Ert/devel/libecl/src/ecl_kw_grdecl.c | 6 +- ThirdParty/Ert/devel/libecl/src/ecl_region.c | 22 +- .../Ert/devel/libecl/src/ecl_rft_file.c | 21 +- .../Ert/devel/libecl/src/ecl_rft_node.c | 16 +- .../Ert/devel/libecl/src/ecl_rst_file.c | 26 +- ThirdParty/Ert/devel/libecl/src/ecl_smspec.c | 26 +- .../Ert/devel/libecl/src/ecl_subsidence.c | 26 +- ThirdParty/Ert/devel/libecl/src/ecl_sum.c | 28 +- .../Ert/devel/libecl/src/ecl_sum_data.c | 29 +- .../Ert/devel/libecl/src/ecl_sum_index.c | 2 +- .../Ert/devel/libecl/src/ecl_sum_tstep.c | 12 +- ThirdParty/Ert/devel/libecl/src/ecl_util.c | 13 +- ThirdParty/Ert/devel/libecl/src/fortio.c | 5 +- ThirdParty/Ert/devel/libecl/src/point.c | 4 +- ThirdParty/Ert/devel/libecl/src/smspec_node.c | 26 +- ThirdParty/Ert/devel/libecl/src/tetrahedron.c | 8 +- .../Ert/devel/libecl/tests/CMakeLists.txt | 2 +- .../Ert/devel/libecl/tests/ecl_coarse_test.c | 83 +- .../Ert/devel/libecl/tests/ecl_lgr_test.c | 5 +- .../Ert/devel/libecl/tests/ecl_restart_test.c | 5 +- .../Ert/devel/libecl_well/CMakeLists.txt | 8 + .../applications/CMakeLists.txt | 5 +- .../applications/well_info_test.c | 41 +- .../include/ert/ecl_well}/well_branch.h | 2 +- .../include/ert/ecl_well}/well_conn.h | 3 +- .../include/ert/ecl_well}/well_const.h | 0 .../include/ert/ecl_well}/well_info.h | 7 +- .../include/ert/ecl_well}/well_path.h | 5 +- .../include/ert/ecl_well}/well_state.h | 8 +- .../include/ert/ecl_well}/well_ts.h | 2 +- .../Ert/devel/libecl_well/src/CMakeLists.txt | 19 + .../src/well_branch.c | 10 +- .../{libwell => libecl_well}/src/well_conn.c | 8 +- .../{libwell => libecl_well}/src/well_info.c | 35 +- .../{libwell => libecl_well}/src/well_path.c | 12 +- .../{libwell => libecl_well}/src/well_state.c | 29 +- .../{libwell => libecl_well}/src/well_ts.c | 12 +- ThirdParty/Ert/devel/libenkf/CMakeLists.txt | 20 +- .../applications/ert_gui/share/doc/kręsj.txt | 5 + .../applications/ert_tui/CMakeLists.txt | 4 +- .../applications/ert_tui/enkf_tui_QC.c | 67 +- .../applications/ert_tui/enkf_tui_analysis.c | 24 +- .../applications/ert_tui/enkf_tui_export.c | 24 +- .../applications/ert_tui/enkf_tui_fs.c | 20 +- .../applications/ert_tui/enkf_tui_init.c | 43 +- .../applications/ert_tui/enkf_tui_misc.c | 17 +- .../applications/ert_tui/enkf_tui_plot.c | 57 +- .../applications/ert_tui/enkf_tui_plot.h | 6 +- .../applications/ert_tui/enkf_tui_plot_rft.c | 57 +- .../applications/ert_tui/enkf_tui_plot_util.c | 58 +- .../applications/ert_tui/enkf_tui_plot_util.h | 5 +- .../applications/ert_tui/enkf_tui_ranking.c | 17 +- .../applications/ert_tui/enkf_tui_run.c | 25 +- .../applications/ert_tui/enkf_tui_simple.c | 26 +- .../applications/ert_tui/enkf_tui_table.c | 31 +- .../applications/ert_tui/enkf_tui_util.c | 21 +- .../applications/ert_tui/enkf_tui_util.h | 10 +- .../applications/ert_tui/ert_tui_jobs.c | 5 +- .../devel/libenkf/applications/ert_tui/main.c | 20 +- .../ert/enkf}/README.new_type.h | 0 .../ert/enkf}/README.new_type_config.h | 0 .../{src => include/ert/enkf}/active_config.h | 0 .../{src => include/ert/enkf}/active_list.h | 2 +- .../{src => include/ert/enkf}/active_node.h | 0 .../ert/enkf}/analysis_config.h | 13 +- .../ert/enkf}/block_fs_driver.h | 5 +- .../{src => include/ert/enkf}/block_obs.h | 20 +- .../{src => include/ert/enkf}/config_keys.h | 0 .../{src => include/ert/enkf}/config_parser.h | 0 .../{src => include/ert/enkf}/container.h | 2 +- .../ert/enkf}/container_config.h | 4 +- .../{src => include/ert/enkf}/data_ranking.h | 5 +- .../{src => include/ert/enkf}/ecl_config.h | 12 +- .../{src => include/ert/enkf}/ecl_static_kw.h | 12 +- .../ert/enkf}/ecl_static_kw_config.h | 0 .../libenkf/{src => include/ert/enkf}/enkf.h | 0 .../{src => include/ert/enkf}/enkf_analysis.h | 9 +- .../ert/enkf}/enkf_config_node.h | 16 +- .../ert/enkf}/enkf_config_private.h | 0 .../{src => include/ert/enkf}/enkf_defaults.h | 0 .../{src => include/ert/enkf}/enkf_fs.h | 22 +- .../{src => include/ert/enkf}/enkf_fs_type.h | 0 .../{src => include/ert/enkf}/enkf_macros.h | 20 +- .../{src => include/ert/enkf}/enkf_main.h | 58 +- .../ert/enkf}/enkf_main_update.h | 0 .../{src => include/ert/enkf}/enkf_node.h | 32 +- .../{src => include/ert/enkf}/enkf_obs.h | 22 +- .../plot => include/ert/enkf}/enkf_plot_arg.h | 0 .../ert/enkf}/enkf_plot_data.h | 8 +- .../ert/enkf}/enkf_plot_member.h | 10 +- .../{src => include/ert/enkf}/enkf_sched.h | 18 +- .../libenkf/include/ert/enkf/enkf_serialize.h | 58 + .../{src => include/ert/enkf}/enkf_state.h | 46 +- .../{src => include/ert/enkf}/enkf_types.h | 2 +- .../{src => include/ert/enkf}/enkf_util.h | 11 +- .../ert/enkf}/ensemble_config.h | 14 +- .../{src => include/ert/enkf}/ert_report.h | 0 .../ert/enkf}/ert_report_list.h | 4 +- .../{src => include/ert/enkf}/ert_template.h | 4 +- .../libenkf/{src => include/ert/enkf}/field.h | 17 +- .../{src => include/ert/enkf}/field_common.h | 0 .../{src => include/ert/enkf}/field_config.h | 23 +- .../{src => include/ert/enkf}/field_trans.h | 0 .../{src => include/ert/enkf}/fs_driver.h | 9 +- .../{src => include/ert/enkf}/fs_types.h | 0 .../{src => include/ert/enkf}/gen_common.h | 12 +- .../{src => include/ert/enkf}/gen_data.h | 16 +- .../ert/enkf}/gen_data_common.h | 0 .../ert/enkf}/gen_data_config.h | 14 +- .../{src => include/ert/enkf}/gen_kw.h | 14 +- .../{src => include/ert/enkf}/gen_kw_common.h | 0 .../{src => include/ert/enkf}/gen_kw_config.h | 12 +- .../{src => include/ert/enkf}/gen_obs.h | 9 +- .../{src => include/ert/enkf}/local_config.h | 13 +- .../{src => include/ert/enkf}/local_context.h | 14 +- .../{src => include/ert/enkf}/local_dataset.h | 0 .../ert/enkf}/local_ministep.h | 12 +- .../{src => include/ert/enkf}/local_obsset.h | 3 +- .../ert/enkf}/local_updatestep.h | 2 +- .../{src => include/ert/enkf}/meas_data.h | 5 +- .../{src => include/ert/enkf}/member_config.h | 21 +- .../ert/enkf}/misfit_ensemble.h | 10 +- .../ert/enkf}/misfit_ensemble_typedef.h | 0 .../{src => include/ert/enkf}/misfit_member.h | 3 +- .../ert/enkf}/misfit_ranking.h | 8 +- .../{src => include/ert/enkf}/misfit_ts.h | 0 .../{src => include/ert/enkf}/model_config.h | 21 +- .../{src => include/ert/enkf}/obs_data.h | 12 +- .../{src => include/ert/enkf}/obs_vector.h | 25 +- .../{src => include/ert/enkf}/plain_driver.h | 3 +- .../ert/enkf}/plain_driver_obs.h | 0 .../{src => include/ert/enkf}/plot_config.h | 2 +- .../{src => include/ert/enkf}/qc_config.h | 2 +- .../ert/enkf}/ranking_common.h | 0 .../{src => include/ert/enkf}/ranking_table.h | 3 +- .../{src => include/ert/enkf}/rng_config.h | 5 +- .../{src => include/ert/enkf}/scalar_config.h | 0 .../{src => include/ert/enkf}/site_config.h | 8 +- .../{src => include/ert/enkf}/summary.h | 13 +- .../ert/enkf}/summary_config.h | 8 +- .../{src => include/ert/enkf}/summary_obs.h | 23 +- .../{src => include/ert/enkf}/surface.h | 7 +- .../ert/enkf}/surface_config.h | 5 +- .../{src => include/ert/enkf}/time_map.h | 1 + .../{src => include/ert/enkf}/trans_func.h | 6 +- .../Ert/devel/libenkf/src/CMakeLists.txt | 20 +- .../libenkf/src/README.new_type_config.c | 28 - .../Ert/devel/libenkf/src/active_config.c | 69 - .../Ert/devel/libenkf/src/active_list.c | 12 +- .../Ert/devel/libenkf/src/analysis_config.c | 18 +- .../Ert/devel/libenkf/src/block_fs_driver.c | 23 +- ThirdParty/Ert/devel/libenkf/src/block_obs.c | 34 +- .../Ert/devel/libenkf/src/config_parser.c | 269 ---- ThirdParty/Ert/devel/libenkf/src/container.c | 14 +- .../Ert/devel/libenkf/src/container_config.c | 8 +- .../Ert/devel/libenkf/src/data_ranking.c | 24 +- ThirdParty/Ert/devel/libenkf/src/ecl_config.c | 27 +- .../Ert/devel/libenkf/src/ecl_static_kw.c | 16 +- .../Ert/devel/libenkf/src/enkf_analysis.c | 1217 +---------------- .../Ert/devel/libenkf/src/enkf_config_node.c | 42 +- .../Ert/devel/libenkf/src/enkf_defaults.c | 2 +- ThirdParty/Ert/devel/libenkf/src/enkf_fs.c | 34 +- ThirdParty/Ert/devel/libenkf/src/enkf_main.c | 129 +- ThirdParty/Ert/devel/libenkf/src/enkf_node.c | 35 +- ThirdParty/Ert/devel/libenkf/src/enkf_obs.c | 34 +- .../libenkf/src/{plot => }/enkf_plot_arg.c | 8 +- .../libenkf/src/{plot => }/enkf_plot_data.c | 16 +- .../libenkf/src/{plot => }/enkf_plot_member.c | 10 +- ThirdParty/Ert/devel/libenkf/src/enkf_sched.c | 16 +- .../Ert/devel/libenkf/src/enkf_serialize.c | 10 +- .../Ert/devel/libenkf/src/enkf_serialize.h | 54 - ThirdParty/Ert/devel/libenkf/src/enkf_state.c | 80 +- ThirdParty/Ert/devel/libenkf/src/enkf_types.c | 6 +- ThirdParty/Ert/devel/libenkf/src/enkf_util.c | 14 +- .../Ert/devel/libenkf/src/ensemble_config.c | 71 +- ThirdParty/Ert/devel/libenkf/src/ert_report.c | 12 +- .../Ert/devel/libenkf/src/ert_report_list.c | 18 +- .../Ert/devel/libenkf/src/ert_template.c | 14 +- ThirdParty/Ert/devel/libenkf/src/field.c | 30 +- .../Ert/devel/libenkf/src/field_config.c | 26 +- .../Ert/devel/libenkf/src/field_trans.c | 7 +- ThirdParty/Ert/devel/libenkf/src/fs_driver.c | 7 +- ThirdParty/Ert/devel/libenkf/src/fs_types.c | 7 +- ThirdParty/Ert/devel/libenkf/src/gen_common.c | 13 +- ThirdParty/Ert/devel/libenkf/src/gen_data.c | 34 +- .../Ert/devel/libenkf/src/gen_data_config.c | 24 +- ThirdParty/Ert/devel/libenkf/src/gen_kw.c | 24 +- .../Ert/devel/libenkf/src/gen_kw_config.c | 23 +- ThirdParty/Ert/devel/libenkf/src/gen_obs.c | 26 +- .../Ert/devel/libenkf/src/local_config.c | 39 +- .../Ert/devel/libenkf/src/local_context.c | 18 +- .../Ert/devel/libenkf/src/local_dataset.c | 17 +- .../Ert/devel/libenkf/src/local_ministep.c | 17 +- .../Ert/devel/libenkf/src/local_obsset.c | 12 +- .../Ert/devel/libenkf/src/local_updatestep.c | 15 +- ThirdParty/Ert/devel/libenkf/src/meas_data.c | 14 +- .../Ert/devel/libenkf/src/member_config.c | 19 +- .../Ert/devel/libenkf/src/misfit_ensemble.c | 24 +- .../Ert/devel/libenkf/src/misfit_member.c | 8 +- .../Ert/devel/libenkf/src/misfit_ranking.c | 26 +- ThirdParty/Ert/devel/libenkf/src/misfit_ts.c | 8 +- .../Ert/devel/libenkf/src/model_config.c | 36 +- ThirdParty/Ert/devel/libenkf/src/obs_data.c | 16 +- ThirdParty/Ert/devel/libenkf/src/obs_vector.c | 38 +- .../Ert/devel/libenkf/src/plain_driver.c | 15 +- .../Ert/devel/libenkf/src/plot/SConstruct | 1 - .../Ert/devel/libenkf/src/plot_config.c | 10 +- ThirdParty/Ert/devel/libenkf/src/qc_config.c | 8 +- .../Ert/devel/libenkf/src/ranking_table.c | 30 +- ThirdParty/Ert/devel/libenkf/src/rng_config.c | 17 +- .../Ert/devel/libenkf/src/site_config.c | 29 +- .../devel/libenkf/src/sqlite3_driver_test.c | 71 - ThirdParty/Ert/devel/libenkf/src/summary.c | 26 +- .../Ert/devel/libenkf/src/summary_config.c | 16 +- .../Ert/devel/libenkf/src/summary_obs.c | 14 +- ThirdParty/Ert/devel/libenkf/src/surface.c | 21 +- .../Ert/devel/libenkf/src/surface_config.c | 12 +- ThirdParty/Ert/devel/libenkf/src/time_map.c | 8 +- ThirdParty/Ert/devel/libenkf/src/trans_func.c | 13 +- .../Ert/devel/libenkf/src/uncle_sam_100.h | 110 -- .../devel/libenkf/src/well_config_private.h | 32 - .../Ert/devel/libert_util/CMakeLists.txt | 13 +- .../libert_util/applications/matrix_test.c | 7 +- .../include/ert/util/CMakeLists.txt | 22 + .../{src => include/ert/util}/arg_pack.h | 4 +- .../{src => include/ert/util}/atomic.h | 0 .../{src => include/ert/util}/block_fs.h | 6 +- .../{src => include/ert/util}/buffer.h | 3 +- .../{src => include/ert/util}/hash.h | 9 +- .../{src => include/ert/util}/hash_node.h | 2 +- .../{src => include/ert/util}/hash_sll.h | 2 +- .../{src => include/ert/util}/lars.h | 3 +- .../{src => include/ert/util}/latex.h | 0 .../{src => include/ert/util}/log.h | 0 .../{src => include/ert/util}/lookup_table.h | 2 +- .../{src => include/ert/util}/matrix.h | 6 +- .../{src => include/ert/util}/matrix_blas.h | 3 +- .../{src => include/ert/util}/matrix_lapack.h | 2 +- .../{src => include/ert/util}/menu.h | 0 .../{src => include/ert/util}/msg.h | 3 +- .../{src => include/ert/util}/msvc_stdbool.h | 2 +- .../{src => include/ert/util}/mzran.h | 2 +- .../{src => include/ert/util}/node_ctype.h | 0 .../{src => include/ert/util}/node_data.h | 0 .../{src => include/ert/util}/parser.h | 2 +- .../{src => include/ert/util}/path_fmt.h | 3 +- .../{src => include/ert/util}/regression.h | 2 +- .../{src => include/ert/util}/rng.h | 2 +- .../{src => include/ert/util}/set.h | 1 - .../{src => include/ert/util}/ssize_t.h | 0 .../{src => include/ert/util}/statistics.h | 2 +- .../{src => include/ert/util}/stepwise.h | 4 +- .../{src => include/ert/util}/stringlist.h | 6 +- .../{src => include/ert/util}/subst_func.h | 2 +- .../{src => include/ert/util}/subst_list.h | 4 +- .../{src => include/ert/util}/template.h | 3 +- .../libert_util/include/ert/util/test_util.h | 74 + .../{src => include/ert/util}/thread_pool.h | 0 .../{src => include/ert/util}/thread_pool1.h | 0 .../ert/util}/thread_pool_posix.h | 0 .../{src => include/ert/util}/timer.h | 0 .../{src => include/ert/util}/type_macros.h | 0 .../{src => include/ert/util}/util.h | 0 .../{src => include/ert/util}/util_endian.h | 0 .../{src => include/ert/util}/util_env.h | 0 .../{src => include/ert/util}/util_fork.h | 0 .../{src => include/ert/util}/vector.h | 4 +- .../ert/util}/vector_template.h | 4 +- .../Ert/devel/libert_util/src/CMakeLists.txt | 29 +- .../Ert/devel/libert_util/src/all_include.h | 44 - .../Ert/devel/libert_util/src/arg_pack.c | 6 +- .../Ert/devel/libert_util/src/block_fs.c | 14 +- ThirdParty/Ert/devel/libert_util/src/buffer.c | 10 +- .../Ert/devel/libert_util/src/conf_new.c | 803 ----------- .../Ert/devel/libert_util/src/conf_new.h | 49 - ThirdParty/Ert/devel/libert_util/src/hash.c | 12 +- .../Ert/devel/libert_util/src/hash_node.c | 7 +- .../Ert/devel/libert_util/src/hash_sll.c | 6 +- ThirdParty/Ert/devel/libert_util/src/lars.c | 14 +- ThirdParty/Ert/devel/libert_util/src/latex.c | 4 +- ThirdParty/Ert/devel/libert_util/src/log.c | 4 +- .../Ert/devel/libert_util/src/lookup_table.c | 8 +- ThirdParty/Ert/devel/libert_util/src/matrix.c | 10 +- .../Ert/devel/libert_util/src/matrix_blas.c | 6 +- .../Ert/devel/libert_util/src/matrix_lapack.c | 6 +- ThirdParty/Ert/devel/libert_util/src/menu.c | 8 +- ThirdParty/Ert/devel/libert_util/src/msg.c | 6 +- ThirdParty/Ert/devel/libert_util/src/mzran.c | 6 +- .../Ert/devel/libert_util/src/node_ctype.c | 4 +- .../Ert/devel/libert_util/src/node_data.c | 7 +- ThirdParty/Ert/devel/libert_util/src/parser.c | 6 +- .../Ert/devel/libert_util/src/path_fmt.c | 8 +- .../Ert/devel/libert_util/src/regression.c | 12 +- ThirdParty/Ert/devel/libert_util/src/rng.c | 8 +- ThirdParty/Ert/devel/libert_util/src/set.c | 7 +- .../Ert/devel/libert_util/src/statistics.c | 7 +- .../Ert/devel/libert_util/src/stepwise.c | 13 +- .../Ert/devel/libert_util/src/str_buffer.c | 124 -- .../Ert/devel/libert_util/src/str_buffer.h | 36 - .../Ert/devel/libert_util/src/stringlist.c | 10 +- .../Ert/devel/libert_util/src/subst_func.c | 13 +- .../Ert/devel/libert_util/src/subst_list.c | 14 +- .../Ert/devel/libert_util/src/template.c | 10 +- .../Ert/devel/libert_util/src/template_loop.c | 4 +- .../Ert/devel/libert_util/src/test_util.c | 143 ++ .../Ert/devel/libert_util/src/thread_pool.c | 2 +- .../devel/libert_util/src/thread_pool_posix.c | 4 +- ThirdParty/Ert/devel/libert_util/src/timer.c | 4 +- ThirdParty/Ert/devel/libert_util/src/util.c | 6 +- .../Ert/devel/libert_util/src/util_env.c | 6 +- ThirdParty/Ert/devel/libert_util/src/vector.c | 9 +- .../devel/libert_util/src/vector_template.c | 8 +- .../libert_util/tests/ert_util_latex_test.c | 2 +- .../tests/ert_util_stringlist_test.c | 2 +- .../tests/ert_util_type_vector_test.c | 2 +- .../libert_util/tests/ert_util_vector_test.c | 2 +- .../Ert/devel/libgeometry/CMakeLists.txt | 10 +- .../ert/geometry}/geo_pointset.h | 0 .../ert/geometry}/geo_polygon.h | 0 .../ert/geometry}/geo_region.h | 10 +- .../ert/geometry}/geo_surface.h | 3 +- .../{src => include/ert/geometry}/geo_util.h | 0 .../Ert/devel/libgeometry/src/CMakeLists.txt | 20 +- .../Ert/devel/libgeometry/src/geo_pointset.c | 4 +- .../Ert/devel/libgeometry/src/geo_polygon.c | 11 +- .../Ert/devel/libgeometry/src/geo_region.c | 16 +- .../Ert/devel/libgeometry/src/geo_surface.c | 8 +- .../Ert/devel/libgeometry/src/geo_util.c | 6 +- .../Ert/devel/libjob_queue/CMakeLists.txt | 13 +- .../{src => include/ert/job_queue}/ext_cmd.h | 2 +- .../{src => include/ert/job_queue}/ext_job.h | 17 +- .../ert/job_queue}/ext_joblist.h | 13 +- .../ert/job_queue}/forward_model.h | 6 +- .../ert/job_queue}/job_queue.h | 4 +- .../ert/job_queue}/local_driver.h | 3 +- .../ert/job_queue}/lsf_driver.h | 5 +- .../ert/job_queue}/queue_driver.h | 2 +- .../ert/job_queue}/rsh_driver.h | 2 +- .../Ert/devel/libjob_queue/src/CMakeLists.txt | 8 + .../Ert/devel/libjob_queue/src/dependencies | 10 - .../Ert/devel/libjob_queue/src/ext_cmd.c | 10 +- .../Ert/devel/libjob_queue/src/ext_job.c | 23 +- .../Ert/devel/libjob_queue/src/ext_joblist.c | 14 +- .../devel/libjob_queue/src/forward_model.c | 16 +- .../Ert/devel/libjob_queue/src/job_queue.c | 13 +- .../Ert/devel/libjob_queue/src/local_driver.c | 8 +- .../devel/libjob_queue/src/lsf_driver_dummy.c | 2 +- .../devel/libjob_queue/src/lsf_driver_impl.c | 16 +- .../Ert/devel/libjob_queue/src/queue_driver.c | 10 +- .../Ert/devel/libjob_queue/src/rsh_driver.c | 8 +- .../libjob_queue/tests/job_lsf_submit_test.c | 9 +- .../devel/libjob_queue/tests/job_lsf_test.c | 3 +- .../Ert/devel/libjob_queue/tests/loadOK.c | 5 +- ThirdParty/Ert/devel/libplot/CMakeLists.txt | 1 - .../libplot/{src => include/ert/plot}/plot.h | 9 +- .../{src => include/ert/plot}/plot_const.h | 0 .../{src => include/ert/plot}/plot_dataset.h | 6 +- .../{src => include/ert/plot}/plot_driver.h | 8 +- .../{src => include/ert/plot}/plot_range.h | 0 .../{src => include/ert/plot}/plot_summary.h | 0 .../{src => include/ert/plot}/plplot_driver.h | 10 +- .../{src => include/ert/plot}/text_driver.h | 0 .../Ert/devel/libplot/src/CMakeLists.txt | 14 +- .../Ert/devel/libplot/src/all_include.h | 25 - ThirdParty/Ert/devel/libplot/src/dependencies | 8 - ThirdParty/Ert/devel/libplot/src/makefile | 62 - ThirdParty/Ert/devel/libplot/src/plot.c | 20 +- .../Ert/devel/libplot/src/plot_dataset.c | 19 +- .../Ert/devel/libplot/src/plot_driver.c | 8 +- ThirdParty/Ert/devel/libplot/src/plot_range.c | 11 +- .../Ert/devel/libplot/src/plplot_driver.c | 12 +- ThirdParty/Ert/devel/libplot/src/simple.c | 35 +- .../Ert/devel/libplot/src/text_driver.c | 11 +- ThirdParty/Ert/devel/librms/CMakeLists.txt | 13 +- .../devel/librms/applications/rms_extract.c | 9 +- .../devel/librms/applications/rms_setname.c | 8 +- .../Ert/devel/librms/applications/rms_stat.c | 7 +- .../Ert/devel/librms/applications/rms_test.c | 7 +- .../Ert/devel/librms/applications/tag_list.c | 7 +- .../{src => include/ert/rms}/rms_export.h | 4 +- .../{src => include/ert/rms}/rms_file.h | 3 +- .../{src => include/ert/rms}/rms_stats.h | 3 +- .../librms/{src => include/ert/rms}/rms_tag.h | 6 +- .../{src => include/ert/rms}/rms_tagkey.h | 9 +- .../{src => include/ert/rms}/rms_type.h | 0 .../{src => include/ert/rms}/rms_util.h | 7 +- .../Ert/devel/librms/src/CMakeLists.txt | 12 +- .../Ert/devel/librms/src/condor_import.c | 95 -- ThirdParty/Ert/devel/librms/src/dependencies | 6 - ThirdParty/Ert/devel/librms/src/rms_export.c | 14 +- ThirdParty/Ert/devel/librms/src/rms_file.c | 19 +- ThirdParty/Ert/devel/librms/src/rms_stats.c | 17 +- ThirdParty/Ert/devel/librms/src/rms_tag.c | 14 +- ThirdParty/Ert/devel/librms/src/rms_tagkey.c | 12 +- ThirdParty/Ert/devel/librms/src/rms_type.c | 2 +- ThirdParty/Ert/devel/librms/src/rms_util.c | 32 +- ThirdParty/Ert/devel/libsched/CMakeLists.txt | 11 +- .../libsched/applications/get_well_list.c | 5 +- .../libsched/applications/gruptree_test.c | 3 +- .../libsched/applications/sched_summary.c | 17 +- .../devel/libsched/applications/sched_test.c | 15 +- .../ert/sched}/group_history.h | 6 +- .../{src => include/ert/sched}/group_index.h | 5 +- .../{src => include/ert/sched}/gruptree.h | 1 - .../{src => include/ert/sched}/history.h | 8 +- .../{src => include/ert/sched}/sched_blob.h | 0 .../{src => include/ert/sched}/sched_file.h | 8 +- .../ert/sched}/sched_history.h | 4 +- .../{src => include/ert/sched}/sched_kw.h | 4 +- .../ert/sched}/sched_kw_compdat.h | 7 +- .../ert/sched}/sched_kw_dates.h | 7 +- .../ert/sched}/sched_kw_gruptree.h | 6 +- .../ert/sched}/sched_kw_include.h | 5 +- .../ert/sched}/sched_kw_tstep.h | 6 +- .../ert/sched}/sched_kw_untyped.h | 6 +- .../ert/sched}/sched_kw_wconhist.h | 13 +- .../ert/sched}/sched_kw_wconinj.h | 8 +- .../ert/sched}/sched_kw_wconinje.h | 13 +- .../ert/sched}/sched_kw_wconinjh.h | 14 +- .../ert/sched}/sched_kw_wconprod.h | 2 +- .../ert/sched}/sched_kw_welspecs.h | 7 +- .../{src => include/ert/sched}/sched_macros.h | 0 .../{src => include/ert/sched}/sched_time.h | 2 +- .../{src => include/ert/sched}/sched_types.h | 0 .../{src => include/ert/sched}/sched_util.h | 3 +- .../{src => include/ert/sched}/well_history.h | 10 +- .../{src => include/ert/sched}/well_index.h | 4 +- .../Ert/devel/libsched/src/CMakeLists.txt | 14 +- .../Ert/devel/libsched/src/dependencies | 17 - .../Ert/devel/libsched/src/group_history.c | 17 +- .../Ert/devel/libsched/src/group_index.c | 12 +- ThirdParty/Ert/devel/libsched/src/gruptree.c | 7 +- ThirdParty/Ert/devel/libsched/src/history.c | 21 +- .../Ert/devel/libsched/src/sched_blob.c | 14 +- .../Ert/devel/libsched/src/sched_file.c | 29 +- .../Ert/devel/libsched/src/sched_history.c | 40 +- ThirdParty/Ert/devel/libsched/src/sched_kw.c | 36 +- .../Ert/devel/libsched/src/sched_kw_compdat.c | 11 +- .../Ert/devel/libsched/src/sched_kw_dates.c | 19 +- .../devel/libsched/src/sched_kw_gruptree.c | 15 +- .../Ert/devel/libsched/src/sched_kw_include.c | 15 +- .../Ert/devel/libsched/src/sched_kw_tstep.c | 12 +- .../Ert/devel/libsched/src/sched_kw_untyped.c | 13 +- .../devel/libsched/src/sched_kw_wconhist.c | 20 +- .../Ert/devel/libsched/src/sched_kw_wconinj.c | 13 +- .../devel/libsched/src/sched_kw_wconinje.c | 21 +- .../devel/libsched/src/sched_kw_wconinjh.c | 22 +- .../devel/libsched/src/sched_kw_wconprod.c | 12 +- .../devel/libsched/src/sched_kw_welspecs.c | 18 +- .../Ert/devel/libsched/src/sched_time.c | 8 +- .../Ert/devel/libsched/src/sched_types.c | 6 +- .../Ert/devel/libsched/src/sched_util.c | 8 +- .../Ert/devel/libsched/src/well_history.c | 24 +- .../Ert/devel/libsched/src/well_index.c | 10 +- ThirdParty/Ert/devel/libwell/CMakeLists.txt | 4 - .../Ert/devel/libwell/src/CMakeLists.txt | 21 - ThirdParty/Ert/devel/python/CMakeLists.txt | 2 + .../Ert/devel/python/python/CMakeLists.txt | 2 + .../devel/python/python/ert/CMakeLists.txt | 11 + .../Ert/devel/python/python/ert/__init__.py | 10 +- .../python/python/ert/config/CMakeLists.txt | 1 + .../python/python/ert/cwrap/CMakeLists.txt | 1 + .../python/python/ert/ecl/CMakeLists.txt | 2 + .../python/python/ert/enkf/CMakeLists.txt | 1 + .../python/python/ert/geo/CMakeLists.txt | 1 + .../python/ert/job_queue/CMakeLists.txt | 1 + .../python/python/ert/rms/CMakeLists.txt | 1 + .../python/python/ert/sched/CMakeLists.txt | 1 + .../python/python/ert/util/CMakeLists.txt | 1 + .../python/python/ert/well/CMakeLists.txt | 1 + .../Ert/devel/python/test/CMakeLists.txt | 2 + ThirdParty/Ert/devel/redhat/ert.ecl.spec | 74 + 588 files changed, 4324 insertions(+), 6276 deletions(-) create mode 100644 ThirdParty/Ert/README create mode 100644 ThirdParty/Ert/devel/CMake/Modules/UseMultiArch.cmake create mode 100644 ThirdParty/Ert/devel/CMake/ert_check.cmake create mode 100644 ThirdParty/Ert/devel/CMake/ert_find.cmake create mode 100644 ThirdParty/Ert/devel/CMake/python.cmake delete mode 100644 ThirdParty/Ert/devel/debian/README.source delete mode 100644 ThirdParty/Ert/devel/debian/libert-dev.install rename ThirdParty/Ert/devel/debian/{libert-dev.dirs => libert.ecl-dev.dirs} (100%) create mode 100644 ThirdParty/Ert/devel/debian/libert.ecl-dev.install rename ThirdParty/Ert/devel/debian/{libert1.dirs => libert.ecl1.dirs} (100%) create mode 100644 ThirdParty/Ert/devel/debian/libert.ecl1.install delete mode 100644 ThirdParty/Ert/devel/debian/libert1.install rename ThirdParty/Ert/devel/libanalysis/{src => include/ert/analysis}/analysis_module.h (99%) rename ThirdParty/Ert/devel/libanalysis/{src => include/ert/analysis}/analysis_table.h (98%) rename ThirdParty/Ert/devel/libanalysis/{src => include/ert/analysis}/cv_enkf.h (97%) rename ThirdParty/Ert/devel/libanalysis/{src => include/ert/analysis}/enkf_linalg.h (97%) rename ThirdParty/Ert/devel/libanalysis/{src => include/ert/analysis}/fwd_step_enkf.h (96%) rename ThirdParty/Ert/devel/libanalysis/{src => include/ert/analysis}/rml_enkf_common.h (100%) rename ThirdParty/Ert/devel/libanalysis/{src => include/ert/analysis}/std_enkf.h (96%) delete mode 100644 ThirdParty/Ert/devel/libanalysis/src/SConscript rename ThirdParty/Ert/devel/libconfig/{src => include/ert/config}/conf.h (95%) rename ThirdParty/Ert/devel/libconfig/{src => include/ert/config}/conf_data.h (100%) rename ThirdParty/Ert/devel/libconfig/{src => include/ert/config}/conf_util.h (100%) rename ThirdParty/Ert/devel/libconfig/{src => include/ert/config}/config.h (99%) delete mode 100644 ThirdParty/Ert/devel/libconfig/src/dependencies rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_box.h (86%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_coarse_cell.h (100%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_endian_flip.h (100%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_file.h (98%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_file_kw.h (97%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_grav.h (95%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_grav_calc.h (94%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_grav_common.h (94%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_grid.h (98%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_grid_cache.h (98%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_init_file.h (92%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_intehead.h (98%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_io_config.h (100%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_kw.h (98%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_kw_grdecl.h (100%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_kw_magic.h (100%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_region.h (98%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_rft_file.h (90%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_rft_node.h (98%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_rst_file.h (100%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_smspec.h (98%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_subsidence.h (95%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_sum.h (98%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_sum_data.h (96%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_sum_index.h (100%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_sum_tstep.h (96%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/ecl_util.h (99%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/fortio.h (100%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/point.h (100%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/smspec_node.h (99%) rename ThirdParty/Ert/devel/libecl/{src => include/ert/ecl}/tetrahedron.h (100%) create mode 100644 ThirdParty/Ert/devel/libecl_well/CMakeLists.txt rename ThirdParty/Ert/devel/{libwell => libecl_well}/applications/CMakeLists.txt (82%) rename ThirdParty/Ert/devel/{libwell => libecl_well}/applications/well_info_test.c (78%) rename ThirdParty/Ert/devel/{libwell/src => libecl_well/include/ert/ecl_well}/well_branch.h (97%) rename ThirdParty/Ert/devel/{libwell/src => libecl_well/include/ert/ecl_well}/well_conn.h (97%) rename ThirdParty/Ert/devel/{libwell/src => libecl_well/include/ert/ecl_well}/well_const.h (100%) rename ThirdParty/Ert/devel/{libwell/src => libecl_well/include/ert/ecl_well}/well_info.h (95%) rename ThirdParty/Ert/devel/{libwell/src => libecl_well/include/ert/ecl_well}/well_path.h (95%) rename ThirdParty/Ert/devel/{libwell/src => libecl_well/include/ert/ecl_well}/well_state.h (95%) rename ThirdParty/Ert/devel/{libwell/src => libecl_well/include/ert/ecl_well}/well_ts.h (97%) create mode 100644 ThirdParty/Ert/devel/libecl_well/src/CMakeLists.txt rename ThirdParty/Ert/devel/{libwell => libecl_well}/src/well_branch.c (94%) rename ThirdParty/Ert/devel/{libwell => libecl_well}/src/well_conn.c (97%) rename ThirdParty/Ert/devel/{libwell => libecl_well}/src/well_info.c (95%) rename ThirdParty/Ert/devel/{libwell => libecl_well}/src/well_path.c (96%) rename ThirdParty/Ert/devel/{libwell => libecl_well}/src/well_state.c (97%) rename ThirdParty/Ert/devel/{libwell => libecl_well}/src/well_ts.c (98%) create mode 100644 ThirdParty/Ert/devel/libenkf/applications/ert_gui/share/doc/kręsj.txt rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/README.new_type.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/README.new_type_config.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/active_config.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/active_list.h (98%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/active_node.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/analysis_config.h (97%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/block_fs_driver.h (98%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/block_obs.h (89%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/config_keys.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/config_parser.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/container.h (97%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/container_config.h (95%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/data_ranking.h (95%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/ecl_config.h (96%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/ecl_static_kw.h (94%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/ecl_static_kw_config.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_analysis.h (94%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_config_node.h (97%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_config_private.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_defaults.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_fs.h (93%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_fs_type.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_macros.h (98%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_main.h (93%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_main_update.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_node.h (95%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_obs.h (90%) rename ThirdParty/Ert/devel/libenkf/{src/plot => include/ert/enkf}/enkf_plot_arg.h (100%) rename ThirdParty/Ert/devel/libenkf/{src/plot => include/ert/enkf}/enkf_plot_data.h (92%) rename ThirdParty/Ert/devel/libenkf/{src/plot => include/ert/enkf}/enkf_plot_member.h (91%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_sched.h (76%) create mode 100644 ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_serialize.h rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_state.h (89%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_types.h (99%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/enkf_util.h (99%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/ensemble_config.h (95%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/ert_report.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/ert_report_list.h (97%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/ert_template.h (97%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/field.h (93%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/field_common.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/field_config.h (96%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/field_trans.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/fs_driver.h (98%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/fs_types.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/gen_common.h (91%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/gen_data.h (91%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/gen_data_common.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/gen_data_config.h (95%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/gen_kw.h (92%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/gen_kw_common.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/gen_kw_config.h (95%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/gen_obs.h (90%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/local_config.h (97%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/local_context.h (92%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/local_dataset.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/local_ministep.h (93%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/local_obsset.h (98%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/local_updatestep.h (97%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/meas_data.h (98%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/member_config.h (92%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/misfit_ensemble.h (91%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/misfit_ensemble_typedef.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/misfit_member.h (97%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/misfit_ranking.h (93%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/misfit_ts.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/model_config.h (93%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/obs_data.h (96%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/obs_vector.h (93%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/plain_driver.h (97%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/plain_driver_obs.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/plot_config.h (98%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/qc_config.h (97%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/ranking_common.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/ranking_table.h (98%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/rng_config.h (96%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/scalar_config.h (100%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/site_config.h (97%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/summary.h (88%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/summary_config.h (97%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/summary_obs.h (90%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/surface.h (93%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/surface_config.h (95%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/time_map.h (98%) rename ThirdParty/Ert/devel/libenkf/{src => include/ert/enkf}/trans_func.h (96%) delete mode 100644 ThirdParty/Ert/devel/libenkf/src/README.new_type_config.c delete mode 100644 ThirdParty/Ert/devel/libenkf/src/active_config.c delete mode 100644 ThirdParty/Ert/devel/libenkf/src/config_parser.c rename ThirdParty/Ert/devel/libenkf/src/{plot => }/enkf_plot_arg.c (96%) rename ThirdParty/Ert/devel/libenkf/src/{plot => }/enkf_plot_data.c (95%) rename ThirdParty/Ert/devel/libenkf/src/{plot => }/enkf_plot_member.c (96%) delete mode 100644 ThirdParty/Ert/devel/libenkf/src/enkf_serialize.h delete mode 100644 ThirdParty/Ert/devel/libenkf/src/plot/SConstruct delete mode 100644 ThirdParty/Ert/devel/libenkf/src/sqlite3_driver_test.c delete mode 100644 ThirdParty/Ert/devel/libenkf/src/uncle_sam_100.h delete mode 100644 ThirdParty/Ert/devel/libenkf/src/well_config_private.h create mode 100644 ThirdParty/Ert/devel/libert_util/include/ert/util/CMakeLists.txt rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/arg_pack.h (97%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/atomic.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/block_fs.h (97%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/buffer.h (99%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/hash.h (97%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/hash_node.h (98%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/hash_sll.h (97%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/lars.h (98%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/latex.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/log.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/lookup_table.h (98%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/matrix.h (98%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/matrix_blas.h (97%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/matrix_lapack.h (99%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/menu.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/msg.h (97%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/msvc_stdbool.h (88%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/mzran.h (98%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/node_ctype.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/node_data.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/parser.h (99%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/path_fmt.h (98%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/regression.h (97%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/rng.h (98%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/set.h (99%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/ssize_t.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/statistics.h (96%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/stepwise.h (95%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/stringlist.h (98%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/subst_func.h (98%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/subst_list.h (98%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/template.h (98%) create mode 100644 ThirdParty/Ert/devel/libert_util/include/ert/util/test_util.h rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/thread_pool.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/thread_pool1.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/thread_pool_posix.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/timer.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/type_macros.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/util.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/util_endian.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/util_env.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/util_fork.h (100%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/vector.h (98%) rename ThirdParty/Ert/devel/libert_util/{src => include/ert/util}/vector_template.h (99%) delete mode 100644 ThirdParty/Ert/devel/libert_util/src/all_include.h delete mode 100644 ThirdParty/Ert/devel/libert_util/src/conf_new.c delete mode 100644 ThirdParty/Ert/devel/libert_util/src/conf_new.h delete mode 100644 ThirdParty/Ert/devel/libert_util/src/str_buffer.c delete mode 100644 ThirdParty/Ert/devel/libert_util/src/str_buffer.h create mode 100644 ThirdParty/Ert/devel/libert_util/src/test_util.c rename ThirdParty/Ert/devel/libgeometry/{src => include/ert/geometry}/geo_pointset.h (100%) rename ThirdParty/Ert/devel/libgeometry/{src => include/ert/geometry}/geo_polygon.h (100%) rename ThirdParty/Ert/devel/libgeometry/{src => include/ert/geometry}/geo_region.h (94%) rename ThirdParty/Ert/devel/libgeometry/{src => include/ert/geometry}/geo_surface.h (97%) rename ThirdParty/Ert/devel/libgeometry/{src => include/ert/geometry}/geo_util.h (100%) rename ThirdParty/Ert/devel/libjob_queue/{src => include/ert/job_queue}/ext_cmd.h (98%) rename ThirdParty/Ert/devel/libjob_queue/{src => include/ert/job_queue}/ext_job.h (90%) rename ThirdParty/Ert/devel/libjob_queue/{src => include/ert/job_queue}/ext_joblist.h (88%) rename ThirdParty/Ert/devel/libjob_queue/{src => include/ert/job_queue}/forward_model.h (95%) rename ThirdParty/Ert/devel/libjob_queue/{src => include/ert/job_queue}/job_queue.h (98%) rename ThirdParty/Ert/devel/libjob_queue/{src => include/ert/job_queue}/local_driver.h (97%) rename ThirdParty/Ert/devel/libjob_queue/{src => include/ert/job_queue}/lsf_driver.h (97%) rename ThirdParty/Ert/devel/libjob_queue/{src => include/ert/job_queue}/queue_driver.h (99%) rename ThirdParty/Ert/devel/libjob_queue/{src => include/ert/job_queue}/rsh_driver.h (98%) delete mode 100644 ThirdParty/Ert/devel/libjob_queue/src/dependencies rename ThirdParty/Ert/devel/libplot/{src => include/ert/plot}/plot.h (96%) rename ThirdParty/Ert/devel/libplot/{src => include/ert/plot}/plot_const.h (100%) rename ThirdParty/Ert/devel/libplot/{src => include/ert/plot}/plot_dataset.h (98%) rename ThirdParty/Ert/devel/libplot/{src => include/ert/plot}/plot_driver.h (98%) rename ThirdParty/Ert/devel/libplot/{src => include/ert/plot}/plot_range.h (100%) rename ThirdParty/Ert/devel/libplot/{src => include/ert/plot}/plot_summary.h (100%) rename ThirdParty/Ert/devel/libplot/{src => include/ert/plot}/plplot_driver.h (88%) rename ThirdParty/Ert/devel/libplot/{src => include/ert/plot}/text_driver.h (100%) delete mode 100644 ThirdParty/Ert/devel/libplot/src/all_include.h delete mode 100644 ThirdParty/Ert/devel/libplot/src/dependencies delete mode 100644 ThirdParty/Ert/devel/libplot/src/makefile rename ThirdParty/Ert/devel/librms/{src => include/ert/rms}/rms_export.h (94%) rename ThirdParty/Ert/devel/librms/{src => include/ert/rms}/rms_file.h (98%) rename ThirdParty/Ert/devel/librms/{src => include/ert/rms}/rms_stats.h (96%) rename ThirdParty/Ert/devel/librms/{src => include/ert/rms}/rms_tag.h (97%) rename ThirdParty/Ert/devel/librms/{src => include/ert/rms}/rms_tagkey.h (97%) rename ThirdParty/Ert/devel/librms/{src => include/ert/rms}/rms_type.h (100%) rename ThirdParty/Ert/devel/librms/{src => include/ert/rms}/rms_util.h (96%) delete mode 100644 ThirdParty/Ert/devel/librms/src/condor_import.c delete mode 100644 ThirdParty/Ert/devel/librms/src/dependencies rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/group_history.h (96%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/group_index.h (96%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/gruptree.h (98%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/history.h (95%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_blob.h (100%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_file.h (97%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_history.h (97%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw.h (97%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw_compdat.h (92%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw_dates.h (95%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw_gruptree.h (95%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw_include.h (94%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw_tstep.h (96%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw_untyped.h (96%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw_wconhist.h (95%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw_wconinj.h (91%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw_wconinje.h (94%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw_wconinjh.h (94%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw_wconprod.h (96%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_kw_welspecs.h (95%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_macros.h (100%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_time.h (97%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_types.h (100%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/sched_util.h (98%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/well_history.h (93%) rename ThirdParty/Ert/devel/libsched/{src => include/ert/sched}/well_index.h (96%) delete mode 100644 ThirdParty/Ert/devel/libsched/src/dependencies delete mode 100644 ThirdParty/Ert/devel/libwell/CMakeLists.txt delete mode 100644 ThirdParty/Ert/devel/libwell/src/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/python/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/python/ert/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/python/ert/config/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/python/ert/cwrap/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/python/ert/ecl/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/python/ert/enkf/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/python/ert/geo/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/python/ert/job_queue/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/python/ert/rms/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/python/ert/sched/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/python/ert/util/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/python/ert/well/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/python/test/CMakeLists.txt create mode 100644 ThirdParty/Ert/devel/redhat/ert.ecl.spec diff --git a/ThirdParty/Ert/README b/ThirdParty/Ert/README new file mode 100644 index 0000000000..5718e9c9d8 --- /dev/null +++ b/ThirdParty/Ert/README @@ -0,0 +1,273 @@ + _________________________________ + / \ + | ______ ______ _______ | + | | ____| | __ \ |__ __| | + | | |__ | |__) | | | | + | | __| | _ / | | | + | | |____ | | \ \ | | | + | |______| |_| \_\ |_| | + | | + | Ensemble based Reservoir Tool | + \_________________________________/ + + +------------------------------------------------------------------------ + + 1. ERT + 2. ECLIPSE utilities. + 3. Building ERT + 3.1 CMake settings you might want to adjust + 4. The code: + 4.1 The different libraries + 4.2 The general structure + 4.3 Python wrappers + 5. Tests + +------------------------------------------------------------------------ + +1. ERT + +ERT - Ensemble based Reservoir Tool is a tool for managing en ensemble +of reservoir models. The initial motivation for creating ERT was a as +tool to do assisted history matching with Ensemble Kalman Filter +(EnKF). Very briefly use of EnKF can be summarized as: + + 1. Sample initial reservoir parameters from a (Gaussian) prior + distribution. + + 2. Simulate the ensemble of of reservoir forward in time through + part of the historical period. + + 3. Load the results, compare with observed data, update the + parameters and the state of reservoir and restart the + simulations. + +This recipe is quite complex technically, and in particular involves +the ability to read and write input and output files from the +reservoir simulator (i.e. ECLIPSE in the case of ERT), run simulations +with arbitrary external programs, plotting data and so on. This +implies that a quite significant technical machinery must be in place +before the EnKF algorithm as such can be utilizied. This in particular +applies to real industry reservoir models, where typically +imperfections of all kinds flourish. + +The initial motivation for creating ERT was to be able to use the EnKF +algorithm for history matching. Currently ERT is more used with the +Ensemble Smoother and also purely as a worklfow manager; herding a +large collection of reservoir models through the required simulations +steps. + + +2. ECLIPSE Utilities + +ERT has a quite large amount of code devoted to reading and writing +the ECLIPSE output files (grid/rft/restart/init/summary). In addition +there is also reasonable support for reading and writing the grdecl +input files, but there is no general .DATA file parser. The ability to +read and write ECLIPSE output files is valuable in many reservoir +applications, and it is possible to only build and use the libecl +(with support libraries) library for working with ECLIPSE files. In +fact the default build setup is to only build the ECLIPSE related +library and utilities. This part of the ERT distribution can also be +built on Windows with Visual Studio (albeit with maaaany warnings) and +with MinGW. + + +3. Building ERT + +CMake is the build system for ERT. The top level CMakeLists.txt file +is located in the devel/ directory, and this CMakeLists.txt file +includes individual CMakeLists.txt files for the different libraries. + +Building with CMake is performed like this: + + 1. Create a build directory, this can in principle be anywhere in + the filesystem. At the same level as the devel/ directory is a + practical choice. + + 2. Go to the build directory and invoke the command: + + ccmake + + Go through several 'configure' steps with CMake and generate + native build files. + + 3. Exit ccmake and invoke the native build system, i.e. ordinaray + make on Linux. + + 4. Subsequent builds can be performed using just the native make + command, as in step 3. + +3.1 CMake settings you might want to adjust + +The main setting you should adjust is BUILD_ERT which is default to +OFF, i.e. by default only the ECLIPSE related utilities will be +built. The build system has numerous configurations checks; the +ECLIPSE utilities should build on Windows, but to build all of ERT you +will need a Linux (Posix) system. + + +4. The code + +The code is mainly written as a collection of libraries written in C. + +4.1 The different libraries + +The different libraries are: + + libert_util: This library is a collection of utilities of various + sorts; if C++ had been chosen as implementation language most of + these utilities would probably have been in libstdc++. + + libgeometry: This is a very small geometry library; the main code + is a small implementantion of an alorithm to determine whether a + point is inside a polyhedron. The ECLIPSE library has some + geometry related code which should be moved here. + + libwell: This library will load well information from an ECLIPSE + restart file. This is mainly for the purpose of visualization + of the existing wells, and can not be used to update or model + the well configuration. + + libecl: This library will read and (partly) write the various + binary ECLIPSE files, including GRID/EGRID, summary, INIT, + restart and RFT files. There is also support for reading an + writing grdecl formatted files, but there is no support for + general parsing of the ECLIPSE input format. + + ---------------------------------------------------------------------------- + + librms: This is a library for reading and writing RMS Roff + files. It turns out that ECLIPSE file formats is the most common + external file format for RMS and the ROFF support is not + essential. + + libconfig: This library implements a parser for the ERT config file + format, this format is used in the main ERT configuration file, + and also in several small special topic configuration files used + by ERT. The config format parsed by this library was inspired by + the ECLIPSE format, in retrospect that was a mistake - it should + have been based on a standard format like xml. + + To confuse things evan further the libconfig library implements + /two/ config formats, the 'second format' is implemented in the + file conf.c, and only used as format for the observations in + ERT. + + libplot: A *very* simple librarry for creating plots, just exactly + satisfies the needs of ERT. + + libanalysis: The EnKF algorithm is implemented in this library. + + libjob_queue: This library implements a system to manage and run + simulations in the form of external programs. The library has a + queue manager, and a system with drivers which communicate with + the underlying system. Currently the library has a LSF driver to + work with LSF, a LOCAL driver which starts simulations on the + current workstation and a RSH driver which submits to a + 'cluster' of workstation with ssh. + + libenkf: This is the main functionality which is ERT specific; this + library is to large. + + +4.2 General structure + +The code is written in C, but conventions give a 'scent of object +oriented'. Common to a very large part of the code is the following: + + - Every file 'xxx' implements a datatype 'xxx_type' - the naming + convention is quite strong. + + - All the struct defintions are in the source files, i.e. external + scope must access the fields of a structure through accessor + functions. + + - All functions which operate on a type 'xxx_type' take a pointer + to xxx_type as the first argument, the structure closely resemble + the 'self' argument used when implementing Python classes. + + - Memory management is manual; however there are some conventions: + * Functions allocating storage have _alloc_ as part of the name. + * For all functions xxx_alloc() allocating storage there should + be a matching xxx_free() to discard the objects. + * Containers can optionally destroy their content is the content + is installed with a destructor. + + - In libert_util/src/type_macros.h there is a macro based + 'type-system' which is used to runtime check casts of (void *). + + +4.3 Python wrappers + +Some of the code, in particular the ECLIPSE related functionality, has +been wrapped in Python. Using these wrappers it is quite easy work +with ECLIPSE files. The python wrappers are quite well documented both +in the devel/python/docs directory and in the Python classes +themselves. + + +5. Testing + +The ERT is very weak on tests, but that is being improved. There are two different +categories of tests: + + CMake tests: CMake has a system for adding and running tests, and + these can be invoked with the command 'make test' after the + normal build process has completed, or alternatively the + 'ctest' test-runner which allows more options on which tests to run. + + Python test: The python directory devel/python/test has several + python unittests. These tests test both the Python wrappers + and the underlying C code and serve as quite good integration + tests. Read the content of devel/python/test/README carfully + before you invoke the Python tests, you might have to update + the local_(csh|bash) scripts to reflect your build output + path. + + +5.1 Test data & labels + +Unfortunately a large fraction of the test data is based on Statoil +internal data, and is not available on GitHub. All the tests which are +based on Statoil internal test data are labeled with the label +'Statoil', and using the 'ctest' program you can use the -L and -LE +options to include/exclude tests based on their label. + + ctest -L Statoil # Run all the tests with the 'Statoil' label + ctest -LE Statoil # Run all the tests without the 'Statoil' label + +The argument to the -L and -LE options are regular expressions, +i.e. in the case above all tests which have a label matching the +regexp 'Statoil' will be run. A test can only have one single label, +but due to to the regexp mechanism we can create a 'list-like' +structure by chaining labels together; by convention the label +elements are joined with ':'. In the example + + set_property( TEST test_name PROPERTY LABELS Statoil:Python ) + +the labels 'Statoil' and 'Python' are applied to the test. The labels +in use are: + + Statoil: This indicates that the test makes use of Statoil internal + test data, and will fail if the Statoil test data have not + been made available according to the description in + devel/test-data/README.txt + + Python: This indicates that the test is a Python unittest, and the + Python interpreter will be the test runner for the test. + +5.2 Test names + +The tests in the cmake build system follow the naming convention of +the library which functionality they are testing - i.e. all tests in +the libecl library have a name starting with 'ecl' and all tests in +the config library start with 'config'. The options -R and -E to ctest +can be used to include and exclude tests based on their name + + ctest -R ecl # Run all tests mathing the regexp 'ecl' + ctest -E ecl # Run all tests NOT matching the regexp 'ecl' + + +The python tests are not yet integrated into this convention.... + diff --git a/ThirdParty/Ert/devel/CMake/Modules/UseMultiArch.cmake b/ThirdParty/Ert/devel/CMake/Modules/UseMultiArch.cmake new file mode 100644 index 0000000000..538051b29d --- /dev/null +++ b/ThirdParty/Ert/devel/CMake/Modules/UseMultiArch.cmake @@ -0,0 +1,42 @@ +# - Multiarch support in object code library directories +# +# This module sets the following variable +# CMAKE_INSTALL_LIBDIR to lib, lib64 or lib/x86_64-linux-gnu +# depending on the platform; use this path +# for platform-specific binaries. +# +# CMAKE_INSTALL_LIBDIR_NOARCH to lib or lib64 depending on the platform; +# use this path for architecture-independent +# files. +# +# Note that it will override the results of GNUInstallDirs if included after +# that module. + +# Fedora uses lib64/ for 64-bit systems, Debian uses lib/x86_64-linux-gnu; +# Fedora put module files in lib64/ too, but Debian uses lib/ for that +if ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") + # Debian or Ubuntu? + if (EXISTS "/etc/debian_version") + set (_libdir_def "lib/${CMAKE_LIBRARY_ARCHITECTURE}") + set (_libdir_noarch "lib") + else (EXISTS "/etc/debian_version") + # 64-bit system? + if (CMAKE_SIZEOF_VOID_P EQUAL 8) + set (_libdir_noarch "lib64") + else (CMAKE_SIZEOF_VOID_P EQUAL 8) + set (_libdir_noarch "lib") + endif (CMAKE_SIZEOF_VOID_P EQUAL 8) + set (_libdir_def "${_libdir_noarch}") + endif (EXISTS "/etc/debian_version") +else ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") + set (_libdir_def "lib") + set (_libdir_noarch "lib") +endif ("${CMAKE_SYSTEM_NAME}" MATCHES "Linux") + +# let the user override if somewhere else is desirable +set (CMAKE_INSTALL_LIBDIR "${_libdir_def}" CACHE PATH "Object code libraries") +set (CMAKE_INSTALL_LIBDIR_NOARCH "${_libdir_noarch}" CACHE PATH "Architecture-independent library files") +mark_as_advanced ( + CMAKE_INSTALL_LIBDIR + CMAKE_INSTALL_LIBDIR_NOARCH + ) diff --git a/ThirdParty/Ert/devel/CMake/ert_check.cmake b/ThirdParty/Ert/devel/CMake/ert_check.cmake new file mode 100644 index 0000000000..5097a6d97f --- /dev/null +++ b/ThirdParty/Ert/devel/CMake/ert_check.cmake @@ -0,0 +1,109 @@ +check_function_exists( regexec HAVE_REGEXP ) +if (HAVE_REGEXP) + add_definitions( -DHAVE_REGEXP ) +endif() + +check_function_exists( realpath HAVE_REALPATH ) +if (HAVE_REALPATH) + add_definitions( -DHAVE_REALPATH ) +endif() + +check_function_exists( fork HAVE_FORK ) +if (HAVE_FORK) + add_definitions( -DHAVE_FORK ) +endif() + +check_function_exists( round HAVE_ROUND ) +if (HAVE_ROUND) + add_definitions( -DHAVE_ROUND ) +endif() + +check_function_exists( ftruncate HAVE_FTRUNCATE ) +if (HAVE_FTRUNCATE) + add_definitions( -DHAVE_FTRUNCATE ) +endif() + +check_function_exists( readlinkat HAVE_READLINKAT ) +if (HAVE_READLINKAT) + add_definitions( -DHAVE_READLINKAT ) +endif() + +check_function_exists( symlink HAVE_SYMLINK ) +if (HAVE_SYMLINK) + add_definitions( -DHAVE_SYMLINK ) +endif() + +check_function_exists( getuid HAVE_GETUID ) +if (HAVE_GETUID) + add_definitions( -DHAVE_GETUID ) +endif() + +check_function_exists( localtime_r HAVE_LOCALTIME_R ) +if (HAVE_LOCALTIME_R) + add_definitions( -DHAVE_LOCALTIME_R ) +endif() + +check_function_exists( lockf HAVE_LOCKF ) +if (HAVE_LOCKF) + add_definitions( -DHAVE_LOCKF ) +endif() + + +check_function_exists( glob HAVE_GLOB ) +if (HAVE_GLOB) + add_definitions( -DHAVE_GLOB ) +endif() + +check_function_exists( fnmatch HAVE_FNMATCH ) +if (HAVE_FNMATCH) + add_definitions( -DHAVE_FNMATCH ) +endif() + +check_function_exists( fsync HAVE_FSYNC ) +if (HAVE_FSYNC) + add_definitions( -DHAVE_FSYNC ) +endif() + +check_function_exists( setenv HAVE_SETENV ) +if (HAVE_SETENV) + add_definitions( -DPOSIX_SETENV ) +endif() + + + +check_function_exists( opendir HAVE_OPENDIR ) +if (HAVE_OPENDIR) + add_definitions( -DHAVE_OPENDIR ) +endif() + +check_function_exists( usleep HAVE_USLEEP ) +if (HAVE_OPENDIR) + add_definitions( -DHAVE_USLEEP ) +endif() + +try_compile( HAVE_ISFINITE ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_isfinite.c ) +if (HAVE_ISFINITE) + add_definitions( -DHAVE_ISFINITE ) +endif() + +try_compile( MKDIR_POSIX ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_mkdir.c ) +if (MKDIR_POSIX) + add_definitions( -DMKDIR_POSIX ) +endif() + +try_compile( HAVE_PID_T ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_pid_t.c ) +if (HAVE_PID_T) + add_definitions( -DHAVE_PID_T ) +endif() + +try_compile( HAVE_VA_COPY ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_va_copy.c ) +if (HAVE_VA_COPY) + add_definitions( -DHAVE_VA_COPY ) +endif() + + +try_compile( ISREG_POSIX ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_isreg.c ) +if (ISREG_POSIX) + add_definitions( -DHAVE_ISREG ) +endif() + diff --git a/ThirdParty/Ert/devel/CMake/ert_find.cmake b/ThirdParty/Ert/devel/CMake/ert_find.cmake new file mode 100644 index 0000000000..4d7d1efb66 --- /dev/null +++ b/ThirdParty/Ert/devel/CMake/ert_find.cmake @@ -0,0 +1,68 @@ +#----------------------------------------------------------------- +find_library( ZLIB_LIBRARY NAMES z ) +find_path( ZLIB_HEADER zlib.h /usr/include ) + +if (ZLIB_LIBRARY AND ZLIB_HEADER) + option(WITH_ZLIB "Include support for zlib functions compress()/uncompress()" ON) + if (WITH_ZLIB) + add_definitions( -DWITH_ZLIB ) + endif() +else() + set( WITH_ZLIB FALSE ) + message("ZLib not found - zlib support will not be included." ) +endif() +#----------------------------------------------------------------- +find_library( PTHREAD_LIBRARY NAMES pthread ) +if (PTHREAD_LIBRARY) + option( WITH_PTHREAD "Include support for pthreads" ON ) + if (WITH_PTHREAD) + add_definitions( -DWITH_PTHREAD ) + endif() +else() + set( WITH_PTHREAD FALSE ) + message("pthread library not found - pthread support will not be included") +endif() +#----------------------------------------------------------------- +find_library( LAPACK_LIBRARY NAMES lapack) +if (LAPACK_LIBRARY) + set(CMAKE_REQUIRED_LIBS LAPACK_LIBRARY) + try_compile( BLAS0 ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_blas.c ) + if (BLAS0) + set(NEED_BLAS OFF) + else() + set(NEED_BLAS ON) + find_library( BLAS_LIBRARY NAMES blas) + endif() + option(WITH_LAPACK "Build LAPACK enabled code" ON) + if (WITH_LAPACK) + add_definitions( -DWITH_LAPACK ) + endif() +else() + set( WITH_LAPACK OFF) + message("LAPACK library not found - LAPACK support will not be included") +endif() +#----------------------------------------------------------------- +find_program(LATEX_PATH NAMES pdflatex) +if (LATEX_PATH) + option( WITH_LATEX "Build small class for compiling LaTeX files" ON) + if (WITH_LATEX) + set( WITH_LATEX ON) + add_definitions( -DWITH_LATEX ) + endif() +else() + set( WITH_LATEX OFF ) +endif() +#----------------------------------------------------------------- +find_path( EXECINFO_HEADER execinfo.h /usr/include ) +if (EXECINFO_HEADER) + add_definitions( -DHAVE_EXECINFO ) +endif() +#----------------------------------------------------------------- +find_path( GETOPT_HEADER getopt.h /usr/include ) +if (GETOPT_HEADER) + add_definitions( -DHAVE_GETOPT ) +endif() +#----------------------------------------------------------------- +if (ERT_WINDOWS) + find_library( SHLWAPI_LIBRARY NAMES Shlwapi ) +endif() diff --git a/ThirdParty/Ert/devel/CMake/python.cmake b/ThirdParty/Ert/devel/CMake/python.cmake new file mode 100644 index 0000000000..cb53d7103f --- /dev/null +++ b/ThirdParty/Ert/devel/CMake/python.cmake @@ -0,0 +1,20 @@ +macro(add_python_target tgt PYTHON_INSTALL_PATH ARGN) + SET(OUT_FILES "") + foreach(file ${ARGN}) + set(OUT ${CMAKE_CURRENT_BINARY_DIR}/${file}.pyc) + list(APPEND OUT_FILES ${OUT}) + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${file}.pyc + COMMAND python -m py_compile + ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.py + WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} + COMMAND mv + ARGS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.pyc ${CMAKE_CURRENT_BINARY_DIR} + ) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${file}.pyc DESTINATION ${CMAKE_INSTALL_PREFIX}/${PYTHON_INSTALL_PATH}) + endforeach(file) +list(REMOVE_DUPLICATES OUT_FILES) +ADD_CUSTOM_TARGET( + ${tgt} ALL + DEPENDS ${OUT_FILES}) +endmacro() diff --git a/ThirdParty/Ert/devel/CMakeLists.txt b/ThirdParty/Ert/devel/CMakeLists.txt index c0335ee0de..263f31744a 100644 --- a/ThirdParty/Ert/devel/CMakeLists.txt +++ b/ThirdParty/Ert/devel/CMakeLists.txt @@ -1,9 +1,19 @@ cmake_minimum_required( VERSION 2.6 ) project( ERT C CXX ) + +set( ERT_VERSION_MAJOR 1 ) +set( ERT_VERSION_MINOR 0 ) + +option( BUILD_ERT "Build the full ERT application - Linux only" OFF) +option( BUILD_ENS_PLOT "Build small Eclipse plotting program - no" OFF) +option( BUILD_TESTS "Should the tests be built" OFF) +option( BUILD_APPLICATONS "Should we build small utility applications" OFF) +option( BUILD_ECL_SUMMARY "Build the commandline application ecl_summary" OFF) +option( BUILD_PYTHON "Run py_compile on the python wrappers" OFF) + include( CheckFunctionExists ) ENABLE_TESTING() - if (${CMAKE_SYSTEM_NAME} MATCHES "Linux") set(ERT_LINUX TRUE ) add_definitions( -DERT_LINUX ) @@ -12,16 +22,22 @@ elseif (${CMAKE_SYSTEM_NAME} MATCHES "Windows") add_definitions( -DERT_WINDOWS ) endif() - set( CMAKE_C_FLAGS "-g -O2 -Wall -std=gnu99 -fno-leading-underscore" ) set( CMAKE_CXX_FLAGS "-g -O2 -Wall" ) +include(cmake/ert_check.cmake) +include(cmake/ert_find.cmake) +include(cmake/Modules/UseMultiArch.cmake) +include(cmake/python.cmake) set( INSTALL_GROUP "" CACHE STRING "Group to install as - blank to install as current group") +set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_LIBDIR}) +set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin) + if (MSVC) set(SHARED_LIB OFF) else() - option( SHARED_LIB "Build shared libraries" OFF) + option( SHARED_LIB "Build shared libraries" ON) endif() if (SHARED_LIB) @@ -30,190 +46,12 @@ else() set( LIBRARY_TYPE STATIC ) endif() -set(LIBRARY_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/lib) -set(EXECUTABLE_OUTPUT_PATH ${CMAKE_CURRENT_BINARY_DIR}/bin) -#----------------------------------------------------------------- -find_library( ZLIB_LIBRARY NAMES z ) -find_path( ZLIB_HEADER zlib.h /usr/include ) - -if (ZLIB_LIBRARY AND ZLIB_HEADER) - option(WITH_ZLIB "Include support for zlib functions compress()/uncompress()" ON) - if (WITH_ZLIB) - add_definitions( -DWITH_ZLIB ) - endif() -else() - set( WITH_ZLIB FALSE ) - message("ZLib not found - zlib support will not be included." ) -endif() -#----------------------------------------------------------------- -find_library( PTHREAD_LIBRARY NAMES pthread ) -if (PTHREAD_LIBRARY) - option( WITH_PTHREAD "Include support for pthreads" ON ) - if (WITH_PTHREAD) - add_definitions( -DWITH_PTHREAD ) - endif() -else() - set( WITH_PTHREAD FALSE ) - message("pthread library not found - pthread support will not be included") -endif() -#----------------------------------------------------------------- -find_library( LAPACK_LIBRARY NAMES lapack) -if (LAPACK_LIBRARY) - set(CMAKE_REQUIRED_LIBS LAPACK_LIBRARY) - try_compile( BLAS0 ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_blas.c ) - if (BLAS0) - set(NEED_BLAS OFF) - else() - set(NEED_BLAS ON) - find_library( BLAS_LIBRARY NAMES blas) - endif() - option(WITH_LAPACK "Build LAPACK enabled code" ON) - if (WITH_LAPACK) - add_definitions( -DWITH_LAPACK ) - endif() -else() - set( WITH_LAPACK OFF) - message("LAPACK library not found - LAPACK support will not be included") -endif() -#----------------------------------------------------------------- -find_program(LATEX_PATH NAMES pdflatex) -if (LATEX_PATH) - option( WITH_LATEX "Build small class for compiling LaTeX files" ON) - if (WITH_LATEX) - set( WITH_LATEX ON) - add_definitions( -DWITH_LATEX ) - endif() -else() - set( WITH_LATEX OFF ) -endif() -#----------------------------------------------------------------- -find_path( EXECINFO_HEADER execinfo.h /usr/include ) -if (EXECINFO_HEADER) - add_definitions( -DHAVE_EXECINFO ) -endif() -#----------------------------------------------------------------- -find_path( GETOPT_HEADER getopt.h /usr/include ) -if (GETOPT_HEADER) - add_definitions( -DHAVE_GETOPT ) -endif() -#----------------------------------------------------------------- -if (ERT_WINDOWS) - find_library( SHLWAPI_LIBRARY NAMES Shlwapi ) -endif() if (MSVC) add_definitions( -D__func__="\\"????\\"") endif() -check_function_exists( regexec HAVE_REGEXP ) -if (HAVE_REGEXP) - add_definitions( -DHAVE_REGEXP ) -endif() - -check_function_exists( realpath HAVE_REALPATH ) -if (HAVE_REALPATH) - add_definitions( -DHAVE_REALPATH ) -endif() - -check_function_exists( fork HAVE_FORK ) -if (HAVE_FORK) - add_definitions( -DHAVE_FORK ) -endif() - -check_function_exists( round HAVE_ROUND ) -if (HAVE_ROUND) - add_definitions( -DHAVE_ROUND ) -endif() - -check_function_exists( ftruncate HAVE_FTRUNCATE ) -if (HAVE_FTRUNCATE) - add_definitions( -DHAVE_FTRUNCATE ) -endif() - -check_function_exists( readlinkat HAVE_READLINKAT ) -if (HAVE_READLINKAT) - add_definitions( -DHAVE_READLINKAT ) -endif() - -check_function_exists( symlink HAVE_SYMLINK ) -if (HAVE_SYMLINK) - add_definitions( -DHAVE_SYMLINK ) -endif() - -check_function_exists( getuid HAVE_GETUID ) -if (HAVE_GETUID) - add_definitions( -DHAVE_GETUID ) -endif() - -check_function_exists( localtime_r HAVE_LOCALTIME_R ) -if (HAVE_LOCALTIME_R) - add_definitions( -DHAVE_LOCALTIME_R ) -endif() - -check_function_exists( lockf HAVE_LOCKF ) -if (HAVE_LOCKF) - add_definitions( -DHAVE_LOCKF ) -endif() - - -check_function_exists( glob HAVE_GLOB ) -if (HAVE_GLOB) - add_definitions( -DHAVE_GLOB ) -endif() - -check_function_exists( fnmatch HAVE_FNMATCH ) -if (HAVE_FNMATCH) - add_definitions( -DHAVE_FNMATCH ) -endif() - -check_function_exists( fsync HAVE_FSYNC ) -if (HAVE_FSYNC) - add_definitions( -DHAVE_FSYNC ) -endif() - -check_function_exists( setenv HAVE_SETENV ) -if (HAVE_SETENV) - add_definitions( -DPOSIX_SETENV ) -endif() - - - -check_function_exists( opendir HAVE_OPENDIR ) -if (HAVE_OPENDIR) - add_definitions( -DHAVE_OPENDIR ) -endif() - -check_function_exists( usleep HAVE_USLEEP ) -if (HAVE_OPENDIR) - add_definitions( -DHAVE_USLEEP ) -endif() - -try_compile( HAVE_ISFINITE ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_isfinite.c ) -if (HAVE_ISFINITE) - add_definitions( -DHAVE_ISFINITE ) -endif() - -try_compile( MKDIR_POSIX ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_mkdir.c ) -if (MKDIR_POSIX) - add_definitions( -DMKDIR_POSIX ) -endif() - -try_compile( HAVE_PID_T ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_pid_t.c ) -if (HAVE_PID_T) - add_definitions( -DHAVE_PID_T ) -endif() - -try_compile( HAVE_VA_COPY ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_va_copy.c ) -if (HAVE_VA_COPY) - add_definitions( -DHAVE_VA_COPY ) -endif() - - -try_compile( ISREG_POSIX ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_isreg.c ) -if (ISREG_POSIX) - add_definitions( -DHAVE_ISREG ) -endif() if (ERT_LINUX) set( NEED_LIBM TRUE ) @@ -225,32 +63,36 @@ else() endif() -configure_file( ${PROJECT_SOURCE_DIR}/CMake/config/ert_build_config.h.in +configure_file( ${PROJECT_SOURCE_DIR}/cmake/config/ert_build_config.h.in ${PROJECT_BINARY_DIR}/ert_build_config.h ) -set( libert_util_build_path ${PROJECT_BINARY_DIR}/libert_util/src ) -set( libert_util_src_path ${PROJECT_SOURCE_DIR}/libert_util/src ) -set( libecl_src_path ${PROJECT_SOURCE_DIR}/libecl/src ) -set( libgeometry_src_path ${PROJECT_SOURCE_DIR}/libgeometry/src ) -set( libwell_src_path ${PROJECT_SOURCE_DIR}/libwell/src ) -set( libplot_src_path ${PROJECT_SOURCE_DIR}/libplot/src ) - -include_directories( ${libert_util_build_path}) -include_directories( ${libert_util_src_path} ) - +include_directories( ${PROJECT_SOURCE_DIR}/libert_util/include ) +include_directories( ${PROJECT_BINARY_DIR}/libert_util/include ) +if (MSVC) + include_directories( ${PROJECT_BINARY_DIR}/libert_util/include/ert/util ) +endif() add_subdirectory( libert_util ) -add_subdirectory( libgeometry ) -add_subdirectory( libecl ) -add_subdirectory( libwell ) -option( BUILD_ERT "Build the full ERT application - Linux only" OFF) -option( BUILD_ENS_PLOT "Build small Eclipse plotting program - no" OFF) + +include_directories( ${PROJECT_SOURCE_DIR}/libgeometry/include ) +add_subdirectory( libgeometry ) + +if (BUILD_ERT OR BUILD_ENS_PLOT) + include_directories( ${PROJECT_SOURCE_DIR}/libplot/include ) + add_subdirectory( libplot ) +endif() + +include_directories( ${PROJECT_SOURCE_DIR}/libecl/include ) +add_subdirectory( libecl ) + +include_directories( ${PROJECT_SOURCE_DIR}/libecl_well/include ) +add_subdirectory( libecl_well ) + #----------------------------------------------------------------- if (BUILD_ERT) #----------------------------------------------------------------- - - try_compile( DLOPEN ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/CMake/Tests/test_dlopen.c ) + try_compile( DLOPEN ${CMAKE_BINARY_DIR} ${PROJECT_SOURCE_DIR}/cmake/Tests/test_dlopen.c ) if (DLOPEN) set(NEED_LIBDL OFF) else() @@ -258,37 +100,28 @@ if (BUILD_ERT) endif() option(USE_LSF "Include support for LSF" ON) - set( libconfig_src_path ${CMAKE_SOURCE_DIR}/libconfig/src ) - set( libsched_src_path ${CMAKE_SOURCE_DIR}/libsched/src ) - set( librms_src_path ${CMAKE_SOURCE_DIR}/librms/src ) - set( libanalysis_src_path ${CMAKE_SOURCE_DIR}/libanalysis/src ) - set( libjob_queue_src_path ${CMAKE_SOURCE_DIR}/libjob_queue/src ) - set( libenkf_src_path ${CMAKE_SOURCE_DIR}/libenkf/src ) + include_directories( ${PROJECT_SOURCE_DIR}/libconfig/include ) add_subdirectory( libconfig ) - add_subdirectory( libanalysis ) - add_subdirectory( librms ) - add_subdirectory( libsched ) - add_subdirectory( libjob_queue ) - add_subdirectory( libplot ) - add_subdirectory( libenkf) - #add_dependencies( config_shared util_shared ) - ##add_dependencies( analysis_shared util_shared ) - #add_dependencies( rms_shared geometry_shared util_shared ) - #add_dependencies( sched_shared util_shared ecl_shared ) - #add_dependencies( job_queue_shared config_shared util ) - #add_dependencies( plot_shared util_shared ) - #add_dependencies( enkf_shared plot_shared ecl_shared util_shared config_shared sched_shared rms_shared analysis job_queue_shared ) - #add_dependencies( ert_shared enkf_shared plot_shared ) - # - #add_dependencies( config_static util_static ) - ##add_dependencies( analysis_static util_static ) - #add_dependencies( rms_static geometry_static util_static ) - #add_dependencies( sched_static util_static ecl_static ) - #add_dependencies( job_queue_static config_static util ) - #add_dependencies( plot_static util_static ) - #add_dependencies( enkf_static plot_static ecl_static util_static config_static sched_static rms_static analysis job_queue_static ) - #add_dependencies( ert enkf_static plot_static ) + include_directories( ${PROJECT_SOURCE_DIR}/libsched/include ) + add_subdirectory( libsched ) + + include_directories( ${PROJECT_SOURCE_DIR}/librms/include ) + add_subdirectory( librms ) + + include_directories( ${PROJECT_SOURCE_DIR}/libanalysis/include ) + add_subdirectory( libanalysis ) + + include_directories( ${PROJECT_SOURCE_DIR}/libjob_queue/include ) + add_subdirectory( libjob_queue ) + + include_directories( ${PROJECT_SOURCE_DIR}/libenkf/include ) + add_subdirectory( libenkf ) +endif() + + +if (BUILD_PYTHON) + add_subdirectory( python ) endif() diff --git a/ThirdParty/Ert/devel/debian/README.Debian b/ThirdParty/Ert/devel/debian/README.Debian index cf9ec6fcd6..ce79dec2d5 100644 --- a/ThirdParty/Ert/devel/debian/README.Debian +++ b/ThirdParty/Ert/devel/debian/README.Debian @@ -1,6 +1,13 @@ -libert for Debian +libert.ecl for Debian ----------------- - +ERT - Ensemble based Reservoir Tool is a tool for managing en ensemble +of reservoir models. This package contains the ERT functionality for +working with ECLIPSE output files. The package contains functionality +for reading, and partly writing, ECLIPSE INIT/GRID/EGRID/RFT and +summary and restart files. There is also some functionality for +working with .grdecl formatted ECLIPSE input files. + + -- Joakim Hove Wed, 23 Jan 2013 13:41:00 +0100 -- Arne Morten Kvarving Wed, 16 Jan 2013 11:21:17 +0100 diff --git a/ThirdParty/Ert/devel/debian/README.source b/ThirdParty/Ert/devel/debian/README.source deleted file mode 100644 index 416197b904..0000000000 --- a/ThirdParty/Ert/devel/debian/README.source +++ /dev/null @@ -1,9 +0,0 @@ -libert for Debian ------------------ - - - - - - diff --git a/ThirdParty/Ert/devel/debian/changelog b/ThirdParty/Ert/devel/debian/changelog index 244f6fbc2b..f86efe7fe7 100644 --- a/ThirdParty/Ert/devel/debian/changelog +++ b/ThirdParty/Ert/devel/debian/changelog @@ -1,4 +1,4 @@ -libert (0.1-1) unstable; urgency=low +libert.ecl (1.0-1) unstable; urgency=low * Initial release diff --git a/ThirdParty/Ert/devel/debian/control b/ThirdParty/Ert/devel/debian/control index a85649159a..7ea4d426b8 100644 --- a/ThirdParty/Ert/devel/debian/control +++ b/ThirdParty/Ert/devel/debian/control @@ -1,22 +1,22 @@ -Source: libert +Source: libert.ecl Priority: extra Maintainer: Arne Morten Kvarving -Build-Depends: debhelper (>= 8.0.0), cmake +Build-Depends: debhelper (>= 8.0.0), cmake, liblapack-dev, libquadmath0 Standards-Version: 3.9.2 Section: libs -Homepage: +Homepage: http://ert.nr.no Vcs-Git: git://github.com/Ensembles/ert.git Vcs-Browser: https://github.com/Ensembles/ert -Package: libert-dev +Package: libert.ecl-dev Section: libdevel Architecture: any -Depends: libert1 (= ${binary:Version}) +Depends: libert.ecl1 (= ${binary:Version}) Description: The Ensemble based Reservoir Tool -- Development files ERT - Ensemble based Reservoir Tool is a tool for managing en ensemble of reservoir models. -Package: libert1 +Package: libert.ecl1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} diff --git a/ThirdParty/Ert/devel/debian/copyright b/ThirdParty/Ert/devel/debian/copyright index 788db9b7db..a8797ba46b 100644 --- a/ThirdParty/Ert/devel/debian/copyright +++ b/ThirdParty/Ert/devel/debian/copyright @@ -1,36 +1,22 @@ Format: http://dep.debian.net/deps/dep5 -Upstream-Name: libert -Source: +Upstream-Name: libert.ecl +Source: https://github.com/Ensembles/ert Files: * -Copyright: - -License: - - - . - - -# If you want to use GPL v2 or later for the /debian/* files use -# the following clauses, or change it to suit. Delete these two lines -Files: debian/* -Copyright: 2013 Arne Morten Kvarving -License: GPL-2+ +Copyright: 2013 Statoil +License: GPL-3+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation; either version 3 of the License, or (at your option) any later version. . This package is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program. If not, see . On Debian systems, the complete text of the GNU General - Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". diff --git a/ThirdParty/Ert/devel/debian/docs b/ThirdParty/Ert/devel/debian/docs index d27ecff8cd..e69de29bb2 100644 --- a/ThirdParty/Ert/devel/debian/docs +++ b/ThirdParty/Ert/devel/debian/docs @@ -1 +0,0 @@ -Windows.txt diff --git a/ThirdParty/Ert/devel/debian/libert-dev.install b/ThirdParty/Ert/devel/debian/libert-dev.install deleted file mode 100644 index 41a1414493..0000000000 --- a/ThirdParty/Ert/devel/debian/libert-dev.install +++ /dev/null @@ -1 +0,0 @@ -usr/include/* diff --git a/ThirdParty/Ert/devel/debian/libert-dev.dirs b/ThirdParty/Ert/devel/debian/libert.ecl-dev.dirs similarity index 100% rename from ThirdParty/Ert/devel/debian/libert-dev.dirs rename to ThirdParty/Ert/devel/debian/libert.ecl-dev.dirs diff --git a/ThirdParty/Ert/devel/debian/libert.ecl-dev.install b/ThirdParty/Ert/devel/debian/libert.ecl-dev.install new file mode 100644 index 0000000000..c2ab584fbd --- /dev/null +++ b/ThirdParty/Ert/devel/debian/libert.ecl-dev.install @@ -0,0 +1,2 @@ +usr/include/* +usr/lib/*/*.so diff --git a/ThirdParty/Ert/devel/debian/libert1.dirs b/ThirdParty/Ert/devel/debian/libert.ecl1.dirs similarity index 100% rename from ThirdParty/Ert/devel/debian/libert1.dirs rename to ThirdParty/Ert/devel/debian/libert.ecl1.dirs diff --git a/ThirdParty/Ert/devel/debian/libert.ecl1.install b/ThirdParty/Ert/devel/debian/libert.ecl1.install new file mode 100644 index 0000000000..3ddde58419 --- /dev/null +++ b/ThirdParty/Ert/devel/debian/libert.ecl1.install @@ -0,0 +1 @@ +usr/lib/*/lib*.so.* diff --git a/ThirdParty/Ert/devel/debian/libert1.install b/ThirdParty/Ert/devel/debian/libert1.install deleted file mode 100644 index dc21b896ac..0000000000 --- a/ThirdParty/Ert/devel/debian/libert1.install +++ /dev/null @@ -1 +0,0 @@ -usr/lib/lib*.so diff --git a/ThirdParty/Ert/devel/libanalysis/CMakeLists.txt b/ThirdParty/Ert/devel/libanalysis/CMakeLists.txt index dce3d6629e..c1aa34ba2b 100644 --- a/ThirdParty/Ert/devel/libanalysis/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libanalysis/CMakeLists.txt @@ -1,5 +1,9 @@ -set( ANALYSIS_INSTALL_PREFIX "" CACHE STRING "Prefix for installation of libanalysis") - -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) - add_subdirectory( src ) + +#if (BUILD_APPLICATONS) +# add_subdirectory( applications ) +#endif() + +#if (BUILD_TESTS) +# add_subdirectory( tests ) +#endif() diff --git a/ThirdParty/Ert/devel/libanalysis/src/analysis_module.h b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/analysis_module.h similarity index 99% rename from ThirdParty/Ert/devel/libanalysis/src/analysis_module.h rename to ThirdParty/Ert/devel/libanalysis/include/ert/analysis/analysis_module.h index adc5aa1e45..82de8c95c3 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/analysis_module.h +++ b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/analysis_module.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include /* diff --git a/ThirdParty/Ert/devel/libanalysis/src/analysis_table.h b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/analysis_table.h similarity index 98% rename from ThirdParty/Ert/devel/libanalysis/src/analysis_table.h rename to ThirdParty/Ert/devel/libanalysis/include/ert/analysis/analysis_table.h index b503db47e9..b1945a92d4 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/analysis_table.h +++ b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/analysis_table.h @@ -6,8 +6,8 @@ extern "C" { #endif -#include -#include +#include +#include typedef void (analysis_updateA_ftype) (void * module_data , diff --git a/ThirdParty/Ert/devel/libanalysis/src/cv_enkf.h b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/cv_enkf.h similarity index 97% rename from ThirdParty/Ert/devel/libanalysis/src/cv_enkf.h rename to ThirdParty/Ert/devel/libanalysis/include/ert/analysis/cv_enkf.h index 2c10f283a1..abd043fd3d 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/cv_enkf.h +++ b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/cv_enkf.h @@ -16,8 +16,8 @@ for more details. */ -#include -#include +#include +#include typedef struct cv_enkf_data_struct cv_enkf_data_type; diff --git a/ThirdParty/Ert/devel/libanalysis/src/enkf_linalg.h b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/enkf_linalg.h similarity index 97% rename from ThirdParty/Ert/devel/libanalysis/src/enkf_linalg.h rename to ThirdParty/Ert/devel/libanalysis/include/ert/analysis/enkf_linalg.h index 0094d3061c..4556efa532 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/enkf_linalg.h +++ b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/enkf_linalg.h @@ -1,8 +1,8 @@ #ifndef __ENKF_LINALG_H__ #define __ENKF_LINALG_H__ -#include -#include +#include +#include void enkf_linalg_get_PC( const matrix_type * S0, @@ -39,7 +39,7 @@ int enkf_linalg_svd_truncation(const matrix_type * S , dgesvd_vector_enum store_V0T , double * sig0, matrix_type * U0 , - matrix_type * V0T); + matrix_type * V0T); int enkf_linalg_svdS(const matrix_type * S , diff --git a/ThirdParty/Ert/devel/libanalysis/src/fwd_step_enkf.h b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/fwd_step_enkf.h similarity index 96% rename from ThirdParty/Ert/devel/libanalysis/src/fwd_step_enkf.h rename to ThirdParty/Ert/devel/libanalysis/include/ert/analysis/fwd_step_enkf.h index 5be33c70c1..0723c95521 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/fwd_step_enkf.h +++ b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/fwd_step_enkf.h @@ -16,8 +16,8 @@ for more details. */ -#include -#include +#include +#include typedef struct fwd_step_enkf_data_struct fwd_step_enkf_data_type; diff --git a/ThirdParty/Ert/devel/libanalysis/src/rml_enkf_common.h b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/rml_enkf_common.h similarity index 100% rename from ThirdParty/Ert/devel/libanalysis/src/rml_enkf_common.h rename to ThirdParty/Ert/devel/libanalysis/include/ert/analysis/rml_enkf_common.h diff --git a/ThirdParty/Ert/devel/libanalysis/src/std_enkf.h b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/std_enkf.h similarity index 96% rename from ThirdParty/Ert/devel/libanalysis/src/std_enkf.h rename to ThirdParty/Ert/devel/libanalysis/include/ert/analysis/std_enkf.h index 42245b104d..d40d89357f 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/std_enkf.h +++ b/ThirdParty/Ert/devel/libanalysis/include/ert/analysis/std_enkf.h @@ -7,8 +7,8 @@ extern "C" { #include -#include -#include +#include +#include #define DEFAULT_ENKF_TRUNCATION_ 0.98 #define ENKF_TRUNCATION_KEY_ "ENKF_TRUNCATION" diff --git a/ThirdParty/Ert/devel/libanalysis/src/CMakeLists.txt b/ThirdParty/Ert/devel/libanalysis/src/CMakeLists.txt index 98996b92b9..ffaedd6bf9 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libanalysis/src/CMakeLists.txt @@ -3,6 +3,7 @@ set( source_files analysis_module.c enkf_linalg.c std_enkf.c sqrt_enkf.c cv_enkf set( header_files analysis_module.h enkf_linalg.h analysis_table.h) add_library( analysis SHARED ${source_files} ) set_target_properties( analysis PROPERTIES COMPILE_DEFINITIONS INTERNAL_LINK) +set_target_properties( analysis PROPERTIES VERSION 1.0 SOVERSION 1.0 ) target_link_libraries( analysis ert_util ) if (NEED_LIBDL) @@ -18,12 +19,9 @@ add_library( sqrt_enkf MODULE sqrt_enkf.c ) #----------------------------------------------------------------- -if (ANALYSIS_INSTALL_PREFIX) - install(TARGETS analysis DESTINATION ${ANALYSIS_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${ANALYSIS_INSTALL_PREFIX}/include) -else() - install(TARGETS analysis DESTINATION lib) - install(FILES ${header_files} DESTINATION include) -endif() +install(TARGETS analysis DESTINATION ${CMAKE_INSTALL_LIBDIR}) +foreach(header ${header_files}) + install(FILES ../include/ert/analysis/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/analysis) +endforeach() diff --git a/ThirdParty/Ert/devel/libanalysis/src/SConscript b/ThirdParty/Ert/devel/libanalysis/src/SConscript deleted file mode 100644 index ef97b8c562..0000000000 --- a/ThirdParty/Ert/devel/libanalysis/src/SConscript +++ /dev/null @@ -1,48 +0,0 @@ -import os -import os.path -import sys -sys.path += ["../../scons-config"] -import global_config -from global_config import LIBUTIL -from global_config import LIBANALYSIS -from global_config import add_static_library -from global_config import add_shared_library -from global_config import add_header -from global_config import get_target -from global_config import add_program - -package = "analysis" -lib_path = "../lib" -slib_path = "../lib" -include_path = "../include" -module_path = "../modules" - - -conf = global_config.get_conf(os.getcwd() , 2) -env = Environment() -conf.update_env( env , [ LIBUTIL , LIBANALYSIS ] , link = False) - -src_list = Split("analysis_module.c enkf_linalg.c") -src_list.append("std_enkf.c") -src_list.append("sqrt_enkf.c") -src_list.append("cv_enkf.c") -src_list.append("bootstrap_enkf.c") -src_list.append("null_enkf.c") -src_list.append("fwd_step_enkf.c") - -header_list = Split("analysis_module.h analysis_table.h enkf_linalg.h") - -add_shared_library( env , conf , slib_path , package , src_list) -add_header( env , conf , include_path , header_list ) - -env['SHLIBPREFIX'] = "" -add_shared_library( env , conf , module_path , "std_enkf.so" , ["std_enkf.c"] ) -add_shared_library( env , conf , module_path , "sqrt_enkf.so" , ["sqrt_enkf.c"] ) -add_shared_library( env , conf , module_path , "cv_enkf.so" , ["cv_enkf.c"] ) -add_shared_library( env , conf , module_path , "bootstrap_enkf.so" , ["bootstrap_enkf.c"] ) -add_shared_library( env , conf , module_path , "null_enkf.so" , ["null_enkf.c"] ) -add_shared_library( env , conf , module_path , "fwd_step_enkf.so" , ["fwd_step_enkf.c"] ) - - -Default( include_path , slib_path , module_path ) - diff --git a/ThirdParty/Ert/devel/libanalysis/src/analysis_module.c b/ThirdParty/Ert/devel/libanalysis/src/analysis_module.c index a7b8d49008..44eb25f351 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/analysis_module.c +++ b/ThirdParty/Ert/devel/libanalysis/src/analysis_module.c @@ -21,12 +21,13 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include + +#include +#include #define ANALYSIS_MODULE_TYPE_ID 6610123 diff --git a/ThirdParty/Ert/devel/libanalysis/src/bootstrap_enkf.c b/ThirdParty/Ert/devel/libanalysis/src/bootstrap_enkf.c index fa1016be9c..4cedc4ebca 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/bootstrap_enkf.c +++ b/ThirdParty/Ert/devel/libanalysis/src/bootstrap_enkf.c @@ -21,17 +21,17 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define BOOTSTRAP_ENKF_TYPE_ID 741223 diff --git a/ThirdParty/Ert/devel/libanalysis/src/cv_enkf.c b/ThirdParty/Ert/devel/libanalysis/src/cv_enkf.c index dd1c0f3cff..0226305705 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/cv_enkf.c +++ b/ThirdParty/Ert/devel/libanalysis/src/cv_enkf.c @@ -21,16 +21,16 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define CV_ENKF_TYPE_ID 765523 diff --git a/ThirdParty/Ert/devel/libanalysis/src/enkf_linalg.c b/ThirdParty/Ert/devel/libanalysis/src/enkf_linalg.c index e38297622b..b335096240 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/enkf_linalg.c +++ b/ThirdParty/Ert/devel/libanalysis/src/enkf_linalg.c @@ -2,12 +2,12 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include void enkf_linalg_genX3(matrix_type * X3 , const matrix_type * W , const matrix_type * D , const double * eig) { const int nrobs = matrix_get_rows( D ); diff --git a/ThirdParty/Ert/devel/libanalysis/src/ert_module b/ThirdParty/Ert/devel/libanalysis/src/ert_module index 1663b50926..96fdff2176 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/ert_module +++ b/ThirdParty/Ert/devel/libanalysis/src/ert_module @@ -5,9 +5,9 @@ from optparse import OptionParser #----------------------------------------------------------------- -lib_list = ["analysis" , "ert_util"] -lib_path_list = ["./" , "../../libutil/slib"] -include_path_list = ["./" , "../../libutil/src"] +lib_list = ["analysis" , "ert_util"] +lib_path_list = ["./" , "../../libutil/slib"] +include_path_list = ["../include" , "../../libutil/src"] define_list = ["HAVE_PTHREAD"] diff --git a/ThirdParty/Ert/devel/libanalysis/src/fwd_step_enkf.c b/ThirdParty/Ert/devel/libanalysis/src/fwd_step_enkf.c index 4d5438e040..7ac42dc493 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/fwd_step_enkf.c +++ b/ThirdParty/Ert/devel/libanalysis/src/fwd_step_enkf.c @@ -18,17 +18,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -/*#include */ -#include -#include #include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include + #define FWD_STEP_ENKF_TYPE_ID 765524 diff --git a/ThirdParty/Ert/devel/libanalysis/src/null_enkf.c b/ThirdParty/Ert/devel/libanalysis/src/null_enkf.c index 7170ab56e2..e6f1fb576c 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/null_enkf.c +++ b/ThirdParty/Ert/devel/libanalysis/src/null_enkf.c @@ -18,20 +18,16 @@ #include #include -#include -#include -#include #include -#include -#include -#include -#include - - - - +#include +#include +#include +#include +#include +#include +#include void null_enkf_initX(void * module_data , diff --git a/ThirdParty/Ert/devel/libanalysis/src/rml_enkf.c b/ThirdParty/Ert/devel/libanalysis/src/rml_enkf.c index 696fe6b349..ba87280090 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/rml_enkf.c +++ b/ThirdParty/Ert/devel/libanalysis/src/rml_enkf.c @@ -21,17 +21,17 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* A random 'magic' integer id which is used for run-time type checking diff --git a/ThirdParty/Ert/devel/libanalysis/src/rml_enkf_common.c b/ThirdParty/Ert/devel/libanalysis/src/rml_enkf_common.c index 704d5bcb70..b0d745797e 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/rml_enkf_common.c +++ b/ThirdParty/Ert/devel/libanalysis/src/rml_enkf_common.c @@ -23,15 +23,15 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libanalysis/src/rml_enkf_imodel.c b/ThirdParty/Ert/devel/libanalysis/src/rml_enkf_imodel.c index 8a8749cb04..56490aa87f 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/rml_enkf_imodel.c +++ b/ThirdParty/Ert/devel/libanalysis/src/rml_enkf_imodel.c @@ -22,18 +22,18 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* A random 'magic' integer id which is used for run-time type checking diff --git a/ThirdParty/Ert/devel/libanalysis/src/sqrt_enkf.c b/ThirdParty/Ert/devel/libanalysis/src/sqrt_enkf.c index 58d460bcab..7f1fabe26b 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/sqrt_enkf.c +++ b/ThirdParty/Ert/devel/libanalysis/src/sqrt_enkf.c @@ -18,14 +18,16 @@ #include #include -#include -#include -#include #include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include +#include +#include /* diff --git a/ThirdParty/Ert/devel/libanalysis/src/std_enkf.c b/ThirdParty/Ert/devel/libanalysis/src/std_enkf.c index d79997dfb0..4f64dccf8f 100644 --- a/ThirdParty/Ert/devel/libanalysis/src/std_enkf.c +++ b/ThirdParty/Ert/devel/libanalysis/src/std_enkf.c @@ -20,15 +20,15 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include /* diff --git a/ThirdParty/Ert/devel/libconfig/CMakeLists.txt b/ThirdParty/Ert/devel/libconfig/CMakeLists.txt index b1268b877a..d4fb658258 100644 --- a/ThirdParty/Ert/devel/libconfig/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libconfig/CMakeLists.txt @@ -1,5 +1 @@ -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -include_directories( ${libert_util_build_path} ) -include_directories( ${libert_util_src_path} ) - add_subdirectory( src ) diff --git a/ThirdParty/Ert/devel/libconfig/src/conf.h b/ThirdParty/Ert/devel/libconfig/include/ert/config/conf.h similarity index 95% rename from ThirdParty/Ert/devel/libconfig/src/conf.h rename to ThirdParty/Ert/devel/libconfig/include/ert/config/conf.h index 708c535ecd..a3dc75e951 100644 --- a/ThirdParty/Ert/devel/libconfig/src/conf.h +++ b/ThirdParty/Ert/devel/libconfig/include/ert/config/conf.h @@ -104,16 +104,19 @@ extern "C" { #endif #include -#include -#include -#include + +#include +#include + +#include -typedef struct conf_class_struct conf_class_type; -typedef struct conf_instance_struct conf_instance_type; -typedef struct conf_item_spec_struct conf_item_spec_type; -typedef struct conf_item_struct conf_item_type; -typedef struct conf_item_mutex_struct conf_item_mutex_type; + +typedef struct conf_class_struct conf_class_type; +typedef struct conf_instance_struct conf_instance_type; +typedef struct conf_item_spec_struct conf_item_spec_type; +typedef struct conf_item_struct conf_item_type; +typedef struct conf_item_mutex_struct conf_item_mutex_type; /** D E F A U L T A L L O C / F R E E F U N C T I O N S */ diff --git a/ThirdParty/Ert/devel/libconfig/src/conf_data.h b/ThirdParty/Ert/devel/libconfig/include/ert/config/conf_data.h similarity index 100% rename from ThirdParty/Ert/devel/libconfig/src/conf_data.h rename to ThirdParty/Ert/devel/libconfig/include/ert/config/conf_data.h diff --git a/ThirdParty/Ert/devel/libconfig/src/conf_util.h b/ThirdParty/Ert/devel/libconfig/include/ert/config/conf_util.h similarity index 100% rename from ThirdParty/Ert/devel/libconfig/src/conf_util.h rename to ThirdParty/Ert/devel/libconfig/include/ert/config/conf_util.h diff --git a/ThirdParty/Ert/devel/libconfig/src/config.h b/ThirdParty/Ert/devel/libconfig/include/ert/config/config.h similarity index 99% rename from ThirdParty/Ert/devel/libconfig/src/config.h rename to ThirdParty/Ert/devel/libconfig/include/ert/config/config.h index 334b4fdfaf..007bf7fa5d 100644 --- a/ThirdParty/Ert/devel/libconfig/src/config.h +++ b/ThirdParty/Ert/devel/libconfig/include/ert/config/config.h @@ -24,8 +24,9 @@ extern "C" { #include #include -#include -#include + +#include +#include #define ECL_COM_KW "--" #define ENKF_COM_KW "--" diff --git a/ThirdParty/Ert/devel/libconfig/src/CMakeLists.txt b/ThirdParty/Ert/devel/libconfig/src/CMakeLists.txt index 2e9245b9ce..e0c31cfab9 100644 --- a/ThirdParty/Ert/devel/libconfig/src/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libconfig/src/CMakeLists.txt @@ -2,13 +2,11 @@ set( source_files config.c conf.c conf_util.c conf_data.c) set( header_files config.h conf.h conf_data.h) add_library( config ${LIBRARY_TYPE} ${source_files} ) +set_target_properties( config PROPERTIES VERSION 1.0 SOVERSION 1.0 ) target_link_libraries( config ert_util ) -if (CONFIG_INSTALL_PREFIX) - install(TARGETS config DESTINATION ${CONFIG_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${CONFIG_INSTALL_PREFIX}/include) -else() - install(TARGETS config DESTINATION lib) - install(FILES ${header_files} DESTINATION include) -endif() \ No newline at end of file +install(TARGETS config DESTINATION ${CMAKE_INSTALL_LIBDIR}) +foreach(header ${header_files}) + install(FILES ../include/ert/config/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/config) +endforeach() diff --git a/ThirdParty/Ert/devel/libconfig/src/conf.c b/ThirdParty/Ert/devel/libconfig/src/conf.c index 934936cdbc..2f5c5c4d75 100644 --- a/ThirdParty/Ert/devel/libconfig/src/conf.c +++ b/ThirdParty/Ert/devel/libconfig/src/conf.c @@ -18,12 +18,15 @@ #include #include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include + +#include +#include + /** S T R U C T D E F I N I T I O N S */ diff --git a/ThirdParty/Ert/devel/libconfig/src/conf_data.c b/ThirdParty/Ert/devel/libconfig/src/conf_data.c index 57eb1fce59..476070f3c8 100644 --- a/ThirdParty/Ert/devel/libconfig/src/conf_data.c +++ b/ThirdParty/Ert/devel/libconfig/src/conf_data.c @@ -19,8 +19,12 @@ #include #include #include -#include -#include + +#include + +#include + + #define DT_STR_STRING "string" #define DT_INT_STRING "integer" diff --git a/ThirdParty/Ert/devel/libconfig/src/conf_util.c b/ThirdParty/Ert/devel/libconfig/src/conf_util.c index 6263fe8430..c077fb3a07 100644 --- a/ThirdParty/Ert/devel/libconfig/src/conf_util.c +++ b/ThirdParty/Ert/devel/libconfig/src/conf_util.c @@ -17,10 +17,12 @@ */ #include -#include #include -#include -#include + +#include +#include + +#include /* diff --git a/ThirdParty/Ert/devel/libconfig/src/config.c b/ThirdParty/Ert/devel/libconfig/src/config.c index 39d7da8dab..1eb45b0336 100644 --- a/ThirdParty/Ert/devel/libconfig/src/config.c +++ b/ThirdParty/Ert/devel/libconfig/src/config.c @@ -21,16 +21,16 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include +#include #define CLEAR_STRING "__RESET__" diff --git a/ThirdParty/Ert/devel/libconfig/src/dependencies b/ThirdParty/Ert/devel/libconfig/src/dependencies deleted file mode 100644 index 1a41cd88fc..0000000000 --- a/ThirdParty/Ert/devel/libconfig/src/dependencies +++ /dev/null @@ -1,5 +0,0 @@ -conf.o : conf.c conf.h conf_util.o -conf_data.o : conf_data.c conf_data.h -conf_util.o : conf_util.c conf_util.h -config.o : config.c config.h -tokenizer.o : tokenizer.c tokenizer.h diff --git a/ThirdParty/Ert/devel/libecl/CMakeLists.txt b/ThirdParty/Ert/devel/libecl/CMakeLists.txt index f342ea93d5..acb1c9d2f4 100644 --- a/ThirdParty/Ert/devel/libecl/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libecl/CMakeLists.txt @@ -1,10 +1,9 @@ -set( ECL_INSTALL_PREFIX "" CACHE STRING "Prefix for installation of libecl") - -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -include_directories( ${libgeometry_src_path} ) - - add_subdirectory( src ) -add_subdirectory( applications ) -add_subdirectory( tests ) +if (BUILD_APPLICATONS OR BUILD_ECL_SUMMARY) + add_subdirectory( applications ) +endif() + +if (BUILD_TESTS) + add_subdirectory( tests ) +endif() diff --git a/ThirdParty/Ert/devel/libecl/applications/CMakeLists.txt b/ThirdParty/Ert/devel/libecl/applications/CMakeLists.txt index f73d1d93d9..80644e6dea 100644 --- a/ThirdParty/Ert/devel/libecl/applications/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libecl/applications/CMakeLists.txt @@ -1,68 +1,73 @@ -add_executable( sum_write sum_write.c ) -add_executable( make_grid make_grid.c ) -add_executable( grdecl_grid grdecl_grid.c ) -add_executable( summary2csv summary2csv.c ) -if (ERT_LINUX) - add_executable( convert.x convert.c ) - add_executable( grdecl_test.x grdecl_test.c ) - add_executable( kw_list.x kw_list.c ) - add_executable( kw_extract.x kw_extract.c ) - add_executable( grid_info.x grid_info.c ) - add_executable( grid_dump.x grid_dump.c ) - add_executable( grid_dump_ascii.x grid_dump_ascii.c ) - add_executable( summary.x view_summary.c ) - add_executable( select_test.x select_test.c ) - add_executable( load_test.x load_test.c ) - set(program_list summary2csv kw_extract.x grdecl_grid make_grid sum_write load_test.x grdecl_test.x grid_dump_ascii.x select_test.x grid_dump.x convert.x kw_list.x grid_info.x summary.x) -else() - # The stupid .x extension creates problems on windows - add_executable( convert convert.c ) - add_executable( grdecl_test grdecl_test.c ) - add_executable( kw_list kw_list.c ) - add_executable( kw_extract kw_extract.c ) - add_executable( grid_info grid_info.c ) - add_executable( grid_dump grid_dump.c ) - add_executable( grid_dump_ascii grid_dump_ascii.c ) - add_executable( summary view_summary.c ) - add_executable( select_test select_test.c ) - add_executable( load_test load_test.c ) - set(program_list summary2csv kw_extract grdecl_grid make_grid sum_write load_test grdecl_test grid_dump_ascii select_test grid_dump convert kw_list grid_info summary) -endif() - - -foreach(prog ${program_list}) - target_link_libraries( ${prog} ecl ert_util geometry ) - - #----------------------------------------------------------------- - if (ECL_INSTALL_PREFIX) - set (destination ${CMAKE_INSTALL_PREFIX}/${ECL_INSTALL_PREFIX}/bin) +if (BUILD_APPLICATIONS) + add_executable( sum_write sum_write.c ) + add_executable( make_grid make_grid.c ) + add_executable( grdecl_grid grdecl_grid.c ) + add_executable( summary2csv summary2csv.c ) + if (ERT_LINUX) + add_executable( convert.x convert.c ) + add_executable( grdecl_test.x grdecl_test.c ) + add_executable( kw_list.x kw_list.c ) + add_executable( kw_extract.x kw_extract.c ) + add_executable( grid_info.x grid_info.c ) + add_executable( grid_dump.x grid_dump.c ) + add_executable( grid_dump_ascii.x grid_dump_ascii.c ) + add_executable( summary.x view_summary.c ) + add_executable( select_test.x select_test.c ) + add_executable( load_test.x load_test.c ) + set(program_list summary2csv kw_extract.x grdecl_grid make_grid sum_write load_test.x grdecl_test.x grid_dump_ascii.x select_test.x grid_dump.x convert.x kw_list.x grid_info.x summary.x) else() - set (destination ${CMAKE_INSTALL_PREFIX}/bin) + # The stupid .x extension creates problems on windows + add_executable( convert convert.c ) + add_executable( grdecl_test grdecl_test.c ) + add_executable( kw_list kw_list.c ) + add_executable( kw_extract kw_extract.c ) + add_executable( grid_info grid_info.c ) + add_executable( grid_dump grid_dump.c ) + add_executable( grid_dump_ascii grid_dump_ascii.c ) + add_executable( summary view_summary.c ) + add_executable( select_test select_test.c ) + add_executable( load_test load_test.c ) + set(program_list summary2csv kw_extract grdecl_grid make_grid sum_write load_test grdecl_test grid_dump_ascii select_test grid_dump convert kw_list grid_info summary) endif() - install(TARGETS ${prog} DESTINATION ${destination}) - if (INSTALL_GROUP) - install(CODE "EXECUTE_PROCESS(COMMAND chgrp ${INSTALL_GROUP} ${destination}/${prog})") - install(CODE "EXECUTE_PROCESS(COMMAND chmod g+w ${destination}/${prog})") - endif() -endforeach() + + foreach(prog ${program_list}) + target_link_libraries( ${prog} ecl ert_util ) + + #----------------------------------------------------------------- + set (destination ${CMAKE_INSTALL_PREFIX}/bin) + install(TARGETS ${prog} DESTINATION ${destination}) + if (INSTALL_GROUP) + install(CODE "EXECUTE_PROCESS(COMMAND chgrp ${INSTALL_GROUP} ${destination}/${prog})") + install(CODE "EXECUTE_PROCESS(COMMAND chmod g+w ${destination}/${prog})") + endif() + endforeach() +endif() if (BUILD_ENS_PLOT) include_directories( ${PLPLOT_HEADER} ) - include_directories( ${libplot_src_path} ) add_executable( ens_plot.x ens_plot.c ) - target_link_libraries( ens_plot.x plot ecl util) - - if (ECL_INSTALL_PREFIX) - set (destination ${CMAKE_INSTALL_PREFIX}/${ECL_INSTALL_PREFIX}/bin) - else() - set (destination ${CMAKE_INSTALL_PREFIX}/bin) - endif() + target_link_libraries( ens_plot.x plot ecl ert_util) + set (destination ${CMAKE_INSTALL_PREFIX}/bin) install(TARGETS ens_plot.x DESTINATION ${destination}) if (INSTALL_GROUP) install(CODE "EXECUTE_PROCESS(COMMAND chgrp ${INSTALL_GROUP} ${destination}/ens_plot.x)") install(CODE "EXECUTE_PROCESS(COMMAND chmod g+w ${destination}/ens_plot.x)") endif() endif() + + + +if (BUILD_ECL_SUMMARY) + add_executable( ecl_summary view_summary.c ) + target_link_libraries( ecl_summary ecl ert_util) + + set (destination ${CMAKE_INSTALL_PREFIX}/bin) + install(TARGETS ecl_summary DESTINATION ${destination}) + if (INSTALL_GROUP) + install(CODE "EXECUTE_PROCESS(COMMAND chgrp ${INSTALL_GROUP} ${destination}/ecl_summary)") + install(CODE "EXECUTE_PROCESS(COMMAND chmod g+w ${destination}/ecl_summary)") + endif() +endif() diff --git a/ThirdParty/Ert/devel/libecl/applications/convert.c b/ThirdParty/Ert/devel/libecl/applications/convert.c index 1e048bb4bc..1160e9ceaa 100644 --- a/ThirdParty/Ert/devel/libecl/applications/convert.c +++ b/ThirdParty/Ert/devel/libecl/applications/convert.c @@ -19,12 +19,14 @@ #include #include #include -#include -#include #include -#include -#include -#include + +#include + +#include +#include +#include +#include void file_convert(const char * src_file , const char * target_file, ecl_file_enum file_type , bool fmt_src) { diff --git a/ThirdParty/Ert/devel/libecl/applications/ecl_pack.c b/ThirdParty/Ert/devel/libecl/applications/ecl_pack.c index 0d0c06992e..d212d8e82f 100644 --- a/ThirdParty/Ert/devel/libecl/applications/ecl_pack.c +++ b/ThirdParty/Ert/devel/libecl/applications/ecl_pack.c @@ -16,13 +16,16 @@ for more details. */ -#include -#include -#include #include -#include -#include -#include + +#include +#include +#include + +#include +#include +#include + int main(int argc, char ** argv) { diff --git a/ThirdParty/Ert/devel/libecl/applications/ecl_quantile.c b/ThirdParty/Ert/devel/libecl/applications/ecl_quantile.c index bd531ae6e7..d4748b4f00 100644 --- a/ThirdParty/Ert/devel/libecl/applications/ecl_quantile.c +++ b/ThirdParty/Ert/devel/libecl/applications/ecl_quantile.c @@ -24,17 +24,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include +#include -#include +#include #define DEFAULT_NUM_INTERP 50 #define SUMMARY_JOIN ":" diff --git a/ThirdParty/Ert/devel/libecl/applications/ens_plot.c b/ThirdParty/Ert/devel/libecl/applications/ens_plot.c index 65d0f9b4d5..563bc8c471 100644 --- a/ThirdParty/Ert/devel/libecl/applications/ens_plot.c +++ b/ThirdParty/Ert/devel/libecl/applications/ens_plot.c @@ -311,27 +311,31 @@ Q | Quit #define NEW_VECTOR_CMD "_newplotvector_" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include +#include +#include + + diff --git a/ThirdParty/Ert/devel/libecl/applications/grdecl_grid.c b/ThirdParty/Ert/devel/libecl/applications/grdecl_grid.c index b067dbb160..e510ff8e45 100644 --- a/ThirdParty/Ert/devel/libecl/applications/grdecl_grid.c +++ b/ThirdParty/Ert/devel/libecl/applications/grdecl_grid.c @@ -19,10 +19,11 @@ #include #include -#include -#include -#include -#include +#include + +#include +#include +#include int main(int argc , char ** argv) { diff --git a/ThirdParty/Ert/devel/libecl/applications/grdecl_test.c b/ThirdParty/Ert/devel/libecl/applications/grdecl_test.c index 404a42f98c..a503f515b0 100644 --- a/ThirdParty/Ert/devel/libecl/applications/grdecl_test.c +++ b/ThirdParty/Ert/devel/libecl/applications/grdecl_test.c @@ -19,10 +19,10 @@ #include #include -#include -#include +#include +#include -#include +#include int main(int argc , char ** argv) { diff --git a/ThirdParty/Ert/devel/libecl/applications/grid_dump.c b/ThirdParty/Ert/devel/libecl/applications/grid_dump.c index 1919afb9d6..8d405a2323 100644 --- a/ThirdParty/Ert/devel/libecl/applications/grid_dump.c +++ b/ThirdParty/Ert/devel/libecl/applications/grid_dump.c @@ -19,9 +19,9 @@ #include #include -#include +#include -#include +#include diff --git a/ThirdParty/Ert/devel/libecl/applications/grid_dump_ascii.c b/ThirdParty/Ert/devel/libecl/applications/grid_dump_ascii.c index 9a05210ca4..e9e05964be 100644 --- a/ThirdParty/Ert/devel/libecl/applications/grid_dump_ascii.c +++ b/ThirdParty/Ert/devel/libecl/applications/grid_dump_ascii.c @@ -19,9 +19,9 @@ #include #include -#include +#include -#include +#include diff --git a/ThirdParty/Ert/devel/libecl/applications/grid_info.c b/ThirdParty/Ert/devel/libecl/applications/grid_info.c index 73d57e959b..beaf441290 100644 --- a/ThirdParty/Ert/devel/libecl/applications/grid_info.c +++ b/ThirdParty/Ert/devel/libecl/applications/grid_info.c @@ -19,9 +19,11 @@ #include #include -#include +#include + +#include + -#include int main(int argc, char ** argv) { diff --git a/ThirdParty/Ert/devel/libecl/applications/kw_extract.c b/ThirdParty/Ert/devel/libecl/applications/kw_extract.c index bf62ec829b..034c7f66b3 100644 --- a/ThirdParty/Ert/devel/libecl/applications/kw_extract.c +++ b/ThirdParty/Ert/devel/libecl/applications/kw_extract.c @@ -17,18 +17,21 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include #include -#include -#include -#include +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + /** This file will extract all occurences of kw1,kw2,...,kwn from the diff --git a/ThirdParty/Ert/devel/libecl/applications/kw_list.c b/ThirdParty/Ert/devel/libecl/applications/kw_list.c index 46de0e1b94..97f2d1a1fd 100644 --- a/ThirdParty/Ert/devel/libecl/applications/kw_list.c +++ b/ThirdParty/Ert/devel/libecl/applications/kw_list.c @@ -19,11 +19,12 @@ #include #include #include -#include -#include #include -#include -#include + +#include +#include +#include +#include void kw_list(const char *filename) { diff --git a/ThirdParty/Ert/devel/libecl/applications/load_test.c b/ThirdParty/Ert/devel/libecl/applications/load_test.c index 125a6ed4c7..3465e771bb 100644 --- a/ThirdParty/Ert/devel/libecl/applications/load_test.c +++ b/ThirdParty/Ert/devel/libecl/applications/load_test.c @@ -20,10 +20,10 @@ #include #include -#include +#include -#include -#include +#include +#include void test_case( const char * base , bool load_all) { diff --git a/ThirdParty/Ert/devel/libecl/applications/make_grid.c b/ThirdParty/Ert/devel/libecl/applications/make_grid.c index 46eb81082a..ec9d1f4784 100644 --- a/ThirdParty/Ert/devel/libecl/applications/make_grid.c +++ b/ThirdParty/Ert/devel/libecl/applications/make_grid.c @@ -19,9 +19,9 @@ #include #include -#include +#include -#include +#include diff --git a/ThirdParty/Ert/devel/libecl/applications/select_test.c b/ThirdParty/Ert/devel/libecl/applications/select_test.c index b1f6f30558..61acc18034 100644 --- a/ThirdParty/Ert/devel/libecl/applications/select_test.c +++ b/ThirdParty/Ert/devel/libecl/applications/select_test.c @@ -19,10 +19,10 @@ #include #include -#include -#include +#include +#include -#include +#include int main(int argc , char ** argv) { diff --git a/ThirdParty/Ert/devel/libecl/applications/sum_write.c b/ThirdParty/Ert/devel/libecl/applications/sum_write.c index d829c8f969..9495586b15 100644 --- a/ThirdParty/Ert/devel/libecl/applications/sum_write.c +++ b/ThirdParty/Ert/devel/libecl/applications/sum_write.c @@ -16,14 +16,14 @@ */ #include - -#include #include -#include -#include -#include -#include +#include +#include + +#include +#include +#include /* diff --git a/ThirdParty/Ert/devel/libecl/applications/summary2csv.c b/ThirdParty/Ert/devel/libecl/applications/summary2csv.c index db177f4e5d..2a43ed4725 100644 --- a/ThirdParty/Ert/devel/libecl/applications/summary2csv.c +++ b/ThirdParty/Ert/devel/libecl/applications/summary2csv.c @@ -20,10 +20,10 @@ #include #include -#include -#include +#include +#include -#include +#include diff --git a/ThirdParty/Ert/devel/libecl/applications/view_summary.c b/ThirdParty/Ert/devel/libecl/applications/view_summary.c index 7948283992..f01eef1c53 100644 --- a/ThirdParty/Ert/devel/libecl/applications/view_summary.c +++ b/ThirdParty/Ert/devel/libecl/applications/view_summary.c @@ -23,11 +23,11 @@ #include #endif -#include -#include +#include +#include -#include -#include +#include +#include diff --git a/ThirdParty/Ert/devel/libecl/cxx/src/CMakeLists.txt b/ThirdParty/Ert/devel/libecl/cxx/src/CMakeLists.txt index 3bd34bc3a2..857f9b18d1 100644 --- a/ThirdParty/Ert/devel/libecl/cxx/src/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libecl/cxx/src/CMakeLists.txt @@ -15,6 +15,6 @@ if (ECL_INSTALL_PREFIX) install(FILES ${header_files} DESTINATION ${ECL_INSTALL_PREFIX}/include) else() # - install(TARGETS eclxx_static DESTINATION lib) + install(TARGETS eclxx_static DESTINATION ${CMAKE_INSTALL_LIBDIR}) install(FILES ${header_files} DESTINATION include) endif() diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_box.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_box.h similarity index 86% rename from ThirdParty/Ert/devel/libecl/src/ecl_box.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_box.h index 457d71eeb1..f4e8525ec9 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_box.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_box.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include typedef struct ecl_box_struct ecl_box_type; @@ -30,9 +30,9 @@ typedef struct ecl_box_struct ecl_box_type; void ecl_box_set_size (ecl_box_type * , int , int , int , int , int , int ); ecl_box_type * ecl_box_alloc(const ecl_grid_type * ecl_grid , int i1,int i2 , int j1 , int j2 , int k1, int k2); -void ecl_box_free (ecl_box_type * ); -void ecl_box_set_values(const ecl_box_type * , char * , const char * , int ); -int ecl_box_get_total_size(const ecl_box_type * ); +void ecl_box_free (ecl_box_type * ); +void ecl_box_set_values(const ecl_box_type * , char * , const char * , int ); +int ecl_box_get_total_size(const ecl_box_type * ); int ecl_box_get_active_size( const ecl_box_type * ecl_box ); const int * ecl_box_get_active_list( const ecl_box_type * ecl_box ); int ecl_box_get_global_size( const ecl_box_type * ecl_box ); diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_coarse_cell.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_coarse_cell.h similarity index 100% rename from ThirdParty/Ert/devel/libecl/src/ecl_coarse_cell.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_coarse_cell.h diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_endian_flip.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_endian_flip.h similarity index 100% rename from ThirdParty/Ert/devel/libecl/src/ecl_endian_flip.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_endian_flip.h diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_file.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_file.h similarity index 98% rename from ThirdParty/Ert/devel/libecl/src/ecl_file.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_file.h index d6a007aace..cafda84806 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_file.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_file.h @@ -27,10 +27,10 @@ extern "C" { #include -#include -#include -#include -#include +#include +#include +#include +#include typedef struct ecl_file_struct ecl_file_type; diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_file_kw.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_file_kw.h similarity index 97% rename from ThirdParty/Ert/devel/libecl/src/ecl_file_kw.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_file_kw.h index 58a62741d1..a504669d24 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_file_kw.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_file_kw.h @@ -25,8 +25,8 @@ extern "C" { #include -#include -#include +#include +#include typedef struct ecl_file_kw_struct ecl_file_kw_type; typedef struct inv_map_struct inv_map_type; diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_grav.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grav.h similarity index 95% rename from ThirdParty/Ert/devel/libecl/src/ecl_grav.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grav.h index 95c342e9dc..905a15141e 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_grav.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grav.h @@ -23,9 +23,9 @@ extern "C" { #endif -#include -#include -#include +#include +#include +#include typedef struct ecl_grav_struct ecl_grav_type; typedef struct ecl_grav_survey_struct ecl_grav_survey_type; diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_grav_calc.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grav_calc.h similarity index 94% rename from ThirdParty/Ert/devel/libecl/src/ecl_grav_calc.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grav_calc.h index bf32d0d49e..45f3153ef1 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_grav_calc.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grav_calc.h @@ -22,9 +22,9 @@ extern "C" { #endif -#include -#include -#include +#include +#include +#include double ecl_grav_phase_deltag( double utm_x , double utm_y , diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_grav_common.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grav_common.h similarity index 94% rename from ThirdParty/Ert/devel/libecl/src/ecl_grav_common.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grav_common.h index d95ac487c7..53e7f4f388 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_grav_common.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grav_common.h @@ -25,8 +25,8 @@ extern "C" { #endif #include -#include -#include +#include +#include bool * ecl_grav_common_alloc_aquifer_cell( const ecl_grid_cache_type * grid_cache , const ecl_file_type * init_file); double ecl_grav_common_eval_biot_savart( const ecl_grid_cache_type * grid_cache , ecl_region_type * region , const bool * aquifer , const double * weight , double utm_x , double utm_y , double depth); diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_grid.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grid.h similarity index 98% rename from ThirdParty/Ert/devel/libecl/src/ecl_grid.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grid.h index a599e15ad2..00decbc2e2 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_grid.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grid.h @@ -23,12 +23,12 @@ extern "C" { #endif #include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include typedef double (block_function_ftype) ( const double_vector_type *); diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_grid_cache.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grid_cache.h similarity index 98% rename from ThirdParty/Ert/devel/libecl/src/ecl_grid_cache.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grid_cache.h index 407d50a27e..8094326854 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_grid_cache.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_grid_cache.h @@ -20,7 +20,7 @@ #ifndef __ECL_GRID_CACHE_H__ #define __ECL_GRID_CACHE_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_init_file.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_init_file.h similarity index 92% rename from ThirdParty/Ert/devel/libecl/src/ecl_init_file.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_init_file.h index 4932391df0..1051f0f4d0 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_init_file.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_init_file.h @@ -25,9 +25,9 @@ extern "C" { #include -#include -#include -#include +#include +#include +#include void ecl_init_file_fwrite_header( fortio_type * fortio , const ecl_grid_type * grid , const ecl_kw_type * poro , int phases , time_t start_date); diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_intehead.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_intehead.h similarity index 98% rename from ThirdParty/Ert/devel/libecl/src/ecl_intehead.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_intehead.h index 1391ab0a28..5819fccecd 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_intehead.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_intehead.h @@ -24,7 +24,8 @@ extern "C" { #endif #include -#include + +#include #define INTEHEAD_KW "INTEHEAD" /* Long array with lots of data. */ diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_io_config.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_io_config.h similarity index 100% rename from ThirdParty/Ert/devel/libecl/src/ecl_io_config.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_io_config.h diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_kw.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_kw.h similarity index 98% rename from ThirdParty/Ert/devel/libecl/src/ecl_kw.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_kw.h index 1175229d42..b53f614328 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_kw.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_kw.h @@ -25,10 +25,10 @@ extern "C" { #include #include -#include +#include -#include -#include +#include +#include UTIL_IS_INSTANCE_HEADER(ecl_kw); @@ -220,7 +220,7 @@ extern "C" { ECL_KW_MAX_MIN_HEADER( double ); #undef ECL_KW_MAX_MIN_HEADER -#include +#include #ifdef __cplusplus } diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_kw_grdecl.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_kw_grdecl.h similarity index 100% rename from ThirdParty/Ert/devel/libecl/src/ecl_kw_grdecl.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_kw_grdecl.h diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_kw_magic.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_kw_magic.h similarity index 100% rename from ThirdParty/Ert/devel/libecl/src/ecl_kw_magic.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_kw_magic.h diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_region.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_region.h similarity index 98% rename from ThirdParty/Ert/devel/libecl/src/ecl_region.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_region.h index 470c7b424d..e6e00d9790 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_region.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_region.h @@ -23,12 +23,12 @@ extern "C" { #endif #include -#include +#include -#include +#include -#include -#include +#include +#include typedef enum { diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_rft_file.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_rft_file.h similarity index 90% rename from ThirdParty/Ert/devel/libecl/src/ecl_rft_file.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_rft_file.h index 24bc7a1696..d6ff6ded25 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_rft_file.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_rft_file.h @@ -23,9 +23,9 @@ extern "C" { #endif #include -#include +#include -#include +#include typedef struct ecl_rft_file_struct ecl_rft_file_type; @@ -48,8 +48,8 @@ int ecl_rft_file_get_size__( const ecl_rft_file_type * rft int ecl_rft_file_get_size( const ecl_rft_file_type * rft_file); const ecl_rft_node_type * ecl_rft_file_iget_node( const ecl_rft_file_type * rft_file , int index); const ecl_rft_node_type * ecl_rft_file_iget_well_rft( const ecl_rft_file_type * rft_file , const char * well, int index); -bool ecl_rft_file_has_well( const ecl_rft_file_type * rft_file , const char * well); -int ecl_rft_file_get_well_occurences( const ecl_rft_file_type * rft_file , const char * well); +bool ecl_rft_file_has_well( const ecl_rft_file_type * rft_file , const char * well); +int ecl_rft_file_get_well_occurences( const ecl_rft_file_type * rft_file , const char * well); stringlist_type * ecl_rft_file_alloc_well_list(const ecl_rft_file_type * rft_file ); int ecl_rft_file_get_num_wells( const ecl_rft_file_type * rft_file ); void ecl_rft_file_free__( void * arg); diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_rft_node.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_rft_node.h similarity index 98% rename from ThirdParty/Ert/devel/libecl/src/ecl_rft_node.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_rft_node.h index 3c830eac0d..f6fd0d7b7c 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_rft_node.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_rft_node.h @@ -23,7 +23,7 @@ extern "C" { #endif #include -#include +#include typedef enum { RFT = 1 , PLT = 2 , diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_rst_file.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_rst_file.h similarity index 100% rename from ThirdParty/Ert/devel/libecl/src/ecl_rst_file.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_rst_file.h diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_smspec.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_smspec.h similarity index 98% rename from ThirdParty/Ert/devel/libecl/src/ecl_smspec.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_smspec.h index 02f22d2b54..c37575eea1 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_smspec.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_smspec.h @@ -26,10 +26,10 @@ extern "C" { #include #include -#include -#include +#include +#include -#include +#include typedef struct ecl_smspec_struct ecl_smspec_type; diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_subsidence.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_subsidence.h similarity index 95% rename from ThirdParty/Ert/devel/libecl/src/ecl_subsidence.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_subsidence.h index 1c9250c9f7..b28f7b6723 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_subsidence.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_subsidence.h @@ -23,9 +23,9 @@ extern "C" { #endif -#include -#include -#include +#include +#include +#include typedef struct ecl_subsidence_struct ecl_subsidence_type; typedef struct ecl_subsidence_survey_struct ecl_subsidence_survey_type; diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_sum.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum.h similarity index 98% rename from ThirdParty/Ert/devel/libecl/src/ecl_sum.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum.h index 0fd83489a4..22f54b2b2e 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_sum.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum.h @@ -27,13 +27,13 @@ extern "C" { #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include typedef struct { diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_sum_data.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum_data.h similarity index 96% rename from ThirdParty/Ert/devel/libecl/src/ecl_sum_data.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum_data.h index a4ab05aeb7..e8d9593c21 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_sum_data.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum_data.h @@ -26,12 +26,12 @@ extern "C" { #include #include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include typedef struct ecl_sum_data_struct ecl_sum_data_type ; void ecl_sum_data_fwrite_step( const ecl_sum_data_type * data , const char * ecl_case , bool fmt_case , bool unified, int report_step); diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_sum_index.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum_index.h similarity index 100% rename from ThirdParty/Ert/devel/libecl/src/ecl_sum_index.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum_index.h diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_sum_tstep.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum_tstep.h similarity index 96% rename from ThirdParty/Ert/devel/libecl/src/ecl_sum_tstep.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum_tstep.h index 122d7ec348..ba37173cd8 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_sum_tstep.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_sum_tstep.h @@ -23,10 +23,10 @@ extern "C" { #endif -#include +#include -#include -#include +#include +#include typedef struct ecl_sum_tstep_struct ecl_sum_tstep_type; diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_util.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_util.h similarity index 99% rename from ThirdParty/Ert/devel/libecl/src/ecl_util.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_util.h index 8519164ae4..518f58be4c 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_util.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/ecl_util.h @@ -23,7 +23,8 @@ extern "C" { #endif #include #include -#include + +#include typedef enum { ECL_OTHER_FILE = 0 , ECL_RESTART_FILE = 1 , diff --git a/ThirdParty/Ert/devel/libecl/src/fortio.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/fortio.h similarity index 100% rename from ThirdParty/Ert/devel/libecl/src/fortio.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/fortio.h diff --git a/ThirdParty/Ert/devel/libecl/src/point.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/point.h similarity index 100% rename from ThirdParty/Ert/devel/libecl/src/point.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/point.h diff --git a/ThirdParty/Ert/devel/libecl/src/smspec_node.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/smspec_node.h similarity index 99% rename from ThirdParty/Ert/devel/libecl/src/smspec_node.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/smspec_node.h index cd5ec9a3b1..11f3b1fde4 100644 --- a/ThirdParty/Ert/devel/libecl/src/smspec_node.h +++ b/ThirdParty/Ert/devel/libecl/include/ert/ecl/smspec_node.h @@ -22,7 +22,7 @@ #include -#include +#include #ifdef __cplusplus diff --git a/ThirdParty/Ert/devel/libecl/src/tetrahedron.h b/ThirdParty/Ert/devel/libecl/include/ert/ecl/tetrahedron.h similarity index 100% rename from ThirdParty/Ert/devel/libecl/src/tetrahedron.h rename to ThirdParty/Ert/devel/libecl/include/ert/ecl/tetrahedron.h diff --git a/ThirdParty/Ert/devel/libecl/src/CMakeLists.txt b/ThirdParty/Ert/devel/libecl/src/CMakeLists.txt index 4a2d84259f..a6e51931f1 100644 --- a/ThirdParty/Ert/devel/libecl/src/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libecl/src/CMakeLists.txt @@ -9,6 +9,7 @@ set( header_files ecl_sum_tstep.h ecl_rst_file.h ecl_init_file.h smspec_node.h e add_library( ecl ${LIBRARY_TYPE} ${source_files} ) +set_target_properties( ecl PROPERTIES VERSION 1.0 SOVERSION 1.0 ) #----------------------------------------------------------------- option(USE_OPENMP "Include OpenMP support" OFF) @@ -24,16 +25,14 @@ endif() if (OPENMP) target_link_libraries( ecl gomp ) endif() -target_link_libraries( ecl geometry ert_util ) +target_link_libraries( ecl ert_geometry ert_util ) #----------------------------------------------------------------- -if (ECL_INSTALL_PREFIX) - install(TARGETS ecl DESTINATION ${ECL_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${ECL_INSTALL_PREFIX}/include) -else() - install(TARGETS ecl DESTINATION lib) - install(FILES ${header_files} DESTINATION include) -endif() +install(TARGETS ecl DESTINATION ${CMAKE_INSTALL_LIBDIR}) +foreach(header ${header_files}) + install(FILES ../include/ert/ecl/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/ecl) +endforeach() + diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_box.c b/ThirdParty/Ert/devel/libecl/src/ecl_box.c index 2224194dcf..9c5b0350c1 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_box.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_box.c @@ -16,12 +16,15 @@ for more details. */ -#include + #include #include #include -#include -#include + +#include + +#include +#include #define ECL_BOX_TYPE_ID 6610643 diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_coarse_cell.c b/ThirdParty/Ert/devel/libecl/src/ecl_coarse_cell.c index 4b988e9c95..488e23ca98 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_coarse_cell.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_coarse_cell.c @@ -18,12 +18,12 @@ #include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include /******************************************************************/ /* diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_file.c b/ThirdParty/Ert/devel/libecl/src/ecl_file.c index d36032f2b6..a160c809ed 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_file.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_file.c @@ -22,19 +22,19 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_file_kw.c b/ThirdParty/Ert/devel/libecl/src/ecl_file_kw.c index 686648d52f..cdd1ee1529 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_file_kw.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_file_kw.c @@ -21,13 +21,13 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include /* This file implements the datatype ecl_file_kw which is used to hold diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_grav.c b/ThirdParty/Ert/devel/libecl/src/ecl_grav.c index 79d65fc4f4..6bb4ef4707 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_grav.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_grav.c @@ -20,18 +20,20 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_grav_calc.c b/ThirdParty/Ert/devel/libecl/src/ecl_grav_calc.c index 767031c093..c82de30e84 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_grav_calc.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_grav_calc.c @@ -19,11 +19,14 @@ #include #include #include -#include -#include -#include -#include -#include + +#include + +#include +#include +#include +#include + /** diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_grav_common.c b/ThirdParty/Ert/devel/libecl/src/ecl_grav_common.c index 801d3b545a..029e2f204a 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_grav_common.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_grav_common.c @@ -20,12 +20,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include + +#include + +#include +#include +#include +#include +#include /* This file contains code which is common to both the ecl_grav diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_grid.c b/ThirdParty/Ert/devel/libecl/src/ecl_grid.c index e21c903843..a79e8a541d 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_grid.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_grid.c @@ -22,23 +22,22 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* @@ -1215,11 +1214,11 @@ static ecl_grid_type * ecl_grid_alloc_empty(ecl_grid_type * global_grid , int du grid->LGR_list = NULL; grid->LGR_hash = NULL; } - grid->coarse_cells = vector_alloc_new(); grid->name = NULL; grid->parent_name = NULL; grid->parent_grid = NULL; grid->children = hash_alloc(); + grid->coarse_cells = vector_alloc_new(); return grid; } @@ -1365,16 +1364,17 @@ static void ecl_grid_set_cell_GRID(ecl_grid_type * ecl_grid , int coords_size , ecl_grid->total_active is correct. */ -static void ecl_grid_init_index_map__( ecl_grid_type * ecl_grid , int * index_map , int * inv_index_map , int active_mask, int index_index) { +static void ecl_grid_init_index_map__( ecl_grid_type * ecl_grid , int * index_map , int * inv_index_map , int active_mask, int type_index) { int global_index; for (global_index = 0; global_index < ecl_grid->size; global_index++) { const ecl_cell_type * cell = ecl_grid_get_cell( ecl_grid , global_index); if (cell->active & active_mask) { - index_map[global_index] = cell->active_index[index_index]; + index_map[global_index] = cell->active_index[type_index]; if (cell->coarse_group == COARSE_GROUP_NONE) - inv_index_map[cell->active_index[index_index]] = global_index; + inv_index_map[cell->active_index[type_index]] = global_index; + //else: In the case of coarse groups the inv_index_map is set below. } else index_map[global_index] = -1; } @@ -1412,12 +1412,26 @@ static void ecl_grid_realloc_index_map(ecl_grid_type * ecl_grid) { int active_index = ecl_coarse_cell_get_active_index( coarse_cell ); int active_fracture_index = ecl_coarse_cell_get_active_fracture_index( coarse_cell ); - if (active_value & ACTIVE_MATRIX) - ecl_grid->inv_index_map[ active_index ] = global_index; - - if (active_value & ACTIVE_FRACTURE) + if (active_value & ACTIVE_MATRIX) + ecl_grid->inv_index_map[ active_index ] = global_index; // The active -> global mapping point to one "random" cell in the coarse group + + if (active_value & ACTIVE_FRACTURE) ecl_grid->inv_fracture_index_map[ active_fracture_index ] = global_index; - + + { + int coarse_size = ecl_coarse_cell_get_size( coarse_cell ); + const int_vector_type * global_index_list = ecl_coarse_cell_get_index_vector( coarse_cell ); + int ic; + for (ic =0; ic < coarse_size; ic++) { + int gi = int_vector_iget( global_index_list , ic ); + + if (active_value & ACTIVE_MATRIX) + ecl_grid->index_map[ gi ] = active_index; // All the cells in the coarse group point to the same active index. + + if (active_value & ACTIVE_FRACTURE) + ecl_grid->fracture_index_map[ gi ] = active_fracture_index; + } + } } // else the coarse cell does not have any active cells. } } @@ -2991,8 +3005,7 @@ int ecl_grid_get_active_fracture_index3(const ecl_grid_type * ecl_grid , int i , */ int ecl_grid_get_active_fracture_index1(const ecl_grid_type * ecl_grid , int global_index) { - if (!ecl_grid->fracture_index_map) return -1; - return ecl_grid->fracture_index_map[global_index]; + return ecl_grid->fracture_index_map[global_index]; } diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_grid_cache.c b/ThirdParty/Ert/devel/libecl/src/ecl_grid_cache.c index 731a0792ca..717b7a4824 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_grid_cache.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_grid_cache.c @@ -21,13 +21,13 @@ #include #include -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_init_file.c b/ThirdParty/Ert/devel/libecl/src/ecl_init_file.c index d99cd62cf0..bbce79d900 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_init_file.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_init_file.c @@ -31,12 +31,12 @@ */ -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include static ecl_kw_type * ecl_init_file_alloc_INTEHEAD( const ecl_grid_type * ecl_grid , int phases, time_t start_date , int simulator) { ecl_kw_type * intehead_kw = ecl_kw_alloc( INTEHEAD_KW , INTEHEAD_INIT_SIZE , ECL_INT_TYPE ); diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_intehead.c b/ThirdParty/Ert/devel/libecl/src/ecl_intehead.c index c7acfcebc8..cbc4777a9a 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_intehead.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_intehead.c @@ -16,10 +16,12 @@ for more details. */ #include -#include -#include -#include -#include + +#include + +#include +#include +#include static time_t intehead_date( int day , int month , int year) { return util_make_date( day , month, year ); diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_io_config.c b/ThirdParty/Ert/devel/libecl/src/ecl_io_config.c index 047b705642..924bc15c6b 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_io_config.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_io_config.c @@ -16,11 +16,14 @@ for more details. */ -#include + #include #include -#include -#include + +#include + +#include +#include /** diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_kw.c b/ThirdParty/Ert/devel/libecl/src/ecl_kw.c index f4781aa7f6..49b5cdc1c6 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_kw.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_kw.c @@ -22,13 +22,13 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #define ECL_KW_TYPE_ID 6111098 diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_kw_grdecl.c b/ThirdParty/Ert/devel/libecl/src/ecl_kw_grdecl.c index 5f0f67bc19..9d76f8ffc7 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_kw_grdecl.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_kw_grdecl.c @@ -19,10 +19,10 @@ #include #include -#include +#include -#include -#include +#include +#include /* diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_region.c b/ThirdParty/Ert/devel/libecl/src/ecl_region.c index d44587d57d..2c872abaf1 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_region.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_region.c @@ -19,15 +19,19 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + /** This file implements a type called ecl_region which is a way to diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_rft_file.c b/ThirdParty/Ert/devel/libecl/src/ecl_rft_file.c index 55519aff2b..aae99c02e9 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_rft_file.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_rft_file.c @@ -20,20 +20,23 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include #ifdef HAVE_FNMATCH #include #endif +#include +#include +#include +#include + +#include +#include +#include +#include +#include + + /** This data structure is for loading one eclipse RFT file. One RFT file can in general contain RFT information from: diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_rft_node.c b/ThirdParty/Ert/devel/libecl/src/ecl_rft_node.c index c939771918..6c37f90306 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_rft_node.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_rft_node.c @@ -17,17 +17,19 @@ */ #include +#include #include #include #include #include -#include -#include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_rst_file.c b/ThirdParty/Ert/devel/libecl/src/ecl_rst_file.c index 2227a4a0f9..85bff601ef 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_rst_file.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_rst_file.c @@ -22,20 +22,20 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include struct ecl_rst_file_struct { fortio_type * fortio; diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_smspec.c b/ThirdParty/Ert/devel/libecl/src/ecl_smspec.c index f5f3c2b70d..669ffe34b8 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_smspec.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_smspec.c @@ -21,20 +21,20 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_FNMATCH #include diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_subsidence.c b/ThirdParty/Ert/devel/libecl/src/ecl_subsidence.c index 895798b3e2..d748d7a932 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_subsidence.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_subsidence.c @@ -20,18 +20,20 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_sum.c b/ThirdParty/Ert/devel/libecl/src/ecl_sum.c index 149d21dd4a..21b5f02ddc 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_sum.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_sum.c @@ -22,21 +22,21 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_sum_data.c b/ThirdParty/Ert/devel/libecl/src/ecl_sum_data.c index f8b4548785..101a4990aa 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_sum_data.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_sum_data.c @@ -18,22 +18,21 @@ #include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_sum_index.c b/ThirdParty/Ert/devel/libecl/src/ecl_sum_index.c index bde6c09563..92f8d73bc5 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_sum_index.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_sum_index.c @@ -16,7 +16,7 @@ for more details. */ -#include +#include /* This file contains all the internalized information from parsing a diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_sum_tstep.c b/ThirdParty/Ert/devel/libecl/src/ecl_sum_tstep.c index 5b2863aa7b..49dab11754 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_sum_tstep.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_sum_tstep.c @@ -19,13 +19,13 @@ #include #include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #define ECL_SUM_TSTEP_ID 88631 diff --git a/ThirdParty/Ert/devel/libecl/src/ecl_util.c b/ThirdParty/Ert/devel/libecl/src/ecl_util.c index 433ae7c260..5be479866b 100644 --- a/ThirdParty/Ert/devel/libecl/src/ecl_util.c +++ b/ThirdParty/Ert/devel/libecl/src/ecl_util.c @@ -21,11 +21,14 @@ #include #include #include -#include -#include -#include -#include -#include + +#include +#include +#include +#include + +#include + /*****************************************************************/ /* The string names for the different ECLIPSE low-level diff --git a/ThirdParty/Ert/devel/libecl/src/fortio.c b/ThirdParty/Ert/devel/libecl/src/fortio.c index 03bf694de9..2fb6131f8a 100644 --- a/ThirdParty/Ert/devel/libecl/src/fortio.c +++ b/ThirdParty/Ert/devel/libecl/src/fortio.c @@ -22,8 +22,9 @@ #include #include -#include -#include +#include + +#include extern int errno; diff --git a/ThirdParty/Ert/devel/libecl/src/point.c b/ThirdParty/Ert/devel/libecl/src/point.c index 162b486852..57236b6aa4 100644 --- a/ThirdParty/Ert/devel/libecl/src/point.c +++ b/ThirdParty/Ert/devel/libecl/src/point.c @@ -19,9 +19,9 @@ #include #include -#include +#include -#include +#include void point_mapaxes_transform( point_type * p , const double origo[2], const double unit_x[2] , const double unit_y[2]) { diff --git a/ThirdParty/Ert/devel/libecl/src/smspec_node.c b/ThirdParty/Ert/devel/libecl/src/smspec_node.c index 75cf35b0c8..36250fee60 100644 --- a/ThirdParty/Ert/devel/libecl/src/smspec_node.c +++ b/ThirdParty/Ert/devel/libecl/src/smspec_node.c @@ -21,20 +21,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libecl/src/tetrahedron.c b/ThirdParty/Ert/devel/libecl/src/tetrahedron.c index cd8527659a..6a9d6cf0a5 100644 --- a/ThirdParty/Ert/devel/libecl/src/tetrahedron.c +++ b/ThirdParty/Ert/devel/libecl/src/tetrahedron.c @@ -19,11 +19,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include diff --git a/ThirdParty/Ert/devel/libecl/tests/CMakeLists.txt b/ThirdParty/Ert/devel/libecl/tests/CMakeLists.txt index 9638d92a91..8b87e485be 100644 --- a/ThirdParty/Ert/devel/libecl/tests/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libecl/tests/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries( ecl_restart_test ecl ) add_executable( ecl_lgr_test ecl_lgr_test.c ) target_link_libraries( ecl_lgr_test ecl ) -add_test( ecl_coarse_test ${EXECUTABLE_OUTPUT_PATH}/ecl_coarse_test ${PROJECT_SOURCE_DIR}/test-data/Statoil/ECLIPSE/LGCcase/LGC_TESTCASE2.EGRID ) +add_test( ecl_coarse_test ${EXECUTABLE_OUTPUT_PATH}/ecl_coarse_test ${PROJECT_SOURCE_DIR}/test-data/Statoil/ECLIPSE/LGCcase/LGC_TESTCASE2 ) add_test( ecl_restart_test ${EXECUTABLE_OUTPUT_PATH}/ecl_restart_test ${PROJECT_SOURCE_DIR}/test-data/Statoil/ECLIPSE/Gurbat/ECLIPSE.UNRST ) add_test( ecl_lgr_test1 ${EXECUTABLE_OUTPUT_PATH}/ecl_lgr_test ${PROJECT_SOURCE_DIR}/test-data/Statoil/ECLIPSE/10kcase/TEST10K_FLT_LGR_NNC.EGRID) add_test( ecl_lgr_test2 ${EXECUTABLE_OUTPUT_PATH}/ecl_lgr_test ${PROJECT_SOURCE_DIR}/test-data/Statoil/ECLIPSE/10kcase/TEST10K_FLT_LGR_NNC.GRID) diff --git a/ThirdParty/Ert/devel/libecl/tests/ecl_coarse_test.c b/ThirdParty/Ert/devel/libecl/tests/ecl_coarse_test.c index 71f635fd99..d0f5017123 100644 --- a/ThirdParty/Ert/devel/libecl/tests/ecl_coarse_test.c +++ b/ThirdParty/Ert/devel/libecl/tests/ecl_coarse_test.c @@ -18,26 +18,85 @@ #include #include -#include -#include +#include -void assert_equal( bool equal ) { - if (!equal) - exit(1); -} +#include +#include +#include +#include -int test_grid( const char * filename) { - ecl_grid_type * GRID = ecl_grid_alloc( filename ); - assert_equal( ecl_grid_have_coarse_cells( GRID )); - assert_equal( ecl_grid_get_num_coarse_groups( GRID ) == 3384 ); - return 0; +void test_coarse_cell(const ecl_grid_type * grid , ecl_coarse_cell_type * cell ) { + const int_vector_type * global_index_list = ecl_coarse_cell_get_index_vector(cell ); + const int * ijk = ecl_coarse_cell_get_box_ptr( cell ); + int c; + int prev_active = 0; + + for (c=0; c < ecl_coarse_cell_get_size( cell ); c++) { + int gi = int_vector_iget( global_index_list , c ); + int i,j,k; + + /* The coordinates are right */ + ecl_grid_get_ijk1( grid , gi , &i , &j , &k); + if ((i < ijk[0]) || (i > ijk[1])) + test_error_exit("i:%d not inside range [%d,%d] \n",i , ijk[0] , ijk[1]); + + if ((j < ijk[2]) || (j > ijk[3])) + test_error_exit("j:%d not inside range [%d,%d] \n",j , ijk[2] , ijk[3]); + + if ((k < ijk[4]) || (k > ijk[5])) + test_error_exit("k:%d not inside range [%d,%d] \n",k , ijk[4] , ijk[4]); + + if (c == 0) + prev_active = ecl_grid_get_active_index1( grid , gi ); + else { + /* All the cells have the same active value */ + int this_active = ecl_grid_get_active_index1( grid , gi ); + test_assert_int_equal( prev_active , this_active ); + prev_active = this_active; + } + } } int main(int argc , char ** argv) { - test_grid( argv[1] ); + const char * case_path = argv[1]; + char * egrid_file = ecl_util_alloc_filename( NULL , case_path , ECL_EGRID_FILE , false , 0 ); + char * rst_file = ecl_util_alloc_filename( NULL , case_path , ECL_RESTART_FILE , false , 0 ); + char * init_file = ecl_util_alloc_filename( NULL , case_path , ECL_INIT_FILE , false , 0 ); + + ecl_grid_type * GRID = ecl_grid_alloc(egrid_file ); + ecl_file_type * RST_file = ecl_file_open( rst_file ); + ecl_file_type * INIT_file = ecl_file_open( init_file ); + + { + test_assert_true( ecl_grid_have_coarse_cells( GRID ) ); + test_assert_int_equal( ecl_grid_get_num_coarse_groups( GRID ) , 3384); + } + + { + const ecl_kw_type * swat0 = ecl_file_iget_named_kw( RST_file , "SWAT" , 0 ); + const ecl_kw_type * porv = ecl_file_iget_named_kw( INIT_file , "PORV" , 0 ); + + test_assert_int_equal( ecl_kw_get_size( swat0 ) , ecl_grid_get_active_size( GRID ) ); + test_assert_int_equal( ecl_kw_get_size( porv ) , ecl_grid_get_global_size( GRID ) ); + } + + { + int ic; + for (ic = 0; ic < ecl_grid_get_num_coarse_groups(GRID); ic++) { + ecl_coarse_cell_type * coarse_cell = ecl_grid_iget_coarse_group( GRID , ic ); + test_coarse_cell( GRID , coarse_cell ); + } + } + + + + ecl_file_close( INIT_file ); + ecl_file_close( RST_file ); + ecl_grid_free( GRID ); + exit(0); } diff --git a/ThirdParty/Ert/devel/libecl/tests/ecl_lgr_test.c b/ThirdParty/Ert/devel/libecl/tests/ecl_lgr_test.c index 1f9edc4af1..10f91916a7 100644 --- a/ThirdParty/Ert/devel/libecl/tests/ecl_lgr_test.c +++ b/ThirdParty/Ert/devel/libecl/tests/ecl_lgr_test.c @@ -18,8 +18,9 @@ #include #include -#include -#include +#include + +#include diff --git a/ThirdParty/Ert/devel/libecl/tests/ecl_restart_test.c b/ThirdParty/Ert/devel/libecl/tests/ecl_restart_test.c index 23997ff75e..fa90f242e7 100644 --- a/ThirdParty/Ert/devel/libecl/tests/ecl_restart_test.c +++ b/ThirdParty/Ert/devel/libecl/tests/ecl_restart_test.c @@ -18,8 +18,9 @@ #include #include -#include -#include +#include + +#include bool test_get( ecl_file_type * rst_file , int day , int month , int year , int expected_index) { diff --git a/ThirdParty/Ert/devel/libecl_well/CMakeLists.txt b/ThirdParty/Ert/devel/libecl_well/CMakeLists.txt new file mode 100644 index 0000000000..c5e65c48a3 --- /dev/null +++ b/ThirdParty/Ert/devel/libecl_well/CMakeLists.txt @@ -0,0 +1,8 @@ +add_subdirectory( src ) +if (BUILD_APPLICATONS) + add_subdirectory( applications ) +endif() + +#if (BUILD_TESTS) +# add_subdirectory( tests ) +#endif() diff --git a/ThirdParty/Ert/devel/libwell/applications/CMakeLists.txt b/ThirdParty/Ert/devel/libecl_well/applications/CMakeLists.txt similarity index 82% rename from ThirdParty/Ert/devel/libwell/applications/CMakeLists.txt rename to ThirdParty/Ert/devel/libecl_well/applications/CMakeLists.txt index 6a886b1abf..b7fb0639dc 100644 --- a/ThirdParty/Ert/devel/libwell/applications/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libecl_well/applications/CMakeLists.txt @@ -1,11 +1,8 @@ add_executable( well_info_test well_info_test.c ) -include_directories( ${libecl_src_path} ) -include_directories( ${libwell_src_path} ) - set(program_list well_info_test ) foreach(prog ${program_list}) - target_link_libraries( ${prog} well ecl ert_util ) + target_link_libraries( ${prog} ecl_well ecl) #----------------------------------------------------------------- diff --git a/ThirdParty/Ert/devel/libwell/applications/well_info_test.c b/ThirdParty/Ert/devel/libecl_well/applications/well_info_test.c similarity index 78% rename from ThirdParty/Ert/devel/libwell/applications/well_info_test.c rename to ThirdParty/Ert/devel/libecl_well/applications/well_info_test.c index e23068796f..b66fd9e66d 100644 --- a/ThirdParty/Ert/devel/libwell/applications/well_info_test.c +++ b/ThirdParty/Ert/devel/libecl_well/applications/well_info_test.c @@ -20,18 +20,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include int main( int argc , char ** argv) { signal(SIGSEGV , util_abort_signal); /* Segmentation violation, i.e. overwriting memory ... */ @@ -83,16 +84,16 @@ int main( int argc , char ** argv) { const well_conn_type ** connections = well_state_get_connections( well_state , 0 ); printf("Branches: %d \n",well_state_get_num_branches( well_state )); printf("num_connections: %d \n",well_state_get_num_connections( well_state , 0 )); - { - int iconn; - for (iconn = 0; iconn < well_state_get_num_connections( well_state , 0 ); iconn++) { - well_conn_type * conn = connections[ iconn ]; - printf("Connection:%02d i=%3d j=%3d k=%3d State:",iconn , well_conn_get_i( conn ) , well_conn_get_j( conn ) , well_conn_get_k( conn )); - if (well_conn_open( conn ) ) + { + int iconn; + for (iconn = 0; iconn < well_state_get_num_connections( well_state , 0 ); iconn++) { + well_conn_type * conn = connections[ iconn ]; + printf("Connection:%02d i=%3d j=%3d k=%3d State:",iconn , well_conn_get_i( conn ) , well_conn_get_j( conn ) , well_conn_get_k( conn )); + if (well_conn_open( conn ) ) printf("Open\n"); - else - printf("Closed\n"); - } + else + printf("Closed\n"); + } } } } diff --git a/ThirdParty/Ert/devel/libwell/src/well_branch.h b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_branch.h similarity index 97% rename from ThirdParty/Ert/devel/libwell/src/well_branch.h rename to ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_branch.h index 65f425addf..f876ba370f 100644 --- a/ThirdParty/Ert/devel/libwell/src/well_branch.h +++ b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_branch.h @@ -24,7 +24,7 @@ extern "C" { #endif -#include +#include typedef struct well_branch_struct well_branch_type; diff --git a/ThirdParty/Ert/devel/libwell/src/well_conn.h b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_conn.h similarity index 97% rename from ThirdParty/Ert/devel/libwell/src/well_conn.h rename to ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_conn.h index 787a78891e..d4b56920ba 100644 --- a/ThirdParty/Ert/devel/libwell/src/well_conn.h +++ b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_conn.h @@ -27,8 +27,7 @@ extern "C" { #include -#include -#include +#include typedef enum { well_conn_dirX = 1, diff --git a/ThirdParty/Ert/devel/libwell/src/well_const.h b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_const.h similarity index 100% rename from ThirdParty/Ert/devel/libwell/src/well_const.h rename to ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_const.h diff --git a/ThirdParty/Ert/devel/libwell/src/well_info.h b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_info.h similarity index 95% rename from ThirdParty/Ert/devel/libwell/src/well_info.h rename to ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_info.h index 246b52ebcf..5e9aa711e8 100644 --- a/ThirdParty/Ert/devel/libwell/src/well_info.h +++ b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_info.h @@ -24,9 +24,10 @@ extern "C" { #endif -#include -#include -#include +#include +#include + +#include typedef struct well_info_struct well_info_type; diff --git a/ThirdParty/Ert/devel/libwell/src/well_path.h b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_path.h similarity index 95% rename from ThirdParty/Ert/devel/libwell/src/well_path.h rename to ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_path.h index 0b10f3322a..69a4607112 100644 --- a/ThirdParty/Ert/devel/libwell/src/well_path.h +++ b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_path.h @@ -25,8 +25,9 @@ extern "C" { #endif #include -#include -#include + +#include +#include typedef struct well_path_struct well_path_type; diff --git a/ThirdParty/Ert/devel/libwell/src/well_state.h b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_state.h similarity index 95% rename from ThirdParty/Ert/devel/libwell/src/well_state.h rename to ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_state.h index 82a936b8af..423e57c40c 100644 --- a/ThirdParty/Ert/devel/libwell/src/well_state.h +++ b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_state.h @@ -26,11 +26,11 @@ extern "C" { #include -#include -#include +#include +#include -#include -#include +#include +#include #define GLOBAL_GRID_NAME "GLOBAL" // The name assigned to the global grid for name based lookup. diff --git a/ThirdParty/Ert/devel/libwell/src/well_ts.h b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_ts.h similarity index 97% rename from ThirdParty/Ert/devel/libwell/src/well_ts.h rename to ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_ts.h index 69b56aa8cc..ac292598f0 100644 --- a/ThirdParty/Ert/devel/libwell/src/well_ts.h +++ b/ThirdParty/Ert/devel/libecl_well/include/ert/ecl_well/well_ts.h @@ -24,7 +24,7 @@ extern "C" { #endif -#include +#include typedef struct well_ts_struct well_ts_type; diff --git a/ThirdParty/Ert/devel/libecl_well/src/CMakeLists.txt b/ThirdParty/Ert/devel/libecl_well/src/CMakeLists.txt new file mode 100644 index 0000000000..fda632db5c --- /dev/null +++ b/ThirdParty/Ert/devel/libecl_well/src/CMakeLists.txt @@ -0,0 +1,19 @@ +set( source_files well_state.c well_conn.c well_info.c well_ts.c well_branch.c well_path.c ) +set( header_files well_state.h well_const.h well_conn.h well_info.h well_ts.h well_branch.h well_path.h ) + +include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) +include_directories( ${libgeometry_src_path} ) + + +add_library( ecl_well ${LIBRARY_TYPE} ${source_files} ) +set_target_properties( ecl_well PROPERTIES VERSION 1.0 SOVERSION 1.0 ) +target_link_libraries( ecl_well ecl ) + +#----------------------------------------------------------------- +install(TARGETS ecl_well DESTINATION ${CMAKE_INSTALL_LIBDIR}) +foreach(header ${header_files}) + install(FILES ../include/ert/ecl_well/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/ecl_well) +endforeach() + + + diff --git a/ThirdParty/Ert/devel/libwell/src/well_branch.c b/ThirdParty/Ert/devel/libecl_well/src/well_branch.c similarity index 94% rename from ThirdParty/Ert/devel/libwell/src/well_branch.c rename to ThirdParty/Ert/devel/libecl_well/src/well_branch.c index e6f2cab8ff..dd2ccd8416 100644 --- a/ThirdParty/Ert/devel/libwell/src/well_branch.c +++ b/ThirdParty/Ert/devel/libecl_well/src/well_branch.c @@ -16,11 +16,13 @@ for more details. */ -#include #include -#include -#include -#include + +#include + +#include +#include +#include /* diff --git a/ThirdParty/Ert/devel/libwell/src/well_conn.c b/ThirdParty/Ert/devel/libecl_well/src/well_conn.c similarity index 97% rename from ThirdParty/Ert/devel/libwell/src/well_conn.c rename to ThirdParty/Ert/devel/libecl_well/src/well_conn.c index f2de1e2a94..bd733d09a1 100644 --- a/ThirdParty/Ert/devel/libwell/src/well_conn.c +++ b/ThirdParty/Ert/devel/libecl_well/src/well_conn.c @@ -18,12 +18,12 @@ #include -#include +#include -#include +#include -#include -#include +#include +#include /* Observe that when the (ijk) values are initialized they are diff --git a/ThirdParty/Ert/devel/libwell/src/well_info.c b/ThirdParty/Ert/devel/libecl_well/src/well_info.c similarity index 95% rename from ThirdParty/Ert/devel/libwell/src/well_info.c rename to ThirdParty/Ert/devel/libecl_well/src/well_info.c index c18302c4f2..37eb6a036a 100644 --- a/ThirdParty/Ert/devel/libwell/src/well_info.c +++ b/ThirdParty/Ert/devel/libecl_well/src/well_info.c @@ -19,21 +19,23 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include /* The library libwell contains functionality to read and interpret @@ -295,6 +297,11 @@ void well_info_add_wells( well_info_type * well_info , ecl_file_type * rst_file ecl_intehead_free( global_header ); } +/** + Observe that this function will fail if the rst_file instance + corresponds to a non-unified restart file, because these files do + not have the SEQNUM keyword. +*/ void well_info_add_UNRST_wells( well_info_type * well_info , ecl_file_type * rst_file) { { diff --git a/ThirdParty/Ert/devel/libwell/src/well_path.c b/ThirdParty/Ert/devel/libecl_well/src/well_path.c similarity index 96% rename from ThirdParty/Ert/devel/libwell/src/well_path.c rename to ThirdParty/Ert/devel/libecl_well/src/well_path.c index 8b75f5b237..72208435fb 100644 --- a/ThirdParty/Ert/devel/libwell/src/well_path.c +++ b/ThirdParty/Ert/devel/libecl_well/src/well_path.c @@ -16,12 +16,14 @@ for more details. */ -#include #include -#include -#include -#include -#include + +#include + +#include +#include +#include +#include /* This file implements the well_path structure which is container for diff --git a/ThirdParty/Ert/devel/libwell/src/well_state.c b/ThirdParty/Ert/devel/libecl_well/src/well_state.c similarity index 97% rename from ThirdParty/Ert/devel/libwell/src/well_state.c rename to ThirdParty/Ert/devel/libecl_well/src/well_state.c index 7e33b0a70a..dc855b7883 100644 --- a/ThirdParty/Ert/devel/libwell/src/well_state.c +++ b/ThirdParty/Ert/devel/libecl_well/src/well_state.c @@ -25,21 +25,22 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include #define WELL_STATE_TYPE_ID 613307832 diff --git a/ThirdParty/Ert/devel/libwell/src/well_ts.c b/ThirdParty/Ert/devel/libecl_well/src/well_ts.c similarity index 98% rename from ThirdParty/Ert/devel/libwell/src/well_ts.c rename to ThirdParty/Ert/devel/libecl_well/src/well_ts.c index 1caf4a7340..05e47d906c 100644 --- a/ThirdParty/Ert/devel/libwell/src/well_ts.c +++ b/ThirdParty/Ert/devel/libecl_well/src/well_ts.c @@ -61,11 +61,13 @@ #include #include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libenkf/CMakeLists.txt b/ThirdParty/Ert/devel/libenkf/CMakeLists.txt index 127d78cd71..9db4a4c5e8 100644 --- a/ThirdParty/Ert/devel/libenkf/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libenkf/CMakeLists.txt @@ -1,18 +1,6 @@ -set( ENKF_INSTALL_PREFIX "" CACHE STRING "Prefix for installation of libenkf") - -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src/plot ) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -include_directories( ${CMAKE_CURRENT_BINARY_DIR}/src ) -include_directories( ${libecl_src_path} ) -include_directories( ${librms_src_path} ) -include_directories( ${libconfig_src_path} ) -include_directories( ${libjob_queue_src_path} ) -include_directories( ${libplot_src_path} ) -include_directories( ${libanalysis_src_path} ) -include_directories( ${libsched_src_path} ) -include_directories( ${libgeometry_src_path} ) - -link_directories( ${CMAKE_CURRENT_BINARY_DIR}/src ) - add_subdirectory( src ) add_subdirectory( applications/ert_tui ) + +#if (BUILD_TESTS) +# add_subdirectory( tests ) +#endif() diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_gui/share/doc/kręsj.txt b/ThirdParty/Ert/devel/libenkf/applications/ert_gui/share/doc/kręsj.txt new file mode 100644 index 0000000000..ff859ce596 --- /dev/null +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_gui/share/doc/kręsj.txt @@ -0,0 +1,5 @@ +Refcase <-> history source + * Kanskje det er ERT som må sjekka om verdien er sett og så utsetta evt. kjųring? + +Copy from case: + * kręsj. \ No newline at end of file diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/CMakeLists.txt b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/CMakeLists.txt index b064f714a4..3525d95cf8 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/CMakeLists.txt @@ -1,6 +1,4 @@ include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) -include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) -include_directories( ${libplot_src_path} ) include_directories( ${PLPLOT_HEADER} ) set( SITE_CONFIG_FILE /project/res/etc/ERT/site-config CACHE FILEPATH "Path to global ERT Configuration file") @@ -32,7 +30,7 @@ string(STRIP ${GIT_COMMIT} GIT_COMMIT) set_source_files_properties( main.c PROPERTIES COMPILE_DEFINITIONS "COMPILE_TIME_STAMP=\"${BUILD_TIME}\";GIT_COMMIT=\"${GIT_COMMIT}\";SITE_CONFIG_FILE=\"${SITE_CONFIG_FILE}\"") add_executable( ert ${src_list} ) -target_link_libraries( ert enkf sched rms ecl geometry config plot job_queue analysis util ) +target_link_libraries( ert enkf sched rms ecl config plot job_queue analysis ert_util ) if (ERT_INSTALL_PREFIX) set (destination ${CMAKE_INSTALL_PREFIX}/${ERT_INSTALL_PREFIX}/bin) diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_QC.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_QC.c index c56e484720..4430ae126f 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_QC.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_QC.c @@ -15,49 +15,46 @@ See the GNU General Public License at for more details. */ - #include #include #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include void enkf_tui_QC_plot_get_PC( enkf_main_type * enkf_main , int step1 , int step2 , state_enum state , const local_obsset_type * obsset , double truncation , int ncomp , diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_analysis.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_analysis.c index d4ca3d69b4..6ab512c6a7 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_analysis.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_analysis.c @@ -20,19 +20,21 @@ #include #include #include - -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + #include #include #include diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_export.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_export.c index f90624d7bc..3434eb8b59 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_export.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_export.c @@ -20,20 +20,22 @@ #include #include #include -#include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + #include -#include -#include -#include -#include #include #define PROMPT_LEN 60 diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_fs.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_fs.c index 13c4436f20..90eae1e2f0 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_fs.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_fs.c @@ -19,18 +19,18 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include #include +#include void enkf_tui_fs_ls_case(void * arg) { enkf_main_type * enkf_main = enkf_main_safe_cast( arg ); diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_init.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_init.c index 3b48c54ab5..4f4eb68df8 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_init.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_init.c @@ -20,19 +20,22 @@ #include #include #include -#include #include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + #include #include -#include -#include -#include -#include -#include @@ -53,21 +56,21 @@ void enkf_tui_init(enkf_main_type * enkf_main, bool all_members , bool all_param if( interval ) { char * iens1char = util_scanf_int_with_limits_return_char("First ensemble member in interval" , prompt_len , 0 , ens_size - 1); if (strlen(iens1char)) { - util_sscanf_int(iens1char , &iens1); - char * iens2char = util_scanf_int_with_limits_return_char("Second ensemble member in interval" , prompt_len , iens1 , ens_size - 1); - if (strlen(iens2char)) { - util_sscanf_int(iens2char , &iens2); - iens_valid = true; - } - free(iens2char); + util_sscanf_int(iens1char , &iens1); + char * iens2char = util_scanf_int_with_limits_return_char("Second ensemble member in interval" , prompt_len , iens1 , ens_size - 1); + if (strlen(iens2char)) { + util_sscanf_int(iens2char , &iens2); + iens_valid = true; + } + free(iens2char); } free(iens1char); } else { char * iens1char = util_scanf_int_with_limits_return_char("Initialize ensemble member" , prompt_len , 0 , ens_size - 1); if (strlen(iens1char)) { - util_sscanf_int(iens1char , &iens1); - iens2 = iens1; - iens_valid = true; + util_sscanf_int(iens1char , &iens1); + iens2 = iens1; + iens_valid = true; } free(iens1char); } diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_misc.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_misc.c index f5db84740f..d03a71af36 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_misc.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_misc.c @@ -16,14 +16,17 @@ for more details. */ -#include -#include -#include -#include -#include +#include +#include + +#include +#include + +#include +#include +#include + #include -#include -#include #include static void enkf_tui_misc_printf_subst_list(void * arg) { diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot.c index e857bdc783..74886e4ff7 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot.c @@ -24,37 +24,37 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #include #include @@ -63,6 +63,7 @@ #include #include #include + /** The final plot path consists of three parts: diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot.h b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot.h index 3c65e6a453..dfc4954689 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot.h +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot.h @@ -20,8 +20,10 @@ #define __ENKF_TUI_PLOT_H__ -#include -#include +#include + +#include + void enkf_tui_plot_simple_menu(void * ); void enkf_tui_plot_menu(void * ); void enkf_tui_plot_PC( enkf_main_type * enkf_main , const char * plot_name , const matrix_type * PC , const matrix_type * PC_obs); diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_rft.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_rft.c index b720ae20ef..20cd1ffe19 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_rft.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_rft.c @@ -20,37 +20,42 @@ #include #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include #include -#include #include +#include +#include /* diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_util.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_util.c index d5a144d654..9a63237793 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_util.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_util.c @@ -20,36 +20,42 @@ #include #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include #include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + #include -#include -#include +#include +#include +#include + char * enkf_tui_plot_alloc_plot_file(const plot_config_type * plot_config , const char * case_name , const char * base_name) { diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_util.h b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_util.h index 7e5a25fec1..9c8b397d24 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_util.h +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_util.h @@ -24,8 +24,9 @@ extern "C" { #endif -#include -#include +#include + +#include char * enkf_tui_plot_alloc_plot_file(const plot_config_type * plot_config , const char * case_name , const char * base_name); void enkf_tui_show_plot(plot_type * plot , const plot_config_type * plot_config , const char * file); diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_ranking.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_ranking.c index 87b423e0ad..0c63082b8d 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_ranking.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_ranking.c @@ -19,16 +19,17 @@ #include #include -#include -#include -#include +#include +#include +#include + +#include +#include +#include +#include +#include -#include -#include -#include #include -#include -#include #include static void enkf_tui_ranking_make_misfit_ensemble( void * arg) { diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_run.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_run.c index 8814c751bc..c3578336e3 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_run.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_run.c @@ -20,24 +20,25 @@ #include #include #include - -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include + #include #include #include #include -#include #include /* diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_simple.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_simple.c index bdf4d5cd21..1f5b3cc333 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_simple.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_simple.c @@ -20,24 +20,28 @@ #include #include #include -#include #include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + #include #include -#include -#include -#include -#include -#include #include #include #include #include -#include + void enkf_tui_simple_menu(void * arg) { enkf_main_type * enkf_main = enkf_main_safe_cast(arg); diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_table.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_table.c index f5b4bbc271..e25ecd5bdf 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_table.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_table.c @@ -20,24 +20,25 @@ #include #include #include -#include #include -#include -#include -#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_util.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_util.c index 099a76f636..1ab0aa3592 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_util.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_util.c @@ -20,17 +20,18 @@ #include #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_util.h b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_util.h index 543187e6e1..e443467cb4 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_util.h +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_util.h @@ -20,11 +20,11 @@ #define __ENKF_TUI_UTIL_H__ -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include void enkf_tui_util_scanf_report_steps(int , int , int * , int * ); diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/ert_tui_jobs.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/ert_tui_jobs.c index 3c6198ab20..3fd94f190e 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/ert_tui_jobs.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/ert_tui_jobs.c @@ -16,9 +16,10 @@ for more details. */ -#include +#include + +#include -#include #include void enkf_tui_plot_all_summary_JOB(void * self , const stringlist_type * args ) { diff --git a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/main.c b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/main.c index 076f4db832..81d0eb563e 100644 --- a/ThirdParty/Ert/devel/libenkf/applications/ert_tui/main.c +++ b/ThirdParty/Ert/devel/libenkf/applications/ert_tui/main.c @@ -22,20 +22,14 @@ #include #include -#include -#include -#include +#include +#include +#include -#include - -#include -#include -#include - -#include -#include -#include -#include +#include +#include +#include +#include #include diff --git a/ThirdParty/Ert/devel/libenkf/src/README.new_type.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/README.new_type.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/README.new_type.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/README.new_type.h diff --git a/ThirdParty/Ert/devel/libenkf/src/README.new_type_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/README.new_type_config.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/README.new_type_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/README.new_type_config.h diff --git a/ThirdParty/Ert/devel/libenkf/src/active_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/active_config.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/active_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/active_config.h diff --git a/ThirdParty/Ert/devel/libenkf/src/active_list.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/active_list.h similarity index 98% rename from ThirdParty/Ert/devel/libenkf/src/active_list.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/active_list.h index 0ec20fb392..a44e976094 100644 --- a/ThirdParty/Ert/devel/libenkf/src/active_list.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/active_list.h @@ -22,7 +22,7 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include typedef struct active_list_struct active_list_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/active_node.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/active_node.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/active_node.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/active_node.h diff --git a/ThirdParty/Ert/devel/libenkf/src/analysis_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/analysis_config.h similarity index 97% rename from ThirdParty/Ert/devel/libenkf/src/analysis_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/analysis_config.h index e78315aabf..86ea068d98 100644 --- a/ThirdParty/Ert/devel/libenkf/src/analysis_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/analysis_config.h @@ -22,13 +22,16 @@ #include -#include -#include +#include +#include + +#include + +#include + +#include -#include -#include -#include diff --git a/ThirdParty/Ert/devel/libenkf/src/block_fs_driver.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/block_fs_driver.h similarity index 98% rename from ThirdParty/Ert/devel/libenkf/src/block_fs_driver.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/block_fs_driver.h index 1adead8849..3365ad7fd2 100644 --- a/ThirdParty/Ert/devel/libenkf/src/block_fs_driver.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/block_fs_driver.h @@ -23,9 +23,10 @@ extern "C" { #endif #include -#include #include - + +#include + typedef struct block_fs_driver_struct block_fs_driver_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/block_obs.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/block_obs.h similarity index 89% rename from ThirdParty/Ert/devel/libenkf/src/block_obs.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/block_obs.h index 9b7c00368b..81698a58b9 100644 --- a/ThirdParty/Ert/devel/libenkf/src/block_obs.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/block_obs.h @@ -21,20 +21,18 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include -#include +#include -#include +#include +#include -#include -#include - -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libenkf/src/config_keys.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/config_keys.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/config_keys.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/config_keys.h diff --git a/ThirdParty/Ert/devel/libenkf/src/config_parser.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/config_parser.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/config_parser.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/config_parser.h diff --git a/ThirdParty/Ert/devel/libenkf/src/container.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/container.h similarity index 97% rename from ThirdParty/Ert/devel/libenkf/src/container.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/container.h index 8459471a62..8225975c61 100644 --- a/ThirdParty/Ert/devel/libenkf/src/container.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/container.h @@ -22,7 +22,7 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include typedef struct container_struct container_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/container_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/container_config.h similarity index 95% rename from ThirdParty/Ert/devel/libenkf/src/container_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/container_config.h index 08e5a55b62..619b6b99a5 100644 --- a/ThirdParty/Ert/devel/libenkf/src/container_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/container_config.h @@ -24,8 +24,8 @@ extern "C" { #endif -#include -#include +#include +#include typedef struct container_config_struct container_config_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/data_ranking.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/data_ranking.h similarity index 95% rename from ThirdParty/Ert/devel/libenkf/src/data_ranking.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/data_ranking.h index 465b2bbcea..5c2768beb0 100644 --- a/ThirdParty/Ert/devel/libenkf/src/data_ranking.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/data_ranking.h @@ -23,10 +23,11 @@ extern "C" { #endif #include -#include #include -#include +#include + +#include typedef struct data_ranking_struct data_ranking_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/ecl_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ecl_config.h similarity index 96% rename from ThirdParty/Ert/devel/libenkf/src/ecl_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/ecl_config.h index 3713abcdea..770f04fb48 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ecl_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ecl_config.h @@ -23,15 +23,15 @@ extern "C" { #endif #include -#include +#include -#include +#include -#include -#include -#include +#include +#include +#include -#include +#include typedef struct ecl_config_struct ecl_config_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/ecl_static_kw.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ecl_static_kw.h similarity index 94% rename from ThirdParty/Ert/devel/libenkf/src/ecl_static_kw.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/ecl_static_kw.h index 4a8d79b0c5..a01527e361 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ecl_static_kw.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ecl_static_kw.h @@ -21,10 +21,16 @@ #ifdef __cplusplus extern "C" { #endif + #include -#include -#include -#include + +#include + +#include + +#include + + typedef struct ecl_static_kw_struct ecl_static_kw_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/ecl_static_kw_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ecl_static_kw_config.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/ecl_static_kw_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/ecl_static_kw_config.h diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/enkf.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf.h diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_analysis.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_analysis.h similarity index 94% rename from ThirdParty/Ert/devel/libenkf/src/enkf_analysis.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_analysis.h index 5bcf0eae58..2e76a2668a 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_analysis.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_analysis.h @@ -25,9 +25,12 @@ extern "C" { #endif #include -#include -#include -#include + +#include +#include + +#include + void enkf_analysis_fprintf_obs_summary(const obs_data_type * obs_data , diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_config_node.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_config_node.h similarity index 97% rename from ThirdParty/Ert/devel/libenkf/src/enkf_config_node.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_config_node.h index 0e94bad4c3..3c19d6c484 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_config_node.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_config_node.h @@ -21,14 +21,16 @@ #ifdef __cplusplus extern "C" { #endif -#include -#include -#include -#include -#include -#include -#include +#include + +#include + +#include +#include +#include +#include +#include typedef void (config_free_ftype) (void *); typedef int (get_data_size_ftype) (const void *); diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_config_private.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_config_private.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/enkf_config_private.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_config_private.h diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_defaults.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_defaults.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/enkf_defaults.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_defaults.h diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_fs.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_fs.h similarity index 93% rename from ThirdParty/Ert/devel/libenkf/src/enkf_fs.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_fs.h index 48e81cefce..ef3ffc9932 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_fs.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_fs.h @@ -23,18 +23,18 @@ extern "C" { #endif #include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include const char * enkf_fs_get_mount_point( const enkf_fs_type * fs ); diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_fs_type.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_fs_type.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/enkf_fs_type.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_fs_type.h diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_macros.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_macros.h similarity index 98% rename from ThirdParty/Ert/devel/libenkf/src/enkf_macros.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_macros.h index e623d1f1fc..934352b2c2 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_macros.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_macros.h @@ -25,18 +25,18 @@ extern "C" { #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #define CONFIG_STD_FIELDS \ diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_main.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_main.h similarity index 93% rename from ThirdParty/Ert/devel/libenkf/src/enkf_main.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_main.h index 78cec8265e..cf6b5a7060 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_main.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_main.h @@ -24,38 +24,38 @@ extern "C" { #include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include +#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /*****************************************************************/ diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_main_update.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_main_update.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/enkf_main_update.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_main_update.h diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_node.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_node.h similarity index 95% rename from ThirdParty/Ert/devel/libenkf/src/enkf_node.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_node.h index eaca733859..898ca56bfa 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_node.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_node.h @@ -21,24 +21,24 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_obs.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_obs.h similarity index 90% rename from ThirdParty/Ert/devel/libenkf/src/enkf_obs.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_obs.h index 941254cccd..2b714fa247 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_obs.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_obs.h @@ -23,20 +23,20 @@ extern "C" { #endif #include -#include -#include +#include +#include -#include +#include -#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include bool enkf_obs_have_obs( const enkf_obs_type * enkf_obs ); const char * enkf_obs_get_config_file( const enkf_obs_type * enkf_obs); diff --git a/ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_arg.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_plot_arg.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_arg.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_plot_arg.h diff --git a/ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_data.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_plot_data.h similarity index 92% rename from ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_data.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_plot_data.h index b8aa7a0b3f..5d9a2790a5 100644 --- a/ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_data.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_plot_data.h @@ -26,11 +26,11 @@ extern "C" { #include #include -#include +#include -#include -#include -#include +#include +#include +#include typedef struct enkf_plot_data_struct enkf_plot_data_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_member.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_plot_member.h similarity index 91% rename from ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_member.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_plot_member.h index c66c3f4542..be0ec3d8d8 100644 --- a/ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_member.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_plot_member.h @@ -26,12 +26,12 @@ extern "C" { #include #include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include typedef struct enkf_plot_member_struct enkf_plot_member_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_sched.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_sched.h similarity index 76% rename from ThirdParty/Ert/devel/libenkf/src/enkf_sched.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_sched.h index 634655cf8a..19cd3da7a1 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_sched.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_sched.h @@ -19,20 +19,24 @@ #ifndef __ENKF_SCHED_H__ #define __ENKF_SCHED_H__ #include -#include #include -#include -#include + +#include + +#include + +#include + typedef struct enkf_sched_struct enkf_sched_type; typedef struct enkf_sched_node_struct enkf_sched_node_type; -void enkf_sched_fprintf(const enkf_sched_type * , FILE * ); -enkf_sched_type * enkf_sched_fscanf_alloc(const char * , int , run_mode_type); -void enkf_sched_free(enkf_sched_type *); -int enkf_sched_get_num_nodes(const enkf_sched_type *); +void enkf_sched_fprintf(const enkf_sched_type * , FILE * ); +enkf_sched_type * enkf_sched_fscanf_alloc(const char * , int , run_mode_type); +void enkf_sched_free(enkf_sched_type *); +int enkf_sched_get_num_nodes(const enkf_sched_type *); int enkf_sched_get_last_report(const enkf_sched_type * enkf_sched); int enkf_sched_get_node_index(const enkf_sched_type * , int ); const enkf_sched_node_type * enkf_sched_iget_node(const enkf_sched_type * , int); diff --git a/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_serialize.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_serialize.h new file mode 100644 index 0000000000..34a48dbcce --- /dev/null +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_serialize.h @@ -0,0 +1,58 @@ +/* + Copyright (C) 2011 Statoil ASA, Norway. + + The file 'enkf_serialize.h' is part of ERT - Ensemble based Reservoir Tool. + + ERT is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ERT is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. + + See the GNU General Public License at + for more details. +*/ + +#ifndef __ENKF_SERIALIZE_H__ +#define __ENKF_SERIALIZE_H__ +#ifdef __cplusplus +extern "C" { +#endif + +#include +#include + +#include + +#include + +#include + + + + +void enkf_matrix_serialize(const void * __node_data , + int node_size , + ecl_type_enum node_type , + const active_list_type * __active_list , + matrix_type * A, + int row_offset, + int column); + + +void enkf_matrix_deserialize(void * __node_data , + int node_size , + ecl_type_enum node_type , + const active_list_type * __active_list , + const matrix_type * A, + int row_offset, + int column); + + +#ifdef __cplusplus +} +#endif +#endif diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_state.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_state.h similarity index 89% rename from ThirdParty/Ert/devel/libenkf/src/enkf_state.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_state.h index c26b734dbf..2bf0273c3c 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_state.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_state.h @@ -24,33 +24,33 @@ extern "C" { #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include +#include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include typedef struct enkf_state_struct enkf_state_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_types.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_types.h similarity index 99% rename from ThirdParty/Ert/devel/libenkf/src/enkf_types.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_types.h index 9e20add0cc..40500e70bb 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_types.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_types.h @@ -21,7 +21,7 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_util.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_util.h similarity index 99% rename from ThirdParty/Ert/devel/libenkf/src/enkf_util.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_util.h index c9238534ac..344b707b69 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_util.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/enkf_util.h @@ -24,10 +24,13 @@ extern "C" { #include #include #include -#include -#include -#include -#include + +#include +#include + +#include + +#include /*****************************************************************/ diff --git a/ThirdParty/Ert/devel/libenkf/src/ensemble_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ensemble_config.h similarity index 95% rename from ThirdParty/Ert/devel/libenkf/src/ensemble_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/ensemble_config.h index e12d8e88fa..0492450ec9 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ensemble_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ensemble_config.h @@ -23,16 +23,16 @@ extern "C" { #endif #include -#include +#include -#include -#include +#include +#include -#include +#include -#include -#include -#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libenkf/src/ert_report.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ert_report.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/ert_report.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/ert_report.h diff --git a/ThirdParty/Ert/devel/libenkf/src/ert_report_list.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ert_report_list.h similarity index 97% rename from ThirdParty/Ert/devel/libenkf/src/ert_report_list.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/ert_report_list.h index 73f9925e01..2988abc73d 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ert_report_list.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ert_report_list.h @@ -25,9 +25,9 @@ extern "C" { #endif #include -#include +#include -#include +#include typedef struct ert_report_list_struct ert_report_list_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/ert_template.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ert_template.h similarity index 97% rename from ThirdParty/Ert/devel/libenkf/src/ert_template.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/ert_template.h index b01cd19dd4..37788ee01e 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ert_template.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ert_template.h @@ -23,8 +23,8 @@ extern "C" { #endif -#include -#include +#include +#include typedef struct ert_template_struct ert_template_type; typedef struct ert_templates_struct ert_templates_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/field.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/field.h similarity index 93% rename from ThirdParty/Ert/devel/libenkf/src/field.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/field.h index 890741f6f3..234e7532d1 100644 --- a/ThirdParty/Ert/devel/libenkf/src/field.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/field.h @@ -21,17 +21,16 @@ #ifdef __cplusplus extern "C" { #endif -#include -#include +#include -#include -#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /* Typedef field_type moved to field_config.h */ diff --git a/ThirdParty/Ert/devel/libenkf/src/field_common.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/field_common.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/field_common.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/field_common.h diff --git a/ThirdParty/Ert/devel/libenkf/src/field_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/field_config.h similarity index 96% rename from ThirdParty/Ert/devel/libenkf/src/field_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/field_config.h index 97b07e4a51..d5014fdd4c 100644 --- a/ThirdParty/Ert/devel/libenkf/src/field_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/field_config.h @@ -24,21 +24,20 @@ extern "C" { #include #include -#include -#include -#include +#include +#include -#include -#include +#include +#include -#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libenkf/src/field_trans.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/field_trans.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/field_trans.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/field_trans.h diff --git a/ThirdParty/Ert/devel/libenkf/src/fs_driver.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/fs_driver.h similarity index 98% rename from ThirdParty/Ert/devel/libenkf/src/fs_driver.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/fs_driver.h index 0209611d9f..cf0433d5bd 100644 --- a/ThirdParty/Ert/devel/libenkf/src/fs_driver.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/fs_driver.h @@ -21,10 +21,11 @@ #ifdef __cplusplus extern "C" { #endif -#include -#include -#include -#include +#include +#include + +#include +#include #define FS_MAGIC_ID 123998L #define FSTAB_FILE "ert_fstab" diff --git a/ThirdParty/Ert/devel/libenkf/src/fs_types.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/fs_types.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/fs_types.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/fs_types.h diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_common.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_common.h similarity index 91% rename from ThirdParty/Ert/devel/libenkf/src/gen_common.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_common.h index d9add9ada0..2bf79232a1 100644 --- a/ThirdParty/Ert/devel/libenkf/src/gen_common.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_common.h @@ -18,12 +18,22 @@ #ifndef __GEN_COMMON_H__ #define __GEN_COMMON_H__ -#include + +#ifdef __cplusplus +extern "C" { +#endif + #include #include +#include + void * gen_common_fscanf_alloc(const char * , ecl_type_enum , int * ); void * gen_common_fread_alloc(const char * , ecl_type_enum , int * ); void * gen_common_fload_alloc(const char * , gen_data_file_format_type , ecl_type_enum , ecl_type_enum * , int * ); +#ifdef __cplusplus +} +#endif + #endif diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_data.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_data.h similarity index 91% rename from ThirdParty/Ert/devel/libenkf/src/gen_data.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_data.h index b39374575e..d9255e14b2 100644 --- a/ThirdParty/Ert/devel/libenkf/src/gen_data.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_data.h @@ -22,16 +22,16 @@ extern "C" { #endif -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include void gen_data_assert_size( gen_data_type * gen_data , int size , int report_step); bool gen_data_forward_load(gen_data_type * , const char * , const ecl_sum_type * , const ecl_file_type * , int ); diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_data_common.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_data_common.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/gen_data_common.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_data_common.h diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_data_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_data_config.h similarity index 95% rename from ThirdParty/Ert/devel/libenkf/src/gen_data_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_data_config.h index c9493f7021..bcbcb8dc09 100644 --- a/ThirdParty/Ert/devel/libenkf/src/gen_data_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_data_config.h @@ -23,14 +23,14 @@ extern "C" { #endif #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include typedef enum { GEN_DATA_UNDEFINED = 0, ASCII = 1, /* The file is ASCII file with a vector of numbers formatted with "%g". */ diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_kw.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_kw.h similarity index 92% rename from ThirdParty/Ert/devel/libenkf/src/gen_kw.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_kw.h index 58d4aedb12..91ce334d3c 100644 --- a/ThirdParty/Ert/devel/libenkf/src/gen_kw.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_kw.h @@ -22,13 +22,13 @@ extern "C" { #endif -#include -#include -#include -#include -#include -#include -#include +#include + +#include +#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_kw_common.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_kw_common.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/gen_kw_common.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_kw_common.h diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_kw_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_kw_config.h similarity index 95% rename from ThirdParty/Ert/devel/libenkf/src/gen_kw_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_kw_config.h index 9e770e2029..4250818180 100644 --- a/ThirdParty/Ert/devel/libenkf/src/gen_kw_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_kw_config.h @@ -24,11 +24,13 @@ extern "C" { #include #include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include bool gen_kw_config_is_valid( const gen_kw_config_type * config ); diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_obs.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_obs.h similarity index 90% rename from ThirdParty/Ert/devel/libenkf/src/gen_obs.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_obs.h index 0fe8b4c93c..a5f11300be 100644 --- a/ThirdParty/Ert/devel/libenkf/src/gen_obs.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/gen_obs.h @@ -18,10 +18,11 @@ #ifndef __GEN_OBS_H__ #define __GEN_OBS_H__ -#include -#include -#include -#include + +#include +#include +#include +#include typedef struct gen_obs_struct gen_obs_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/local_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_config.h similarity index 97% rename from ThirdParty/Ert/devel/libenkf/src/local_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_config.h index 462442d91f..8b26c20d2b 100644 --- a/ThirdParty/Ert/devel/libenkf/src/local_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_config.h @@ -19,13 +19,14 @@ #ifndef __LOCAL_CONFIG_H__ #define __LOCAL_CONFIG_H__ -#include -#include -#include -#include -#include -#include +#include +#include + +#include +#include +#include +#include #ifdef __cplusplus diff --git a/ThirdParty/Ert/devel/libenkf/src/local_context.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_context.h similarity index 92% rename from ThirdParty/Ert/devel/libenkf/src/local_context.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_context.h index 65a0ca6ece..af4b0feebf 100644 --- a/ThirdParty/Ert/devel/libenkf/src/local_context.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_context.h @@ -25,12 +25,14 @@ extern "C" { #endif #include -#include -#include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include +#include #define GLOBAL_GRID "GLOBAL_GRID" diff --git a/ThirdParty/Ert/devel/libenkf/src/local_dataset.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_dataset.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/local_dataset.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_dataset.h diff --git a/ThirdParty/Ert/devel/libenkf/src/local_ministep.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_ministep.h similarity index 93% rename from ThirdParty/Ert/devel/libenkf/src/local_ministep.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_ministep.h index b86e361094..eafe78f494 100644 --- a/ThirdParty/Ert/devel/libenkf/src/local_ministep.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_ministep.h @@ -23,12 +23,12 @@ extern "C" { #endif -#include -#include -#include -#include -#include -#include +#include +#include + +#include +#include +#include typedef struct local_ministep_struct local_ministep_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/local_obsset.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_obsset.h similarity index 98% rename from ThirdParty/Ert/devel/libenkf/src/local_obsset.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_obsset.h index f625fc330f..5c5ddf0524 100644 --- a/ThirdParty/Ert/devel/libenkf/src/local_obsset.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_obsset.h @@ -23,7 +23,8 @@ extern "C" { #endif #include -#include + +#include typedef struct local_obsset_struct local_obsset_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/local_updatestep.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_updatestep.h similarity index 97% rename from ThirdParty/Ert/devel/libenkf/src/local_updatestep.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_updatestep.h index 106a4205fa..47c9253e5b 100644 --- a/ThirdParty/Ert/devel/libenkf/src/local_updatestep.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/local_updatestep.h @@ -23,7 +23,7 @@ extern "C" { #endif -#include +#include typedef struct local_updatestep_struct local_updatestep_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/meas_data.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/meas_data.h similarity index 98% rename from ThirdParty/Ert/devel/libenkf/src/meas_data.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/meas_data.h index 66fd5095d4..53f8f711cf 100644 --- a/ThirdParty/Ert/devel/libenkf/src/meas_data.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/meas_data.h @@ -24,8 +24,9 @@ extern "C" { #endif #include -#include -#include + +#include +#include typedef struct meas_data_struct meas_data_type; typedef struct meas_block_struct meas_block_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/member_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/member_config.h similarity index 92% rename from ThirdParty/Ert/devel/libenkf/src/member_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/member_config.h index e29da82cad..ce2c95295a 100644 --- a/ThirdParty/Ert/devel/libenkf/src/member_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/member_config.h @@ -23,15 +23,20 @@ extern "C" { #endif -#include -#include -#include -#include -#include -#include -#include #include -#include +#include + +#include + +#include + +#include +#include +#include +#include +#include + + typedef struct member_config_struct member_config_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/misfit_ensemble.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_ensemble.h similarity index 91% rename from ThirdParty/Ert/devel/libenkf/src/misfit_ensemble.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_ensemble.h index eb87f44245..ecadc98515 100644 --- a/ThirdParty/Ert/devel/libenkf/src/misfit_ensemble.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_ensemble.h @@ -26,13 +26,13 @@ extern "C" { #endif -#include -#include -#include -#include +#include +#include +#include +#include #define MISFIT_DEFAULT_RANKING_KEY "DEFAULT" -#include +#include diff --git a/ThirdParty/Ert/devel/libenkf/src/misfit_ensemble_typedef.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_ensemble_typedef.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/misfit_ensemble_typedef.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_ensemble_typedef.h diff --git a/ThirdParty/Ert/devel/libenkf/src/misfit_member.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_member.h similarity index 97% rename from ThirdParty/Ert/devel/libenkf/src/misfit_member.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_member.h index a943bf9b9e..fb6a84b17c 100644 --- a/ThirdParty/Ert/devel/libenkf/src/misfit_member.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_member.h @@ -24,7 +24,8 @@ extern "C" { #endif #include -#include + +#include typedef struct misfit_member_struct misfit_member_type; misfit_ts_type * misfit_member_get_ts( const misfit_member_type * member , const char * obs_key ); diff --git a/ThirdParty/Ert/devel/libenkf/src/misfit_ranking.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_ranking.h similarity index 93% rename from ThirdParty/Ert/devel/libenkf/src/misfit_ranking.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_ranking.h index 148bd7815b..00eacae652 100644 --- a/ThirdParty/Ert/devel/libenkf/src/misfit_ranking.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_ranking.h @@ -19,11 +19,11 @@ #ifndef __MISFIT_RANKING_H__ #define __MISFIT_RANKING_H__ -#include +#include -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/ThirdParty/Ert/devel/libenkf/src/misfit_ts.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_ts.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/misfit_ts.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/misfit_ts.h diff --git a/ThirdParty/Ert/devel/libenkf/src/model_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/model_config.h similarity index 93% rename from ThirdParty/Ert/devel/libenkf/src/model_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/model_config.h index 2d25301030..ffa0e2cd47 100644 --- a/ThirdParty/Ert/devel/libenkf/src/model_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/model_config.h @@ -24,21 +24,22 @@ extern "C" { #include #include -#include -#include +#include -#include -#include +#include -#include -#include +#include +#include -#include +#include +#include -#include -#include -#include +#include + +#include +#include +#include typedef struct model_config_struct model_config_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/obs_data.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/obs_data.h similarity index 96% rename from ThirdParty/Ert/devel/libenkf/src/obs_data.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/obs_data.h index bc5988e5f6..34e618f45d 100644 --- a/ThirdParty/Ert/devel/libenkf/src/obs_data.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/obs_data.h @@ -23,11 +23,13 @@ extern "C" { #endif #include #include -#include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include typedef struct obs_data_struct obs_data_type; typedef struct obs_block_struct obs_block_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/obs_vector.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/obs_vector.h similarity index 93% rename from ThirdParty/Ert/devel/libenkf/src/obs_vector.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/obs_vector.h index cc7af18e64..cf6614b1a6 100644 --- a/ThirdParty/Ert/devel/libenkf/src/obs_vector.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/obs_vector.h @@ -25,23 +25,22 @@ extern "C" { #include -#include -#include +#include -#include +#include -#include +#include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include typedef void (obs_free_ftype) (void *); diff --git a/ThirdParty/Ert/devel/libenkf/src/plain_driver.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/plain_driver.h similarity index 97% rename from ThirdParty/Ert/devel/libenkf/src/plain_driver.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/plain_driver.h index bba8891938..cd0f91b1dc 100644 --- a/ThirdParty/Ert/devel/libenkf/src/plain_driver.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/plain_driver.h @@ -20,9 +20,10 @@ #define __PLAIN_DRIVER_H__ #include -#include #include +#include + typedef struct plain_driver_struct plain_driver_type; void plain_driver_create_fs( FILE * stream , fs_driver_enum driver_type , const char * node_fmt , const char * vector_fmt); diff --git a/ThirdParty/Ert/devel/libenkf/src/plain_driver_obs.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/plain_driver_obs.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/plain_driver_obs.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/plain_driver_obs.h diff --git a/ThirdParty/Ert/devel/libenkf/src/plot_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/plot_config.h similarity index 98% rename from ThirdParty/Ert/devel/libenkf/src/plot_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/plot_config.h index c014a2486e..cad4fa918e 100644 --- a/ThirdParty/Ert/devel/libenkf/src/plot_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/plot_config.h @@ -18,7 +18,7 @@ #ifndef __PLOT_CONFIG_H__ #define __PLOT_CONFIG_H__ -#include +#include typedef struct plot_config_struct plot_config_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/qc_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/qc_config.h similarity index 97% rename from ThirdParty/Ert/devel/libenkf/src/qc_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/qc_config.h index 9576d74ab9..89fc077d50 100644 --- a/ThirdParty/Ert/devel/libenkf/src/qc_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/qc_config.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include typedef struct qc_config_struct qc_config_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/ranking_common.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ranking_common.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/ranking_common.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/ranking_common.h diff --git a/ThirdParty/Ert/devel/libenkf/src/ranking_table.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ranking_table.h similarity index 98% rename from ThirdParty/Ert/devel/libenkf/src/ranking_table.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/ranking_table.h index 519bc8c1ea..0bd65e5cb3 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ranking_table.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/ranking_table.h @@ -25,7 +25,8 @@ extern "C" { #endif #include -#include + +#include typedef struct ranking_table_struct ranking_table_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/rng_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/rng_config.h similarity index 96% rename from ThirdParty/Ert/devel/libenkf/src/rng_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/rng_config.h index 1120aa9471..7b18f918d1 100644 --- a/ThirdParty/Ert/devel/libenkf/src/rng_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/rng_config.h @@ -23,8 +23,9 @@ extern "C" { #endif -#include -#include +#include + +#include typedef struct rng_config_struct rng_config_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/scalar_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/scalar_config.h similarity index 100% rename from ThirdParty/Ert/devel/libenkf/src/scalar_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/scalar_config.h diff --git a/ThirdParty/Ert/devel/libenkf/src/site_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/site_config.h similarity index 97% rename from ThirdParty/Ert/devel/libenkf/src/site_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/site_config.h index d554a6ca5b..dd949bcf7a 100644 --- a/ThirdParty/Ert/devel/libenkf/src/site_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/site_config.h @@ -24,12 +24,12 @@ extern "C" { #include -#include +#include -#include +#include -#include -#include +#include +#include typedef struct site_config_struct site_config_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/summary.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/summary.h similarity index 88% rename from ThirdParty/Ert/devel/libenkf/src/summary.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/summary.h index 8cb27647a9..587569b284 100644 --- a/ThirdParty/Ert/devel/libenkf/src/summary.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/summary.h @@ -18,15 +18,14 @@ #ifndef __SUMMARY_H__ #define __SUMMARY_H__ -#include -#include +#include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libenkf/src/summary_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/summary_config.h similarity index 97% rename from ThirdParty/Ert/devel/libenkf/src/summary_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/summary_config.h index f534e111c5..929c21ab71 100644 --- a/ThirdParty/Ert/devel/libenkf/src/summary_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/summary_config.h @@ -26,12 +26,10 @@ extern "C" { #include #include -#include +#include +#include -#include -#include - -#include +#include /* How should the run system handle a load problem of a summary diff --git a/ThirdParty/Ert/devel/libenkf/src/summary_obs.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/summary_obs.h similarity index 90% rename from ThirdParty/Ert/devel/libenkf/src/summary_obs.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/summary_obs.h index 56ec85651e..52ed9699bf 100644 --- a/ThirdParty/Ert/devel/libenkf/src/summary_obs.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/summary_obs.h @@ -22,18 +22,19 @@ #ifdef __cplusplus extern "C" { #endif - - #include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include + +#include + +#include +#include +#include +#include +#include +#include + #define AUTO_CORRF_EXP "EXP" #define AUTO_CORRF_GAUSS "GAUSS" diff --git a/ThirdParty/Ert/devel/libenkf/src/surface.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/surface.h similarity index 93% rename from ThirdParty/Ert/devel/libenkf/src/surface.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/surface.h index e6ae8a1e77..25c3d7f785 100644 --- a/ThirdParty/Ert/devel/libenkf/src/surface.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/surface.h @@ -23,10 +23,9 @@ extern "C" { #endif -#include -#include -#include -#include +#include +#include +#include typedef struct surface_struct surface_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/surface_config.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/surface_config.h similarity index 95% rename from ThirdParty/Ert/devel/libenkf/src/surface_config.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/surface_config.h index dfd8cc3469..c9fcae0e62 100644 --- a/ThirdParty/Ert/devel/libenkf/src/surface_config.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/surface_config.h @@ -23,8 +23,9 @@ extern "C" { #endif -#include -#include +#include + +#include typedef struct surface_config_struct surface_config_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/time_map.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/time_map.h similarity index 98% rename from ThirdParty/Ert/devel/libenkf/src/time_map.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/time_map.h index 6b5ae0ad6c..1432aa4dfb 100644 --- a/ThirdParty/Ert/devel/libenkf/src/time_map.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/time_map.h @@ -23,6 +23,7 @@ extern "C" { #include +#include typedef struct time_map_struct time_map_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/trans_func.h b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/trans_func.h similarity index 96% rename from ThirdParty/Ert/devel/libenkf/src/trans_func.h rename to ThirdParty/Ert/devel/libenkf/include/ert/enkf/trans_func.h index f801644625..d8e342018f 100644 --- a/ThirdParty/Ert/devel/libenkf/src/trans_func.h +++ b/ThirdParty/Ert/devel/libenkf/include/ert/enkf/trans_func.h @@ -21,11 +21,13 @@ #ifdef __cplusplus extern "C" { #endif -#include -#include #include #include +#include + +#include + typedef struct trans_func_struct trans_func_type; typedef double (transform_ftype) (double , const arg_pack_type *); diff --git a/ThirdParty/Ert/devel/libenkf/src/CMakeLists.txt b/ThirdParty/Ert/devel/libenkf/src/CMakeLists.txt index ac0a6c4be6..32d1963c4c 100644 --- a/ThirdParty/Ert/devel/libenkf/src/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libenkf/src/CMakeLists.txt @@ -1,23 +1,21 @@ -set( source_files ert_report.c time_map.c rng_config.c trans_func.c enkf_types.c enkf_obs.c obs_data.c block_obs.c enkf_config_node.c field_config.c field.c ecl_static_kw.c enkf_state.c enkf_util.c enkf_node.c gen_kw_config.c gen_kw.c enkf_fs.c fs_driver.c meas_data.c summary_obs.c summary.c summary_config.c gen_data_config.c gen_data.c gen_common.c gen_obs.c enkf_sched.c enkf_serialize.c ecl_config.c enkf_defaults.c ensemble_config.c model_config.c site_config.c active_list.c obs_vector.c field_trans.c plain_driver.c config_parser.c enkf_analysis.c local_ministep.c local_updatestep.c container_config.c container.c local_context.c local_config.c analysis_config.c misfit_ensemble.c misfit_member.c misfit_ts.c data_ranking.c misfit_ranking.c ranking_table.c fs_types.c block_fs_driver.c plot_config.c ert_template.c member_config.c enkf_main.c local_dataset.c local_obsset.c surface.c surface_config.c plot/enkf_plot_data.c plot/enkf_plot_member.c qc_config.c ert_report_list.c plot/enkf_plot_arg.c) +set( source_files ert_report.c time_map.c rng_config.c trans_func.c enkf_types.c enkf_obs.c obs_data.c block_obs.c enkf_config_node.c field_config.c field.c ecl_static_kw.c enkf_state.c enkf_util.c enkf_node.c gen_kw_config.c gen_kw.c enkf_fs.c fs_driver.c meas_data.c summary_obs.c summary.c summary_config.c gen_data_config.c gen_data.c gen_common.c gen_obs.c enkf_sched.c enkf_serialize.c ecl_config.c enkf_defaults.c ensemble_config.c model_config.c site_config.c active_list.c obs_vector.c field_trans.c plain_driver.c local_ministep.c local_updatestep.c container_config.c container.c local_context.c local_config.c analysis_config.c misfit_ensemble.c misfit_member.c misfit_ts.c data_ranking.c misfit_ranking.c ranking_table.c fs_types.c block_fs_driver.c plot_config.c ert_template.c member_config.c enkf_analysis.c enkf_main.c local_dataset.c local_obsset.c surface.c surface_config.c enkf_plot_data.c enkf_plot_member.c qc_config.c ert_report_list.c enkf_plot_arg.c) -set( header_files ert_report.h time_map.h rng_config.h enkf_fs_type.h trans_func.h enkf_obs.h obs_data.h enkf_config_node.h block_obs.h field_config.h field.h enkf_macros.h ecl_static_kw.h enkf_state.h enkf_util.h enkf_main.h enkf_node.h enkf_fs.h gen_kw_config.h gen_kw.h enkf_types.h fs_driver.h meas_data.h summary_obs.h summary_config.h summary_config.h gen_data_config.h gen_data.h gen_common.h gen_obs.h enkf_sched.h fs_types.h enkf_serialize.h plain_driver.h ecl_config.h ensemble_config.h model_config.h site_config.h active_list.h obs_vector.h field_trans.h plain_driver.h config_parser.h enkf_analysis.h local_ministep.h container.h local_updatestep.h local_config.h analysis_config.h misfit_ensemble.h misfit_ensemble_typedef.h misfit_ts.h misfit_member.h data_ranking.h ranking_table.h ranking_common.h misfit_ranking.h block_fs_driver.h field_common.h gen_kw_common.h gen_data_common.h plot_config.h ert_template.h member_config.h enkf_defaults.h container_config.h local_dataset.h local_obsset.h surface.h surface_config.h local_context.h plot/enkf_plot_data.h plot/enkf_plot_member.h qc_config.h ert_report_list.h plot/enkf_plot_arg.h) +set( header_files ert_report.h time_map.h rng_config.h enkf_analysis.h enkf_fs_type.h trans_func.h enkf_obs.h obs_data.h enkf_config_node.h block_obs.h field_config.h field.h enkf_macros.h ecl_static_kw.h enkf_state.h enkf_util.h enkf_main.h enkf_node.h enkf_fs.h gen_kw_config.h gen_kw.h enkf_types.h fs_driver.h meas_data.h summary_obs.h summary_config.h summary_config.h gen_data_config.h gen_data.h gen_common.h gen_obs.h enkf_sched.h fs_types.h enkf_serialize.h plain_driver.h ecl_config.h ensemble_config.h model_config.h site_config.h active_list.h obs_vector.h field_trans.h plain_driver.h local_ministep.h container.h local_updatestep.h local_config.h analysis_config.h misfit_ensemble.h misfit_ensemble_typedef.h misfit_ts.h misfit_member.h data_ranking.h ranking_table.h ranking_common.h misfit_ranking.h block_fs_driver.h field_common.h gen_kw_common.h gen_data_common.h plot_config.h ert_template.h member_config.h enkf_defaults.h container_config.h local_dataset.h local_obsset.h surface.h surface_config.h local_context.h enkf_plot_data.h enkf_plot_member.h qc_config.h ert_report_list.h enkf_plot_arg.h) add_library( enkf ${LIBRARY_TYPE} ${source_files} ) - +set_target_properties( enkf PROPERTIES VERSION 1.0 SOVERSION 1.0 ) #configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/CMake/config/ert_build_info.h.in # ${CMAKE_CURRENT_BINARY_DIR}/ert_build_info.h ) #list( APPEND src_files ${CMAKE_CURRENT_BINARY_DIR}/ert_build_info.h ) -target_link_libraries( enkf ecl geometry sched analysis rms plot config job_queue ) +target_link_libraries( enkf ecl sched analysis rms plot config job_queue ) #----------------------------------------------------------------- -if (ENKF_INSTALL_PREFIX) - install(TARGETS enkf DESTINATION ${ENKF_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${ENKF_INSTALL_PREFIX}/include) -else() - install(TARGETS enkf DESTINATION lib) - install(FILES ${header_files} DESTINATION include) -endif() +install(TARGETS enkf DESTINATION ${CMAKE_INSTALL_LIBDIR}) +foreach(header ${header_files}) + install(FILES ../include/ert/enkf/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/enkf) +endforeach() + diff --git a/ThirdParty/Ert/devel/libenkf/src/README.new_type_config.c b/ThirdParty/Ert/devel/libenkf/src/README.new_type_config.c deleted file mode 100644 index ec40fc02e4..0000000000 --- a/ThirdParty/Ert/devel/libenkf/src/README.new_type_config.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'README.new_type_config.c' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -/** -The two files README.new_type.c and README.new_type_config.c (along -with the corresponding header files) are meant to serve as a -documentation and reference on how to add new object types to the enkf -system. - - -new_type_config.c -========== -*/ diff --git a/ThirdParty/Ert/devel/libenkf/src/active_config.c b/ThirdParty/Ert/devel/libenkf/src/active_config.c deleted file mode 100644 index b5d943b403..0000000000 --- a/ThirdParty/Ert/devel/libenkf/src/active_config.c +++ /dev/null @@ -1,69 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'active_config.c' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#include -#include -#include -#include -#include -#include -#include -#include - -/** - This file implements the top level object in the system keeping - track of active/inactive parameters and observations. The system is - based on three levels, from the bottom up: - - 1. active_map_type - - 2. active_report_step_type - - 3. active_type - - - active_map_type - --------------- - This object contains all the information about active/inactive - parameters and observations for _one_single_enkf_update_. This is - many respects the most importan object in the active/inactive - system. - - In many cases there will be only one active_map instance active at - one report_step, but when some form of local analysis is applied, - there wille be several active_map instances at the same - report_step; one for each local update. - - - active_report_step_type - ----------------------- - This is active/inactive information for _one_ report step. The main - content is a list of active_map_type instances. In the case of - global analyis, this will just conists of one element. - - - active_type - ----------- - This contains - -*/ - -struct active_map_struct { - int __id; -}; - diff --git a/ThirdParty/Ert/devel/libenkf/src/active_list.c b/ThirdParty/Ert/devel/libenkf/src/active_list.c index e9997bf394..c8d91e694d 100644 --- a/ThirdParty/Ert/devel/libenkf/src/active_list.c +++ b/ThirdParty/Ert/devel/libenkf/src/active_list.c @@ -17,11 +17,13 @@ */ #include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libenkf/src/analysis_config.c b/ThirdParty/Ert/devel/libenkf/src/analysis_config.c index 02d7393849..357b304ace 100644 --- a/ThirdParty/Ert/devel/libenkf/src/analysis_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/analysis_config.c @@ -21,18 +21,18 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include -#include -#include -#include -#include "config_keys.h" +#include +#include +#include +#include struct analysis_config_struct { diff --git a/ThirdParty/Ert/devel/libenkf/src/block_fs_driver.c b/ThirdParty/Ert/devel/libenkf/src/block_fs_driver.c index ae475f16ff..8619ac1451 100644 --- a/ThirdParty/Ert/devel/libenkf/src/block_fs_driver.c +++ b/ThirdParty/Ert/devel/libenkf/src/block_fs_driver.c @@ -19,16 +19,19 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + typedef struct bfs_struct bfs_type; typedef struct bfs_config_struct bfs_config_type; diff --git a/ThirdParty/Ert/devel/libenkf/src/block_obs.c b/ThirdParty/Ert/devel/libenkf/src/block_obs.c index d4c4b6188a..5e50e2e615 100644 --- a/ThirdParty/Ert/devel/libenkf/src/block_obs.c +++ b/ThirdParty/Ert/devel/libenkf/src/block_obs.c @@ -23,25 +23,25 @@ #include #include -#include -#include +#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define BLOCK_OBS_TYPE_ID 661098 #define POINT_OBS_TYPE_ID 778196 diff --git a/ThirdParty/Ert/devel/libenkf/src/config_parser.c b/ThirdParty/Ert/devel/libenkf/src/config_parser.c deleted file mode 100644 index 6e772aa413..0000000000 --- a/ThirdParty/Ert/devel/libenkf/src/config_parser.c +++ /dev/null @@ -1,269 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'config_parser.c' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#include -//static -//conf_class_type * history_observation_class( -// void) -//{ -// const char * ho_help = "The class HISTORY_OBSERVATION is used to condition on a time series from the production history. The name of the an instance is used to define the item to condition on, and should be in summary.x syntax."; -// const char * ho_error_mode_help = "The string ERROR_MODE gives the error mode for the observation."; -// const char * ho_error_help = "The positive floating number ERROR gives the standard deviation (ABS) or the relative uncertainty (REL/RELMIN) of the observations."; -// const char * ho_error_min_help = "The positive floating point number ERROR_MIN gives the minimum value for the standard deviation of the observation when ERROR_MODE is set to RELMIN."; -// -// conf_class_type * ho_class = conf_class_alloc_empty("HISTORY_OBSERVATION", false , false, ho_help); -// -// conf_item_spec_type * error_mode = conf_item_spec_alloc("ERROR_MODE", true, DT_STR , ho_error_mode_help ); -// conf_item_spec_add_restriction( error_mode, "REL"); -// conf_item_spec_add_restriction( error_mode, "ABS"); -// conf_item_spec_add_restriction( error_mode, "RELMIN"); -// conf_item_spec_set_default_value(error_mode, "RELMIN"); -// -// conf_item_spec_type * error = conf_item_spec_alloc("ERROR", true, DT_POSFLOAT , ho_error_help); -// conf_item_spec_set_default_value(error, "0.10"); -// -// conf_item_spec_type * error_min = conf_item_spec_alloc("ERROR_MIN", true, DT_POSFLOAT , ho_error_min_help); -// conf_item_spec_set_default_value(error_min, "0.10"); -// -// conf_class_insert_owned_item_spec(ho_class, error_mode); -// conf_class_insert_owned_item_spec(ho_class, error); -// conf_class_insert_owned_item_spec(ho_class, error_min); -// -// /** Sub class segment. */ -// { -// const char * seg_help = "The class SEGMENT is used to fine tune the error model."; -// const char * seg_start_help = "The first restart in the segment."; -// const char * seg_stop_help = "The last restart in the segment."; -// const char * seg_error_mode_help = "The string ERROR_MODE gives the error mode for the observation."; -// const char * seg_error_help = "The positive floating number ERROR gives the standard deviation (ABS) or the relative uncertainty (REL/RELMIN) of the observations."; -// const char * seg_error_min_help = "The positive floating point number ERROR_MIN gives the minimum value for the standard deviation of the observation when ERROR_MODE is set to RELMIN."; -// -// conf_class_type * seg_class = conf_class_alloc_empty("SEGMENT", false , false, seg_help); -// -// conf_item_spec_type * start_seg = conf_item_spec_alloc("START", true, DT_INT, seg_start_help); -// conf_item_spec_type * stop_seg = conf_item_spec_alloc("STOP", true, DT_INT, seg_stop_help); -// -// conf_item_spec_type * error_mode_seg = conf_item_spec_alloc("ERROR_MODE", true, DT_STR , seg_error_mode_help); -// conf_item_spec_add_restriction( error_mode_seg, "REL"); -// conf_item_spec_add_restriction( error_mode_seg, "ABS"); -// conf_item_spec_add_restriction( error_mode_seg, "RELMIN"); -// conf_item_spec_set_default_value(error_mode_seg, "RELMIN"); -// -// conf_item_spec_type * error_seg = conf_item_spec_alloc("ERROR", true, DT_POSFLOAT , seg_error_help); -// conf_item_spec_set_default_value(error_seg, "0.10"); -// -// conf_item_spec_type * error_min_seg = conf_item_spec_alloc("ERROR_MIN", true, DT_POSFLOAT , seg_error_min_help); -// conf_item_spec_set_default_value(error_min_seg, "0.10"); -// -// -// conf_class_insert_owned_item_spec(seg_class, start_seg); -// conf_class_insert_owned_item_spec(seg_class, stop_seg); -// conf_class_insert_owned_item_spec(seg_class, error_mode_seg); -// conf_class_insert_owned_item_spec(seg_class, error_seg); -// conf_class_insert_owned_item_spec(seg_class, error_min_seg); -// -// conf_class_insert_owned_sub_class(ho_class, seg_class); -// } -// -// return ho_class; -//} -// -// -// -//static -//conf_class_type * summary_observation_class( -// void) -//{ -// const char * so_help = "The class SUMMARY_OBSERVATION can be used to condition on any observation whos simulated value is written to the ECLIPSE summary file."; -// const char * so_value_help = "The floating point number VALUE gives the observed value."; -// const char * so_error_help = "The positive floating point number ERROR is the standard deviation of the observed value."; -// const char * so_date_help = "The DATE item gives the observation time as the date date it occured. Format is dd/mm/yyyy."; -// const char * so_days_help = "The DAYS item gives the observation time as days after simulation start."; -// const char * so_restart_help = "The RESTART item gives the observation time as the ECLIPSE restart nr."; -// const char * so_key_help = "The string KEY is used to look up the simulated value in the summary file. It has the same format as the summary.x program, e.g. WOPR:P4"; -// -// conf_class_type * so_class = conf_class_alloc_empty("SUMMARY_OBSERVATION", false , false, so_help); -// -// conf_item_spec_type * value = conf_item_spec_alloc("VALUE" , true , DT_FLOAT, so_value_help); -// conf_item_spec_type * error = conf_item_spec_alloc("ERROR" , true , DT_POSFLOAT, so_error_help); -// conf_item_spec_type * date = conf_item_spec_alloc("DATE" , false, DT_DATE, so_date_help); -// conf_item_spec_type * days = conf_item_spec_alloc("DAYS" , false, DT_POSFLOAT, so_days_help); -// conf_item_spec_type * restart = conf_item_spec_alloc("RESTART", false, DT_POSINT , so_restart_help); -// conf_item_spec_type * key = conf_item_spec_alloc("KEY" , true , DT_STR , so_key_help); -// -// conf_class_insert_owned_item_spec(so_class, value); -// conf_class_insert_owned_item_spec(so_class, error); -// conf_class_insert_owned_item_spec(so_class, date); -// conf_class_insert_owned_item_spec(so_class, days); -// conf_class_insert_owned_item_spec(so_class, restart); -// conf_class_insert_owned_item_spec(so_class, key); -// -// /** Create a mutex on DATE, DAYS and RESTART. */ -// conf_item_mutex_type * time_mutex = conf_class_new_item_mutex(so_class , true , false); -// -// conf_item_mutex_add_item_spec(time_mutex, date); -// conf_item_mutex_add_item_spec(time_mutex, days); -// conf_item_mutex_add_item_spec(time_mutex, restart); -// -// return so_class; -//} -// -// -// -//static -//conf_class_type * block_observation_class( -// void) -//{ -// const char * bo_help = "The class BLOCK_OBSERVATION can be used to condition on an observation whos simulated values are block/cell values of a field, e.g. RFT tests."; -// const char * bo_field_help = "The item FIELD gives the observed field. E.g., ECLIPSE fields such as PRESSURE, SGAS or any user defined fields such as PORO or PERMX."; -// const char * bo_date_help = "The DATE item gives the observation time as the date date it occured. Format is dd/mm/yyyy."; -// const char * bo_days_help = "The DAYS item gives the observation time as days after simulation start."; -// const char * bo_restart_help = "The RESTART item gives the observation time as the ECLIPSE restart nr."; -// -// conf_class_type * bo_class = conf_class_alloc_empty("BLOCK_OBSERVATION", false , false, bo_help); -// -// conf_item_spec_type * field = conf_item_spec_alloc("FIELD" , true , DT_STR , bo_field_help); -// conf_item_spec_type * date = conf_item_spec_alloc("DATE" , false, DT_DATE , bo_date_help); -// conf_item_spec_type * days = conf_item_spec_alloc("DAYS" , false, DT_POSFLOAT, bo_days_help); -// conf_item_spec_type * restart = conf_item_spec_alloc("RESTART", false, DT_POSINT , bo_restart_help); -// -// conf_class_insert_owned_item_spec(bo_class, field); -// conf_class_insert_owned_item_spec(bo_class, date); -// conf_class_insert_owned_item_spec(bo_class, days); -// conf_class_insert_owned_item_spec(bo_class, restart); -// -// /** Create a mutex on DATE, DAYS and RESTART. */ -// conf_item_mutex_type * time_mutex = conf_class_new_item_mutex(bo_class , true , false); -// conf_item_mutex_add_item_spec(time_mutex, date); -// conf_item_mutex_add_item_spec(time_mutex, days); -// conf_item_mutex_add_item_spec(time_mutex, restart); -// -// /** Create and insert the sub class OBS. */ -// { -// const char * obs_help = "The class OBS is used to specify a single observed point."; -// const char * obs_i_help = "The item I gives the I index of the block observation."; -// const char * obs_j_help = "The item J gives the J index of the block observation."; -// const char * obs_k_help = "The item K gives the K index of the block observation."; -// const char * obs_value_help = "The floating point number VALUE gives the observed value."; -// const char * obs_error_help = "The positive floating point number ERROR is the standard deviation of the observed value."; -// -// conf_class_type * obs_class = conf_class_alloc_empty("OBS", true , false, obs_help); -// -// conf_item_spec_type * i = conf_item_spec_alloc("I" , true, DT_POSINT , obs_i_help); -// conf_item_spec_type * j = conf_item_spec_alloc("J" , true, DT_POSINT , obs_j_help); -// conf_item_spec_type * k = conf_item_spec_alloc("K" , true, DT_POSINT , obs_k_help); -// conf_item_spec_type * value = conf_item_spec_alloc("VALUE", true, DT_FLOAT , obs_value_help); -// conf_item_spec_type * error = conf_item_spec_alloc("ERROR", true, DT_POSFLOAT, obs_error_help); -// -// conf_class_insert_owned_item_spec(obs_class, i); -// conf_class_insert_owned_item_spec(obs_class, j); -// conf_class_insert_owned_item_spec(obs_class, k); -// conf_class_insert_owned_item_spec(obs_class, value); -// conf_class_insert_owned_item_spec(obs_class, error); -// -// conf_class_insert_owned_sub_class(bo_class, obs_class); -// } -// -// return bo_class; -//} -// -// -// -//static -//conf_class_type * general_observation_class( -// void) -//{ -// const char * go_help = "The class GENERAL_OBSERVATION is used for observations of GENERAL_PARAMETER and GENERAL_STATE."; -// const char * go_restart_help = "The RESTART item gives the observation time as the ECLIPSE restart nr."; -// const char * go_field_help = "The item DATA gives the observed GENERAL_PARAMETER or GENERAL_STATE instance."; -// const char * go_date_help = "The DATE item gives the observation time as the date date it occured. Format is dd/mm/yyyy."; -// const char * go_days_help = "The DAYS item gives the observation time as days after simulation start."; -// const char * go_values_help = "A vector of observed values."; -// const char * go_errors_help = "A vector of the errors in the observed values."; -// const char * go_indices_help = "A vector of indicies which should be observed in the target field."; -// -// conf_class_type * go_class = conf_class_alloc_empty("GENERAL_OBSERVATION" , false , false, go_help); -// -// conf_item_spec_type * field = conf_item_spec_alloc("DATA" , true , DT_STR , go_field_help); -// conf_item_spec_type * date = conf_item_spec_alloc("DATE" , false, DT_DATE , go_date_help); -// conf_item_spec_type * days = conf_item_spec_alloc("DAYS" , false, DT_POSFLOAT , go_days_help); -// conf_item_spec_type * restart = conf_item_spec_alloc("RESTART" , false, DT_POSINT , go_restart_help); -// conf_item_spec_type * values = conf_item_spec_alloc("VALUES" , true, DT_FLOAT_VECTOR , go_values_help); -// conf_item_spec_type * errors = conf_item_spec_alloc("ERRORS" , true, DT_POSFLOAT_VECTOR, go_errors_help); -// conf_item_spec_type * indices = conf_item_spec_alloc("INDICES" , false, DT_INT_VECTOR , go_indices_help); -// -// conf_class_insert_owned_item_spec(go_class, field); -// conf_class_insert_owned_item_spec(go_class, date); -// conf_class_insert_owned_item_spec(go_class, days); -// conf_class_insert_owned_item_spec(go_class, restart); -// conf_class_insert_owned_item_spec(go_class, values); -// conf_class_insert_owned_item_spec(go_class, errors); -// conf_class_insert_owned_item_spec(go_class, indices); -// -// -// /** Create a mutex on DATE, DAYS and RESTART. */ -// { -// conf_item_mutex_type * time_mutex = conf_class_new_item_mutex(go_class , true , false); -// -// conf_item_mutex_add_item_spec(time_mutex, date); -// conf_item_mutex_add_item_spec(time_mutex, days); -// conf_item_mutex_add_item_spec(time_mutex, restart); -// } -// -// return go_class; -//} -// -// -// -//static -//conf_class_type * parameter_collection_class( -// void) -//{ -// const char * pc_help = "The class PARAMETER_COLLECTION is used for parameters based on template subsitution."; -// const char * pc_template_file_help = "The template file to be used."; -// const char * pc_target_file_help = "The name of the file produced in the simulation folder. Remember to include in the ECLIPSE data file."; -// -// conf_class_type * pc_class = conf_class_alloc_empty("PARAMETER_COLLECTION", false, false, pc_help); -// -// conf_item_spec_type * template_file = conf_item_spec_alloc("TEMPLATE_FILE", true, DT_FILE, pc_template_file_help); -// conf_item_spec_type * target_file = conf_item_spec_alloc("TARGET_FILE" , true, DT_STR , pc_target_file_help); -// -//} -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// -// diff --git a/ThirdParty/Ert/devel/libenkf/src/container.c b/ThirdParty/Ert/devel/libenkf/src/container.c index 66ab4e0474..32dd6d9fdf 100644 --- a/ThirdParty/Ert/devel/libenkf/src/container.c +++ b/ThirdParty/Ert/devel/libenkf/src/container.c @@ -16,14 +16,14 @@ for more details. */ -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include typedef struct container_struct { int __type_id; diff --git a/ThirdParty/Ert/devel/libenkf/src/container_config.c b/ThirdParty/Ert/devel/libenkf/src/container_config.c index 6316bfd2f8..9c7f96e7c3 100644 --- a/ThirdParty/Ert/devel/libenkf/src/container_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/container_config.c @@ -18,11 +18,11 @@ #include -#include -#include +#include +#include -#include -#include +#include +#include #define CONTAINER_CONFIG_TYPE_ID 51330852 diff --git a/ThirdParty/Ert/devel/libenkf/src/data_ranking.c b/ThirdParty/Ert/devel/libenkf/src/data_ranking.c index 000c500536..0de095dce5 100644 --- a/ThirdParty/Ert/devel/libenkf/src/data_ranking.c +++ b/ThirdParty/Ert/devel/libenkf/src/data_ranking.c @@ -21,19 +21,19 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #define DATA_RANKING_TYPE_ID 71420672 diff --git a/ThirdParty/Ert/devel/libenkf/src/ecl_config.c b/ThirdParty/Ert/devel/libenkf/src/ecl_config.c index bd432770ae..68f2ace152 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ecl_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/ecl_config.c @@ -21,24 +21,23 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include - -#include "config_keys.h" -#include "enkf_defaults.h" +#include +#include +#include +#include /** This file implements a struct which holds configuration information diff --git a/ThirdParty/Ert/devel/libenkf/src/ecl_static_kw.c b/ThirdParty/Ert/devel/libenkf/src/ecl_static_kw.c index 54774db407..a36ccc3bed 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ecl_static_kw.c +++ b/ThirdParty/Ert/devel/libenkf/src/ecl_static_kw.c @@ -17,12 +17,16 @@ */ #include -#include -#include -#include -#include -#include -#include + +#include +#include + +#include + +#include +#include +#include + struct ecl_static_kw_struct { diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_analysis.c b/ThirdParty/Ert/devel/libenkf/src/enkf_analysis.c index e992a8960e..384e17c0bf 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_analysis.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_analysis.c @@ -16,748 +16,29 @@ for more details. */ -#include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include - - -//CV: int enkf_analysis_get_optimal_numb_comp(const matrix_type * cvErr , const int maxP , const int nFolds , const bool pen_press) { -//CV: -//CV: int i, optP; -//CV: double tmp, minErr; -//CV: -//CV: double tmp2 = (1.0 / (double)nFolds); -//CV: -//CV: double * cvMean = util_malloc( sizeof * cvMean * maxP, __func__); -//CV: -//CV: for (int p = 0; p < maxP; p++ ){ -//CV: tmp = 0.0; -//CV: for (int folds = 0; folds < nFolds; folds++ ){ -//CV: tmp += matrix_iget( cvErr , p, folds ); -//CV: } -//CV: cvMean[p] = tmp * tmp2; -//CV: } -//CV: -//CV: -//CV: tmp2 = 1.0 / ((double)(nFolds - 1)); -//CV: double * cvStd = util_malloc( sizeof * cvStd * maxP, __func__); -//CV: for ( int p = 0; p < maxP; p++){ -//CV: tmp = 0.0; -//CV: for ( int folds = 0; folds < nFolds; folds++){ -//CV: tmp += pow( matrix_iget( cvErr , p , folds ) - cvMean[p] , 2); -//CV: } -//CV: cvStd[p] = sqrt( tmp * tmp2 ); -//CV: } -//CV: -//CV: minErr = cvMean[0]; -//CV: optP = 1; -//CV: -//CV: -//CV: printf("PRESS = \n"); -//CV: for (i = 0; i < maxP; i++) { -//CV: printf(" %0.2f \n",cvMean[i]); -//CV: } -//CV: -//CV: -//CV: -//CV: for (i = 1; i < maxP; i++) { -//CV: tmp = cvMean[i]; -//CV: if (tmp < minErr && tmp > 0.0) { -//CV: minErr = tmp; -//CV: optP = i+1; -//CV: } -//CV: } -//CV: -//CV: printf("Global optimum= %d\n",optP); -//CV: -//CV: -//CV: if (pen_press) { -//CV: printf("Selecting optimal number of components using Penalised PRESS statistic: \n"); -//CV: for ( i = 0; i < optP; i++){ -//CV: if( cvMean[i] - cvStd[i] <= minErr ){ -//CV: optP = i+1; -//CV: break; -//CV: } -//CV: } -//CV: } -//CV: -//CV: -//CV: free( cvStd ); -//CV: free( cvMean ); -//CV: return optP; -//CV: } - -//CV -> -//CV -> -//CV ->/* function that estimates the Predictive Error Sum of Squares (PRESS) -//CV -> statistic based on k-fold Cross-Validation for a particular set of -//CV -> training and test indcies. Note that we do not need to recompute -//CV -> the eigenvalue decomposition X0 in equation 14.26 (Evensen, 2007) -//CV -> for each value of p. -//CV -> -//CV -> OUTPUT : -//CV -> -//CV -> cvErr - Vector containing the estimate PRESS for all valid combinations of p in the prediction -//CV -> -//CV -> INPUT : -//CV -> -//CV -> A - Matrix constaining the state vector ensemble -//CV -> VT - Matrix containing the transpose of the right singular vector of the S matrix -//CV -> Z - Matrix containing the eigenvalues of the X0 matrix defined in Eq. 14.26 in Evensen (2007) -//CV -> eig - Vector containing the diagonal elements of the matrix L1i = inv(I + L1), where L1 -//CV -> are the eigenvalues of the X0 matrix above -//CV -> indexTest - Vector containing integers specifying which ensemble members are -//CV -> contained in the test ensemble -//CV -> indexTrain - Vector containing integers specifying which ensemble members are -//CV -> contained in the training ensemble -//CV -> nTest - Number of ensemble members in the test ensemble -//CV -> nTrain - Number of ensemble members in the training ensemble -//CV ->*/ -//CV -> -//CV -> -//CV -> - -//CV: static void enkf_analysis_get_cv_error(matrix_type * cvErr , -//CV: const matrix_type * A , -//CV: const matrix_type * VT , -//CV: const matrix_type * Z , -//CV: const double * eig, -//CV: const int * indexTest, -//CV: const int * indexTrain , -//CV: const int nTest , -//CV: const int nTrain , -//CV: const int foldIndex) { -//CV: /* -//CV: We need to predict ATest(p), for p = 1,...,nens -1, based on the estimated regression model: -//CV: ATest(p) = A[:,indexTrain] * VT[1:p,indexTrain]' * Z[1:p,1:p] * eig[1:p,1:p] * Z[1:p,1:p]' * VT[1:p,testIndex] -//CV: */ -//CV: const int nx = matrix_get_rows( A ); -//CV: -//CV: matrix_type * AHat = matrix_alloc(nx , nTest ); -//CV: matrix_type * W3 = matrix_alloc(nTrain, nTest ); -//CV: matrix_type * ATrain = matrix_alloc( nx , nTrain ); -//CV: -//CV: int p,i,j; -//CV: double tmp, tmp2; -//CV: -//CV: int maxP = matrix_get_rows( VT ); -//CV: -//CV: /* We only want to search the non-zero eigenvalues */ -//CV: for (i = 0; i < maxP; i++) { -//CV: if (eig[i] == 1.0) { -//CV: maxP = i; -//CV: break; -//CV: } -//CV: } -//CV: -//CV: -//CV: -//CV: -//CV: /* Copy elements*/ -//CV: for (i = 0; i < nx; i++) -//CV: for (j = 0; j < nTrain; j++) -//CV: matrix_iset(ATrain , i , j , matrix_iget( A , i , indexTrain[j])); -//CV: -//CV: for (p = 0; p < maxP; p++) { -//CV: matrix_type * W = matrix_alloc(p + 1 , nTest ); -//CV: matrix_type * W2 = matrix_alloc(p + 1 , nTest ); -//CV: -//CV: /* Matrix multiplication: W = Z[1:p,1:p]' * VT[1:p,indexTest] */ -//CV: for (i = 0; i < p; i++) { -//CV: for (j = 0; j < nTest; j++) { -//CV: double ksum = 0; -//CV: for (int k = 0; k < p; k++) -//CV: ksum += matrix_iget(Z , k , i) * matrix_iget(VT , k , indexTest[j]); -//CV: -//CV: matrix_iset(W , i , j , ksum); -//CV: } -//CV: } -//CV: -//CV: /*Multiply W with the diagonal matrix eig[1:p,1:p] from the left */ -//CV: for (j=0; j < nTest; j++) -//CV: for (i=0; i < p; i++) -//CV: matrix_imul(W , i , j , eig[i]); -//CV: -//CV: for (i = 0; i < p; i++) { -//CV: for (j = 0; j < nTest; j++) { -//CV: double ksum = 0; -//CV: for (int k = 0; k < p; k++) -//CV: ksum += matrix_iget(Z , i , k) * matrix_iget(W , k , j); -//CV: -//CV: matrix_iset(W2 , i , j , ksum); -//CV: } -//CV: } -//CV: matrix_free( W ); -//CV: -//CV: -//CV: /*Compute W3 = VT[TrainIndex,1:p]' * W*/ -//CV: for (i = 0; i < nTrain; i++) { -//CV: for (j = 0; j < nTest; j++) { -//CV: tmp = 0.0; -//CV: for (int k = 0; k < p; k++) { -//CV: tmp += matrix_iget(VT , k , indexTrain[i] ) * matrix_iget(W2 , k , j); -//CV: } -//CV: -//CV: matrix_iset(W3 , i , j , tmp); -//CV: } -//CV: } -//CV: -//CV: matrix_free( W2 ); -//CV: -//CV: -//CV: matrix_matmul(AHat , ATrain , W3 ); -//CV: -//CV: -//CV: -//CV: /*Compute Press Statistic: */ -//CV: tmp = 0.0; -//CV: -//CV: for (i = 0; i < nx; i++) { -//CV: for (j = 0; j < nTest; j++) { -//CV: tmp2 = matrix_iget(A , i , indexTest[j]) - matrix_iget(AHat , i , j); -//CV: tmp += tmp2 * tmp2; -//CV: } -//CV: } -//CV: -//CV: matrix_iset( cvErr , p , foldIndex , tmp ); -//CV: -//CV: } /*end for p */ -//CV: -//CV: matrix_free( AHat ); -//CV: matrix_free( ATrain ); -//CV: matrix_free( W3 ); -//CV: -//CV: } - - -//CV -> -//CV -> -//CV ->/*Function that computes the PRESS for different subspace dimensions using -//CV -> m-fold CV -//CV -> INPUT : -//CV -> A : State-Vector ensemble matrix -//CV -> Z : Ensemble matrix of principal components -//CV -> Rp : Reduced order Observation error matrix -//CV -> indexTrain: index of training ensemble -//CV -> indexTest: index of test ensemble -//CV -> nTest : number of members in the training ensemble -//CV -> nTrain . number of members in the test ensemble -//CV -> foldIndex: integer specifying which "cv-fold" we are considering -//CV -> -//CV -> OUTPUT: -//CV -> cvErr : UPDATED MATRIX OF PRESS VALUES -//CV -> -//CV ->*/ -//CV ->static void enkf_analysis_get_cv_error_prin_comp(matrix_type * cvErr , const matrix_type * A , const matrix_type * Z , const matrix_type * Rp , const int * indexTest, const int * indexTrain , const int nTest , const int nTrain , const int foldIndex, const int maxP) { -//CV -> /* We need to predict ATest(p), for p = 1,...,nens -1, based on the estimated regression model: -//CV -> AHatTest(p) = A[:,indexTrain] * Z[1:p,indexTrain]'* inv( Z[1:p,indexTrain] * Z[1:p,indexTrain]' + (nens-1) * Rp[1:p,1:p] ) * Z[1:p,indexTest]; -//CV -> */ -//CV -> -//CV -> /* Start by multiplying from the right: */ -//CV -> int p,i,j,k, inv_ok, tmp3; -//CV -> double tmp, tmp2; -//CV -> -//CV -> -//CV -> -//CV -> const int nx = matrix_get_rows( A ); -//CV -> -//CV -> -//CV -> matrix_type * AHat = matrix_alloc(nx , nTest ); -//CV -> -//CV -> /*We want to use the blas function to speed things up: */ -//CV -> matrix_type * ATrain = matrix_alloc( nx , nTrain ); -//CV -> /* Copy elements*/ -//CV -> for (i = 0; i < nx; i++) { -//CV -> for (j = 0; j < nTrain; j++) { -//CV -> matrix_iset(ATrain , i , j , matrix_iget( A , i , indexTrain[j])); -//CV -> } -//CV -> } -//CV -> -//CV -> tmp3 = nTrain - 1; -//CV -> int pOrg; -//CV -> -//CV -> for (p = 0; p < maxP; p++) { -//CV -> -//CV -> pOrg = p + 1; -//CV -> -//CV -> -//CV -> /*For now we do this the hard way through a full inversion of the reduced data covariance matrix: */ -//CV -> /* Alloc ZTrain(1:p): */ -//CV -> matrix_type *ZpTrain = matrix_alloc( pOrg, nTrain ); -//CV -> for (i = 0; i < pOrg ; i++) { -//CV -> for (j = 0; j < nTrain; j++) { -//CV -> matrix_iset(ZpTrain , i , j , matrix_iget(Z , i ,indexTrain[j])); -//CV -> } -//CV -> } -//CV -> -//CV -> matrix_type *SigDp = matrix_alloc( pOrg ,pOrg); -//CV -> /*Compute SigDp = ZpTrain * ZpTrain' */ -//CV -> matrix_dgemm( SigDp , ZpTrain , ZpTrain, false , true , 1.0, 0.0); -//CV -> -//CV -> /*Add (ntrain-1) * Rp*/ -//CV -> -//CV -> for(i = 0; i < pOrg; i++) { -//CV -> for( j = 0; j < pOrg; j++) { -//CV -> tmp2 = matrix_iget(SigDp , i , j) + tmp3 * matrix_iget(Rp, i, j); -//CV -> matrix_iset( SigDp , i , j , tmp2 ); -//CV -> } -//CV -> } -//CV -> -//CV -> /* Invert the covariance matrix for the principal components */ -//CV -> inv_ok = matrix_inv( SigDp ); -//CV -> -//CV -> -//CV -> /*Check if the inversion went ok */ -//CV -> if ( inv_ok != 0 ) { -//CV -> util_abort("%s: inversion of covariance matrix for the principal components failed for subspace dimension p = %d\n - aborting \n",__func__,pOrg); -//CV -> } -//CV -> -//CV -> -//CV -> /*Compute inv(SigDp) * ZTest: */ -//CV -> matrix_type * W = matrix_alloc(pOrg , nTest ); -//CV -> for (i = 0; i < pOrg; i++) { -//CV -> for (j = 0; j < nTest; j++) { -//CV -> tmp = 0.0; -//CV -> for (k = 0; k < pOrg; k++) { -//CV -> tmp += matrix_iget(SigDp , i , k) * matrix_iget(Z , k , indexTest[j]); -//CV -> } -//CV -> matrix_iset(W , i , j , tmp); -//CV -> } -//CV -> } -//CV -> -//CV -> -//CV -> -//CV -> matrix_type * W2 = matrix_alloc(nTrain , nTest ); -//CV -> /*Compute W2 = ZpTrain' * W */ -//CV -> matrix_dgemm( W2 , ZpTrain , W , true , false , 1.0 , 0.0); -//CV -> -//CV -> matrix_free( ZpTrain ); -//CV -> matrix_free( SigDp ); -//CV -> matrix_free( W ); -//CV -> -//CV -> /*Estimate the state-vector */ -//CV -> matrix_matmul(AHat , ATrain , W2 ); -//CV -> matrix_free( W2 ); -//CV -> -//CV -> /*Compute Press Statistic: */ -//CV -> tmp = 0.0; -//CV -> -//CV -> for (i = 0; i < nx; i++) { -//CV -> for (j = 0; j < nTest; j++) { -//CV -> tmp2 = matrix_iget(A , i , indexTest[j]) - matrix_iget(AHat , i , j); -//CV -> tmp += tmp2 * tmp2; -//CV -> } -//CV -> } -//CV -> -//CV -> matrix_iset( cvErr , p , foldIndex , tmp ); -//CV -> -//CV -> } /*end for p */ -//CV -> -//CV -> matrix_free( AHat ); -//CV -> matrix_free( ATrain ); -//CV ->} -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV ->/*Special function for doing cross-validation */ -//CV ->static void getW_pre_cv(matrix_type * W , const matrix_type * V0T, const matrix_type * Z , double * eig , const matrix_type * U0 , int nfolds_CV, -//CV -> const matrix_type * A, int unique_bootstrap_components , rng_type * rng, bool pen_press) { -//CV -> -//CV -> const int nrobs = matrix_get_rows( U0 ); -//CV -> const int nrens = matrix_get_columns( V0T ); -//CV -> const int nrmin = util_int_min( nrobs , nrens ); -//CV -> -//CV -> int i,j; -//CV -> -//CV -> -//CV -> /* Vector with random permutations of the itegers 1,...,nrens */ -//CV -> int * randperms = util_malloc( sizeof * randperms * nrens, __func__); -//CV -> int * indexTest = util_malloc( sizeof * indexTest * nrens, __func__); -//CV -> int * indexTrain = util_malloc( sizeof * indexTrain * nrens, __func__); -//CV -> -//CV -> if(nrens != unique_bootstrap_components) -//CV -> nfolds_CV = util_int_min( nfolds_CV , unique_bootstrap_components-1); -//CV -> -//CV -> -//CV -> matrix_type * cvError = matrix_alloc( nrmin,nfolds_CV ); -//CV -> -//CV -> /*Copy Z */ -//CV -> matrix_type * workZ = matrix_alloc_copy( Z ); -//CV -> -//CV -> int optP; -//CV -> -//CV -> -//CV -> /* start cross-validation: */ -//CV -> -//CV -> const int maxp = matrix_get_rows(V0T); -//CV -> -//CV -> /* draw random permutations of the integers 1,...,nrens */ -//CV -> enkf_util_randperm( randperms , nrens , rng); -//CV -> -//CV -> /*need to init cvError to all zeros (?) */ -//CV -> for (i = 0; i < nrmin; i++){ -//CV -> for( j = 0; j> nfolds_CV; j++){ -//CV -> matrix_iset( cvError , i , j , 0.0 ); -//CV -> } -//CV -> } -//CV -> -//CV -> int ntest, ntrain, k; -//CV -> printf("\nStarting cross-validation\n"); -//CV -> for (i = 0; i < nfolds_CV; i++) { -//CV -> printf("."); -//CV -> -//CV -> ntest = 0; -//CV -> ntrain = 0; -//CV -> k = i; -//CV -> /*extract members for the training and test ensembles */ -//CV -> for (j = 0; j < nrens; j++) { -//CV -> if (j == k) { -//CV -> indexTest[ntest] = randperms[j]; -//CV -> k += nfolds_CV; -//CV -> ntest++; -//CV -> } else { -//CV -> indexTrain[ntrain] = randperms[j]; -//CV -> ntrain++; -//CV -> } -//CV -> } -//CV -> enkf_analysis_get_cv_error( cvError , A , V0T , workZ , eig , indexTest , indexTrain, ntest, ntrain , i ); -//CV -> } -//CV -> printf("\n"); -//CV -> /* find optimal truncation value for the cv-scheme */ -//CV -> optP = enkf_analysis_get_optimal_numb_comp( cvError , maxp, nfolds_CV, pen_press); -//CV -> -//CV -> printf("Optimal number of components found: %d \n",optP); -//CV -> printf("\n"); -//CV -> FILE * compSel_log = util_fopen("compSel_log_local_cv" , "a"); -//CV -> fprintf( compSel_log , " %d ",optP); -//CV -> fclose( compSel_log); -//CV -> -//CV -> -//CV -> /*free cvError vector and randperm */ -//CV -> matrix_free( cvError ); -//CV -> free( randperms ); -//CV -> free( indexTest ); -//CV -> free( indexTrain ); -//CV -> -//CV -> /* need to update matrices so that we only use components 1,...,optP */ -//CV -> /* remove non-zero entries of the z matrix (we do not want to recompute sigma0^(+') * z */ -//CV -> /* this can surely be done much more efficiently, but for now we want to minimize the -//CV -> number of potential bugs in the code for now */ -//CV -> for (i = optP; i < nrmin; i++) { -//CV -> for (j = 0; j < nrmin; j++) { -//CV -> matrix_iset(workZ , i , j, 0.0); -//CV -> } -//CV -> } -//CV -> -//CV -> -//CV -> /*fix the eig vector as well: */ -//CV -> { -//CV -> int i; -//CV -> /* lambda1 = (i + lambda)^(-1) */ -//CV -> for (i=optP; i < nrmin; i++) -//CV -> eig[i] = 1.0; -//CV -> } -//CV -> -//CV -> matrix_matmul(W , U0 , workZ); /* x1 = w = u0 * z2 = u0 * sigma0^(+') * z */ -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> /*end cross-validation */ -//CV ->} -//CV -> -//CV -> -//CV ->/* Function that performs cross-validation to find the optimal subspace dimension, */ -//CV -> -//CV -> -//CV ->int get_optimal_principal_components(const matrix_type * Z , const matrix_type * Rp , int nfolds_CV, const matrix_type * A, rng_type * rng, const int maxP, bool pen_press) { -//CV -> -//CV -> const int nrens = matrix_get_columns( Z ); -//CV -> const int nrmin = matrix_get_rows( Z ); -//CV -> -//CV -> int i,j; -//CV -> -//CV -> -//CV -> /* Vector with random permutations of the itegers 1,...,nrens */ -//CV -> int * randperms = util_malloc( sizeof * randperms * nrens, __func__); -//CV -> int * indexTest = util_malloc( sizeof * indexTest * nrens, __func__); -//CV -> int * indexTrain = util_malloc( sizeof * indexTrain * nrens, __func__); -//CV -> -//CV -> -//CV -> if ( nrens < nfolds_CV ) -//CV -> util_abort("%s: number of ensemble members %d need to be larger than the number of cv-folds - aborting \n",__func__,nrens,nfolds_CV); -//CV -> -//CV -> -//CV -> -//CV -> int optP; -//CV -> -//CV -> -//CV -> printf("\nOnly searching for the optimal subspace dimension among the first %d principal components\n",maxP); -//CV -> -//CV -> matrix_type * cvError = matrix_alloc( maxP ,nfolds_CV ); -//CV -> -//CV -> -//CV -> /* start cross-validation: */ -//CV -> if ( nrens < nfolds_CV ) -//CV -> util_abort("%s: number of ensemble members %d need to be larger than the number of cv-folds - aborting \n",__func__,nrens,nfolds_CV); -//CV -> -//CV -> -//CV -> /* draw random permutations of the integers 1,...,nrens */ -//CV -> enkf_util_randperm( randperms , nrens , rng); -//CV -> -//CV -> /*need to init cvError to all zeros (?) */ -//CV -> for (i = 0; i < nrmin; i++){ -//CV -> for( j = 0; j> nfolds_CV; j++){ -//CV -> matrix_iset( cvError , i , j , 0.0 ); -//CV -> } -//CV -> } -//CV -> -//CV -> int ntest, ntrain, k; -//CV -> printf("Starting cross-validation\n"); -//CV -> for (i = 0; i < nfolds_CV; i++) { -//CV -> printf("."); -//CV -> -//CV -> ntest = 0; -//CV -> ntrain = 0; -//CV -> k = i; -//CV -> /*extract members for the training and test ensembles */ -//CV -> for (j = 0; j < nrens; j++) { -//CV -> if (j == k) { -//CV -> indexTest[ntest] = randperms[j]; -//CV -> k += nfolds_CV; -//CV -> ntest++; -//CV -> } else { -//CV -> indexTrain[ntrain] = randperms[j]; -//CV -> ntrain++; -//CV -> } -//CV -> } -//CV -> -//CV -> /*Perform CV for each subspace dimension p */ -//CV -> enkf_analysis_get_cv_error_prin_comp( cvError , A , Z , Rp , indexTest , indexTrain, ntest, ntrain , i , maxP); -//CV -> } -//CV -> printf("\n"); -//CV -> /* find optimal truncation value for the cv-scheme */ -//CV -> optP = enkf_analysis_get_optimal_numb_comp( cvError , maxP, nfolds_CV , pen_press); -//CV -> -//CV -> printf("Optimal number of components found: %d \n",optP); -//CV -> FILE * compSel_log = util_fopen("compSel_log_local_cv" , "a"); -//CV -> fprintf( compSel_log , " %d ",optP); -//CV -> fclose( compSel_log); -//CV -> -//CV -> -//CV -> /*free cvError vector and randperm */ -//CV -> matrix_free( cvError ); -//CV -> free( randperms ); -//CV -> free( indexTest ); -//CV -> free( indexTrain ); -//CV -> -//CV -> -//CV -> return optP; -//CV ->} -//CV -> -//CV -> -//CV ->/*NB! HERE WE COUNT optP from 0,1,2,... */ -//CV ->static void getW_prin_comp(matrix_type *W , const matrix_type * Z , -//CV -> const matrix_type * Rp , const int optP) { -//CV -> -//CV -> int i, j; -//CV -> double tmp2; -//CV -> int nrens = matrix_get_columns( Z ); -//CV -> -//CV -> /* Finally, compute W = Z(1:p,:)' * inv(Z(1:p,:) * Z(1:p,:)' + (n -1) * Rp) */ -//CV -> matrix_type *Zp = matrix_alloc( optP, nrens ); -//CV -> for (i = 0; i < optP ; i++) { -//CV -> for (j = 0; j < nrens; j++) { -//CV -> matrix_iset(Zp , i , j , matrix_iget(Z , i ,j)); -//CV -> } -//CV -> } -//CV -> -//CV -> matrix_type *SigZp = matrix_alloc( optP ,optP); -//CV -> /*Compute SigZp = Zp * Zp' */ -//CV -> matrix_dgemm( SigZp , Zp , Zp, false , true , 1.0, 0.0); -//CV -> -//CV -> /*Add (ntrain-1) * Rp*/ -//CV -> -//CV -> int tmp3 = nrens - 1; -//CV -> -//CV -> -//CV -> for(i = 0; i < optP; i++) { -//CV -> for( j = 0; j < optP; j++) { -//CV -> tmp2 = matrix_iget(SigZp , i , j) + tmp3 * matrix_iget(Rp, i, j); -//CV -> matrix_iset( SigZp , i , j , tmp2 ); -//CV -> } -//CV -> } -//CV -> -//CV -> /* Invert the covariance matrix for the principal components */ -//CV -> int inv_ok = matrix_inv( SigZp ); -//CV -> -//CV -> /*Check if the inversion went ok */ -//CV -> if ( inv_ok != 0 ) { -//CV -> util_abort("%s: inversion of covariance matrix for the principal components failed for subspace dimension p = %d\n - aborting \n",__func__,optP); -//CV -> } -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> /*Compute W = Zp' * inv(SigZp) */ -//CV -> matrix_dgemm( W , Zp , SigZp , true , false , 1.0 , 0.0); -//CV -> -//CV -> matrix_free( Zp ); -//CV -> matrix_free( SigZp ); -//CV -> -//CV -> -//CV ->} - - - - - - - - - - - - - - -/*****************************************************************/ -/*****************************************************************/ -/* High level functions */ -/*****************************************************************/ -/*****************************************************************/ - - -//void enkf_analysis_invertS(const analysis_config_type * config , const matrix_type * S , const matrix_type * R , matrix_type * W , double * eig) { -// pseudo_inversion_type inversion_mode = analysis_config_get_inversion_mode( config ); -// bool force_subspace_dimension = analysis_config_get_force_subspace_dimension( config ); -// int ens_size = matrix_get_columns( S ); -// int nrobs = matrix_get_rows( S ); -// double truncation = -1; -// int ncomp = -1; -// -// if (force_subspace_dimension) { -// ncomp = analysis_config_get_subspace_dimension( config ); -// /* Check if the dimension is appropropriate. If not, change to default */ -// if (ncomp > util_int_min( ens_size - 1, nrobs) ) { -// printf("Selected number of components, %d, too high. Changing to default value: 1\n",ncomp); -// ncomp = 1; -// } -// } else -// truncation = analysis_config_get_truncation( config ); -// -// switch (inversion_mode) { -// case(SVD_SS_N1_R): -// enkf_linalg_lowrankCinv( S , R , W , eig , truncation , ncomp); -// break; -// default: -// util_abort("%s: inversion mode:%d not supported \n",__func__ , inversion_mode); -// } -//} -// -// -// -//void enkf_analysis_invertS_pre_cv(const analysis_config_type * config , -// const matrix_type * S , -// const matrix_type * R , -// matrix_type * V0T , -// matrix_type * Z , -// double * eig , -// matrix_type * U0 ) { -// -// pseudo_inversion_type inversion_mode = analysis_config_get_inversion_mode( config ); -// double truncation = analysis_config_get_truncation( config ); -// -// switch (inversion_mode) { -// case(SVD_SS_N1_R): -// enkf_linalg_lowrankCinv__( S , R , V0T , Z , eig , U0 , truncation , -1); -// break; -// default: -// util_abort("%s: inversion mode:%d not supported \n",__func__ , inversion_mode); -// } -//} -// -// -// -// -// -//static void enkf_analysis_standard(matrix_type * X5 , const matrix_type * S , const matrix_type * D , const matrix_type * W , const double * eig, bool bootstrap) { -// const int nrobs = matrix_get_rows( S ); -// const int nrens = matrix_get_columns( S ); -// matrix_type * X3 = matrix_alloc(nrobs , nrens); -// -// enkf_linalg_genX3(X3 , W , D , eig ); /* X2 = diag(eig) * W' * D (Eq. 14.31, Evensen (2007)) */ -// /* X3 = W * X2 = X1 * X2 (Eq. 14.31, Evensen (2007)) */ -// -// matrix_dgemm( X5 , S , X3 , true , false , 1.0 , 0.0); /* X5 = S' * X3 */ -// if (!bootstrap) { -// for (int i = 0; i < nrens; i++) -// matrix_iadd( X5 , i , i , 1.0); /*X5 = I + X5 */ -// } -// -// matrix_free( X3 ); -//} -// -// -//static void enkf_analysis_SQRT(matrix_type * X5 , -// const matrix_type * S , -// const matrix_type * randrot , -// const matrix_type * innov , -// const matrix_type * W , -// const double * eig , -// bool bootstrap) { -// -// const int nrobs = matrix_get_rows( S ); -// const int nrens = matrix_get_columns( S ); -// const int nrmin = util_int_min( nrobs , nrens ); -// -// matrix_type * X2 = matrix_alloc(nrmin , nrens); -// -// if (bootstrap) -// util_exit("%s: Sorry bootstrap support not fully implemented for SQRT scheme\n",__func__); -// -// enkf_linalg_meanX5( S , W , eig , innov , X5 ); -// enkf_linalg_genX2(X2 , S , W , eig); -// enkf_linalg_X5sqrt(X2 , X5 , randrot , nrobs); -// -// matrix_free( X2 ); -//} - - - - /*****************************************************************/ void enkf_analysis_fprintf_obs_summary(const obs_data_type * obs_data , const meas_data_type * meas_data , const int_vector_type * step_list , const char * ministep_name , FILE * stream ) { @@ -868,472 +149,6 @@ void enkf_analysis_deactivate_outliers(obs_data_type * obs_data , meas_data_type -/* - This function will allocate and initialize the matrices S,R,D and E - and also the innovation. The matrices will be scaled with the - observation error and the mean will be subtracted from the S matrix. -*/ - -// void enkf_analysis_alloc_matrices( rng_type * rng , -// const meas_data_type * meas_data , -// obs_data_type * obs_data , -// enkf_mode_type enkf_mode , -// matrix_type ** S , -// matrix_type ** R , -// matrix_type ** innov, -// matrix_type ** E , -// matrix_type ** D , -// bool scale) { -// -// int ens_size = meas_data_get_ens_size( meas_data ); -// int active_size = obs_data_get_active_size( obs_data ); -// -// *S = meas_data_allocS( meas_data , active_size ); -// *R = obs_data_allocR( obs_data , active_size ); -// *innov = obs_data_alloc_innov( obs_data , meas_data , active_size ); -// -// if (enkf_mode == ENKF_STANDARD) { -// /* -// We are using standard EnKF and need to perturbe the measurements, -// if we are using the SQRT scheme the E & D matrices are not used. -// */ -// *E = obs_data_allocE(obs_data , rng , ens_size, active_size ); -// *D = obs_data_allocD(obs_data , *E , *S ); -// -// } else { -// *E = NULL; -// *D = NULL; -// } -// -// if (scale) -// obs_data_scale(obs_data , *S , *E , *D , *R , *innov ); -// matrix_subtract_row_mean( *S ); /* Subtracting the ensemble mean */ -// } - - - - - - -//Boot: static void enkf_analysis_alloc_matrices_boot( rng_type * rng , -//Boot: const meas_data_type * meas_data , -//Boot: obs_data_type * obs_data , -//Boot: enkf_mode_type enkf_mode , -//Boot: matrix_type ** S , -//Boot: matrix_type ** R , -//Boot: matrix_type ** E , -//Boot: matrix_type ** D , -//Boot: const meas_data_type * fasit) { -//Boot: -//Boot: int ens_size = meas_data_get_ens_size( meas_data ); -//Boot: int active_size = obs_data_get_active_size( obs_data ); -//Boot: -//Boot: *S = meas_data_allocS( meas_data , active_size ); -//Boot: *R = obs_data_allocR( obs_data , active_size ); -//Boot: -//Boot: if (enkf_mode == ENKF_STANDARD) { -//Boot: matrix_type * fullS = meas_data_allocS( fasit , active_size ); -//Boot: /* -//Boot: We are using standard EnKF and need to perturbe the measurements, -//Boot: if we are using the SQRT scheme the E & D matrices are not used. -//Boot: */ -//Boot: *E = obs_data_allocE(obs_data , rng , ens_size, active_size ); -//Boot: *D = obs_data_allocD(obs_data , *E , fullS ); -//Boot: matrix_free( fullS ); -//Boot: } else { -//Boot: *E = NULL; -//Boot: *D = NULL; -//Boot: } -//Boot: -//Boot: obs_data_scale(obs_data , *S , *E , *D , *R , NULL ); -//Boot: matrix_subtract_row_mean( *S ); /* Subtracting the ensemble mean */ -//Boot: } - - - - - - - - - - -/** - This function allocates a X matrix for the - - A' = AX - - EnKF update. Same as above except we do not want a resampled version of the D-matrix so - for bootstrapping purposes we also need the unsampled meas_data. - -*/ - -// matrix_type * enkf_analysis_allocX_boot( const analysis_config_type * config , -// rng_type * rng , -// const meas_data_type * meas_data , -// obs_data_type * obs_data , -// const matrix_type * randrot , -// const meas_data_type * fasit) { -// -// int ens_size = meas_data_get_ens_size( meas_data ); -// matrix_type * X = matrix_alloc( ens_size , ens_size ); -// matrix_set_name( X , "X"); -// { -// matrix_type * S , *R , *E , *D ; -// -// int nrobs = obs_data_get_active_size(obs_data); -// int nrmin = util_int_min( ens_size , nrobs); -// -// matrix_type * W = matrix_alloc(nrobs , nrmin); -// double * eig = util_malloc( sizeof * eig * nrmin , __func__); -// enkf_mode_type enkf_mode = analysis_config_get_enkf_mode( config ); -// bool bootstrap = analysis_config_get_bootstrap( config ); -// enkf_analysis_alloc_matrices_boot( rng , meas_data , obs_data , enkf_mode , &S , &R , &E , &D , fasit); -// -// /* -// 2: Diagonalize the S matrix; singular vectors are stored in W -// and singular values (after some massage) are stored in eig. -// W = X1, eig = inv(I+Lambda1),(Eq.14.30, and 14.29, Evensen, 2007, respectively) -// */ -// -// enkf_analysis_invertS( config , S , R , W , eig); -// -// /* -// 3: actually calculating the X matrix. -// */ -// switch (enkf_mode) { -// case(ENKF_STANDARD): -// enkf_analysis_standard(X , S , D , W , eig , bootstrap); -// break; -// case(ENKF_SQRT): -// //enkf_analysis_SQRT(X , S , randrot , innov , W , eig , bootstrap); -// break; -// default: -// util_abort("%s: INTERNAL ERROR \n",__func__); -// } -// -// matrix_free( W ); -// matrix_free( R ); -// matrix_free( S ); -// free( eig ); -// -// if (enkf_mode == ENKF_STANDARD) { -// matrix_free( E ); -// matrix_free( D ); -// } -// -// enkf_analysis_checkX(X , bootstrap); -// } -// return X; -// } - - -//CV ->matrix_type * enkf_analysis_allocX_pre_cv( const analysis_config_type * config , -//CV -> rng_type * rng , -//CV -> meas_data_type * meas_data , -//CV -> obs_data_type * obs_data , -//CV -> const matrix_type * randrot , -//CV -> const matrix_type * A , -//CV -> const matrix_type * V0T , -//CV -> const matrix_type * Z , -//CV -> const double * eig , -//CV -> const matrix_type * U0 , -//CV -> meas_data_type * fasit , -//CV -> int unique_bootstrap_components) { -//CV -> -//CV -> int ens_size = meas_data_get_ens_size( meas_data ); -//CV -> matrix_type * X = matrix_alloc( ens_size , ens_size ); -//CV -> { -//CV -> int nrobs = obs_data_get_active_size(obs_data); -//CV -> int nrmin = util_int_min( ens_size , nrobs); -//CV -> int nfolds_CV = analysis_config_get_nfolds_CV( config ); -//CV -> -//CV -> /* -//CV -> 1: Allocating all matrices -//CV -> */ -//CV -> /*Need a copy of A, because we need it later */ -//CV -> matrix_type * workA = matrix_alloc_copy( A ); /* <- This is a massive memory requirement. */ -//CV -> matrix_type * S , *R , *E , *D , *innov; -//CV -> -//CV -> matrix_type * W = matrix_alloc(nrobs , nrmin); -//CV -> enkf_mode_type enkf_mode = analysis_config_get_enkf_mode( config ); -//CV -> bool bootstrap = analysis_config_get_bootstrap( config ); -//CV -> bool penalised_press = analysis_config_get_penalised_press( config ); -//CV -> -//CV -> double * workeig = util_malloc( sizeof * workeig * nrmin , __func__); -//CV -> -//CV -> enkf_analysis_alloc_matrices_boot( rng , meas_data , obs_data , enkf_mode , &S , &R , &innov , &E , &D , fasit ); /*Using the bootstrap version every time, does mean a bit more data -//CV -> carried through the function, but we avoid duplicating code.*/ -//CV -> /*copy entries in eig:*/ -//CV -> { -//CV -> int i; -//CV -> for (i = 0 ; i < nrmin ; i++) -//CV -> workeig[i] = eig[i]; -//CV -> } -//CV -> -//CV -> /* Subtracting the ensemble mean of the state vector ensemble */ -//CV -> matrix_subtract_row_mean( workA ); -//CV -> -//CV -> /* -//CV -> 2: Diagonalize the S matrix; singular vectors are stored in W -//CV -> and singular values (after some massage) are stored in eig. -//CV -> W = X1, eig = inv(I+Lambda1),(Eq.14.30, and 14.29, Evensen, 2007, respectively) -//CV -> */ -//CV -> -//CV -> getW_pre_cv(W , V0T , Z , workeig , U0 , nfolds_CV , workA , unique_bootstrap_components , rng , penalised_press); -//CV -> -//CV -> /* -//CV -> 3: actually calculating the X matrix. -//CV -> */ -//CV -> switch (enkf_mode) { -//CV -> case(ENKF_STANDARD): -//CV -> enkf_analysis_standard(X , S , D , W , workeig , bootstrap); -//CV -> break; -//CV -> case(ENKF_SQRT): -//CV -> enkf_analysis_SQRT(X , S , randrot , innov , W , workeig , bootstrap ); -//CV -> break; -//CV -> default: -//CV -> util_abort("%s: INTERNAL ERROR \n",__func__); -//CV -> } -//CV -> -//CV -> matrix_free( W ); -//CV -> matrix_free( R ); -//CV -> matrix_free( S ); -//CV -> matrix_free( workA ); -//CV -> matrix_free( innov ); -//CV -> free( workeig ); -//CV -> -//CV -> if (enkf_mode == ENKF_STANDARD) { -//CV -> matrix_free( E ); -//CV -> matrix_free( D ); -//CV -> } -//CV -> -//CV -> enkf_analysis_checkX(X , bootstrap); -//CV -> } -//CV -> return X; -//CV ->} -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> -//CV ->/** -//CV -> This function initializes the S matrix and performs svd(S). The -//CV -> left and right singular vectors and singular values are returned -//CV -> in U0, V0T and eig respectively. -//CV ->*/ -//CV -> -//CV ->void enkf_analysis_local_pre_cv( const analysis_config_type * config , rng_type * rng , meas_data_type * meas_data , obs_data_type * obs_data , matrix_type * V0T , matrix_type * Z , double * eig , matrix_type * U0, meas_data_type * fasit ) { -//CV -> { -//CV -> matrix_type * S , *R , *E , *D , *innov; -//CV -> -//CV -> enkf_mode_type enkf_mode = analysis_config_get_enkf_mode( config ); -//CV -> enkf_analysis_alloc_matrices_boot( rng , meas_data , obs_data , enkf_mode , &S , &R , &innov , &E , &D , fasit ); /*Using the bootstrap version every time, does mean a bit more data -//CV -> carried through the function, but we avoid duplicating code.*/ -//CV -> /* -//CV -> 2: Diagonalize the S matrix; singular vectors etc. needed later in the local CV: -//CV -> (V0T = transposed right singular vectors of S, Z = scaled principal components, -//CV -> eig = scaled, inverted singular vectors, U0 = left singular vectors of S -//CV -> , eig = inv(I+Lambda1),(Eq.14.30, and 14.29, Evensen, 2007, respectively) -//CV -> */ -//CV -> enkf_analysis_invertS_pre_cv( config , S , R , V0T , Z , eig , U0); -//CV -> -//CV -> -//CV -> matrix_free( R ); -//CV -> matrix_free( S ); -//CV -> matrix_free( innov ); -//CV -> -//CV -> if (enkf_mode == ENKF_STANDARD) { -//CV -> matrix_free( E ); -//CV -> matrix_free( D ); -//CV -> -//CV -> } -//CV -> } -//CV -> -//CV ->} -//CV -> -//CV -> -//CV ->/** -//CV -> FUNCTION THAT COMPUTES THE PRINCIPAL COMPONENTS OF THE CENTRED DATA ENSEMBLE MATRIX: -//CV -> -//CV -> -//CV -> This function initializes the S matrix and performs svd(S). The -//CV -> Function returns: -//CV -> Z - The Principal Components of the empirically estimated data covariance matrix as Z (ens_size times maxP), where ens_size is the -//CV -> ensemble size, and maxP is the maximum number of allowed principal components -//CV -> Rp - (Rp = U0' * R * U0 (maxP times maxP) error covariance matrix in the reduced order subspace (Needed later in the EnKF update) -//CV -> -//CV -> Dp - (Dp = U0' * D) (maxP times ens_size): Reduced data "innovation matrix". -//CV -> where D(:,i) = dObs - dForecast(i) - Eps(i) -//CV ->*/ -//CV -> -//CV -> -//CV ->void enkf_analysis_init_principal_components( double truncation , -//CV -> const matrix_type * S, -//CV -> const matrix_type * R, -//CV -> const matrix_type * innov, -//CV -> const matrix_type * E , -//CV -> const matrix_type * D , -//CV -> matrix_type * Z , -//CV -> matrix_type * Rp , -//CV -> matrix_type * Dp) { -//CV -> { -//CV -> int i, j; -//CV -> -//CV -> -//CV -> const int nrobs = matrix_get_rows( S ); -//CV -> const int nrens = matrix_get_columns( S ); -//CV -> const int nrmin = util_int_min( nrobs , nrens ); -//CV -> -//CV -> printf("Maximum number of Principal Components is %d\n",nrmin - 1); -//CV -> -//CV -> /* -//CV -> Compute SVD(S) -//CV -> */ -//CV -> -//CV -> matrix_type * U0 = matrix_alloc( nrobs , nrmin ); /* Left singular vectors. */ -//CV -> matrix_type * V0T = matrix_alloc( nrmin , nrens ); /* Right singular vectors. */ -//CV -> -//CV -> double * inv_sig0 = util_malloc( nrmin * sizeof * inv_sig0 , __func__); -//CV -> double * sig0 = inv_sig0; -//CV -> -//CV -> enkf_linalg_svdS(S , truncation , -1 , DGESVD_MIN_RETURN , inv_sig0 , U0 , V0T); -//CV -> -//CV -> /* Need to use the original non-inverted singular values. */ -//CV -> for(i = 0; i < nrmin; i++) -//CV -> if ( inv_sig0[i] > 0 ) -//CV -> sig0[i] = 1.0 / inv_sig0[i]; -//CV -> -//CV -> -//CV -> -//CV -> /* -//CV -> Compute the actual principal components, Z = sig0 * VOT -//CV -> NOTE: Z contains potentially alot of redundant zeros, but -//CV -> we do not care about this for now -//CV -> */ -//CV -> -//CV -> for(i = 0; i < nrmin; i++) -//CV -> for(j = 0; j < nrens; j++) -//CV -> matrix_iset( Z , i , j , sig0[i] * matrix_iget( V0T , i , j ) ); -//CV -> -//CV -> -//CV -> /* Also compute Rp */ -//CV -> { -//CV -> matrix_type * X0 = matrix_alloc( nrmin , matrix_get_rows( R )); -//CV -> matrix_dgemm(X0 , U0 , R , true , false , 1.0 , 0.0); /* X0 = U0^T * R */ -//CV -> matrix_dgemm(Rp , X0 , U0 , false , false , 1.0 , 0.0); /* Rp = X0 * U0 */ -//CV -> matrix_free( X0 ); -//CV -> } -//CV -> -//CV -> /*We also need to compute the reduced "Innovation matrix" Dp = U0' * D */ -//CV -> matrix_dgemm(Dp , U0 , D , true , false , 1.0 , 0.0); -//CV -> -//CV -> -//CV -> free(inv_sig0); -//CV -> matrix_free(U0); -//CV -> matrix_free(V0T); -//CV -> -//CV -> /* -//CV -> 2: Diagonalize the S matrix; singular vectors etc. needed later in the local CV: -//CV -> (V0T = transposed right singular vectors of S, Z = scaled principal components, -//CV -> eig = scaled, inverted singular vectors, U0 = left singular vectors of S -//CV -> , eig = inv(I+Lambda1),(Eq.14.30, and 14.29, Evensen, 2007, respectively) -//CV -> */ -//CV -> /* enkf_analysis_invertS_pre_cv( config , S , R , V0T , Z , eig , U0);*/ -//CV -> -//CV -> } -//CV -> -//CV -> -//CV ->} -//CV -> -//CV -> -//CV ->/*Matrix that computes and returns the X5 matrix used in the EnKF updating */ -//CV ->void enkf_analysis_initX_principal_components_cv( int nfolds_CV , -//CV -> bool penalised_press , -//CV -> matrix_type * X , -//CV -> rng_type * rng, -//CV -> const matrix_type * A , -//CV -> const matrix_type * Z , -//CV -> const matrix_type * Rp , -//CV -> const matrix_type * Dp ) { -//CV -> int ens_size = matrix_get_columns( Dp ); -//CV -> { -//CV -> -//CV -> int i, j, k; -//CV -> double tmp; -//CV -> -//CV -> -//CV -> /* -//CV -> 1: Allocating all matrices -//CV -> */ -//CV -> /*Need a copy of A, because we need it later */ -//CV -> matrix_type * workA = matrix_alloc_copy( A ); /* <- This is a massive memory requirement. */ -//CV -> -//CV -> /* Subtracting the ensemble mean of the state vector ensemble */ -//CV -> matrix_subtract_row_mean( workA ); -//CV -> /* -//CV -> 2: Diagonalize the S matrix; singular vectors are stored in W -//CV -> and singular values (after some massage) are stored in eig. -//CV -> W = X1, eig = inv(I+Lambda1),(Eq.14.30, and 14.29, Evensen, 2007, respectively) -//CV -> */ -//CV -> -//CV -> -//CV -> -//CV -> int nrmin = matrix_get_rows( Z ); -//CV -> int maxP = nrmin; -//CV -> -//CV -> /* We only want to search the non-zero eigenvalues */ -//CV -> for (int i = 0; i < nrmin; i++) { -//CV -> if (matrix_iget(Z,i,1) == 0.0) { -//CV -> maxP = i; -//CV -> break; -//CV -> } -//CV -> } -//CV -> -//CV -> if (maxP > nrmin) { -//CV -> maxP = nrmin; -//CV -> } -//CV -> -//CV -> -//CV -> -//CV -> -//CV -> /* Get the optimal number of principal components -//CV -> where p is found minimizing the PRESS statistic */ -//CV -> -//CV -> int optP = get_optimal_principal_components(Z , Rp , nfolds_CV, workA , rng , maxP, penalised_press); -//CV -> matrix_free( workA ); -//CV -> -//CV -> matrix_type * W = matrix_alloc(ens_size , optP); -//CV -> -//CV -> /* Compute W = Z(1:p,:)' * inv(Z(1:p,:) * Z(1:p,:)' + (ens_size-1) * Rp(1:p,1:p))*/ -//CV -> getW_prin_comp( W , Z , Rp, optP); -//CV -> -//CV -> /*Compute the actual X5 matrix: */ -//CV -> /*Compute X5 = W * Dp (The hard way) */ -//CV -> for( i = 0; i < ens_size; i++) { -//CV -> for( j = 0; j < ens_size; j++) { -//CV -> tmp = 0.0; -//CV -> for(k = 0; k < optP; k++) { -//CV -> tmp += matrix_iget( W , i , k) * matrix_iget( Dp , k , j); -//CV -> } -//CV -> -//CV -> matrix_iset(X , i , j ,tmp); -//CV -> } -//CV -> } -//CV -> -//CV -> matrix_free( W ); -//CV -> -//CV -> /*Add one on the diagonal of X: */ -//CV -> for(i = 0; i < ens_size; i++) { -//CV -> matrix_iadd( X , i , i , 1.0); /*X5 = I + X5 */ -//CV -> } -//CV -> -//CV -> enkf_analysis_checkX(X , false); -//CV -> } -//CV ->} - - - diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_config_node.c b/ThirdParty/Ert/devel/libenkf/src/enkf_config_node.c index 5277111e4e..a87b1bdf35 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_config_node.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_config_node.c @@ -21,27 +21,29 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "enkf_defaults.h" -#include "config_keys.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define ENKF_CONFIG_NODE_TYPE_ID 776104 diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_defaults.c b/ThirdParty/Ert/devel/libenkf/src/enkf_defaults.c index 1b08197446..f8647b2ac3 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_defaults.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_defaults.c @@ -16,7 +16,7 @@ for more details. */ -#include "enkf_defaults.h" +#include /** Currently no code here - but the way DEFAULT_STATIC_KW is implemented diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_fs.c b/ThirdParty/Ert/devel/libenkf/src/enkf_fs.c index 3afe3bb68f..5a6d210ae9 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_fs.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_fs.c @@ -25,24 +25,24 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_main.c b/ThirdParty/Ert/devel/libenkf/src/enkf_main.c index 1ab9205d34..2f374dbd38 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_main.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_main.c @@ -30,75 +30,72 @@ #include #define HAVE_THREAD_POOL 1 -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include -#include +#include +#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "enkf_defaults.h" -#include "config_keys.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /**/ @@ -1464,7 +1461,7 @@ bool enkf_main_is_not_initialized_at_all( const enkf_main_type * enkf_main ) { node_id_type node_id = {.report_step = 0 , .iens = iens , .state = ANALYZED }; initialized = enkf_config_node_has_node( config_node , enkf_main->dbase , node_id); if (initialized) - not_initialized_at_all = false; + not_initialized_at_all = false; } } @@ -1797,8 +1794,8 @@ void enkf_main_initialize_from_scratch(enkf_main_type * enkf_main , const string if (i == (num_cpu - 1)){ end_iens = iens2 + 1; /* Input is upper limit inclusive. */ - if(ens_sub_size == 0) - start_iens = iens1; /* Don't necessarily want to start from zero when ens_sub_size = 0*/ + if(ens_sub_size == 0) + start_iens = iens1; /* Don't necessarily want to start from zero when ens_sub_size = 0*/ } arg_pack_append_int( arg_list[i] , start_iens ); arg_pack_append_int( arg_list[i] , end_iens ); diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_node.c b/ThirdParty/Ert/devel/libenkf/src/enkf_node.c index 14084ff412..7ae9d39594 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_node.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_node.c @@ -21,25 +21,24 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /** A small illustration (says more than thousand words ...) of how the diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_obs.c b/ThirdParty/Ert/devel/libenkf/src/enkf_obs.c index 5c102c6ad3..5f28267de3 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_obs.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_obs.c @@ -20,26 +20,26 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "enkf_defaults.h" -#include "config_keys.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* diff --git a/ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_arg.c b/ThirdParty/Ert/devel/libenkf/src/enkf_plot_arg.c similarity index 96% rename from ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_arg.c rename to ThirdParty/Ert/devel/libenkf/src/enkf_plot_arg.c index 5e1b069dd6..2d6bda3628 100644 --- a/ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_arg.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_plot_arg.c @@ -17,11 +17,11 @@ */ #include -#include -#include -#include +#include +#include +#include -#include +#include #define ENKF_PLOT_ARG_ID 6771861 diff --git a/ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_data.c b/ThirdParty/Ert/devel/libenkf/src/enkf_plot_data.c similarity index 95% rename from ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_data.c rename to ThirdParty/Ert/devel/libenkf/src/enkf_plot_data.c index f83c4b8718..63d806038c 100644 --- a/ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_data.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_plot_data.c @@ -18,15 +18,15 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_member.c b/ThirdParty/Ert/devel/libenkf/src/enkf_plot_member.c similarity index 96% rename from ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_member.c rename to ThirdParty/Ert/devel/libenkf/src/enkf_plot_member.c index fc6dfeaf27..7254c845c2 100644 --- a/ThirdParty/Ert/devel/libenkf/src/plot/enkf_plot_member.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_plot_member.c @@ -15,12 +15,12 @@ See the GNU General Public License at for more details. */ -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #define ENKF_PLOT_MEMBER_ID 6111861 diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_sched.c b/ThirdParty/Ert/devel/libenkf/src/enkf_sched.c index ae5faba455..124f5f5285 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_sched.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_sched.c @@ -18,15 +18,17 @@ #include #include -#include #include #include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include + +#include +#include +#include /** How long is the simulation? diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_serialize.c b/ThirdParty/Ert/devel/libenkf/src/enkf_serialize.c index d359cecd70..3532e8e03a 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_serialize.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_serialize.c @@ -18,10 +18,12 @@ #include #include -#include -#include -#include -#include + +#include + +#include +#include +#include /** This is heavy shit ... */ diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_serialize.h b/ThirdParty/Ert/devel/libenkf/src/enkf_serialize.h deleted file mode 100644 index b2e02bbc13..0000000000 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_serialize.h +++ /dev/null @@ -1,54 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'enkf_serialize.h' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#ifndef __ENKF_SERIALIZE_H__ -#define __ENKF_SERIALIZE_H__ -#ifdef __cplusplus -extern "C" { -#endif - -#include -#include -#include -#include -#include - - - -void enkf_matrix_serialize(const void * __node_data , - int node_size , - ecl_type_enum node_type , - const active_list_type * __active_list , - matrix_type * A, - int row_offset, - int column); - - -void enkf_matrix_deserialize(void * __node_data , - int node_size , - ecl_type_enum node_type , - const active_list_type * __active_list , - const matrix_type * A, - int row_offset, - int column); - - -#ifdef __cplusplus -} -#endif -#endif diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_state.c b/ThirdParty/Ert/devel/libenkf/src/enkf_state.c index 89ba913c3e..23cac00826 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_state.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_state.c @@ -26,50 +26,50 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include #define ENKF_STATE_TYPE_ID 78132 diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_types.c b/ThirdParty/Ert/devel/libenkf/src/enkf_types.c index 4d970ab63d..8d0cce567a 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_types.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_types.c @@ -19,8 +19,10 @@ #include #include #include -#include -#include + +#include + +#include /*****************************************************************/ diff --git a/ThirdParty/Ert/devel/libenkf/src/enkf_util.c b/ThirdParty/Ert/devel/libenkf/src/enkf_util.c index 49ef8a0b64..bcd43dd87d 100644 --- a/ThirdParty/Ert/devel/libenkf/src/enkf_util.c +++ b/ThirdParty/Ert/devel/libenkf/src/enkf_util.c @@ -21,11 +21,15 @@ #include #include #include -#include -#include -#include -#include -#include + +#include +#include + +#include + +#include +#include + diff --git a/ThirdParty/Ert/devel/libenkf/src/ensemble_config.c b/ThirdParty/Ert/devel/libenkf/src/ensemble_config.c index 97ac5b2665..da935d4bec 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ensemble_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/ensemble_config.c @@ -25,45 +25,46 @@ #include #include /* must have rw locking on the config_nodes ... */ -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "config_keys.h" -#include "enkf_defaults.h" +#include + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include struct ensemble_config_struct { diff --git a/ThirdParty/Ert/devel/libenkf/src/ert_report.c b/ThirdParty/Ert/devel/libenkf/src/ert_report.c index a8fe77c808..211d8a7ce6 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ert_report.c +++ b/ThirdParty/Ert/devel/libenkf/src/ert_report.c @@ -21,13 +21,13 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include /* The LATEX_PATH_FMT is a format string for where the latex diff --git a/ThirdParty/Ert/devel/libenkf/src/ert_report_list.c b/ThirdParty/Ert/devel/libenkf/src/ert_report_list.c index be4d675cf0..98aa060da4 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ert_report_list.c +++ b/ThirdParty/Ert/devel/libenkf/src/ert_report_list.c @@ -21,18 +21,18 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include +#include -#include +#include -#include -#include -#include +#include +#include +#include #define WELL_LIST_TAG "$WELL_LIST" #define GROUP_LIST_TAG "$GROUP_LIST" diff --git a/ThirdParty/Ert/devel/libenkf/src/ert_template.c b/ThirdParty/Ert/devel/libenkf/src/ert_template.c index 2091817faf..196ca905c2 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ert_template.c +++ b/ThirdParty/Ert/devel/libenkf/src/ert_template.c @@ -18,14 +18,14 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include "config_keys.h" -#include "enkf_defaults.h" +#include +#include +#include #define ERT_TEMPLATE_TYPE_ID 7731963 diff --git a/ThirdParty/Ert/devel/libenkf/src/field.c b/ThirdParty/Ert/devel/libenkf/src/field.c index 739f8dcf00..9dbd68faea 100644 --- a/ThirdParty/Ert/devel/libenkf/src/field.c +++ b/ThirdParty/Ert/devel/libenkf/src/field.c @@ -20,24 +20,24 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include GET_DATA_SIZE_HEADER(field); diff --git a/ThirdParty/Ert/devel/libenkf/src/field_config.c b/ThirdParty/Ert/devel/libenkf/src/field_config.c index 60ed2d0df0..6721de679c 100644 --- a/ThirdParty/Ert/devel/libenkf/src/field_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/field_config.c @@ -20,22 +20,22 @@ #include #include -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include -#include -#include -#include -#include -#include -#include "config_keys.h" -#include "enkf_defaults.h" +#include +#include +#include +#include +#include +#include +#include /** About transformations and truncations diff --git a/ThirdParty/Ert/devel/libenkf/src/field_trans.c b/ThirdParty/Ert/devel/libenkf/src/field_trans.c index f9405330da..5396114ec9 100644 --- a/ThirdParty/Ert/devel/libenkf/src/field_trans.c +++ b/ThirdParty/Ert/devel/libenkf/src/field_trans.c @@ -29,12 +29,13 @@ bottom of the file. */ #include -#include -#include #include -#include #include +#include +#include + +#include /*****************************************************************/ struct field_trans_table_struct { diff --git a/ThirdParty/Ert/devel/libenkf/src/fs_driver.c b/ThirdParty/Ert/devel/libenkf/src/fs_driver.c index 045782ec22..4bc137e4e5 100644 --- a/ThirdParty/Ert/devel/libenkf/src/fs_driver.c +++ b/ThirdParty/Ert/devel/libenkf/src/fs_driver.c @@ -16,9 +16,10 @@ for more details. */ -#include -#include -#include +#include + +#include +#include /* The underlying base types (abstract - with no accompanying diff --git a/ThirdParty/Ert/devel/libenkf/src/fs_types.c b/ThirdParty/Ert/devel/libenkf/src/fs_types.c index fda1462291..166d2ea1c2 100644 --- a/ThirdParty/Ert/devel/libenkf/src/fs_types.c +++ b/ThirdParty/Ert/devel/libenkf/src/fs_types.c @@ -18,8 +18,11 @@ #include #include -#include -#include + +#include + +#include + fs_driver_impl fs_types_lookup_string_name(const char * driver_name) { diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_common.c b/ThirdParty/Ert/devel/libenkf/src/gen_common.c index d2911e0da3..bd368c7dda 100644 --- a/ThirdParty/Ert/devel/libenkf/src/gen_common.c +++ b/ThirdParty/Ert/devel/libenkf/src/gen_common.c @@ -17,13 +17,16 @@ */ #include -#include #include #include -#include -#include -#include -#include + +#include + +#include +#include + +#include +#include /** This file implements some (very basic) functionality which is used diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_data.c b/ThirdParty/Ert/devel/libenkf/src/gen_data.c index 126faf8ca1..52c9a2b4d8 100644 --- a/ThirdParty/Ert/devel/libenkf/src/gen_data.c +++ b/ThirdParty/Ert/devel/libenkf/src/gen_data.c @@ -22,25 +22,25 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include /** The file implements a general data type which can be used to update diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_data_config.c b/ThirdParty/Ert/devel/libenkf/src/gen_data_config.c index a6fbb17019..3f496faba2 100644 --- a/ThirdParty/Ert/devel/libenkf/src/gen_data_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/gen_data_config.c @@ -21,21 +21,21 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include -#include -#include -#include -#include -#include -#include "config_keys.h" -#include "enkf_defaults.h" +#include +#include +#include +#include +#include +#include +#include /** About deactivating by the forward model diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_kw.c b/ThirdParty/Ert/devel/libenkf/src/gen_kw.c index 2c5c721bda..8d9261afaf 100644 --- a/ThirdParty/Ert/devel/libenkf/src/gen_kw.c +++ b/ThirdParty/Ert/devel/libenkf/src/gen_kw.c @@ -21,19 +21,19 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include GET_DATA_SIZE_HEADER(gen_kw); diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_kw_config.c b/ThirdParty/Ert/devel/libenkf/src/gen_kw_config.c index d643e68299..6ed9ce2fdd 100644 --- a/ThirdParty/Ert/devel/libenkf/src/gen_kw_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/gen_kw_config.c @@ -18,17 +18,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "config_keys.h" + +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include #define GEN_KW_CONFIG_TYPE_ID 550761 #define GEN_KW_PARAMETER_TYPE_ID 886201 diff --git a/ThirdParty/Ert/devel/libenkf/src/gen_obs.c b/ThirdParty/Ert/devel/libenkf/src/gen_obs.c index 8172308ecb..a2446ab625 100644 --- a/ThirdParty/Ert/devel/libenkf/src/gen_obs.c +++ b/ThirdParty/Ert/devel/libenkf/src/gen_obs.c @@ -22,20 +22,20 @@ */ #include -#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /** This file implemenets a structure for general observations. A diff --git a/ThirdParty/Ert/devel/libenkf/src/local_config.c b/ThirdParty/Ert/devel/libenkf/src/local_config.c index a944b690e5..7f13693a5d 100644 --- a/ThirdParty/Ert/devel/libenkf/src/local_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/local_config.c @@ -19,23 +19,28 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "config_keys.h" -#include "enkf_defaults.h" + +#include +#include +#include + +#include +#include + +#include +#include + + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /******************************************************************/ /* diff --git a/ThirdParty/Ert/devel/libenkf/src/local_context.c b/ThirdParty/Ert/devel/libenkf/src/local_context.c index 8fc8e59fb4..b2654d4696 100644 --- a/ThirdParty/Ert/devel/libenkf/src/local_context.c +++ b/ThirdParty/Ert/devel/libenkf/src/local_context.c @@ -16,14 +16,18 @@ for more details. */ -#include -#include #include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include + +#include + +#include struct local_context_struct { hash_type * ecl_regions; diff --git a/ThirdParty/Ert/devel/libenkf/src/local_dataset.c b/ThirdParty/Ert/devel/libenkf/src/local_dataset.c index 9bc624c68f..aa29cf4040 100644 --- a/ThirdParty/Ert/devel/libenkf/src/local_dataset.c +++ b/ThirdParty/Ert/devel/libenkf/src/local_dataset.c @@ -16,15 +16,18 @@ for more details. */ -#include + #include #include -#include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include +#include +#include #define LOCAL_DATASET_TYPE_ID 6615409 diff --git a/ThirdParty/Ert/devel/libenkf/src/local_ministep.c b/ThirdParty/Ert/devel/libenkf/src/local_ministep.c index 9f45797c6b..71bdc262f6 100644 --- a/ThirdParty/Ert/devel/libenkf/src/local_ministep.c +++ b/ThirdParty/Ert/devel/libenkf/src/local_ministep.c @@ -16,15 +16,18 @@ for more details. */ -#include + #include #include -#include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include +#include +#include /** This file implements a 'ministep' configuration for active / diff --git a/ThirdParty/Ert/devel/libenkf/src/local_obsset.c b/ThirdParty/Ert/devel/libenkf/src/local_obsset.c index 8fdbb1b106..2bb094f653 100644 --- a/ThirdParty/Ert/devel/libenkf/src/local_obsset.c +++ b/ThirdParty/Ert/devel/libenkf/src/local_obsset.c @@ -19,11 +19,13 @@ #include #include #include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include #define LOCAL_OBSSET_TYPE_ID 991534 diff --git a/ThirdParty/Ert/devel/libenkf/src/local_updatestep.c b/ThirdParty/Ert/devel/libenkf/src/local_updatestep.c index b89ddb5bf3..bbfc1d20e9 100644 --- a/ThirdParty/Ert/devel/libenkf/src/local_updatestep.c +++ b/ThirdParty/Ert/devel/libenkf/src/local_updatestep.c @@ -16,13 +16,14 @@ for more details. */ -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include + +#include +#include +#include +#include /** One enkf update is described/configured by the data structure in diff --git a/ThirdParty/Ert/devel/libenkf/src/meas_data.c b/ThirdParty/Ert/devel/libenkf/src/meas_data.c index c814602405..c3b12579df 100644 --- a/ThirdParty/Ert/devel/libenkf/src/meas_data.c +++ b/ThirdParty/Ert/devel/libenkf/src/meas_data.c @@ -23,14 +23,16 @@ #include #include -#include #include -#include -#include -#include #include -#include -#include + +#include +#include +#include +#include +#include + +#include #define MEAS_BLOCK_TYPE_ID 661936407 diff --git a/ThirdParty/Ert/devel/libenkf/src/member_config.c b/ThirdParty/Ert/devel/libenkf/src/member_config.c index fcd703e5e3..1969b9ca06 100644 --- a/ThirdParty/Ert/devel/libenkf/src/member_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/member_config.c @@ -17,21 +17,18 @@ */ #include -#include #include #include -#include -#include +#include +#include +#include -#include - -#include - -#include -#include -#include -#include +#include +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libenkf/src/misfit_ensemble.c b/ThirdParty/Ert/devel/libenkf/src/misfit_ensemble.c index e86201c199..1803989043 100644 --- a/ThirdParty/Ert/devel/libenkf/src/misfit_ensemble.c +++ b/ThirdParty/Ert/devel/libenkf/src/misfit_ensemble.c @@ -21,19 +21,19 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libenkf/src/misfit_member.c b/ThirdParty/Ert/devel/libenkf/src/misfit_member.c index 3d414f76dd..1e6520809c 100644 --- a/ThirdParty/Ert/devel/libenkf/src/misfit_member.c +++ b/ThirdParty/Ert/devel/libenkf/src/misfit_member.c @@ -19,11 +19,11 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include #define MISFIT_MEMBER_TYPE_ID 541066 diff --git a/ThirdParty/Ert/devel/libenkf/src/misfit_ranking.c b/ThirdParty/Ert/devel/libenkf/src/misfit_ranking.c index 64f2315c81..f21f42d939 100644 --- a/ThirdParty/Ert/devel/libenkf/src/misfit_ranking.c +++ b/ThirdParty/Ert/devel/libenkf/src/misfit_ranking.c @@ -20,20 +20,20 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include /** This struct contains the misfits & sort keys for one particular diff --git a/ThirdParty/Ert/devel/libenkf/src/misfit_ts.c b/ThirdParty/Ert/devel/libenkf/src/misfit_ts.c index 54cdaba167..0bee8620c0 100644 --- a/ThirdParty/Ert/devel/libenkf/src/misfit_ts.c +++ b/ThirdParty/Ert/devel/libenkf/src/misfit_ts.c @@ -17,11 +17,11 @@ */ -#include -#include -#include +#include +#include +#include -#include +#include #define MISFIT_TS_TYPE_ID 641066 diff --git a/ThirdParty/Ert/devel/libenkf/src/model_config.c b/ThirdParty/Ert/devel/libenkf/src/model_config.c index 8b01616d4c..0e2d3e08b7 100644 --- a/ThirdParty/Ert/devel/libenkf/src/model_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/model_config.c @@ -22,29 +22,29 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include +#include +#include -#include +#include -#include -#include -#include +#include +#include +#include -#include +#include -#include -#include -#include -#include -#include -#include "config_keys.h" +#include +#include +#include +#include +#include +#include /** This struct contains configuration which is specific to this diff --git a/ThirdParty/Ert/devel/libenkf/src/obs_data.c b/ThirdParty/Ert/devel/libenkf/src/obs_data.c index cbe5cd997c..ade0bf71ac 100644 --- a/ThirdParty/Ert/devel/libenkf/src/obs_data.c +++ b/ThirdParty/Ert/devel/libenkf/src/obs_data.c @@ -64,14 +64,16 @@ Matrices: S, D, E and various internal variables. #include #include #include -#include -#include -#include -#include -#include #include -#include -#include + +#include +#include +#include +#include + +#include +#include +#include #define OBS_BLOCK_TYPE_ID 995833 diff --git a/ThirdParty/Ert/devel/libenkf/src/obs_vector.c b/ThirdParty/Ert/devel/libenkf/src/obs_vector.c index 3f0b184621..7148e92de7 100644 --- a/ThirdParty/Ert/devel/libenkf/src/obs_vector.c +++ b/ThirdParty/Ert/devel/libenkf/src/obs_vector.c @@ -25,29 +25,29 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include +#include -#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include "enkf_defaults.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include #define OBS_VECTOR_TYPE_ID 120086 diff --git a/ThirdParty/Ert/devel/libenkf/src/plain_driver.c b/ThirdParty/Ert/devel/libenkf/src/plain_driver.c index 5bdb92ab2f..aa93ad6e59 100644 --- a/ThirdParty/Ert/devel/libenkf/src/plain_driver.c +++ b/ThirdParty/Ert/devel/libenkf/src/plain_driver.c @@ -19,14 +19,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include + +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libenkf/src/plot/SConstruct b/ThirdParty/Ert/devel/libenkf/src/plot/SConstruct deleted file mode 100644 index f7602b3aa7..0000000000 --- a/ThirdParty/Ert/devel/libenkf/src/plot/SConstruct +++ /dev/null @@ -1 +0,0 @@ -SConscript(["../SConstruct"]) \ No newline at end of file diff --git a/ThirdParty/Ert/devel/libenkf/src/plot_config.c b/ThirdParty/Ert/devel/libenkf/src/plot_config.c index 862362707b..af3650482f 100644 --- a/ThirdParty/Ert/devel/libenkf/src/plot_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/plot_config.c @@ -17,10 +17,12 @@ */ #include -#include -#include -#include -#include "config_keys.h" + +#include + +#include +#include +#include /** Struct holding basic information used when plotting. diff --git a/ThirdParty/Ert/devel/libenkf/src/qc_config.c b/ThirdParty/Ert/devel/libenkf/src/qc_config.c index 1b411bd871..1e00c0e8d7 100644 --- a/ThirdParty/Ert/devel/libenkf/src/qc_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/qc_config.c @@ -19,12 +19,12 @@ #include #include -#include +#include -#include +#include -#include -#include +#include +#include struct qc_config_struct { diff --git a/ThirdParty/Ert/devel/libenkf/src/ranking_table.c b/ThirdParty/Ert/devel/libenkf/src/ranking_table.c index 3fc7889aa9..55c895e65f 100644 --- a/ThirdParty/Ert/devel/libenkf/src/ranking_table.c +++ b/ThirdParty/Ert/devel/libenkf/src/ranking_table.c @@ -21,22 +21,22 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include #define RANKING_TABLE_TYPE_ID 78420651 diff --git a/ThirdParty/Ert/devel/libenkf/src/rng_config.c b/ThirdParty/Ert/devel/libenkf/src/rng_config.c index 3c40390bcb..0441d979ac 100644 --- a/ThirdParty/Ert/devel/libenkf/src/rng_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/rng_config.c @@ -16,14 +16,17 @@ for more details. */ -#include -#include #include -#include -#include -#include -#include -#include + +#include +#include +#include + +#include + +#include +#include +#include struct rng_config_struct { diff --git a/ThirdParty/Ert/devel/libenkf/src/site_config.c b/ThirdParty/Ert/devel/libenkf/src/site_config.c index d4713e4ded..59dccf66f7 100644 --- a/ThirdParty/Ert/devel/libenkf/src/site_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/site_config.c @@ -22,24 +22,23 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include -#include - -#include -#include "enkf_defaults.h" -#include "config_keys.h" +#include +#include +#include /** This struct contains information which is specific to the site diff --git a/ThirdParty/Ert/devel/libenkf/src/sqlite3_driver_test.c b/ThirdParty/Ert/devel/libenkf/src/sqlite3_driver_test.c deleted file mode 100644 index 4daf024802..0000000000 --- a/ThirdParty/Ert/devel/libenkf/src/sqlite3_driver_test.c +++ /dev/null @@ -1,71 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'sqlite3_driver_test.c' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#include -#include -#include -#include -#include - -static const char SQLITE3_DB_FILE[] = "my_sqlite3_db.bin"; - - -int main( - int argc, - char ** argv) -{ - //const char * id = "poro"; - //int realization_nr = 1; - //int restart_nr = 123; - //const char * data = "svadafesalsdfhalkdfhasldkfahklsdfhasdkfjht"; - //int bytesize_data = strlen(data) + 1; - // - //char * my_data; - //int bytesize_my_data; - // - //sqlite3_driver_type * driver = sqlite3_driver_alloc(SQLITE3_DB_FILE, "default"); - //void * _driver = (void *) driver; - - //printf("Attempting to save a node.\n"); - //sqlite3_driver_save_node( _driver, id, realization_nr, restart_nr, data, bytesize_data); - //if( sqlite3_driver_has_node( _driver, id, realization_nr, restart_nr ) ) - // printf("Successfully saved a node.\n"); - //else - // printf("Failed to save a node!!\n"); - // - // - //printf("Attempting to load the node.\n"); - //if( sqlite3_driver_load_node( _driver, id, realization_nr, restart_nr, (void **) &my_data, &bytesize_my_data) ) - //{ - // printf("Loaded: %s\n", my_data); - // free(my_data); - //} - //else - // printf("Coulnd't find the node.\n"); - // - // - //printf("Deleting node.\n"); - //sqlite3_driver_unlink_node( _driver, id, realization_nr, restart_nr); - //if( sqlite3_driver_has_node( _driver, id, realization_nr, restart_nr) ) - // printf("Failed to delete node!!!\n"); - //else - // printf("Successfully deleted node.\n"); - // - //sqlite3_driver_free( _driver ); - return 0; -}; diff --git a/ThirdParty/Ert/devel/libenkf/src/summary.c b/ThirdParty/Ert/devel/libenkf/src/summary.c index 98f738f707..cfa4a728b3 100644 --- a/ThirdParty/Ert/devel/libenkf/src/summary.c +++ b/ThirdParty/Ert/devel/libenkf/src/summary.c @@ -20,21 +20,21 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /*****************************************************************/ diff --git a/ThirdParty/Ert/devel/libenkf/src/summary_config.c b/ThirdParty/Ert/devel/libenkf/src/summary_config.c index b29e194536..bd26fd39fb 100644 --- a/ThirdParty/Ert/devel/libenkf/src/summary_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/summary_config.c @@ -20,16 +20,16 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #define SUMMARY_CONFIG_TYPE_ID 63106 diff --git a/ThirdParty/Ert/devel/libenkf/src/summary_obs.c b/ThirdParty/Ert/devel/libenkf/src/summary_obs.c index 6e8bfb6cfd..3c002bedb4 100644 --- a/ThirdParty/Ert/devel/libenkf/src/summary_obs.c +++ b/ThirdParty/Ert/devel/libenkf/src/summary_obs.c @@ -23,13 +23,15 @@ #include #include #include -#include #include -#include -#include -#include -#include -#include + +#include + +#include +#include +#include +#include +#include #define SUMMARY_OBS_TYPE_ID 66103 diff --git a/ThirdParty/Ert/devel/libenkf/src/surface.c b/ThirdParty/Ert/devel/libenkf/src/surface.c index 713e14b8af..231059e6e7 100644 --- a/ThirdParty/Ert/devel/libenkf/src/surface.c +++ b/ThirdParty/Ert/devel/libenkf/src/surface.c @@ -20,19 +20,18 @@ #include #include -#include -#include +#include +#include -#include +#include -#include -#include - -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /*****************************************************************/ diff --git a/ThirdParty/Ert/devel/libenkf/src/surface_config.c b/ThirdParty/Ert/devel/libenkf/src/surface_config.c index f019de78a3..0d494f056a 100644 --- a/ThirdParty/Ert/devel/libenkf/src/surface_config.c +++ b/ThirdParty/Ert/devel/libenkf/src/surface_config.c @@ -17,11 +17,13 @@ */ -#include -#include -#include -#include -#include +#include + +#include + +#include +#include +#include #define SURFACE_CONFIG_TYPE_ID 853317 diff --git a/ThirdParty/Ert/devel/libenkf/src/time_map.c b/ThirdParty/Ert/devel/libenkf/src/time_map.c index 4dc7c7c2fd..9b5595d85a 100644 --- a/ThirdParty/Ert/devel/libenkf/src/time_map.c +++ b/ThirdParty/Ert/devel/libenkf/src/time_map.c @@ -21,12 +21,12 @@ #include #include -#include -#include +#include +#include -#include +#include -#include +#include #define DEFAULT_TIME -1 diff --git a/ThirdParty/Ert/devel/libenkf/src/trans_func.c b/ThirdParty/Ert/devel/libenkf/src/trans_func.c index 0ada8881c2..c546741653 100644 --- a/ThirdParty/Ert/devel/libenkf/src/trans_func.c +++ b/ThirdParty/Ert/devel/libenkf/src/trans_func.c @@ -17,13 +17,18 @@ */ #include -#include #include #include #include -#include -#include -#include + +#include +#include +#include + +#include + + + diff --git a/ThirdParty/Ert/devel/libenkf/src/uncle_sam_100.h b/ThirdParty/Ert/devel/libenkf/src/uncle_sam_100.h deleted file mode 100644 index f1a29a8613..0000000000 --- a/ThirdParty/Ert/devel/libenkf/src/uncle_sam_100.h +++ /dev/null @@ -1,110 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'uncle_sam_100.h' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#define SPLASH_LENGTH 90 -const char *splash_text[SPLASH_LENGTH] = { -".. . ................. ......... . .::=I$O8888OO?. . .........................................", -". . ..........................,MM7.. ..MMMMMMM,... .MMMN. ......................................", -". . . ................... ,ZMMMMMMM.....MMMMMMM.....ZMMMM~Z:.....................................", -". . .............. ....O...~MMMMMM.....MMMMMMM.....MMMMM .DN ...................................", -". ................ MM. ..MMMMMM.....NMMMMMM ....MMMMM .MM ...................................", -". . ... ...... ........~MMM7...IMMMMMO....IMMMMMM ....MMMMM..MN ...................................", -". ..... ........MMMMM... MMMMMM....:MMMMMM ...,MMMM: OM.....................................", -"... . ..................NMMMM8...NMMMMM ..,MMMMMM ...OMMMM .MM.....................................", -".. . . .................DMMMM. ..MMMMM~ ...MMMMMM ...MMMMM..MI ....................................", -" . ... .. ...... ...MMMMM .MMMMMM ...MMMMMM....MMMMM.~M......................................", -" .............. . ..MMMM, .MMMMM....MMMMMM ...MMMM=.MM......................................", -" . ... ...............MMMM .MMMMM, . MMMNN8 +MMMM. MD......................................", -" ... ................NMMM? .. ...:+ZNMMMMMMMD+ ..N .M+.... ................ .... .........", -" .....................MM~ZNMMMMMMMMMMM=MMMMMMMMMMMMMO,7......................................", -" .... .. ........ .. ..MMMMMMMMMMMMMM: ~MMMMMMMMMMMMMM$......................................", -" ......................MMMMMMMMMMMMMM....MMMMMMMMMMMM~:......................................", -" ......... .. . . ..8MMMMMMMMMM,... . . .$MMMMMM,. =. . ... .. . . .... . . ... .... ", -" .....................,MMMMMMMN. ........MMMMMMMM...N.. ...................................", -" .... .............. .. I MMMMMMMMM, .....MMMMMMMMMM+ ...... ................................", -" ......... ...... .... .OMMMMMMMMMM....... MMMMMMMMM MD ..INM ..... ....... ..... ..........", -" ................ .OO$OD,. ..MMMMMMMMMMM.. DM,. 7MMMMMMMO7MMMN,. ,M. ...... ..... . .... .. .... ", -" . ..............Z. MMMM8,~I ..MMMMMMMMMI,MMMMMMM:MMMMMMMNM$ . ,MMM..,...... ...... ...............", -" ...............I ~:MMMMMMMMM,,NMMMMMMMMMMMMMMMMMMD,$. .+MMMMMM:.D .............................", -" . ..............88~..NMMMMMMMMMD... .. .. . .......DMMMMMMMMMMMMM7.$$...........................", -" . ...............MO+..$MMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMMM .+D$ . ...... ......... .... ", -" ..................=MMMMMMMMMMMMMMMMNMMMMMMMMMMMMMMM7 ..7MMMMMMMM= .:M7 .........................", -" . ... . . ....NMM.MMMMMMMMM..D .: .:, .M~. .,7:.M:.MMMMMMMMMZ~Z . . ..... ......... .....", -" ............... ... .IMMMMMIMMM$MMMM$M......I.M. ..M .7MMMMMMMMMMMII: .... ...... ...............", -" . .................MMMM8:MMMMMM~DMMMI.O M.M,MDMMMMMMMMMM~MMDMMM$D ... . ..... ................", -" . ....................MDMMMMMMMMDMMMMMMMMMN7M MMMMDMM.8MMM,.IMMMM 7.O ............................", -" .. ..... .... ... .+ MMMMMMD..MMM.N Z.MMM .MMDND? .MM.. 7MMMM M N ..... ......................", -" . ....................NMMMMMMM8.. .MZ .+ZDMM. .MN..,DMD.....NMMMO~ I .. . . ..... . ....... .....", -" .......................MMMMMMMM...........~N .+ .. I ...:MMMM .N. .............................", -" .....................=.NMMMMMM: ...... ..D ..7. ..OO ..ZMMMMMM7....... . ..... ......... .....", -" . .....................M IMMMMMMM.....8. ..M.... ......MMMMMMMMMMMM+.............. ...............", -" .......... .. . ... .M, 7:+MMMMMMM ZM. . ..N:. . .MMMMMMMMMMMMM. ... . . ... ......... .....", -" .................... ?~M.MMMMMMD~M,. ...MM. .,M=....IMDMMMMMMMMMMMM ............................", -" ................... ..NMMMMMMMMM..D7 ..... .,MMM ...., MM.ZMMMMMMMM, .... ..... ......... .....", -" ................,NMMMMMMMMMMMMMMM.I =..... M.,I... . .D NM...MMMMMMMM ...........................", -" ......,. . MMMMMMMMMMMMMMMMMM MMM~I.... ... ........M. .....MMMMMMMMM7... ..... .. . .... .. ..", -" . ..:MMMMMMMMMMMMMMMMMMMMMM:..MM = .NMMMMMMMMMMMM.M..Z . MMMMMMMMMMMMNM$:.. ......... .....", -" .=MMMNMMMMMMMMMMMMMMMMMM. OMMMI ..,M. ...+~. .7, +MMMMMMMMMMMMMMMMIM8MM ..... ........", -". ... .MMM$,MMMMMMMMMMMMMMMMMMMMMMMMM..ZN+.MMM N ..O..,M..M$.MMMMMMMMMMMMMMMMMZMM,MNM..MM, .......", -".. .MMMM8 DMMMMMMMMMMMMMMMMMMMDZMMMMMMMMM8M .:.MIMM..M.8MMM+.MMMMMMMMMMMMMMMMMMMMMMMMM.. .....", -" . ZMMMMMM.MMMMMMMMMMMMMMMMMMMD ...MMMMMM~M .... M.M?N :MMMMM MMMMMMMMMMMN,MMMMMMMMMMMM+ .....", -" .MMMM,77 MMMMMMMMMMMMMMMMM?D ...7$MMDM ....=,=:MMMMMMMMM8.MMMMMMMMM.MD DMMMMMMMMMMMM. .....", -" . .MMMMM.: .MMMMM?IMMMMMMMMMM=D ..?.N.M+M7$. ..ZI7MMMMMMMMM?MMMMMMMMMMMMMMMMMMMDMMMMMMM+ Z....", -" . . .$MM8MM ..8MMM~MMMMMMMMMMM Z~....8~.MMO8=8M~. 8MMMMNMMD~ ,MMMMMMMMMMMMMMMMMMMMMMMMMMMMMO ...", -" .MMMM:ZMM .MMMMOMMMMMMMMM. .:D,.$7:NM7....Z~D.$MMMMM.....MMMMD.IMMMMMMMMMMMMMMMMMMMMMMMM ..", -".. ..OMMMMMM+MO,~8MMMMMMMMMMMM$O .. 7M? .....$$ 8.D:M.MMMMD ...MMM7.NMMMMMMMMMMMZ.:MMMMMMMMMMM....", -" . MMMMMMMMMMMMMMMMNMMMMMMM?.. IM. ... . . 8M..M D:$MMMMM MMM NMM. . .,+. . .MMMMMMMMMMMM. . ", -" ..=MMMNMMMMMMMMMMMMMMMMMMMM.D.......~8MO,... .:M.IM$MMMMMMMMZMO .MM.. ..MMMMMM.MMMMMMMMMMMM....", -" OMM8=N=MMMMMMMMMMMMMMMMM 7 ......... ,D? ..=Z.., . ... MM. .MMMNINMMMMMM,,MMMMMMMMMMMM:...", -" . :MM.MMM MMMMMMMMMMMMM+7...?MDMMMMMZ......:MI.:,M ....... MM ...$MMMMMMMMMM .MMMMMMMMMMMM ..", -".. IMMMMMMMM:MMMMMMMMMMM : M..... MMMMMMMMM.MI~ OM+........=MM....... ...MMMM :MMMMMMMDMMMM8 ..", -". =MMMMMMMM M ZMMMMMMM M..=.M. .......MM$NMMMMZ8.ON. ......OM: ........ .... DMMMMM$OMMMMMM ..", -". NMMMMMMM.ND.,$=MMMMN. : ..Z.M7. M ... .. MMM~~~ZN ........MM .=...NMMMMMNM~..8MMMMMMMMMMMMM...", -" .MMMMMMMMMMMM8.MMM,.... ....NMMD..?DM7....M..MMOO?M ........MM .M .M. ....7MI.MMMMMMM+MMMMMD...", -" ..MMMMMMMMMM .MMMD...........M? ..IMMMMMMMZ...NM...........MM.,? ..... . . ..MMMMMNIMMMMMMM ...", -". 8MMMMMMMMMMM,MN,.....M .... .?...MMMMMMM$......... ...... MZ?M..........M .7MMMMMMMMMMNMM,....", -" MMMMDMMMMM8~M = .....M= ....=.~MMMMMMMM.. ..... . .......:M.MN .........= MMMZ8MMMOM.+.......", -" .MM .. .M$M...M 8......N~.... , MMMMMMMMM......8...........IM,M..........D MMMN7MMMMM$:, ......", -" . MNMM=7NMMM.NNMM.= .....:N ...N DMMMMM7IMM......= ..~.......8MMM .. .. . .M..MMMM8MMMMMMMMMMN . ", -". MMM~M:MMMN.M:MIMM........M. .. ~MMM~MMMMMN .......... ......MMM, ........:M DMMMMMMMMMMMMMMM=....", -" DMNZMMN..M..7MMM .......?M. MMMMMNMMMMN . ...,...........MMM.. ...... ,~.MMM7NMMMMMMMMMMM:. ..", -". NMM.D,..M,=?.MM$.........MZ.MMMMMM?DMMMM ...... ..........,MM? ........=M MMMMMMMMMMMMMMMMM ....", -". MN..MMMM $. .MM7 ........?MM: .+$ $.MMMM:.......: .. .....8MM....... ....=MMMMMMMMMMMMMMMM .....", -"====================================================================================================", -"", -" Y88b d88P 888 ", -" Y88b d88P 888 ", -" Y88o88P 888 ", -" Y888P .d88b. 888 888 88888b. .d88b. .d88b. .d88888 8888b. ", -" 888 d88\"\"88b 888 888 888 \"88b d8P Y8b d8P Y8b d88\" 888 \"88b ", -" 888 888 888 888 888 888 888 88888888 88888888 888 888 .d888888 ", -" 888 Y88..88P Y88b 888 888 888 Y8b. Y8b. Y88b 888 888 888 ", -" 888 \"Y88P\" \"Y88888 888 888 \"Y8888 \"Y8888 \"Y88888 \"Y888888 ", -" ", -" ", -" ", -" 888 .d888 888 888 ", -" 888 d88P\" 888 888 ", -" 888 888 888 888 ", -" 888 888 888 .d88b. 888d888 888 888 888888 888 .d88b. 888 888 888 888 ", -" 888 888 888 d88\"\"88b 888P\" 888 .88P 888 888 d88\"\"88b 888 888 888 888 ", -" 888 888 888 888 888 888 888888K 888 888 888 888 888 888 888 Y8P ", -" Y88b 888 d88P Y88..88P 888 888 \"88b 888 888 Y88..88P Y88b 888 d88P \" ", -" \"Y8888888P\" \"Y88P\" 888 888 888 888 888 \"Y88P\" \"Y8888888P\" 888", -"", -"===================================================================================================="}; diff --git a/ThirdParty/Ert/devel/libenkf/src/well_config_private.h b/ThirdParty/Ert/devel/libenkf/src/well_config_private.h deleted file mode 100644 index 577e305f03..0000000000 --- a/ThirdParty/Ert/devel/libenkf/src/well_config_private.h +++ /dev/null @@ -1,32 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'well_config_private.h' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#ifndef __WELL_CONFIG_PRIVATE_H__ -#define __WELL_CONFIG_PRIVATE_H__ - -#define __WELL_GRAT_INDEX 0 -#define __WELL_ORAT_INDEX 1 -#define __WELL_WRAT_INDEX 2 -#define __WELL_BHP_INDEX 3 -#define __WELL_THP_INDEX 4 - - - - - -#endif diff --git a/ThirdParty/Ert/devel/libert_util/CMakeLists.txt b/ThirdParty/Ert/devel/libert_util/CMakeLists.txt index bd25b13710..68ce6c9109 100644 --- a/ThirdParty/Ert/devel/libert_util/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libert_util/CMakeLists.txt @@ -1,4 +1,11 @@ -set( UTIL_INSTALL_PREFIX "" CACHE STRING "Prefix for installation of libert_util") +add_subdirectory( include/ert/util ) + add_subdirectory( src ) -add_subdirectory( applications ) -add_subdirectory( tests ) +if (BUILD_APPLICATONS) + add_subdirectory( applications ) +endif() + +if (BUILD_TESTS) + add_subdirectory( tests ) +endif() + diff --git a/ThirdParty/Ert/devel/libert_util/applications/matrix_test.c b/ThirdParty/Ert/devel/libert_util/applications/matrix_test.c index 21483997ab..bfa71c7b95 100644 --- a/ThirdParty/Ert/devel/libert_util/applications/matrix_test.c +++ b/ThirdParty/Ert/devel/libert_util/applications/matrix_test.c @@ -20,10 +20,11 @@ #include #include -#include -#include +#include +#include + #ifdef WITH_LAPACK -#include +#include #endif int main( int argc, char ** argv) { diff --git a/ThirdParty/Ert/devel/libert_util/include/ert/util/CMakeLists.txt b/ThirdParty/Ert/devel/libert_util/include/ert/util/CMakeLists.txt new file mode 100644 index 0000000000..4fe85bd641 --- /dev/null +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/CMakeLists.txt @@ -0,0 +1,22 @@ +set(header_files) +foreach (type int double bool long time_t size_t float) + set(TYPE ${type} ) + set(header_target ${type}_vector.h) + + configure_file( vector_template.h ${header_target}) + + list( APPEND header_files ${CMAKE_CURRENT_BINARY_DIR}/${header_target} ) +endforeach( type ) + +if (MSVC) + configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/msvc_stdbool.h ${CMAKE_CURRENT_BINARY_DIR}/stdbool.h) + list( APPEND header_files ${CMAKE_CURRENT_BINARY_DIR}/stdbool.h) +endif() + +foreach(header ${header_files}) + install(FILES ${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/util) +endforeach() + + + + diff --git a/ThirdParty/Ert/devel/libert_util/src/arg_pack.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/arg_pack.h similarity index 97% rename from ThirdParty/Ert/devel/libert_util/src/arg_pack.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/arg_pack.h index a92a5ae913..903aca1c8f 100644 --- a/ThirdParty/Ert/devel/libert_util/src/arg_pack.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/arg_pack.h @@ -24,8 +24,8 @@ extern "C" { #include #include -#include -#include +#include +#include typedef struct arg_pack_struct arg_pack_type; typedef void (arg_node_free_ftype) (void *); diff --git a/ThirdParty/Ert/devel/libert_util/src/atomic.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/atomic.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/atomic.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/atomic.h diff --git a/ThirdParty/Ert/devel/libert_util/src/block_fs.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/block_fs.h similarity index 97% rename from ThirdParty/Ert/devel/libert_util/src/block_fs.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/block_fs.h index b7add48364..2255c2ded4 100644 --- a/ThirdParty/Ert/devel/libert_util/src/block_fs.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/block_fs.h @@ -18,9 +18,9 @@ #ifndef __BLOCK_FS__ #define __BLOCK_FS__ -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/ThirdParty/Ert/devel/libert_util/src/buffer.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/buffer.h similarity index 99% rename from ThirdParty/Ert/devel/libert_util/src/buffer.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/buffer.h index 7df53ca7d7..b5201d4c73 100644 --- a/ThirdParty/Ert/devel/libert_util/src/buffer.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/buffer.h @@ -27,7 +27,8 @@ extern "C" { #include #include #include -#include + +#include typedef struct buffer_struct buffer_type; diff --git a/ThirdParty/Ert/devel/libert_util/src/hash.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/hash.h similarity index 97% rename from ThirdParty/Ert/devel/libert_util/src/hash.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/hash.h index 6f185c23cc..74f9212c1f 100644 --- a/ThirdParty/Ert/devel/libert_util/src/hash.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/hash.h @@ -23,12 +23,15 @@ extern"C" { #endif #include -#include -#include + +#include +#include +#include + typedef struct hash_struct hash_type; typedef struct hash_iter_struct hash_iter_type; typedef void (hash_apply_ftype) (void * ); -#include + void hash_lock (hash_type * ); void hash_unlock(hash_type * ); diff --git a/ThirdParty/Ert/devel/libert_util/src/hash_node.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/hash_node.h similarity index 98% rename from ThirdParty/Ert/devel/libert_util/src/hash_node.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/hash_node.h index ca73155e27..87e25bead6 100644 --- a/ThirdParty/Ert/devel/libert_util/src/hash_node.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/hash_node.h @@ -24,7 +24,7 @@ extern "C" { #include #include -#include +#include typedef struct hash_node_struct hash_node_type; typedef uint32_t (hashf_type) (const char *key, size_t len); diff --git a/ThirdParty/Ert/devel/libert_util/src/hash_sll.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/hash_sll.h similarity index 97% rename from ThirdParty/Ert/devel/libert_util/src/hash_sll.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/hash_sll.h index 3154367013..d21def816c 100644 --- a/ThirdParty/Ert/devel/libert_util/src/hash_sll.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/hash_sll.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include typedef struct hash_sll_struct hash_sll_type; diff --git a/ThirdParty/Ert/devel/libert_util/src/lars.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/lars.h similarity index 98% rename from ThirdParty/Ert/devel/libert_util/src/lars.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/lars.h index 80ec223cf1..3d3aad27be 100644 --- a/ThirdParty/Ert/devel/libert_util/src/lars.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/lars.h @@ -24,9 +24,10 @@ extern "C" { #endif -#include #include +#include + typedef struct lars_struct lars_type; int lars_get_sample( const lars_type * lars ); diff --git a/ThirdParty/Ert/devel/libert_util/src/latex.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/latex.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/latex.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/latex.h diff --git a/ThirdParty/Ert/devel/libert_util/src/log.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/log.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/log.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/log.h diff --git a/ThirdParty/Ert/devel/libert_util/src/lookup_table.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/lookup_table.h similarity index 98% rename from ThirdParty/Ert/devel/libert_util/src/lookup_table.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/lookup_table.h index a7e0b3e0ef..42a68536ed 100644 --- a/ThirdParty/Ert/devel/libert_util/src/lookup_table.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/lookup_table.h @@ -23,7 +23,7 @@ extern "C" { #endif -#include +#include typedef struct lookup_table_struct lookup_table_type; diff --git a/ThirdParty/Ert/devel/libert_util/src/matrix.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/matrix.h similarity index 98% rename from ThirdParty/Ert/devel/libert_util/src/matrix.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/matrix.h index a44fd96866..b16bad7bae 100644 --- a/ThirdParty/Ert/devel/libert_util/src/matrix.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/matrix.h @@ -22,10 +22,10 @@ #include #include -#include -#include +#include +#include #ifdef HAVE_THREAD_POOL -#include +#include #endif #ifdef __cplusplus diff --git a/ThirdParty/Ert/devel/libert_util/src/matrix_blas.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/matrix_blas.h similarity index 97% rename from ThirdParty/Ert/devel/libert_util/src/matrix_blas.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/matrix_blas.h index d7d2b82c0b..69bd88c37a 100644 --- a/ThirdParty/Ert/devel/libert_util/src/matrix_blas.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/matrix_blas.h @@ -17,7 +17,8 @@ */ #include -#include + +#include #ifdef __cplusplus diff --git a/ThirdParty/Ert/devel/libert_util/src/matrix_lapack.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/matrix_lapack.h similarity index 99% rename from ThirdParty/Ert/devel/libert_util/src/matrix_lapack.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/matrix_lapack.h index a872e356e8..ceabd72556 100644 --- a/ThirdParty/Ert/devel/libert_util/src/matrix_lapack.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/matrix_lapack.h @@ -18,7 +18,7 @@ #ifndef __MATRIX_LAPACK_H__ #define __MATRIX_LAPACK_H__ -#include +#include #ifdef __cplusplus extern "C" { diff --git a/ThirdParty/Ert/devel/libert_util/src/menu.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/menu.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/menu.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/menu.h diff --git a/ThirdParty/Ert/devel/libert_util/src/msg.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/msg.h similarity index 97% rename from ThirdParty/Ert/devel/libert_util/src/msg.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/msg.h index 9dc5a55858..1896556904 100644 --- a/ThirdParty/Ert/devel/libert_util/src/msg.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/msg.h @@ -22,7 +22,8 @@ extern "C" { #endif #include -#include + +#include typedef struct msg_struct msg_type; diff --git a/ThirdParty/Ert/devel/libert_util/src/msvc_stdbool.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/msvc_stdbool.h similarity index 88% rename from ThirdParty/Ert/devel/libert_util/src/msvc_stdbool.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/msvc_stdbool.h index bdd05c6870..396185b107 100644 --- a/ThirdParty/Ert/devel/libert_util/src/msvc_stdbool.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/msvc_stdbool.h @@ -7,7 +7,7 @@ statements fail when compiling. - When included in a C++ project the compiler already has a bool - defined; it is therefor important not to redifine this symbol if + defined; it is therefor important not to redefine this symbol if we are compiling C++. */ diff --git a/ThirdParty/Ert/devel/libert_util/src/mzran.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/mzran.h similarity index 98% rename from ThirdParty/Ert/devel/libert_util/src/mzran.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/mzran.h index 6af24eac52..23f1332d1b 100644 --- a/ThirdParty/Ert/devel/libert_util/src/mzran.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/mzran.h @@ -23,7 +23,7 @@ extern "C" { #endif #include -#include +#include typedef struct mzran_struct mzran_type; diff --git a/ThirdParty/Ert/devel/libert_util/src/node_ctype.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/node_ctype.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/node_ctype.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/node_ctype.h diff --git a/ThirdParty/Ert/devel/libert_util/src/node_data.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/node_data.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/node_data.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/node_data.h diff --git a/ThirdParty/Ert/devel/libert_util/src/parser.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/parser.h similarity index 99% rename from ThirdParty/Ert/devel/libert_util/src/parser.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/parser.h index dde0056f3b..31e6704f2b 100644 --- a/ThirdParty/Ert/devel/libert_util/src/parser.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/parser.h @@ -18,7 +18,7 @@ #ifndef __PARSER_H__ #define __PARSER_H__ -#include +#include typedef struct parser_struct parser_type; diff --git a/ThirdParty/Ert/devel/libert_util/src/path_fmt.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/path_fmt.h similarity index 98% rename from ThirdParty/Ert/devel/libert_util/src/path_fmt.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/path_fmt.h index fc913fef86..b01c62c2d4 100644 --- a/ThirdParty/Ert/devel/libert_util/src/path_fmt.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/path_fmt.h @@ -23,7 +23,8 @@ extern "C" { #endif #include #include -#include + +#include typedef struct path_fmt_struct path_fmt_type; diff --git a/ThirdParty/Ert/devel/libert_util/src/regression.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/regression.h similarity index 97% rename from ThirdParty/Ert/devel/libert_util/src/regression.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/regression.h index c5858e732f..7e66fa8d97 100644 --- a/ThirdParty/Ert/devel/libert_util/src/regression.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/regression.h @@ -23,7 +23,7 @@ extern "C" { #endif -#include +#include double regression_scale( matrix_type * X , matrix_type * Y , matrix_type * X_mean , matrix_type * X_norm); diff --git a/ThirdParty/Ert/devel/libert_util/src/rng.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/rng.h similarity index 98% rename from ThirdParty/Ert/devel/libert_util/src/rng.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/rng.h index 873bbd9fe0..aba2a3d0d5 100644 --- a/ThirdParty/Ert/devel/libert_util/src/rng.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/rng.h @@ -23,7 +23,7 @@ extern "C" { #endif -#include +#include typedef enum { diff --git a/ThirdParty/Ert/devel/libert_util/src/set.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/set.h similarity index 99% rename from ThirdParty/Ert/devel/libert_util/src/set.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/set.h index 5febf85da8..e120351b68 100644 --- a/ThirdParty/Ert/devel/libert_util/src/set.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/set.h @@ -25,7 +25,6 @@ extern "C" { #include #include -#include typedef struct set_struct set_type; typedef struct set_iter_struct set_iter_type; diff --git a/ThirdParty/Ert/devel/libert_util/src/ssize_t.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/ssize_t.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/ssize_t.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/ssize_t.h diff --git a/ThirdParty/Ert/devel/libert_util/src/statistics.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/statistics.h similarity index 96% rename from ThirdParty/Ert/devel/libert_util/src/statistics.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/statistics.h index fad1e4ec24..1c6f3ec694 100644 --- a/ThirdParty/Ert/devel/libert_util/src/statistics.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/statistics.h @@ -22,7 +22,7 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include double statistics_mean( const double_vector_type * data_vector ); double statistics_empirical_quantile( double_vector_type * data , double quantile ); diff --git a/ThirdParty/Ert/devel/libert_util/src/stepwise.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/stepwise.h similarity index 95% rename from ThirdParty/Ert/devel/libert_util/src/stepwise.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/stepwise.h index 3b1a9f2b67..9cf2cf4e63 100644 --- a/ThirdParty/Ert/devel/libert_util/src/stepwise.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/stepwise.h @@ -5,8 +5,8 @@ extern "C" { #endif -#include -#include +#include +#include typedef struct stepwise_struct stepwise_type; diff --git a/ThirdParty/Ert/devel/libert_util/src/stringlist.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/stringlist.h similarity index 98% rename from ThirdParty/Ert/devel/libert_util/src/stringlist.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/stringlist.h index 239082fac8..7d1d98c8f4 100644 --- a/ThirdParty/Ert/devel/libert_util/src/stringlist.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/stringlist.h @@ -25,9 +25,9 @@ extern "C" { #include #include -#include -#include -#include +#include +#include +#include typedef struct stringlist_struct stringlist_type; typedef int ( string_cmp_ftype) (const void * , const void *); diff --git a/ThirdParty/Ert/devel/libert_util/src/subst_func.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/subst_func.h similarity index 98% rename from ThirdParty/Ert/devel/libert_util/src/subst_func.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/subst_func.h index 1c0fee52dd..dc41aeccf2 100644 --- a/ThirdParty/Ert/devel/libert_util/src/subst_func.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/subst_func.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include typedef char * (subst_func_ftype) (const stringlist_type * , void * ); typedef struct subst_func_struct subst_func_type; diff --git a/ThirdParty/Ert/devel/libert_util/src/subst_list.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/subst_list.h similarity index 98% rename from ThirdParty/Ert/devel/libert_util/src/subst_list.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/subst_list.h index 71f5d9666e..909a2c7c24 100644 --- a/ThirdParty/Ert/devel/libert_util/src/subst_list.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/subst_list.h @@ -24,9 +24,7 @@ extern "C" { #endif #include -#include -#include -#include +#include typedef struct subst_list_struct subst_list_type; void subst_list_update_buffer( const subst_list_type * subst_list , buffer_type * buffer ); diff --git a/ThirdParty/Ert/devel/libert_util/src/template.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/template.h similarity index 98% rename from ThirdParty/Ert/devel/libert_util/src/template.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/template.h index f751c58a26..bccbedc6b8 100644 --- a/ThirdParty/Ert/devel/libert_util/src/template.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/template.h @@ -24,7 +24,8 @@ extern "C" { #include -#include + +#include typedef struct template_struct template_type; diff --git a/ThirdParty/Ert/devel/libert_util/include/ert/util/test_util.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/test_util.h new file mode 100644 index 0000000000..4dc39eafab --- /dev/null +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/test_util.h @@ -0,0 +1,74 @@ +/* + Copyright (C) 2012 Statoil ASA, Norway. + + The file 'test_util.h' is part of ERT - Ensemble based Reservoir Tool. + + ERT is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ERT is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. + + See the GNU General Public License at + for more details. +*/ + + +#ifndef __TEST_UTIL_H__ +#define __TEST_UTIL_H__ + +#ifdef __cplusplus +extern "C" { +#endif + + + + void test_error_exit( const char * fmt , ...); + bool test_string_equal( const char * s1 , const char * s2 ); + +#define test_assert_string_equal( s1 , s2 ) test_assert_string_equal__(s1 , s2 , __FILE__ , __LINE__) + void test_assert_string_equal__( const char * s1 , const char * s2 , const char * file , int line); + +#define test_assert_int_equal( i1 , i2 ) test_assert_int_equal__( (i1) , (i2) , __FILE__ , __LINE__ ) + void test_assert_int_equal__( int i1 , int i2 , const char * file , int line ); + +#define test_assert_int_not_equal( i1 , i2 ) test_assert_int_not_equal__( (i1) , (i2) , __FILE__ , __LINE__ ) + void test_assert_int_not_equal__( int i1 , int i2 , const char * file , int line ); + +#define test_assert_bool_equal( b1 , b2 ) test_assert_bool_equal__( (b1) , (b2) , __FILE__ , __LINE__ ) + void test_assert_bool_equal__( bool b1 , bool b2 , const char * file , int line); + +#define test_assert_true( value ) test_assert_true__( (value) , __FILE__ , __LINE__); + void test_assert_true__( bool value, const char * file , int line); + +#define test_assert_false( value ) test_assert_false__( (value) , __FILE__ , __LINE__); + void test_assert_false__( bool value, const char * file , int line); + +#define test_assert_time_t_equal( t1 , t2) test_assert_time_t_equal__((t1) , (t2) , __FILE__ , __LINE__); + void test_assert_time_t_equal__( time_t t1 , time_t t2 , const char * file , int line); + +#define test_assert_time_t_not_equal( t1 , t2) test_assert_time_t_not_equal__((t1) , (t2) , __FILE__ , __LINE__); + void test_assert_time_t_not_equal__( time_t t1 , time_t t2 , const char * file , int line); + +#define test_assert_ptr_equal( p1 , p2 ) test_assert_ptr_equal__( (p1) , (p2) , __FILE__ , __LINE__); + void test_assert_ptr_equal__( const void * p1 , const void * p2 , const char * file , int line); + +#define test_assert_NULL( p ) test_assert_NULL__( (p) , __FILE__ , __LINE__); + void test_assert_NULL__( const void * p , const char * file , int line); + +#define test_assert_not_NULL( p ) test_assert_not_NULL__( (p) , __FILE__ , __LINE__); + void test_assert_not_NULL__( const void * p , const char * file , int line); + +#define test_assert_mem_equal( p1 , p2 , byte_size ) test_assert_mem_equal__( (p1) , (p2) , (byte_size), __FILE__ , __LINE__); + void test_assert_mem_equal__( const void * p1 , const void * p2 , size_t byte_size , const char * file , int line); + +#define test_assert_mem_not_equal( p1 , p2 , byte_size ) test_assert_mem_not_equal__( (p1) , (p2) , (byte_size), __FILE__ , __LINE__); + void test_assert_mem_not_equal__( const void * p1 , const void * p2 , size_t byte_size , const char * file , int line); + +#ifdef __cplusplus +} +#endif +#endif diff --git a/ThirdParty/Ert/devel/libert_util/src/thread_pool.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/thread_pool.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/thread_pool.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/thread_pool.h diff --git a/ThirdParty/Ert/devel/libert_util/src/thread_pool1.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/thread_pool1.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/thread_pool1.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/thread_pool1.h diff --git a/ThirdParty/Ert/devel/libert_util/src/thread_pool_posix.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/thread_pool_posix.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/thread_pool_posix.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/thread_pool_posix.h diff --git a/ThirdParty/Ert/devel/libert_util/src/timer.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/timer.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/timer.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/timer.h diff --git a/ThirdParty/Ert/devel/libert_util/src/type_macros.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/type_macros.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/type_macros.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/type_macros.h diff --git a/ThirdParty/Ert/devel/libert_util/src/util.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/util.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/util.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/util.h diff --git a/ThirdParty/Ert/devel/libert_util/src/util_endian.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/util_endian.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/util_endian.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/util_endian.h diff --git a/ThirdParty/Ert/devel/libert_util/src/util_env.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/util_env.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/util_env.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/util_env.h diff --git a/ThirdParty/Ert/devel/libert_util/src/util_fork.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/util_fork.h similarity index 100% rename from ThirdParty/Ert/devel/libert_util/src/util_fork.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/util_fork.h diff --git a/ThirdParty/Ert/devel/libert_util/src/vector.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/vector.h similarity index 98% rename from ThirdParty/Ert/devel/libert_util/src/vector.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/vector.h index 48394de0ea..ca24a17435 100644 --- a/ThirdParty/Ert/devel/libert_util/src/vector.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/vector.h @@ -22,8 +22,8 @@ #ifdef __cplusplus extern "C" { #endif -#include -#include +#include +#include typedef void ( vector_func_type ) (void * , void *); typedef int ( vector_cmp_ftype) (const void * , const void *); diff --git a/ThirdParty/Ert/devel/libert_util/src/vector_template.h b/ThirdParty/Ert/devel/libert_util/include/ert/util/vector_template.h similarity index 99% rename from ThirdParty/Ert/devel/libert_util/src/vector_template.h rename to ThirdParty/Ert/devel/libert_util/include/ert/util/vector_template.h index c38b52b24a..fa875cd7f1 100644 --- a/ThirdParty/Ert/devel/libert_util/src/vector_template.h +++ b/ThirdParty/Ert/devel/libert_util/include/ert/util/vector_template.h @@ -23,8 +23,8 @@ extern "C" { #endif #include -#include -#include +#include +#include typedef struct @TYPE@_vector_struct @TYPE@_vector_type; typedef @TYPE@ (@TYPE@_ftype) (@TYPE@); diff --git a/ThirdParty/Ert/devel/libert_util/src/CMakeLists.txt b/ThirdParty/Ert/devel/libert_util/src/CMakeLists.txt index 8141d45699..cc7766f7b8 100644 --- a/ThirdParty/Ert/devel/libert_util/src/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libert_util/src/CMakeLists.txt @@ -1,7 +1,7 @@ -set(source_files rng.c lookup_table.c statistics.c mzran.c set.c hash_node.c hash_sll.c hash.c node_data.c node_ctype.c util.c thread_pool.c msg.c arg_pack.c path_fmt.c menu.c subst_list.c subst_func.c vector.c parser.c stringlist.c matrix.c buffer.c log.c template.c timer.c) +set(source_files rng.c lookup_table.c statistics.c mzran.c set.c hash_node.c hash_sll.c hash.c node_data.c node_ctype.c util.c thread_pool.c msg.c arg_pack.c path_fmt.c menu.c subst_list.c subst_func.c vector.c parser.c stringlist.c matrix.c buffer.c log.c template.c timer.c test_util.c) -set(header_files ssize_t.h type_macros.h rng.h lookup_table.h statistics.h mzran.h set.h hash.h hash_node.h hash_sll.h node_data.h node_ctype.h util.h thread_pool.h msg.h arg_pack.h path_fmt.h stringlist.h menu.h subst_list.h subst_func.h vector.h parser.h matrix.h buffer.h log.h template.h timer.h ) +set(header_files ssize_t.h type_macros.h rng.h lookup_table.h statistics.h mzran.h set.h hash.h hash_node.h hash_sll.h node_data.h node_ctype.h util.h thread_pool.h msg.h arg_pack.h path_fmt.h stringlist.h menu.h subst_list.h subst_func.h vector.h parser.h matrix.h buffer.h log.h template.h timer.h test_util.h) if (WITH_LATEX) add_definitions( -DWITH_LATEX ) @@ -16,21 +16,13 @@ if (WITH_LAPACK) list( APPEND header_files matrix_lapack.h matrix_blas.h regression.h lars.h stepwise.h) endif() -if (MSVC) - configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/msvc_stdbool.h ${CMAKE_CURRENT_BINARY_DIR}/stdbool.h) - list( APPEND header_files ${CMAKE_CURRENT_BINARY_DIR}/stdbool.h) -endif() - foreach (type int double bool long time_t size_t float) set(TYPE ${type} ) set(src_target ${CMAKE_CURRENT_BINARY_DIR}/${type}_vector.c) - set(header_target ${CMAKE_CURRENT_BINARY_DIR}/${type}_vector.h) configure_file( vector_template.c ${src_target}) - configure_file( vector_template.h ${header_target}) list( APPEND source_files ${src_target} ) - list( APPEND header_files ${header_target} ) endforeach( type ) @@ -48,10 +40,8 @@ if (WITH_PTHREAD) list( APPEND header_files thread_pool_posix.h ) endif() -include_directories( ${CMAKE_CURRENT_BINARY_DIR} ) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) - add_library( ert_util ${LIBRARY_TYPE} ${source_files} ) +set_target_properties( ert_util PROPERTIES VERSION 1.0 SOVERSION 1.0 ) if (WITH_PTHREAD) target_link_libraries( ert_util ${PTHREAD_LIBRARY} ) @@ -79,14 +69,11 @@ if (NEED_LIBM) endif() #----------------------------------------------------------------- - -if (UTIL_INSTALL_PREFIX) - install(TARGETS ert_util DESTINATION ${CMAKE_INSTALL_PREFIX}/${UTIL_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/${UTIL_INSTALL_PREFIX}/include) -else() - install(TARGETS ert_util DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) -endif() +install(TARGETS ert_util DESTINATION ${CMAKE_INSTALL_LIBDIR}) +foreach(header ${header_files}) + install(FILES ../include/ert/util/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/util) +endforeach() + diff --git a/ThirdParty/Ert/devel/libert_util/src/all_include.h b/ThirdParty/Ert/devel/libert_util/src/all_include.h deleted file mode 100644 index e417cf0eaf..0000000000 --- a/ThirdParty/Ert/devel/libert_util/src/all_include.h +++ /dev/null @@ -1,44 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'all_include.h' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include diff --git a/ThirdParty/Ert/devel/libert_util/src/arg_pack.c b/ThirdParty/Ert/devel/libert_util/src/arg_pack.c index 084c4048aa..74d8de15c7 100644 --- a/ThirdParty/Ert/devel/libert_util/src/arg_pack.c +++ b/ThirdParty/Ert/devel/libert_util/src/arg_pack.c @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libert_util/src/block_fs.c b/ThirdParty/Ert/devel/libert_util/src/block_fs.c index 93f9732056..68e98ac957 100644 --- a/ThirdParty/Ert/devel/libert_util/src/block_fs.c +++ b/ThirdParty/Ert/devel/libert_util/src/block_fs.c @@ -21,18 +21,20 @@ #include #include #include -#include -#include #include #include #include -#include -#include -#include -#include #include #include +#include +#include +#include +#include +#include +#include + + #define MOUNT_MAP_MAGIC_INT 8861290 #define BLOCK_FS_TYPE_ID 7100652 #define INDEX_MAGIC_INT 1213775 diff --git a/ThirdParty/Ert/devel/libert_util/src/buffer.c b/ThirdParty/Ert/devel/libert_util/src/buffer.c index 22e540e113..7a2491d9ba 100644 --- a/ThirdParty/Ert/devel/libert_util/src/buffer.c +++ b/ThirdParty/Ert/devel/libert_util/src/buffer.c @@ -16,15 +16,19 @@ for more details. */ -#include + #include #include #include -#include #include #include -#include +#include +#include +#include + + + /** This function implements a small buffer type. The whole point of this type is that it should work (more-or-less) as a drop in diff --git a/ThirdParty/Ert/devel/libert_util/src/conf_new.c b/ThirdParty/Ert/devel/libert_util/src/conf_new.c deleted file mode 100644 index 7bf82f900a..0000000000 --- a/ThirdParty/Ert/devel/libert_util/src/conf_new.c +++ /dev/null @@ -1,803 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'conf_new.c' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#include -#include -#include -#include -#include -#include -#include -#include -#include - - - -/******************************************************************************/ - - -/** - Defining parameters for the file inclusion and tokenizing. -*/ -#define __CONF_INCLUDE "include" -#define __CONF_WHITESPACE " \t\n\r,;" -#define __CONF_COM_START "--" -#define __CONF_COM_STOP "\n" -#define __CONF_SPECIAL "[]{}=" -#define __CONF_QUOTERS "'\"" -#define __CONF_DELETE NULL - -#define __CONF_VEC_START "[" -#define __CONF_VEC_STOP "]" -#define __CONF_EXP_START "{" -#define __CONF_EXP_STOP "}" -#define __CONF_ASSIGN "=" - - - -/** - Defining numbers for safe run time casting. -*/ -#define __CONF_SPEC_ID 132489012 -#define __CONF_ITEM_ID 342349032 -#define __CONF_ID 314234239 - - - -/******************************************************************************/ - - -/** - TODO - - Data structures should have some parsing info etc. - Should have a special structure for the error messages. -*/ - - - -struct conf_spec_struct -{ - int __id; /** Used for safe run time casting. */ - char * name; /** Name used to identify this class. */ - const conf_spec_type * super; /** Mother. Can be NULL for the root. */ - hash_type * specs; /** Hash of conf_spec_type's. */ - validator_ftype * validator; /** Function used to validate a conf_type.*/ -}; - - - -struct conf_struct -{ - int __id; /** Used for safe run time casting. */ - conf_type * super; /** Mother. Can be NULL for the root. */ - char * type; /** Name used to identify the class. */ - char * name; /** Name used to identify the instance. */ - vector_type * confs; /** Vector of conf_type's. */ - hash_type * items; /** Hash of conf_item_type's. */ -}; - - - -struct conf_item_struct -{ - int __id; /** Used for safe run time casting. */ - conf_type * super; /** Mother. Can not be NULL. */ - stringlist_type * values; /** Raw tokens read from file. */ -}; - - - -/******************************************************************************/ - - - -static -bool strings_are_equal( - const char * string_a, - const char * string_b) -{ - if( strcmp(string_a, string_b) == 0) - return true; - else - return false; -} - - - -/** - Check if a string is equal one of the characters in the special set. -*/ -static -bool string_is_special( - const char * str) -{ - int num_special_chars = strlen(__CONF_SPECIAL); - if( num_special_chars != 1 ) - { - /** - Cannot be in the special set if it's not a single character. - */ - return false; - } - else - { - for(int i=0; i__id = __CONF_ID; - conf->super = NULL; - conf->type = util_alloc_string_copy("root"); - conf->name = util_alloc_string_copy("root"); - - conf->confs = vector_alloc_new(); - conf->items = hash_alloc(); - - return conf; -} - - - -static -conf_type * conf_safe_cast( - void * conf -) -{ - conf_type * __conf = (conf_type *) conf; - if( __conf->__id != __CONF_ID ) - util_abort("%s: Internal error. Run time cast failed.\n", __func__); - return __conf; -} - - - -void conf_free( - conf_type * conf -) -{ - hash_free(conf->items); - vector_free(conf->confs); - - free(conf->type); - free(conf->name); - free(conf); -} - - - -static -void conf_free__( - void * conf -) -{ - conf_type * conf__ = conf_safe_cast(conf); - conf_free(conf__); -} - - - -static -conf_item_type * conf_item_safe_cast( - void * item -) -{ - conf_item_type * __item = (conf_item_type *) item; - if( __item->__id != __CONF_ITEM_ID) - util_abort("%s: Internal error. Run time cast failed.\n", __func__); - return __item; -} - - - -static -void conf_item_free( - conf_item_type * item -) -{ - stringlist_free(item->values); - free(item); -} - - - -static -void conf_item_free__( - void * item -) -{ - conf_item_type * item__ = conf_item_safe_cast(item); - conf_item_free(item__); -} - - - -/******************************************************************************/ - - - -static -conf_item_type * conf_insert_item( - conf_type * conf, - const char * name -) -{ - assert(conf != NULL); - assert(name != NULL); - - conf_item_type * item = util_malloc(sizeof * item ); - item->__id = __CONF_ITEM_ID; - item->values = stringlist_alloc_new(); - - hash_insert_hash_owned_ref(conf->items, name, item, conf_item_free__); - - return item; -} - - - -static -conf_type * conf_append_child( - conf_type * conf, - const char * type, - const char * name -) -{ - assert(conf != NULL); - assert(type != NULL ); - assert(name != NULL ); - - conf_type * child = util_malloc(sizeof * child ); - - child->__id = __CONF_ID; - child->super = conf; - child->type = util_alloc_string_copy(type); - child->name = util_alloc_string_copy(name); - - child->confs = vector_alloc_new(); - child->items = hash_alloc(); - - vector_append_owned_ref(conf->confs, child, conf_free__); - - return child; -} - - - -static -conf_type * conf_get_super( - conf_type * conf -) -{ - return conf->super; -} - - - -static -void conf_item_append_data_item( - conf_item_type * item, - const char * data -) -{ - stringlist_append_copy(item->values, data); -} - - - -static -void conf_item_append_data( - conf_item_type * item, - const stringlist_type * data -) -{ - stringlist_append_stringlist_copy(item->values, data); -} - - - -/******************************************************************************/ - - - -/** - Create a shallow copy stringlist of tokens that belong to an item - starting at *position__. The memory pointed by position__ is updated - so that it contains the position of the first token AFTER the tokens - belonging to the item. -*/ -static -int get_item_tokens( - const stringlist_type * tokens, - stringlist_type ** item_tokens, - int * position__ -) -{ - int status = CONF_OK; - - int item_size = 0; - int start = *position__; - int position = *position__; - int num_tokens = stringlist_get_size(tokens); - - - const char * current_token = stringlist_iget(tokens, position); - if( strings_are_equal(current_token, __CONF_VEC_START) ) - { - position++; - start = position; - bool matched_delimiters = false; - while( position < num_tokens && !matched_delimiters ) - { - current_token = stringlist_iget(tokens, position); - if( strings_are_equal(current_token, __CONF_VEC_STOP) ) - { - matched_delimiters = true; - position++; - } - else - { - item_size++; - position++; - } - } - - if( !matched_delimiters ) - { - /** - TODO - - This is an error. Should add a message. - */ - status = CONF_PARSE_ERROR; - } - } - else - { - item_size = 1; - position++; - } - - *item_tokens = stringlist_alloc_shallow_copy_with_limits(tokens, start, - item_size); - *position__ = position; - - return status; -} - - - -static -int get_conf_tokens( - const stringlist_type * tokens, - stringlist_type ** conf_tokens, - int * position__ -) -{ - int status = CONF_OK; - - int conf_size = 0; - int start = *position__; - int position = *position__; - int num_tokens = stringlist_get_size(tokens); - - - const char * current_token = stringlist_iget(tokens, position); - if( strings_are_equal(current_token, __CONF_EXP_START) ) - { - position++; - start = position; - int depth = 1; - while( position < num_tokens && depth > 0 ) - { - current_token = stringlist_iget(tokens, position); - if( strings_are_equal(current_token, __CONF_EXP_START) ) - { - position++; - conf_size++; - depth++; - } - else if( strings_are_equal(current_token, __CONF_EXP_STOP) ) - { - position++; - depth--; - if(depth > 0) - conf_size++; - } - else - { - position++; - conf_size++; - } - } - - if( depth > 0 ) - { - /** - TODO - - This is an error. Should add a message. - */ - status = CONF_PARSE_ERROR; - } - } - else - { - conf_size = 0; - position++; - } - - *conf_tokens = stringlist_alloc_shallow_copy_with_limits(tokens, start, - conf_size); - *position__ = position; - - return status; -} - - - -static -int conf_alloc_from_tokens( - const stringlist_type * tokens, - stringlist_type * errors, - conf_type ** conf__ -) -{ - assert(tokens != NULL); - assert(errors != NULL); - - typedef enum {IN_ROOT, IN_CLASS, IN_ITEM} PARSER_STATE; - PARSER_STATE state = IN_ROOT; - - int position = 0; - int num_tokens = stringlist_get_size(tokens); - - conf_type * root = conf_alloc_root(); - - conf_type * current_conf = root; - conf_item_type * current_item; - - while(position < num_tokens) - { - /** - On entering this loop, stringlist_iget(tokens, position) - shall always be a non-special token. - */ - - const char * current_token = stringlist_iget(tokens, position); - const char * look_ahead_one; - const char * look_ahead_two; - } -} - diff --git a/ThirdParty/Ert/devel/libert_util/src/conf_new.h b/ThirdParty/Ert/devel/libert_util/src/conf_new.h deleted file mode 100644 index e85ce54ddb..0000000000 --- a/ThirdParty/Ert/devel/libert_util/src/conf_new.h +++ /dev/null @@ -1,49 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'conf_new.h' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#ifndef __CONF_NEW_H__ -#define __CONF_NEW_H__ - -#include -#ifdef __cplusplus -extern "C" { -#endif - -#define CONF_OK 0 -#define CONF_PARSE_ERROR 1 -#define CONF_CIRCULAR_INCLUDE_ERROR 2 -#define CONF_UNEXPECTED_EOF_ERROR 3 -#define CONF_UNABLE_TO_OPEN_FILE 4 - - - -typedef struct conf_struct conf_type; -typedef struct conf_item_struct conf_item_type; -typedef struct conf_spec_struct conf_spec_type; - -typedef int (validator_ftype)(conf_type * conf); - - - - -#ifdef __cplusplus -} -#endif -#endif - - diff --git a/ThirdParty/Ert/devel/libert_util/src/hash.c b/ThirdParty/Ert/devel/libert_util/src/hash.c index f67883cdbc..02f7beb5cc 100644 --- a/ThirdParty/Ert/devel/libert_util/src/hash.c +++ b/ThirdParty/Ert/devel/libert_util/src/hash.c @@ -23,12 +23,12 @@ #include #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include #ifdef HAVE_PTHREAD #include diff --git a/ThirdParty/Ert/devel/libert_util/src/hash_node.c b/ThirdParty/Ert/devel/libert_util/src/hash_node.c index 6288db3cfd..218b5bfe1f 100644 --- a/ThirdParty/Ert/devel/libert_util/src/hash_node.c +++ b/ThirdParty/Ert/devel/libert_util/src/hash_node.c @@ -20,10 +20,11 @@ #include #include #include -#include #include -#include -#include + +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/ThirdParty/Ert/devel/libert_util/src/hash_sll.c b/ThirdParty/Ert/devel/libert_util/src/hash_sll.c index f34bdb4627..54a7377028 100644 --- a/ThirdParty/Ert/devel/libert_util/src/hash_sll.c +++ b/ThirdParty/Ert/devel/libert_util/src/hash_sll.c @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/ThirdParty/Ert/devel/libert_util/src/lars.c b/ThirdParty/Ert/devel/libert_util/src/lars.c index 07b0f4a951..f5038ef091 100644 --- a/ThirdParty/Ert/devel/libert_util/src/lars.c +++ b/ThirdParty/Ert/devel/libert_util/src/lars.c @@ -21,13 +21,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #define LARS_TYPE_ID 77125439 diff --git a/ThirdParty/Ert/devel/libert_util/src/latex.c b/ThirdParty/Ert/devel/libert_util/src/latex.c index d1589163ce..394e482a7f 100644 --- a/ThirdParty/Ert/devel/libert_util/src/latex.c +++ b/ThirdParty/Ert/devel/libert_util/src/latex.c @@ -25,8 +25,8 @@ #include #include -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/ThirdParty/Ert/devel/libert_util/src/log.c b/ThirdParty/Ert/devel/libert_util/src/log.c index bb34be7867..b498eed00e 100644 --- a/ThirdParty/Ert/devel/libert_util/src/log.c +++ b/ThirdParty/Ert/devel/libert_util/src/log.c @@ -33,8 +33,8 @@ #include #endif -#include -#include +#include +#include struct log_struct { char * filename; diff --git a/ThirdParty/Ert/devel/libert_util/src/lookup_table.c b/ThirdParty/Ert/devel/libert_util/src/lookup_table.c index 256a2783d3..0a4d4e2da2 100644 --- a/ThirdParty/Ert/devel/libert_util/src/lookup_table.c +++ b/ThirdParty/Ert/devel/libert_util/src/lookup_table.c @@ -16,10 +16,12 @@ for more details. */ -#include #include -#include -#include +#include + +#include +#include +#include struct lookup_table_struct { bool data_owner; diff --git a/ThirdParty/Ert/devel/libert_util/src/matrix.c b/ThirdParty/Ert/devel/libert_util/src/matrix.c index 033f3a9ca7..6084fe24ab 100644 --- a/ThirdParty/Ert/devel/libert_util/src/matrix.c +++ b/ThirdParty/Ert/devel/libert_util/src/matrix.c @@ -21,11 +21,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include /** This is V E R Y S I M P L E matrix implementation. It is not diff --git a/ThirdParty/Ert/devel/libert_util/src/matrix_blas.c b/ThirdParty/Ert/devel/libert_util/src/matrix_blas.c index 183824acff..cc8dbfe1a1 100644 --- a/ThirdParty/Ert/devel/libert_util/src/matrix_blas.c +++ b/ThirdParty/Ert/devel/libert_util/src/matrix_blas.c @@ -18,9 +18,9 @@ #include -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/ThirdParty/Ert/devel/libert_util/src/matrix_lapack.c b/ThirdParty/Ert/devel/libert_util/src/matrix_lapack.c index a0096a74da..3f8bb0ec9a 100644 --- a/ThirdParty/Ert/devel/libert_util/src/matrix_lapack.c +++ b/ThirdParty/Ert/devel/libert_util/src/matrix_lapack.c @@ -18,9 +18,9 @@ #include -#include -#include -#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/ThirdParty/Ert/devel/libert_util/src/menu.c b/ThirdParty/Ert/devel/libert_util/src/menu.c index fc6f02e982..291164287f 100644 --- a/ThirdParty/Ert/devel/libert_util/src/menu.c +++ b/ThirdParty/Ert/devel/libert_util/src/menu.c @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include /** This file implements a simple character based menu system. The menu @@ -311,7 +311,7 @@ static void __print_helptext(char * label, int l){ while(!end_reached){ int i; if(strlen(label_copy) > l){ - util_binary_split_string_from_max_length(label_copy , " ", l , &first_part , &second_part); + util_binary_split_string_from_max_length(label_copy , " ", l , &first_part , &second_part); printf("| %s",first_part); for (i=strlen(first_part); i < l; i++) fputc(' ' , stdout); diff --git a/ThirdParty/Ert/devel/libert_util/src/msg.c b/ThirdParty/Ert/devel/libert_util/src/msg.c index 54b0b56179..b10dad1bba 100644 --- a/ThirdParty/Ert/devel/libert_util/src/msg.c +++ b/ThirdParty/Ert/devel/libert_util/src/msg.c @@ -21,9 +21,9 @@ #include #include -#include -#include -#include +#include +#include +#include #define MSG_TYPE_ID 1999867 diff --git a/ThirdParty/Ert/devel/libert_util/src/mzran.c b/ThirdParty/Ert/devel/libert_util/src/mzran.c index ebaa86badf..bf128a027a 100644 --- a/ThirdParty/Ert/devel/libert_util/src/mzran.c +++ b/ThirdParty/Ert/devel/libert_util/src/mzran.c @@ -19,9 +19,9 @@ #include #include -#include -#include -#include +#include +#include +#include /*****************************************************************/ /* diff --git a/ThirdParty/Ert/devel/libert_util/src/node_ctype.c b/ThirdParty/Ert/devel/libert_util/src/node_ctype.c index b4a7b6eb10..08c9219273 100644 --- a/ThirdParty/Ert/devel/libert_util/src/node_ctype.c +++ b/ThirdParty/Ert/devel/libert_util/src/node_ctype.c @@ -19,8 +19,8 @@ #include #include -#include -#include +#include +#include const char * node_ctype_name(node_ctype ctype) { diff --git a/ThirdParty/Ert/devel/libert_util/src/node_data.c b/ThirdParty/Ert/devel/libert_util/src/node_data.c index 948ef27780..2db22e4fce 100644 --- a/ThirdParty/Ert/devel/libert_util/src/node_data.c +++ b/ThirdParty/Ert/devel/libert_util/src/node_data.c @@ -19,9 +19,10 @@ #include #include #include -#include -#include -#include + +#include +#include +#include /* diff --git a/ThirdParty/Ert/devel/libert_util/src/parser.c b/ThirdParty/Ert/devel/libert_util/src/parser.c index c69ff6afb7..73c5de9a03 100644 --- a/ThirdParty/Ert/devel/libert_util/src/parser.c +++ b/ThirdParty/Ert/devel/libert_util/src/parser.c @@ -20,9 +20,9 @@ #include #include -#include -#include -#include +#include +#include +#include #define PARSER_ESCAPE_CHAR '\\' diff --git a/ThirdParty/Ert/devel/libert_util/src/path_fmt.c b/ThirdParty/Ert/devel/libert_util/src/path_fmt.c index 095c79db12..7d20a43cf2 100644 --- a/ThirdParty/Ert/devel/libert_util/src/path_fmt.c +++ b/ThirdParty/Ert/devel/libert_util/src/path_fmt.c @@ -23,10 +23,10 @@ #include -#include -#include -#include -#include +#include +#include +#include +#include /** The basic idea of the path_fmt_type is that it should be possible for diff --git a/ThirdParty/Ert/devel/libert_util/src/regression.c b/ThirdParty/Ert/devel/libert_util/src/regression.c index babfa45cd8..e1002db0ff 100644 --- a/ThirdParty/Ert/devel/libert_util/src/regression.c +++ b/ThirdParty/Ert/devel/libert_util/src/regression.c @@ -20,11 +20,11 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include @@ -68,7 +68,7 @@ double regression_scale(matrix_type * X , matrix_type * Y , matrix_type * X_mean for (col=0; col < nvar; col++) { double norm = 1.0 / sqrt( (1.0 / (nsample - 1)) * matrix_get_column_sum2( X , col )); - matrix_iset( X_norm , 0 , col , norm ); + matrix_iset( X_norm , 0 , col , norm ); } } return y_mean; diff --git a/ThirdParty/Ert/devel/libert_util/src/rng.c b/ThirdParty/Ert/devel/libert_util/src/rng.c index 165643ccbd..0a7a74b756 100644 --- a/ThirdParty/Ert/devel/libert_util/src/rng.c +++ b/ThirdParty/Ert/devel/libert_util/src/rng.c @@ -20,10 +20,10 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include #define RNG_TYPE_ID 66154432 #ifdef __cplusplus diff --git a/ThirdParty/Ert/devel/libert_util/src/set.c b/ThirdParty/Ert/devel/libert_util/src/set.c index 406617a22e..6b6c5b87dc 100644 --- a/ThirdParty/Ert/devel/libert_util/src/set.c +++ b/ThirdParty/Ert/devel/libert_util/src/set.c @@ -17,12 +17,13 @@ */ #include -#include #include #include -#include #include -#include + +#include +#include +#include struct set_struct { diff --git a/ThirdParty/Ert/devel/libert_util/src/statistics.c b/ThirdParty/Ert/devel/libert_util/src/statistics.c index d0b4ec5536..3b6f4644e9 100644 --- a/ThirdParty/Ert/devel/libert_util/src/statistics.c +++ b/ThirdParty/Ert/devel/libert_util/src/statistics.c @@ -18,9 +18,10 @@ #include #include -#include -#include -#include + +#include +#include +#include double statistics_mean( const double_vector_type * data_vector ) { diff --git a/ThirdParty/Ert/devel/libert_util/src/stepwise.c b/ThirdParty/Ert/devel/libert_util/src/stepwise.c index fdfc05c885..efcc0bdfe7 100644 --- a/ThirdParty/Ert/devel/libert_util/src/stepwise.c +++ b/ThirdParty/Ert/devel/libert_util/src/stepwise.c @@ -1,11 +1,12 @@ #include #include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libert_util/src/str_buffer.c b/ThirdParty/Ert/devel/libert_util/src/str_buffer.c deleted file mode 100644 index 4a04e1c8a6..0000000000 --- a/ThirdParty/Ert/devel/libert_util/src/str_buffer.c +++ /dev/null @@ -1,124 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'str_buffer.c' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#include -#include - -#define NULL_CHAR '\0' - -struct str_buffer_struct { - int size; - int len; - char *buffer; -}; - - - -static void str_buffer_realloc(str_buffer_type *str_buffer , int new_size) { - str_buffer->size = new_size; - str_buffer->buffer = realloc(str_buffer->buffer , new_size * (sizeof *str_buffer->buffer)); -} - -static void str_buffer_grow(str_buffer_type *str_buffer , int str_size) { - const int old_size = str_buffer->size; - const int min_size = str_buffer->len + str_size + 1; - int new_size; - - if (old_size * 2 >= min_size) - new_size = 2 * old_size; - else - new_size = old_size + 2*str_size; - - str_buffer_realloc(str_buffer , new_size); -} - - -static void __str_buffer_fprintf_substring(str_buffer_type *str_buffer, int i1, int i2, FILE *stream) { - if (i1 < 0 || i2 > str_buffer->len) { - fprintf(stderr,"%s: substring interval : [%d,%d> invalid - aborting \n",__func__ , i1 , i2); - abort(); - } - { - int i; - for (i=0; i < (i2 - i1); i++) - fprintf(stream,"%c",str_buffer->buffer[i]); - } -} - -str_buffer_type * str_buffer_alloc(int size) { - str_buffer_type *str_buffer = malloc(sizeof *str_buffer); - str_buffer->buffer = NULL; - str_buffer_realloc(str_buffer , size); - str_buffer->len = 0; - str_buffer->buffer[0] = NULL_CHAR; - return str_buffer; -} - -str_buffer_type * str_buffer_alloc_with_string(const char *s) { - str_buffer_type *str_buffer = str_buffer_alloc(2 * strlen(s)); - str_buffer_add_string(str_buffer , s); - return str_buffer; -} - - -void str_buffer_free(str_buffer_type *str_buffer) { - free(str_buffer->buffer); - free(str_buffer); -} - - -/* - static bool str_buffer_large_enough(const str_buffer_type , -*/ - - -static void str_buffer_add_char_vector(str_buffer_type *str_buffer , const char *c , int len) { - if (len + str_buffer->len >= (str_buffer->size - 1)) - str_buffer_grow(str_buffer , len); - { - int i; - for (i=0; i < len; i++) - str_buffer->buffer[i+str_buffer->len] = c[i]; - str_buffer->len += len; - str_buffer->buffer[str_buffer->len] = NULL_CHAR; - } -} - - -void str_buffer_add_string(str_buffer_type *str_buffer , const char *s) { - str_buffer_add_char_vector(str_buffer , s , strlen(s)); -} - - -void str_buffer_add_char(str_buffer_type *str_buffer , char c) { - str_buffer_add_char_vector(str_buffer , &c , 1); -} - - -void str_buffer_fprintf_substring(str_buffer_type *str_buffer , int i1 , int i2 , FILE *stream) { - if (i2 < 0) - __str_buffer_fprintf_substring(str_buffer , i1 , str_buffer->len + i2 , stream); - else - __str_buffer_fprintf_substring(str_buffer , i1 , i2 , stream); -} - -const char * str_buffer_get_char_ptr(const str_buffer_type *str_buffer) { - return str_buffer->buffer; -} - -#undef NULL_CHAR diff --git a/ThirdParty/Ert/devel/libert_util/src/str_buffer.h b/ThirdParty/Ert/devel/libert_util/src/str_buffer.h deleted file mode 100644 index 13f9d423ee..0000000000 --- a/ThirdParty/Ert/devel/libert_util/src/str_buffer.h +++ /dev/null @@ -1,36 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'str_buffer.h' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#include -#include -#ifdef __cplusplus -extern "C" { -#ifdef __cplusplus -} -#endif -#endif - -typedef struct str_buffer_struct str_buffer_type; - - -str_buffer_type * str_buffer_alloc(int ); -str_buffer_type * str_buffer_alloc_with_string(const char *); -void str_buffer_free(str_buffer_type *); -void str_buffer_add_string(str_buffer_type *, const char *); -void str_buffer_fprintf_substring(str_buffer_type * , int , int , FILE *); -const char * str_buffer_get_char_ptr(const str_buffer_type *); diff --git a/ThirdParty/Ert/devel/libert_util/src/stringlist.c b/ThirdParty/Ert/devel/libert_util/src/stringlist.c index e1c4040e9b..83e1fedc5a 100644 --- a/ThirdParty/Ert/devel/libert_util/src/stringlist.c +++ b/ThirdParty/Ert/devel/libert_util/src/stringlist.c @@ -20,17 +20,17 @@ #include #include -#include -#include -#include -#include - #ifdef HAVE_GLOB #include #else #include #endif +#include +#include +#include +#include + #define STRINGLIST_TYPE_ID 671855 diff --git a/ThirdParty/Ert/devel/libert_util/src/subst_func.c b/ThirdParty/Ert/devel/libert_util/src/subst_func.c index ea6c020161..d90b3882e4 100644 --- a/ThirdParty/Ert/devel/libert_util/src/subst_func.c +++ b/ThirdParty/Ert/devel/libert_util/src/subst_func.c @@ -16,13 +16,16 @@ for more details. */ -#include -#include -#include + #include -#include #include -#include + +#include +#include +#include +#include +#include + #define SUBST_FUNC_TYPE_ID 646781 #define SUBST_FUNC_POOL_TYPE_ID 7641 diff --git a/ThirdParty/Ert/devel/libert_util/src/subst_list.c b/ThirdParty/Ert/devel/libert_util/src/subst_list.c index 94ba671c85..be9c2bced5 100644 --- a/ThirdParty/Ert/devel/libert_util/src/subst_list.c +++ b/ThirdParty/Ert/devel/libert_util/src/subst_list.c @@ -20,13 +20,13 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include /** This file implements a small support struct for search-replace diff --git a/ThirdParty/Ert/devel/libert_util/src/template.c b/ThirdParty/Ert/devel/libert_util/src/template.c index af93376e7c..6e43cfc7f4 100644 --- a/ThirdParty/Ert/devel/libert_util/src/template.c +++ b/ThirdParty/Ert/devel/libert_util/src/template.c @@ -32,11 +32,11 @@ #define END_OPTIONS REG_EXTENDED #endif - -#include -#include -#include -#include +#include +#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libert_util/src/template_loop.c b/ThirdParty/Ert/devel/libert_util/src/template_loop.c index 065f41cf4c..4a43b42227 100644 --- a/ThirdParty/Ert/devel/libert_util/src/template_loop.c +++ b/ThirdParty/Ert/devel/libert_util/src/template_loop.c @@ -16,8 +16,8 @@ for more details. */ -#include -#include +#include +#include #define DOLLAR '$' /* diff --git a/ThirdParty/Ert/devel/libert_util/src/test_util.c b/ThirdParty/Ert/devel/libert_util/src/test_util.c new file mode 100644 index 0000000000..89c442a8dd --- /dev/null +++ b/ThirdParty/Ert/devel/libert_util/src/test_util.c @@ -0,0 +1,143 @@ +/* + Copyright (C) 2012 Statoil ASA, Norway. + + The file 'test_util.c' is part of ERT - Ensemble based Reservoir Tool. + + ERT is free software: you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. + + ERT is distributed in the hope that it will be useful, but WITHOUT ANY + WARRANTY; without even the implied warranty of MERCHANTABILITY or + FITNESS FOR A PARTICULAR PURPOSE. + + See the GNU General Public License at + for more details. +*/ + + + +#include +#include +#include +#include + +#include +#include + +void test_error_exit( const char * fmt , ...) { + char * s; + va_list ap; + va_start(ap , fmt); + s = util_alloc_sprintf_va(fmt , ap); + va_end(ap); + + fprintf( stderr , s ); + exit(1); +} + + +bool test_string_equal( const char * s1 , const char * s2 ) { + bool equal = true; + if (s1 == NULL && s2 == NULL) + return true; + else { + if (s1 == NULL) + equal = false; + if (s2 == NULL) + equal = false; + + if (equal && (strcmp(s1,s2) != 0)) + equal = false; + } + return equal; +} + + + +void test_assert_string_equal__( const char * s1 , const char * s2 , const char * file, int line) { + bool equal = test_string_equal( s1 , s2 ); + if (!equal) + test_error_exit( "%s:%d => String are different s1:[%s] s2:[%s]\n" , file , line , s1 , s2 ); +} + + + +void test_assert_int_equal__( int i1 , int i2 , const char * file , int line) { + if (i1 != i2) + test_error_exit( "%s:%d => Integers are different i1:[%d] i2:[%d]\n" , file , line , i1 , i2 ); +} + + +void test_assert_int_not_equal__( int i1 , int i2 , const char * file , int line) { + if (i1 == i2) + test_error_exit( "%s:%d => Integers are equal i1:[%d] i2:[%d]\n" , file , line , i1 , i2 ); +} + + +void test_assert_bool_equal__( bool b1 , bool b2 , const char * file , int line) { + if (b1 != b2) + test_error_exit( "%s:%d => Booleans are different b1:[%d] b2:[%d]\n" , file , line , b1 , b2 ); +} + + + +/*****************************************************************/ + +void test_assert_time_t_equal__( time_t t1 , time_t t2 , const char * file , int line) { + if (t1 != t2) + test_error_exit("%s:%d => time_t values are different t1:%d t2:[%d]" , file , line , t1 , t2); +} + + +void test_assert_time_t_not_equal__( time_t t1 , time_t t2 , const char * file , int line) { + if (t1 == t2) + test_error_exit("%s:%d => time_t values are different t1:%d t2:[%d]" , file , line , t1 , t2); +} + +/*****************************************************************/ + +void test_assert_true__( bool value, const char * file , int line) { + if (!value) + test_error_exit("%s:%d => assert( true ) failed" , file , line); +} + + +void test_assert_false__( bool value, const char * file , int line) { + if (value) + test_error_exit("%s:%d => assert( false ) failed" , file , line); +} + + +/*****************************************************************/ + +void test_assert_ptr_equal__( const void * p1 , const void * p2 , const char * file , int line) { + bool equal = (p1 == p2); + if (!equal) + test_error_exit( "%s:%d => Pointers are different p1:[%p] p2:[%p]\n" , file , line , p1 , p2 ); +} + + +void test_assert_NULL__( const void * p , const char * file , int line) { + if (p != NULL) + test_error_exit( "%s:%d => Pointer is != NULL \n" , file , line , p); +} + + +void test_assert_not_NULL__( const void * p , const char * file , int line) { + if (p == NULL) + test_error_exit( "%s:%d => Pointer is NULL \n" , file , line , p); +} + + +void test_assert_mem_equal__( const void * p1 , const void * p2 , size_t byte_size , const char * file , int line) { + if (memcmp(p1 ,p2 , byte_size) != 0) + test_error_exit( "%s:%d => Memory regions have different content \n" , file , line); +} + + +void test_assert_mem_not_equal__( const void * p1 , const void * p2 , size_t byte_size , const char * file , int line) { + if (memcmp(p1 ,p2 , byte_size) == 0) + test_error_exit( "%s:%d => Memory regions have the same content \n" , file , line); +} diff --git a/ThirdParty/Ert/devel/libert_util/src/thread_pool.c b/ThirdParty/Ert/devel/libert_util/src/thread_pool.c index 0ca9f94dc3..9673623814 100644 --- a/ThirdParty/Ert/devel/libert_util/src/thread_pool.c +++ b/ThirdParty/Ert/devel/libert_util/src/thread_pool.c @@ -16,7 +16,7 @@ for more details. */ -#include +#include #ifdef WITH_PTHREAD #include "thread_pool_posix.c" diff --git a/ThirdParty/Ert/devel/libert_util/src/thread_pool_posix.c b/ThirdParty/Ert/devel/libert_util/src/thread_pool_posix.c index fb5c734e07..6865ff3c29 100644 --- a/ThirdParty/Ert/devel/libert_util/src/thread_pool_posix.c +++ b/ThirdParty/Ert/devel/libert_util/src/thread_pool_posix.c @@ -23,8 +23,8 @@ #include #include -#include -#include +#include +#include /** This file implements a small thread_pool object based on diff --git a/ThirdParty/Ert/devel/libert_util/src/timer.c b/ThirdParty/Ert/devel/libert_util/src/timer.c index 80d5722d8c..485474b8e2 100644 --- a/ThirdParty/Ert/devel/libert_util/src/timer.c +++ b/ThirdParty/Ert/devel/libert_util/src/timer.c @@ -21,8 +21,8 @@ #include #include -#include -#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/ThirdParty/Ert/devel/libert_util/src/util.c b/ThirdParty/Ert/devel/libert_util/src/util.c index a88b9d8bc8..1469eeb957 100644 --- a/ThirdParty/Ert/devel/libert_util/src/util.c +++ b/ThirdParty/Ert/devel/libert_util/src/util.c @@ -54,9 +54,6 @@ #include #endif -#include -#include - #ifdef HAVE_FORK #include #include @@ -90,6 +87,9 @@ #error "Could not determine if this is a 32 bit or 64 bit computer?" #endif +#include +#include + /* Macros for endian flipping. The macros create a new endian-flipped diff --git a/ThirdParty/Ert/devel/libert_util/src/util_env.c b/ThirdParty/Ert/devel/libert_util/src/util_env.c index bcf1339ef7..303ed7043e 100644 --- a/ThirdParty/Ert/devel/libert_util/src/util_env.c +++ b/ThirdParty/Ert/devel/libert_util/src/util_env.c @@ -19,9 +19,9 @@ #include #include -#include -#include -#include +#include +#include +#include #ifdef POSIX_SETENV #define PATHVAR_SPLIT ":" diff --git a/ThirdParty/Ert/devel/libert_util/src/vector.c b/ThirdParty/Ert/devel/libert_util/src/vector.c index 9a0d8df086..b4fe3181ef 100644 --- a/ThirdParty/Ert/devel/libert_util/src/vector.c +++ b/ThirdParty/Ert/devel/libert_util/src/vector.c @@ -18,10 +18,11 @@ #include #include -#include -#include -#include -#include + +#include +#include +#include +#include #define VECTOR_TYPE_ID 551087 diff --git a/ThirdParty/Ert/devel/libert_util/src/vector_template.c b/ThirdParty/Ert/devel/libert_util/src/vector_template.c index fce02f4873..dd6fc5d667 100644 --- a/ThirdParty/Ert/devel/libert_util/src/vector_template.c +++ b/ThirdParty/Ert/devel/libert_util/src/vector_template.c @@ -96,10 +96,10 @@ #include #include -#include -#include -#include -#include <@TYPE@_vector.h> +#include +#include +#include +#include #ifdef __cplusplus extern "C" { diff --git a/ThirdParty/Ert/devel/libert_util/tests/ert_util_latex_test.c b/ThirdParty/Ert/devel/libert_util/tests/ert_util_latex_test.c index 74b45aba98..ae87d99bdf 100644 --- a/ThirdParty/Ert/devel/libert_util/tests/ert_util_latex_test.c +++ b/ThirdParty/Ert/devel/libert_util/tests/ert_util_latex_test.c @@ -19,7 +19,7 @@ #include #include -#include +#include int main(int argc , char ** argv) { diff --git a/ThirdParty/Ert/devel/libert_util/tests/ert_util_stringlist_test.c b/ThirdParty/Ert/devel/libert_util/tests/ert_util_stringlist_test.c index e56f78aefb..a7b4624100 100644 --- a/ThirdParty/Ert/devel/libert_util/tests/ert_util_stringlist_test.c +++ b/ThirdParty/Ert/devel/libert_util/tests/ert_util_stringlist_test.c @@ -19,7 +19,7 @@ #include //#include -#include +#include void test_char() { const char * S1 = "S1"; diff --git a/ThirdParty/Ert/devel/libert_util/tests/ert_util_type_vector_test.c b/ThirdParty/Ert/devel/libert_util/tests/ert_util_type_vector_test.c index 2e5760d5cd..e9e2447909 100644 --- a/ThirdParty/Ert/devel/libert_util/tests/ert_util_type_vector_test.c +++ b/ThirdParty/Ert/devel/libert_util/tests/ert_util_type_vector_test.c @@ -18,7 +18,7 @@ #include #include -#include +#include void assert_equal( bool equal ) { if (!equal) diff --git a/ThirdParty/Ert/devel/libert_util/tests/ert_util_vector_test.c b/ThirdParty/Ert/devel/libert_util/tests/ert_util_vector_test.c index 3eb9a83be6..c68d64c911 100644 --- a/ThirdParty/Ert/devel/libert_util/tests/ert_util_vector_test.c +++ b/ThirdParty/Ert/devel/libert_util/tests/ert_util_vector_test.c @@ -18,7 +18,7 @@ #include #include -#include +#include void assert_equal( bool equal ) { if (!equal) diff --git a/ThirdParty/Ert/devel/libgeometry/CMakeLists.txt b/ThirdParty/Ert/devel/libgeometry/CMakeLists.txt index 585005a631..d74347b1c0 100644 --- a/ThirdParty/Ert/devel/libgeometry/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libgeometry/CMakeLists.txt @@ -1,2 +1,10 @@ -set( GEOMETRY_INSTALL_PREFIX "" CACHE STRING "Prefix for installation of libgeometry") add_subdirectory( src ) + +#if (BUILD_APPLICATONS) +# add_subdirectory( applications ) +#endif() +# +#if (BUILD_TESTS) +# add_subdirectory( tests ) +#endif() + diff --git a/ThirdParty/Ert/devel/libgeometry/src/geo_pointset.h b/ThirdParty/Ert/devel/libgeometry/include/ert/geometry/geo_pointset.h similarity index 100% rename from ThirdParty/Ert/devel/libgeometry/src/geo_pointset.h rename to ThirdParty/Ert/devel/libgeometry/include/ert/geometry/geo_pointset.h diff --git a/ThirdParty/Ert/devel/libgeometry/src/geo_polygon.h b/ThirdParty/Ert/devel/libgeometry/include/ert/geometry/geo_polygon.h similarity index 100% rename from ThirdParty/Ert/devel/libgeometry/src/geo_polygon.h rename to ThirdParty/Ert/devel/libgeometry/include/ert/geometry/geo_polygon.h diff --git a/ThirdParty/Ert/devel/libgeometry/src/geo_region.h b/ThirdParty/Ert/devel/libgeometry/include/ert/geometry/geo_region.h similarity index 94% rename from ThirdParty/Ert/devel/libgeometry/src/geo_region.h rename to ThirdParty/Ert/devel/libgeometry/include/ert/geometry/geo_region.h index 57157409e5..42f684833f 100644 --- a/ThirdParty/Ert/devel/libgeometry/src/geo_region.h +++ b/ThirdParty/Ert/devel/libgeometry/include/ert/geometry/geo_region.h @@ -19,9 +19,12 @@ #include #include -#include -#include -#include + +#include +#include + +#include +#include #ifndef __GEO_REGION_H__ #define __GEO_REGION_H__ @@ -32,6 +35,7 @@ extern "C" { #endif + typedef struct geo_region_struct geo_region_type; geo_region_type * geo_region_alloc( const geo_pointset_type * pointset , bool preselect); diff --git a/ThirdParty/Ert/devel/libgeometry/src/geo_surface.h b/ThirdParty/Ert/devel/libgeometry/include/ert/geometry/geo_surface.h similarity index 97% rename from ThirdParty/Ert/devel/libgeometry/src/geo_surface.h rename to ThirdParty/Ert/devel/libgeometry/include/ert/geometry/geo_surface.h index b97f9d50c6..59105e81a9 100644 --- a/ThirdParty/Ert/devel/libgeometry/src/geo_surface.h +++ b/ThirdParty/Ert/devel/libgeometry/include/ert/geometry/geo_surface.h @@ -25,7 +25,8 @@ extern "C" { #endif #include -#include + +#include typedef struct geo_surface_struct geo_surface_type; diff --git a/ThirdParty/Ert/devel/libgeometry/src/geo_util.h b/ThirdParty/Ert/devel/libgeometry/include/ert/geometry/geo_util.h similarity index 100% rename from ThirdParty/Ert/devel/libgeometry/src/geo_util.h rename to ThirdParty/Ert/devel/libgeometry/include/ert/geometry/geo_util.h diff --git a/ThirdParty/Ert/devel/libgeometry/src/CMakeLists.txt b/ThirdParty/Ert/devel/libgeometry/src/CMakeLists.txt index 355dcd0007..223ca9976b 100644 --- a/ThirdParty/Ert/devel/libgeometry/src/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libgeometry/src/CMakeLists.txt @@ -1,21 +1,15 @@ set( source_files geo_surface.c geo_util.c geo_pointset.c geo_region.c geo_polygon.c) set( header_files geo_surface.h geo_util.h geo_pointset.h geo_region.h geo_polygon.h) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) -include_directories( ${libert_util_build_path} ) -include_directories( ${libert_util_src_path} ) - -add_library( geometry ${LIBRARY_TYPE} ${source_files} ) -target_link_libraries( geometry ert_util ) +add_library( ert_geometry ${LIBRARY_TYPE} ${source_files} ) +set_target_properties( ert_geometry PROPERTIES VERSION 1.0 SOVERSION 1.0 ) +target_link_libraries( ert_geometry ert_util ) #----------------------------------------------------------------- -if (GEOMETRY_INSTALL_PREFIX) - install(TARGETS geometry DESTINATION ${CMAKE_INSTALL_PREFIX}/${GEOMETRY_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/${GEOMETRY_INSTALL_PREFIX}/include) -else() - install(TARGETS geometry DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) -endif() +install(TARGETS ert_geometry DESTINATION ${CMAKE_INSTALL_LIBDIR}) +foreach(header ${header_files}) + install(FILES ../include/ert/geometry/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/geometry) +endforeach() diff --git a/ThirdParty/Ert/devel/libgeometry/src/geo_pointset.c b/ThirdParty/Ert/devel/libgeometry/src/geo_pointset.c index b617d1ecdf..4514f1f7a8 100644 --- a/ThirdParty/Ert/devel/libgeometry/src/geo_pointset.c +++ b/ThirdParty/Ert/devel/libgeometry/src/geo_pointset.c @@ -20,9 +20,9 @@ #include #include -#include +#include -#include +#include #define INIT_SIZE 256 diff --git a/ThirdParty/Ert/devel/libgeometry/src/geo_polygon.c b/ThirdParty/Ert/devel/libgeometry/src/geo_polygon.c index b5d540a636..7e619276de 100644 --- a/ThirdParty/Ert/devel/libgeometry/src/geo_polygon.c +++ b/ThirdParty/Ert/devel/libgeometry/src/geo_polygon.c @@ -19,10 +19,13 @@ #include #include -#include -#include -#include -#include + +#include +#include + +#include +#include + #define GEO_POLYGON_TYPE_ID 9951322 diff --git a/ThirdParty/Ert/devel/libgeometry/src/geo_region.c b/ThirdParty/Ert/devel/libgeometry/src/geo_region.c index e66c294d35..e1def85bec 100644 --- a/ThirdParty/Ert/devel/libgeometry/src/geo_region.c +++ b/ThirdParty/Ert/devel/libgeometry/src/geo_region.c @@ -20,15 +20,15 @@ #include #include -#include -#include -#include -#include +#include +#include +#include +#include -#include -#include -#include -#include +#include +#include +#include +#include #define GEO_REGION_TYPE_ID 4431973 diff --git a/ThirdParty/Ert/devel/libgeometry/src/geo_surface.c b/ThirdParty/Ert/devel/libgeometry/src/geo_surface.c index 1705a55714..cce7f74be4 100644 --- a/ThirdParty/Ert/devel/libgeometry/src/geo_surface.c +++ b/ThirdParty/Ert/devel/libgeometry/src/geo_surface.c @@ -20,11 +20,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include #define __PI 3.14159265 #define GEO_SURFACE_TYPE_ID 111743 diff --git a/ThirdParty/Ert/devel/libgeometry/src/geo_util.c b/ThirdParty/Ert/devel/libgeometry/src/geo_util.c index d9cafb307b..e9e1aec44b 100644 --- a/ThirdParty/Ert/devel/libgeometry/src/geo_util.c +++ b/ThirdParty/Ert/devel/libgeometry/src/geo_util.c @@ -19,8 +19,10 @@ #include #include -#include -#include + +#include + +#include diff --git a/ThirdParty/Ert/devel/libjob_queue/CMakeLists.txt b/ThirdParty/Ert/devel/libjob_queue/CMakeLists.txt index 0590ae40fd..22c9ef1cec 100644 --- a/ThirdParty/Ert/devel/libjob_queue/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libjob_queue/CMakeLists.txt @@ -21,11 +21,14 @@ if (USE_LSF) endif() include_directories( ${LSF_INCLUDE_PATH} ) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -include_directories( ${libconfig_src_path} ) add_subdirectory( src ) -add_subdirectory( applications ) -add_subdirectory( tests ) -#----------------------------------------------------------------- +if (BUILD_APPLICATONS) + add_subdirectory( applications ) +endif() + +if (BUILD_TESTS) + add_subdirectory( tests ) +endif() + diff --git a/ThirdParty/Ert/devel/libjob_queue/src/ext_cmd.h b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/ext_cmd.h similarity index 98% rename from ThirdParty/Ert/devel/libjob_queue/src/ext_cmd.h rename to ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/ext_cmd.h index 9f6686d399..0414011e1e 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/ext_cmd.h +++ b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/ext_cmd.h @@ -23,7 +23,7 @@ extern "C" { #endif -#include +#include typedef struct ext_cmd_struct ext_cmd_type; diff --git a/ThirdParty/Ert/devel/libjob_queue/src/ext_job.h b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/ext_job.h similarity index 90% rename from ThirdParty/Ert/devel/libjob_queue/src/ext_job.h rename to ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/ext_job.h index 69cbce46fc..b358a2beb3 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/ext_job.h +++ b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/ext_job.h @@ -21,10 +21,11 @@ #ifdef __cplusplus extern "C" { #endif -#include #include -#include -#include + +#include +#include +#include typedef struct ext_job_struct ext_job_type; @@ -36,15 +37,15 @@ void ext_job_fprintf_config(const ext_job_type * ext_job , co ext_job_type * ext_job_alloc_copy(const ext_job_type * ); ext_job_type * ext_job_alloc(const char * , const char * license_root_path , bool private_job); const char * ext_job_get_name(const ext_job_type * ); -void ext_job_free(ext_job_type * ) ; -void ext_job_free__(void * ); -void ext_job_add_environment(ext_job_type *, const char * , const char * ) ; +void ext_job_free(ext_job_type * ) ; +void ext_job_free__(void * ); +void ext_job_add_environment(ext_job_type *, const char * , const char * ) ; void ext_job_save( const ext_job_type * ext_job ); void ext_job_fprintf(const ext_job_type * , FILE * stream ); void ext_job_set_private_arg(ext_job_type * , const char * , const char * ); -void ext_job_set_argc(ext_job_type * , const char ** , int); -void ext_job_python_fprintf(const ext_job_type * , FILE * , const subst_list_type *); +void ext_job_set_argc(ext_job_type * , const char ** , int); +void ext_job_python_fprintf(const ext_job_type * , FILE * , const subst_list_type *); ext_job_type * ext_job_fscanf_alloc(const char * , const char * , bool private_job , const char *); const stringlist_type * ext_job_get_arglist( const ext_job_type * ext_job ); bool ext_job_is_shared( const ext_job_type * ext_job ); diff --git a/ThirdParty/Ert/devel/libjob_queue/src/ext_joblist.h b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/ext_joblist.h similarity index 88% rename from ThirdParty/Ert/devel/libjob_queue/src/ext_joblist.h rename to ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/ext_joblist.h index 9ba72dc128..59f528e4a2 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/ext_joblist.h +++ b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/ext_joblist.h @@ -22,17 +22,20 @@ extern "C" { #endif #include -#include -#include -#include -#include + +#include +#include +#include + +#include + typedef struct ext_joblist_struct ext_joblist_type; ext_joblist_type * ext_joblist_alloc(); void ext_joblist_free(ext_joblist_type * ); void ext_joblist_add_job(ext_joblist_type * joblist , const char * name , ext_job_type * new_job); -ext_job_type * ext_joblist_get_job(const ext_joblist_type * , const char * ); +ext_job_type * ext_joblist_get_job(const ext_joblist_type * , const char * ); ext_job_type * ext_joblist_get_job_copy(const ext_joblist_type * , const char * ); //void ext_joblist_python_fprintf(const ext_joblist_type * , const stringlist_type * , const char * , const subst_list_type *); bool ext_joblist_has_job(const ext_joblist_type * , const char * ); diff --git a/ThirdParty/Ert/devel/libjob_queue/src/forward_model.h b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/forward_model.h similarity index 95% rename from ThirdParty/Ert/devel/libjob_queue/src/forward_model.h rename to ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/forward_model.h index af13e1fcbc..75e1d761f8 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/forward_model.h +++ b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/forward_model.h @@ -24,10 +24,10 @@ extern "C" { #include -#include -#include +#include +#include -#include +#include typedef struct forward_model_struct forward_model_type ; diff --git a/ThirdParty/Ert/devel/libjob_queue/src/job_queue.h b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/job_queue.h similarity index 98% rename from ThirdParty/Ert/devel/libjob_queue/src/job_queue.h rename to ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/job_queue.h index ba6a3e5b83..be5590af35 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/job_queue.h +++ b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/job_queue.h @@ -24,9 +24,9 @@ extern "C" { #include #include -#include +#include -#include +#include typedef bool (job_callback_ftype) (void *); diff --git a/ThirdParty/Ert/devel/libjob_queue/src/local_driver.h b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/local_driver.h similarity index 97% rename from ThirdParty/Ert/devel/libjob_queue/src/local_driver.h rename to ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/local_driver.h index 184cb000a2..f0ab7ef19f 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/local_driver.h +++ b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/local_driver.h @@ -21,7 +21,8 @@ #ifdef __cplusplus extern "C" { #endif -#include + +#include typedef struct local_driver_struct local_driver_type; typedef struct local_job_struct local_job_type; diff --git a/ThirdParty/Ert/devel/libjob_queue/src/lsf_driver.h b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/lsf_driver.h similarity index 97% rename from ThirdParty/Ert/devel/libjob_queue/src/lsf_driver.h rename to ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/lsf_driver.h index f0dbded569..6362f6aa6c 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/lsf_driver.h +++ b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/lsf_driver.h @@ -21,8 +21,9 @@ #ifdef __cplusplus extern "C" { #endif -#include -#include +#include + +#include /* diff --git a/ThirdParty/Ert/devel/libjob_queue/src/queue_driver.h b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/queue_driver.h similarity index 99% rename from ThirdParty/Ert/devel/libjob_queue/src/queue_driver.h rename to ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/queue_driver.h index c45211ebfb..0eb2cecf59 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/queue_driver.h +++ b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/queue_driver.h @@ -22,7 +22,7 @@ extern "C" { #endif -#include +#include typedef enum { NULL_DRIVER = 0, LSF_DRIVER = 1, diff --git a/ThirdParty/Ert/devel/libjob_queue/src/rsh_driver.h b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/rsh_driver.h similarity index 98% rename from ThirdParty/Ert/devel/libjob_queue/src/rsh_driver.h rename to ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/rsh_driver.h index 5866992e81..ad7909ae13 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/rsh_driver.h +++ b/ThirdParty/Ert/devel/libjob_queue/include/ert/job_queue/rsh_driver.h @@ -21,7 +21,7 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include #define RSH_HOST "RSH_HOST" #define RSH_HOSTLIST "RSH_HOSTLIST" diff --git a/ThirdParty/Ert/devel/libjob_queue/src/CMakeLists.txt b/ThirdParty/Ert/devel/libjob_queue/src/CMakeLists.txt index 51bdd36806..171a098633 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libjob_queue/src/CMakeLists.txt @@ -4,6 +4,8 @@ set(source_files forward_model.c queue_driver.c job_queue.c lsf_driver.c local_d set(header_files job_queue.h queue_driver.h lsf_driver.h local_driver.h rsh_driver.h ext_job.h ext_joblist.h forward_model.h ext_cmd.h) add_library( job_queue ${LIBRARY_TYPE} ${source_files} ) +set_target_properties( job_queue PROPERTIES VERSION 1.0 SOVERSION 1.0 ) + target_link_libraries( job_queue config ert_util ) if (HAVE_LSF) target_link_libraries( job_queue bat ${LSF_LIBRARY} nsl) @@ -12,3 +14,9 @@ endif() if (NEED_LIBDL) target_link_libraries( job_queue dl ) endif() + + +install(TARGETS job_queue DESTINATION ${CMAKE_INSTALL_LIBDIR}) +foreach(header ${header_files}) + install(FILES ../include/ert/job_queue/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/job_queue) +endforeach() diff --git a/ThirdParty/Ert/devel/libjob_queue/src/dependencies b/ThirdParty/Ert/devel/libjob_queue/src/dependencies deleted file mode 100644 index e9bdec4adf..0000000000 --- a/ThirdParty/Ert/devel/libjob_queue/src/dependencies +++ /dev/null @@ -1,10 +0,0 @@ -lsf_request.o : lsf_request.c lsf_request.h ext_job.o ext_joblist.o -local_driver.o : local_driver.c local_driver.h basic_queue_driver.o -forward_model.o : forward_model.c forward_model.h ext_job.o ext_joblist.o lsf_request.o -rsh_driver.o : rsh_driver.c rsh_driver.h basic_queue_driver.o -basic_queue_driver.o : basic_queue_driver.c basic_queue_driver.h -all_include.o : all_include.h -ext_joblist.o : ext_joblist.c ext_joblist.h ext_job.o -lsf_driver.o : lsf_driver.c lsf_driver.h basic_queue_driver.o -job_queue.o : job_queue.c job_queue.h basic_queue_driver.o -ext_job.o : ext_job.c ext_job.h diff --git a/ThirdParty/Ert/devel/libjob_queue/src/ext_cmd.c b/ThirdParty/Ert/devel/libjob_queue/src/ext_cmd.c index 45076c19a7..cec99560bb 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/ext_cmd.c +++ b/ThirdParty/Ert/devel/libjob_queue/src/ext_cmd.c @@ -20,13 +20,13 @@ #include #include -#include -#include -#include +#include +#include +#include -#include +#include -#include +#include /* The default values are interepreted as no limit. */ diff --git a/ThirdParty/Ert/devel/libjob_queue/src/ext_job.c b/ThirdParty/Ert/devel/libjob_queue/src/ext_job.c index fe129d4c89..c4fa5e9971 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/ext_job.c +++ b/ThirdParty/Ert/devel/libjob_queue/src/ext_job.c @@ -17,19 +17,22 @@ */ #include -#include -#include -#include -#include -#include -#include -#include -#include #include #include #include -#include -#include +#include +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include /* About arguments diff --git a/ThirdParty/Ert/devel/libjob_queue/src/ext_joblist.c b/ThirdParty/Ert/devel/libjob_queue/src/ext_joblist.c index 060f8b6da1..9f950f5a3c 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/ext_joblist.c +++ b/ThirdParty/Ert/devel/libjob_queue/src/ext_joblist.c @@ -19,12 +19,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include + +#include +#include //#define MODULE_NAME "jobs.py" diff --git a/ThirdParty/Ert/devel/libjob_queue/src/forward_model.c b/ThirdParty/Ert/devel/libjob_queue/src/forward_model.c index 346b266b19..223ee539ee 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/forward_model.c +++ b/ThirdParty/Ert/devel/libjob_queue/src/forward_model.c @@ -19,16 +19,16 @@ #include #include #include - #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include +#include /** This file implements a 'forward-model' object. I diff --git a/ThirdParty/Ert/devel/libjob_queue/src/job_queue.c b/ThirdParty/Ert/devel/libjob_queue/src/job_queue.c index e2abb7b86b..4756dc3625 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/job_queue.c +++ b/ThirdParty/Ert/devel/libjob_queue/src/job_queue.c @@ -24,13 +24,14 @@ #include #include -#include -#include -#include +#include +#include +#include +#include + +#include +#include -#include -#include -#include #define JOB_QUEUE_START_SIZE 16 diff --git a/ThirdParty/Ert/devel/libjob_queue/src/local_driver.c b/ThirdParty/Ert/devel/libjob_queue/src/local_driver.c index 1f5e3d31de..04cd04869c 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/local_driver.c +++ b/ThirdParty/Ert/devel/libjob_queue/src/local_driver.c @@ -24,11 +24,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include diff --git a/ThirdParty/Ert/devel/libjob_queue/src/lsf_driver_dummy.c b/ThirdParty/Ert/devel/libjob_queue/src/lsf_driver_dummy.c index 8998d625b9..b1e6917b9d 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/lsf_driver_dummy.c +++ b/ThirdParty/Ert/devel/libjob_queue/src/lsf_driver_dummy.c @@ -16,7 +16,7 @@ for more details. */ -#include +#include static void lsf_driver_invalid_usage( const char * func) { diff --git a/ThirdParty/Ert/devel/libjob_queue/src/lsf_driver_impl.c b/ThirdParty/Ert/devel/libjob_queue/src/lsf_driver_impl.c index db04165039..4dabc8d70e 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/lsf_driver_impl.c +++ b/ThirdParty/Ert/devel/libjob_queue/src/lsf_driver_impl.c @@ -19,15 +19,19 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include #include +#include +#include +#include + + +#include + +#include +#include + /** diff --git a/ThirdParty/Ert/devel/libjob_queue/src/queue_driver.c b/ThirdParty/Ert/devel/libjob_queue/src/queue_driver.c index 1dfc534445..2002b3d33d 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/queue_driver.c +++ b/ThirdParty/Ert/devel/libjob_queue/src/queue_driver.c @@ -19,12 +19,12 @@ #include #include -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libjob_queue/src/rsh_driver.c b/ThirdParty/Ert/devel/libjob_queue/src/rsh_driver.c index 1c118ca356..a4df97372b 100644 --- a/ThirdParty/Ert/devel/libjob_queue/src/rsh_driver.c +++ b/ThirdParty/Ert/devel/libjob_queue/src/rsh_driver.c @@ -25,11 +25,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include diff --git a/ThirdParty/Ert/devel/libjob_queue/tests/job_lsf_submit_test.c b/ThirdParty/Ert/devel/libjob_queue/tests/job_lsf_submit_test.c index 55c8cebb71..143cb5be81 100644 --- a/ThirdParty/Ert/devel/libjob_queue/tests/job_lsf_submit_test.c +++ b/ThirdParty/Ert/devel/libjob_queue/tests/job_lsf_submit_test.c @@ -18,11 +18,14 @@ #include #include -#include -//#include -#include #include +#include +//#include + +#include + + void test_submit(lsf_driver_type * driver , const char * server , const char * bsub_cmd , const char * bjobs_cmd , const char * bkill_cmd , const char * cmd) { if (server != NULL) diff --git a/ThirdParty/Ert/devel/libjob_queue/tests/job_lsf_test.c b/ThirdParty/Ert/devel/libjob_queue/tests/job_lsf_test.c index 1ed9c5edfa..b858590b8b 100644 --- a/ThirdParty/Ert/devel/libjob_queue/tests/job_lsf_test.c +++ b/ThirdParty/Ert/devel/libjob_queue/tests/job_lsf_test.c @@ -19,9 +19,10 @@ #include //#include -#include #include +#include + void test_option(lsf_driver_type * driver , const char * option , const char * value) { if (!lsf_driver_set_option( driver , option , value)) diff --git a/ThirdParty/Ert/devel/libjob_queue/tests/loadOK.c b/ThirdParty/Ert/devel/libjob_queue/tests/loadOK.c index 9d3b4b1dd6..1f8920b01c 100644 --- a/ThirdParty/Ert/devel/libjob_queue/tests/loadOK.c +++ b/ThirdParty/Ert/devel/libjob_queue/tests/loadOK.c @@ -18,8 +18,9 @@ #include #include -#include -#include +#include + +#include diff --git a/ThirdParty/Ert/devel/libplot/CMakeLists.txt b/ThirdParty/Ert/devel/libplot/CMakeLists.txt index a93285d4b3..b9ced7fd31 100644 --- a/ThirdParty/Ert/devel/libplot/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libplot/CMakeLists.txt @@ -8,6 +8,5 @@ find_library( PLPLOT_LIBRARY NAMES plplotd PATHS ${PLPLOT_LIB_PATH} ) find_path( PLPLOT_HEADER plplot/plplot.h ${PLPLOT_INCLUDE_PATH} ) include_directories( ${PLPLOT_HEADER} ) -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) add_subdirectory( src ) diff --git a/ThirdParty/Ert/devel/libplot/src/plot.h b/ThirdParty/Ert/devel/libplot/include/ert/plot/plot.h similarity index 96% rename from ThirdParty/Ert/devel/libplot/src/plot.h rename to ThirdParty/Ert/devel/libplot/include/ert/plot/plot.h index bbe6fe4a12..b34d811077 100644 --- a/ThirdParty/Ert/devel/libplot/src/plot.h +++ b/ThirdParty/Ert/devel/libplot/include/ert/plot/plot.h @@ -33,10 +33,13 @@ extern "c" { * @{ */ #include -#include + +#include + #include -#include -#include + +#include +#include typedef struct plot_struct plot_type; diff --git a/ThirdParty/Ert/devel/libplot/src/plot_const.h b/ThirdParty/Ert/devel/libplot/include/ert/plot/plot_const.h similarity index 100% rename from ThirdParty/Ert/devel/libplot/src/plot_const.h rename to ThirdParty/Ert/devel/libplot/include/ert/plot/plot_const.h diff --git a/ThirdParty/Ert/devel/libplot/src/plot_dataset.h b/ThirdParty/Ert/devel/libplot/include/ert/plot/plot_dataset.h similarity index 98% rename from ThirdParty/Ert/devel/libplot/src/plot_dataset.h rename to ThirdParty/Ert/devel/libplot/include/ert/plot/plot_dataset.h index edb0b07fe3..98a47ebb3f 100644 --- a/ThirdParty/Ert/devel/libplot/src/plot_dataset.h +++ b/ThirdParty/Ert/devel/libplot/include/ert/plot/plot_dataset.h @@ -22,9 +22,9 @@ extern "C" { #endif -#include -#include -#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libplot/src/plot_driver.h b/ThirdParty/Ert/devel/libplot/include/ert/plot/plot_driver.h similarity index 98% rename from ThirdParty/Ert/devel/libplot/src/plot_driver.h rename to ThirdParty/Ert/devel/libplot/include/ert/plot/plot_driver.h index 5142307ba0..cabc4befb3 100644 --- a/ThirdParty/Ert/devel/libplot/src/plot_driver.h +++ b/ThirdParty/Ert/devel/libplot/include/ert/plot/plot_driver.h @@ -19,9 +19,11 @@ #ifndef __PLOT_DRIVER_H__ #define __PLOT_DRIVER_H__ -#include -#include -#include +#include + +#include +#include + typedef struct plot_dataset_struct plot_dataset_type; diff --git a/ThirdParty/Ert/devel/libplot/src/plot_range.h b/ThirdParty/Ert/devel/libplot/include/ert/plot/plot_range.h similarity index 100% rename from ThirdParty/Ert/devel/libplot/src/plot_range.h rename to ThirdParty/Ert/devel/libplot/include/ert/plot/plot_range.h diff --git a/ThirdParty/Ert/devel/libplot/src/plot_summary.h b/ThirdParty/Ert/devel/libplot/include/ert/plot/plot_summary.h similarity index 100% rename from ThirdParty/Ert/devel/libplot/src/plot_summary.h rename to ThirdParty/Ert/devel/libplot/include/ert/plot/plot_summary.h diff --git a/ThirdParty/Ert/devel/libplot/src/plplot_driver.h b/ThirdParty/Ert/devel/libplot/include/ert/plot/plplot_driver.h similarity index 88% rename from ThirdParty/Ert/devel/libplot/src/plplot_driver.h rename to ThirdParty/Ert/devel/libplot/include/ert/plot/plplot_driver.h index 40400f2605..1cf73f822d 100644 --- a/ThirdParty/Ert/devel/libplot/src/plplot_driver.h +++ b/ThirdParty/Ert/devel/libplot/include/ert/plot/plplot_driver.h @@ -18,8 +18,16 @@ #ifndef __PLPLOT_DRIVER_H__ #define __PLPLOT_DRIVER_H__ -#include + +#ifdef __cplusplus +extern "C" { +#endif +#include plot_driver_type * plplot_driver_alloc(); +#ifdef __cplusplus +} +#endif + #endif diff --git a/ThirdParty/Ert/devel/libplot/src/text_driver.h b/ThirdParty/Ert/devel/libplot/include/ert/plot/text_driver.h similarity index 100% rename from ThirdParty/Ert/devel/libplot/src/text_driver.h rename to ThirdParty/Ert/devel/libplot/include/ert/plot/text_driver.h diff --git a/ThirdParty/Ert/devel/libplot/src/CMakeLists.txt b/ThirdParty/Ert/devel/libplot/src/CMakeLists.txt index 0fab9fcc04..6d0bb9130c 100644 --- a/ThirdParty/Ert/devel/libplot/src/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libplot/src/CMakeLists.txt @@ -3,14 +3,12 @@ set( header_files plot.h plot_dataset.h plot_range.h plot_const.h plot_driver.h add_library( plot ${LIBRARY_TYPE} ${source_files} ) + target_link_libraries( plot ert_util ${PLPLOT_LIBRARY} ) +set_target_properties( plot PROPERTIES VERSION 1.0 SOVERSION 1.0 ) #----------------------------------------------------------------- -if (PLOT_INSTALL_PREFIX) - install(TARGETS plot DESTINATION ${PLOT_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${PLOT_INSTALL_PREFIX}/include) -else() - install(TARGETS plot DESTINATION lib) - install(FILES ${header_files} DESTINATION include) -endif() - +install(TARGETS plot DESTINATION ${CMAKE_INSTALL_LIBDIR}) +foreach(header ${header_files}) + install(FILES ../include/ert/plot/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/plot) +endforeach() diff --git a/ThirdParty/Ert/devel/libplot/src/all_include.h b/ThirdParty/Ert/devel/libplot/src/all_include.h deleted file mode 100644 index d39cdfb188..0000000000 --- a/ThirdParty/Ert/devel/libplot/src/all_include.h +++ /dev/null @@ -1,25 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'all_include.h' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#include -#include -#include -#include -#include -#include -#include diff --git a/ThirdParty/Ert/devel/libplot/src/dependencies b/ThirdParty/Ert/devel/libplot/src/dependencies deleted file mode 100644 index 44f01963f6..0000000000 --- a/ThirdParty/Ert/devel/libplot/src/dependencies +++ /dev/null @@ -1,8 +0,0 @@ -plot_driver.o : plot_driver.c plot_driver.h plot_const.h -plplot_driver.o : plplot_driver.c plplot_driver.h plot_driver.o plot_const.h -plot_const_cxx.o : plot_const_cxx.cxx plot_const_cxx.hxx -plot.o : plot.c plot.h plot_dataset.o plot_range.o plot_const.h plot_driver.o plplot_driver.o text_driver.o -all_include.o : plot_const.h -plot_range.o : plot_range.c plot_range.h plot_const.h -plot_dataset.o : plot_dataset.c plot_dataset.h plot_const.h plot_range.o plot_driver.o -text_driver.o : text_driver.c text_driver.h plot_driver.o plot_const.h diff --git a/ThirdParty/Ert/devel/libplot/src/makefile b/ThirdParty/Ert/devel/libplot/src/makefile deleted file mode 100644 index f86cebc7d9..0000000000 --- a/ThirdParty/Ert/devel/libplot/src/makefile +++ /dev/null @@ -1,62 +0,0 @@ -include global_config -SDP_ROOT = $(shell get_sdp_root.py) -#################### PLPLOT LINKING ############################# -WITH_TRUETYPE = 1 # Change this (0-1) when compiling with or without truetype. -################################################################# -COMPILE_INCLUDE = -I$(LIBPLOT_HOME)/src -I$(EXTERNAL_INC_PATH) -I$(LIBUTIL_HOME)/include -I$(LIBECL_HOME)/include -INSTALL_INC_PATH = $(LIBPLOT_HOME)/include -INSTALL_LIB_PATH = $(LIBPLOT_HOME)/lib -################################################################# -ARFLAGS = -csr -################################################################# -OBJECTS = plot.o plot_dataset.o plot_range.o plplot_driver.o plot_driver.o text_driver.o -INC_FILES = plot.h plot_dataset.h plot_range.h plot_const.h plot_driver.h plplot_driver.h text_driver.h -LIB = libplot.a -TARGET_INCLUDE = -I$(LIBPLOT_HOME)/include -I$(EXTERNAL_INC_PATH) -I$(LIBUTIL_HOME)/include -I$(LIBECL_HOME)/include - - - -all: $(LIB) - install -d $(INSTALL_INC_PATH) - install -d $(INSTALL_LIB_PATH) - install $(INC_FILES) $(INSTALL_INC_PATH) - install $(LIB) $(INSTALL_LIB_PATH) - -SDP_INSTALL: all - install $(LIB) $(SDP_ROOT)/lib - install $(INC_FILES) $(SDP_ROOT)/include - -clean: - rm -f *.o *~ *.x - rm -f $(LIB) - rm -f $(INSTALL_LIB_PATH)/$(LIB) - rm -f $(INSTALL_INC_PATH)/*.h - - -distclean: - rm -f *.o *~ *.x - rm -f $(LIB) - rm -f $(INSTALL_LIB_PATH)/$(LIB) - rm -f $(INSTALL_INC_PATH)/*.h - -rebuild: clean all - -$(LIB): $(OBJECTS) - $(AR) $(ARFLAGS) $(LIB) $(OBJECTS) - -%.o : %.c - $(CC) -c $(CFLAGS) -DWITH_TRUETYPE=$(WITH_TRUETYPE) $(COMPILE_INCLUDE) $< -o $@ - -%.o : %.cc - $(CPP) -c $(CPPFLAGS) $(COMPILE_INCLUDE) $< -o $@ - -%.o : %.cxx - $(CPP) -c $(CPPFLAGS) $(COMPILE_INCLUDE) $< -o $@ - -testplot_cxx : testplot_cxx.o $(LIB) - $(CPP) -o testplot_cxx testplot_cxx.o -L. $(LIB_PATH) $(LIB_LINK) - -new: - ../../Scripts/cdep.py all_include.h 0 - -include dependencies diff --git a/ThirdParty/Ert/devel/libplot/src/plot.c b/ThirdParty/Ert/devel/libplot/src/plot.c index b6e2ba9980..d895ee152f 100644 --- a/ThirdParty/Ert/devel/libplot/src/plot.c +++ b/ThirdParty/Ert/devel/libplot/src/plot.c @@ -18,15 +18,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include /** diff --git a/ThirdParty/Ert/devel/libplot/src/plot_dataset.c b/ThirdParty/Ert/devel/libplot/src/plot_dataset.c index 5ad6eb6978..528c6a7658 100644 --- a/ThirdParty/Ert/devel/libplot/src/plot_dataset.c +++ b/ThirdParty/Ert/devel/libplot/src/plot_dataset.c @@ -17,16 +17,19 @@ */ #include -#include +#include + +#include +#include +#include + #include #include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libplot/src/plot_driver.c b/ThirdParty/Ert/devel/libplot/src/plot_driver.c index 647fbba715..9463cb8b73 100644 --- a/ThirdParty/Ert/devel/libplot/src/plot_driver.c +++ b/ThirdParty/Ert/devel/libplot/src/plot_driver.c @@ -16,9 +16,11 @@ for more details. */ -#include -#include -#include +#include + +#include +#include + /** diff --git a/ThirdParty/Ert/devel/libplot/src/plot_range.c b/ThirdParty/Ert/devel/libplot/src/plot_range.c index c57637f35d..d1a5e385eb 100644 --- a/ThirdParty/Ert/devel/libplot/src/plot_range.c +++ b/ThirdParty/Ert/devel/libplot/src/plot_range.c @@ -19,12 +19,15 @@ #include #include #include + +#include +#include + #include #include -#include -#include -#include -#include + +#include +#include /** diff --git a/ThirdParty/Ert/devel/libplot/src/plplot_driver.c b/ThirdParty/Ert/devel/libplot/src/plplot_driver.c index 8b5b2aa956..d1a25ff050 100644 --- a/ThirdParty/Ert/devel/libplot/src/plplot_driver.c +++ b/ThirdParty/Ert/devel/libplot/src/plplot_driver.c @@ -17,14 +17,18 @@ */ #include -#include #include #include #include + +#include +#include + #include -#include -#include -#include + +#include +#include + typedef struct { diff --git a/ThirdParty/Ert/devel/libplot/src/simple.c b/ThirdParty/Ert/devel/libplot/src/simple.c index 84e15f7a42..a49f5a6465 100644 --- a/ThirdParty/Ert/devel/libplot/src/simple.c +++ b/ThirdParty/Ert/devel/libplot/src/simple.c @@ -16,8 +16,9 @@ for more details. */ -#include -#include + +#include +#include int main() { @@ -29,22 +30,22 @@ int main() plot_initialize(item, "png", "test.png"); { - plot_dataset_type *d; - int N = pow(2, 10); - PLFLT x[2 * N]; - PLFLT y[2 * N]; - int i; + plot_dataset_type *d; + int N = pow(2, 10); + PLFLT x[2 * N]; + PLFLT y[2 * N]; + int i; - for (i = 0; i <= 2 * N; i++) { - x[i] = (i - N) / period; - if (x[i] != 0.0) - y[i] = sin(PI * x[i]) / (PI * x[i]); - else - y[i] = 1.0; - } - d = plot_dataset_alloc(); - plot_dataset_set_data(d, x, y, 2 * N, BLUE, LINE); - plot_dataset_add(item, d); + for (i = 0; i <= 2 * N; i++) { + x[i] = (i - N) / period; + if (x[i] != 0.0) + y[i] = sin(PI * x[i]) / (PI * x[i]); + else + y[i] = 1.0; + } + d = plot_dataset_alloc(); + plot_dataset_set_data(d, x, y, 2 * N, BLUE, LINE); + plot_dataset_add(item, d); } plot_set_labels(item, "x-axis", "y-axis", "y = sinc(x)", BLACK); diff --git a/ThirdParty/Ert/devel/libplot/src/text_driver.c b/ThirdParty/Ert/devel/libplot/src/text_driver.c index 9bd95157dc..1da7d8fd83 100644 --- a/ThirdParty/Ert/devel/libplot/src/text_driver.c +++ b/ThirdParty/Ert/devel/libplot/src/text_driver.c @@ -17,12 +17,15 @@ */ #include -#include #include #include -#include -#include -#include + +#include +#include + +#include +#include + typedef struct { diff --git a/ThirdParty/Ert/devel/librms/CMakeLists.txt b/ThirdParty/Ert/devel/librms/CMakeLists.txt index 881e778b8a..c5e65c48a3 100644 --- a/ThirdParty/Ert/devel/librms/CMakeLists.txt +++ b/ThirdParty/Ert/devel/librms/CMakeLists.txt @@ -1,7 +1,8 @@ -set( RMS_INSTALL_PREFIX "" CACHE STRING "Prefix for installation of librms") - -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) -include_directories( ${libecl_src_path} ) - add_subdirectory( src ) -add_subdirectory( applications ) +if (BUILD_APPLICATONS) + add_subdirectory( applications ) +endif() + +#if (BUILD_TESTS) +# add_subdirectory( tests ) +#endif() diff --git a/ThirdParty/Ert/devel/librms/applications/rms_extract.c b/ThirdParty/Ert/devel/librms/applications/rms_extract.c index 398826ab17..cffd6dad58 100644 --- a/ThirdParty/Ert/devel/librms/applications/rms_extract.c +++ b/ThirdParty/Ert/devel/librms/applications/rms_extract.c @@ -18,12 +18,13 @@ #include #include -#include -#include -#include #include -#include +#include + +#include +#include +#include void split_name(const char * arg, char **_old_name , char **_new_name) { diff --git a/ThirdParty/Ert/devel/librms/applications/rms_setname.c b/ThirdParty/Ert/devel/librms/applications/rms_setname.c index 4bb473c18f..b1a250df72 100644 --- a/ThirdParty/Ert/devel/librms/applications/rms_setname.c +++ b/ThirdParty/Ert/devel/librms/applications/rms_setname.c @@ -18,11 +18,13 @@ #include #include -#include -#include -#include #include +#include +#include +#include + + int main (int argc , char **argv) { int i; char *name; diff --git a/ThirdParty/Ert/devel/librms/applications/rms_stat.c b/ThirdParty/Ert/devel/librms/applications/rms_stat.c index 603209d773..770d84176d 100644 --- a/ThirdParty/Ert/devel/librms/applications/rms_stat.c +++ b/ThirdParty/Ert/devel/librms/applications/rms_stat.c @@ -19,9 +19,10 @@ #include #include #include -#include -#include -#include + +#include +#include +#include diff --git a/ThirdParty/Ert/devel/librms/applications/rms_test.c b/ThirdParty/Ert/devel/librms/applications/rms_test.c index 04d77c3f0d..fea7328777 100644 --- a/ThirdParty/Ert/devel/librms/applications/rms_test.c +++ b/ThirdParty/Ert/devel/librms/applications/rms_test.c @@ -18,9 +18,10 @@ #include #include -#include -#include -#include + +#include +#include +#include diff --git a/ThirdParty/Ert/devel/librms/applications/tag_list.c b/ThirdParty/Ert/devel/librms/applications/tag_list.c index 5c480e1a55..0f755c1bd1 100644 --- a/ThirdParty/Ert/devel/librms/applications/tag_list.c +++ b/ThirdParty/Ert/devel/librms/applications/tag_list.c @@ -18,9 +18,10 @@ #include #include -#include -#include -#include + +#include +#include +#include diff --git a/ThirdParty/Ert/devel/librms/src/rms_export.h b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_export.h similarity index 94% rename from ThirdParty/Ert/devel/librms/src/rms_export.h rename to ThirdParty/Ert/devel/librms/include/ert/rms/rms_export.h index cf16e3cc6e..e8d3158007 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_export.h +++ b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_export.h @@ -22,8 +22,8 @@ extern "C" { #endif -#include -#include +#include +#include void rms_export_roff_from_keyword(const char *filename, ecl_grid_type *ecl_grid, diff --git a/ThirdParty/Ert/devel/librms/src/rms_file.h b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_file.h similarity index 98% rename from ThirdParty/Ert/devel/librms/src/rms_file.h rename to ThirdParty/Ert/devel/librms/include/ert/rms/rms_file.h index 3dfc1b6d27..3a9ad07ccf 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_file.h +++ b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_file.h @@ -25,7 +25,8 @@ extern "C" { #include #include #include -#include + +#include typedef struct rms_file_struct rms_file_type; diff --git a/ThirdParty/Ert/devel/librms/src/rms_stats.h b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_stats.h similarity index 96% rename from ThirdParty/Ert/devel/librms/src/rms_stats.h rename to ThirdParty/Ert/devel/librms/include/ert/rms/rms_stats.h index 6b7dfd3e2f..120dd0a6a4 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_stats.h +++ b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_stats.h @@ -21,7 +21,8 @@ #ifdef __cplusplus extern "C" { #endif -#include + +#include void rms_stats_mean_std(rms_tagkey_type * , rms_tagkey_type * , const char * , int , const char ** , bool); void rms_stats_update_ens(const char * , const char *, const char **, const char *, int , const double **); diff --git a/ThirdParty/Ert/devel/librms/src/rms_tag.h b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_tag.h similarity index 97% rename from ThirdParty/Ert/devel/librms/src/rms_tag.h rename to ThirdParty/Ert/devel/librms/include/ert/rms/rms_tag.h index eed2f65d86..b4ddbd9567 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_tag.h +++ b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_tag.h @@ -24,8 +24,10 @@ extern "C" { #include #include #include -#include -#include + +#include + +#include diff --git a/ThirdParty/Ert/devel/librms/src/rms_tagkey.h b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_tagkey.h similarity index 97% rename from ThirdParty/Ert/devel/librms/src/rms_tagkey.h rename to ThirdParty/Ert/devel/librms/include/ert/rms/rms_tagkey.h index a7fa0b774c..4e7908dc5e 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_tagkey.h +++ b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_tagkey.h @@ -22,11 +22,14 @@ extern "C" { #endif -#include #include #include -#include -#include + +#include + +#include + +#include typedef struct rms_tagkey_struct rms_tagkey_type; diff --git a/ThirdParty/Ert/devel/librms/src/rms_type.h b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_type.h similarity index 100% rename from ThirdParty/Ert/devel/librms/src/rms_type.h rename to ThirdParty/Ert/devel/librms/include/ert/rms/rms_type.h diff --git a/ThirdParty/Ert/devel/librms/src/rms_util.h b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_util.h similarity index 96% rename from ThirdParty/Ert/devel/librms/src/rms_util.h rename to ThirdParty/Ert/devel/librms/include/ert/rms/rms_util.h index cda309ccba..4b6c47016f 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_util.h +++ b/ThirdParty/Ert/devel/librms/include/ert/rms/rms_util.h @@ -21,10 +21,13 @@ #ifdef __cplusplus extern "C" { #endif + #include #include -#include -#include + +#include + +#include #define RMS_INACTIVE_DOUBLE -999.00 #define RMS_INACTIVE_FLOAT -999.00 diff --git a/ThirdParty/Ert/devel/librms/src/CMakeLists.txt b/ThirdParty/Ert/devel/librms/src/CMakeLists.txt index 0c4f6efe02..0eb80e4871 100644 --- a/ThirdParty/Ert/devel/librms/src/CMakeLists.txt +++ b/ThirdParty/Ert/devel/librms/src/CMakeLists.txt @@ -2,14 +2,12 @@ set( source_files rms_file.c rms_util.c rms_tag.c rms_type.c rms_tagkey.c rms_st set( header_files rms_file.h rms_util.h rms_tag.h rms_type.h rms_tagkey.h rms_stats.h rms_export.h) add_library( rms ${LIBRARY_TYPE} ${source_files} ) +set_target_properties( rms PROPERTIES VERSION 1.0 SOVERSION 1.0 ) #----------------------------------------------------------------- -if (RMS_INSTALL_PREFIX) - install(TARGETS rms DESTINATION ${RMS_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${RMS_INSTALL_PREFIX}/include) -else() - install(TARGETS rms DESTINATION lib) - install(FILES ${header_files} DESTINATION include) -endif() +install(TARGETS rms DESTINATION ${CMAKE_INSTALL_LIBDIR}) +foreach(header ${header_files}) + install(FILES ../include/ert/rms/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/rms) +endforeach() diff --git a/ThirdParty/Ert/devel/librms/src/condor_import.c b/ThirdParty/Ert/devel/librms/src/condor_import.c deleted file mode 100644 index 029fb18956..0000000000 --- a/ThirdParty/Ert/devel/librms/src/condor_import.c +++ /dev/null @@ -1,95 +0,0 @@ -/* - Copyright (C) 2011 Statoil ASA, Norway. - - The file 'condor_import.c' is part of ERT - Ensemble based Reservoir Tool. - - ERT is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - ERT is distributed in the hope that it will be useful, but WITHOUT ANY - WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. - - See the GNU General Public License at - for more details. -*/ - -#include -#include -#include -#include -#include -#include - - - -int main(int argc , char **argv) { - int nx,ny,nz; - char * condor_file , *rms_file_name , *file_base, *path; - float * data; - char * param_name = "PARAM"; - if (argc <= 4) { - fprintf(stderr,"%s: nx ny nz condor-file \n",argv[0]); - exit(1); - } - - nx = atoi(argv[1]); - ny = atoi(argv[2]); - nz = atoi(argv[3]); - condor_file = argv[4]; - data = util_malloc(nx*ny*nz * sizeof * data , __func__); - - { - FILE *stream = util_fopen(condor_file , "r"); - int condor_index, rms_index; - int i,j,k; - float * tmp_data = util_malloc(nx*ny*nz * sizeof * data , __func__); - for (i=0; i < nx*ny*nz; i++) - fscanf(stream , "%g" , &tmp_data[i]); - fclose(stream); - - rms_index = -1; - for (i=0; i < nx; i++) - for (j=0; j < ny; j++) - for (k= (nz - 1); k >= 0; k--) { - rms_index += 1; - condor_index = i + j*nx + k*nx*ny; - /*k + j*nz + i*ny*nz;*/ - data[rms_index] = tmp_data[condor_index]; - } - - free(tmp_data); - } - - util_alloc_file_components(condor_file , &path , &file_base , NULL); - if (path != NULL) { - rms_file_name = util_malloc(strlen(path) + strlen(file_base) + 7, __func__); - sprintf(rms_file_name , "%s/%s.ROFF" , path , file_base); - } else { - rms_file_name = util_malloc(strlen(file_base) + 7, __func__); - sprintf(rms_file_name , "%s.ROFF" , file_base); - } - - { - rms_file_type * rms_file = rms_file_alloc(rms_file_name , false); - FILE *stream = rms_file_fopen_w(rms_file); - rms_tag_type * dim_tag = rms_tag_alloc_dimensions(nx , ny , nz); - rms_tagkey_type * data_key = rms_tagkey_alloc_complete("data" , nx*ny*nz , rms_float_type , data , true); - - rms_file_init_fwrite(rms_file , "parameter"); - rms_tag_fwrite(dim_tag , stream); - rms_tag_fwrite_parameter(param_name , data_key , stream); - rms_file_complete_fwrite(rms_file); - - fclose(stream); - rms_file_free(rms_file); - rms_tagkey_free(data_key); - rms_tag_free(dim_tag); - } - printf("Have written file: %s \n",rms_file_name); - - - free(rms_file_name); -} diff --git a/ThirdParty/Ert/devel/librms/src/dependencies b/ThirdParty/Ert/devel/librms/src/dependencies deleted file mode 100644 index 7f412847c6..0000000000 --- a/ThirdParty/Ert/devel/librms/src/dependencies +++ /dev/null @@ -1,6 +0,0 @@ -rms_tag.o : rms_tag.c rms_tag.h rms_util.o rms_tagkey.o -rms_file.o : rms_file.c rms_file.h rms_type.o rms_util.o rms_tag.o rms_tagkey.o -rms_util.o : rms_util.c rms_util.h -rms_tagkey.o : rms_tagkey.c rms_tagkey.h rms_type.o rms_util.o -rms_stats.o : rms_stats.c rms_stats.h rms_tagkey.o rms_tag.o rms_file.o -rms_type.o : rms_type.c rms_type.h diff --git a/ThirdParty/Ert/devel/librms/src/rms_export.c b/ThirdParty/Ert/devel/librms/src/rms_export.c index 7d1bf93a27..672eb25025 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_export.c +++ b/ThirdParty/Ert/devel/librms/src/rms_export.c @@ -20,13 +20,15 @@ #include #include #include -#include -#include -#include -#include "rms_file.h" -#include "rms_util.h" -#include "rms_export.h" +#include + +#include +#include + +#include +#include +#include void rms_export_roff_from_keyword(const char *filename, ecl_grid_type *ecl_grid, diff --git a/ThirdParty/Ert/devel/librms/src/rms_file.c b/ThirdParty/Ert/devel/librms/src/rms_file.c index 443c21cb4d..b973b36761 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_file.c +++ b/ThirdParty/Ert/devel/librms/src/rms_file.c @@ -20,17 +20,18 @@ #include #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include + +#include /*****************************************************************/ static const char * rms_ascii_header = "roff-asc"; diff --git a/ThirdParty/Ert/devel/librms/src/rms_stats.c b/ThirdParty/Ert/devel/librms/src/rms_stats.c index 6f7cc5713a..0de7946029 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_stats.c +++ b/ThirdParty/Ert/devel/librms/src/rms_stats.c @@ -18,11 +18,14 @@ #include #include -#include -#include -#include -#include -#include + +#include + +#include +#include +#include +#include + @@ -43,7 +46,7 @@ void rms_stats_mean_std(rms_tagkey_type * mean , rms_tagkey_type * std , const c rms_tagkey_type * file_tag = rms_file_fread_alloc_data_tagkey(rms_file, "parameter" , "name" , parameter_name); if (log_transform) - rms_tagkey_inplace_log10(file_tag); + rms_tagkey_inplace_log10(file_tag); rms_tagkey_inplace_add_scaled(mean , file_tag , norm); rms_tagkey_inplace_sqr(file_tag); @@ -93,7 +96,7 @@ void rms_stats_update_ens(const char *prior_path , const char *posterior_path , prior[iens] = rms_file_fread_alloc_data_tagkey(rms_file , "parameter" , "name" , param_name); if (iens == 0) - dim_tag = rms_file_fread_alloc_tag(rms_file , "dimensions" , NULL , NULL); + dim_tag = rms_file_fread_alloc_tag(rms_file , "dimensions" , NULL , NULL); rms_file_free(rms_file); } diff --git a/ThirdParty/Ert/devel/librms/src/rms_tag.c b/ThirdParty/Ert/devel/librms/src/rms_tag.c index 7548b3824c..4384f4055a 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_tag.c +++ b/ThirdParty/Ert/devel/librms/src/rms_tag.c @@ -19,12 +19,14 @@ #include #include #include -#include -#include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include +#include static const char * rms_eof_tag = "eof"; static const char * rms_starttag_string = "tag"; diff --git a/ThirdParty/Ert/devel/librms/src/rms_tagkey.c b/ThirdParty/Ert/devel/librms/src/rms_tagkey.c index d4dc3556e2..5bb8f15379 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_tagkey.c +++ b/ThirdParty/Ert/devel/librms/src/rms_tagkey.c @@ -19,13 +19,15 @@ #include #include #include -#include #include #include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include static const char * rms_array_string = "array"; diff --git a/ThirdParty/Ert/devel/librms/src/rms_type.c b/ThirdParty/Ert/devel/librms/src/rms_type.c index 52b678d2d2..5d3e44a744 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_type.c +++ b/ThirdParty/Ert/devel/librms/src/rms_type.c @@ -17,7 +17,7 @@ */ #include -#include +#include /*****************************************************************/ /* A microscopic (purely internal) type object only used diff --git a/ThirdParty/Ert/devel/librms/src/rms_util.c b/ThirdParty/Ert/devel/librms/src/rms_util.c index 89c276c633..59b92bbeaf 100644 --- a/ThirdParty/Ert/devel/librms/src/rms_util.c +++ b/ThirdParty/Ert/devel/librms/src/rms_util.c @@ -20,9 +20,13 @@ #include #include #include -#include -#include -#include + +#include + +#include + +#include + @@ -51,9 +55,9 @@ void rms_util_set_fortran_data(void *_f90_data , const void * _rms_data, int siz for (i=0; i < nx; i++) for (j=0; j < ny; j++) for (k= 0; k < nz; k++) { - rms_index = rms_util_global_index_from_eclipse_ijk(nx,ny,nz,i,j,k); - f90_index = i + j*nx + k*nx*ny; - memcpy(&f90_data[f90_index * sizeof_ctype] , &rms_data[rms_index * sizeof_ctype] , sizeof_ctype); + rms_index = rms_util_global_index_from_eclipse_ijk(nx,ny,nz,i,j,k); + f90_index = i + j*nx + k*nx*ny; + memcpy(&f90_data[f90_index * sizeof_ctype] , &rms_data[rms_index * sizeof_ctype] , sizeof_ctype); } } @@ -67,9 +71,9 @@ void rms_util_read_fortran_data(const void *_f90_data , void * _rms_data, int si for (i=0; i < nx; i++) for (j=0; j < ny; j++) for (k= 0; k < nz; k++) { - rms_index = rms_util_global_index_from_eclipse_ijk(nx,ny,nz,i,j,k); - f90_index = i + j*nx + k*nx*ny; - memcpy(&rms_data[rms_index * sizeof_ctype] , &f90_data[f90_index * sizeof_ctype] , sizeof_ctype); + rms_index = rms_util_global_index_from_eclipse_ijk(nx,ny,nz,i,j,k); + f90_index = i + j*nx + k*nx*ny; + memcpy(&rms_data[rms_index * sizeof_ctype] , &f90_data[f90_index * sizeof_ctype] , sizeof_ctype); } } @@ -122,11 +126,11 @@ bool rms_util_fread_string(char *string , int max_length , FILE *stream) { } else { pos++; if (max_length > 0) { - if (pos == max_length) { - read_ok = false; - fseek(stream , init_pos , SEEK_SET); - cont = false; - } + if (pos == max_length) { + read_ok = false; + fseek(stream , init_pos , SEEK_SET); + cont = false; + } } } } diff --git a/ThirdParty/Ert/devel/libsched/CMakeLists.txt b/ThirdParty/Ert/devel/libsched/CMakeLists.txt index 1da7472e43..c5e65c48a3 100644 --- a/ThirdParty/Ert/devel/libsched/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libsched/CMakeLists.txt @@ -1,5 +1,8 @@ -set( SCHED_INSTALL_PREFIX "" CACHE STRING "Prefix for installation of libsched") - -include_directories( ${CMAKE_CURRENT_SOURCE_DIR}/src ) add_subdirectory( src ) -add_subdirectory( applications ) +if (BUILD_APPLICATONS) + add_subdirectory( applications ) +endif() + +#if (BUILD_TESTS) +# add_subdirectory( tests ) +#endif() diff --git a/ThirdParty/Ert/devel/libsched/applications/get_well_list.c b/ThirdParty/Ert/devel/libsched/applications/get_well_list.c index 4d1433921e..1d5e9aec4e 100644 --- a/ThirdParty/Ert/devel/libsched/applications/get_well_list.c +++ b/ThirdParty/Ert/devel/libsched/applications/get_well_list.c @@ -18,8 +18,9 @@ #include #include -#include -#include + +#include +#include int main(int argc, char **argv) { diff --git a/ThirdParty/Ert/devel/libsched/applications/gruptree_test.c b/ThirdParty/Ert/devel/libsched/applications/gruptree_test.c index 8697569f79..06fc7eed27 100644 --- a/ThirdParty/Ert/devel/libsched/applications/gruptree_test.c +++ b/ThirdParty/Ert/devel/libsched/applications/gruptree_test.c @@ -18,7 +18,8 @@ #include #include -#include + +#include int main() { diff --git a/ThirdParty/Ert/devel/libsched/applications/sched_summary.c b/ThirdParty/Ert/devel/libsched/applications/sched_summary.c index b65600fee7..460305fadc 100644 --- a/ThirdParty/Ert/devel/libsched/applications/sched_summary.c +++ b/ThirdParty/Ert/devel/libsched/applications/sched_summary.c @@ -16,13 +16,20 @@ for more details. */ -#include #include -#include -#include -#include -#include #include +#include + +#include + +#include + +#include +#include + + + + diff --git a/ThirdParty/Ert/devel/libsched/applications/sched_test.c b/ThirdParty/Ert/devel/libsched/applications/sched_test.c index 9464cdb75f..1aa98b8200 100644 --- a/ThirdParty/Ert/devel/libsched/applications/sched_test.c +++ b/ThirdParty/Ert/devel/libsched/applications/sched_test.c @@ -18,12 +18,15 @@ #include #include -#include -#include -#include -#include -#include -#include + +#include + +#include +#include +#include +#include +#include + int main(int argc, char **argv) diff --git a/ThirdParty/Ert/devel/libsched/src/group_history.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/group_history.h similarity index 96% rename from ThirdParty/Ert/devel/libsched/src/group_history.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/group_history.h index b961fad2c9..ee91eb7baa 100644 --- a/ThirdParty/Ert/devel/libsched/src/group_history.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/group_history.h @@ -22,9 +22,9 @@ #ifdef __cplusplus extern "C" { #endif -#include -#include -#include +#include +#include +#include typedef struct group_history_struct group_history_type; diff --git a/ThirdParty/Ert/devel/libsched/src/group_index.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/group_index.h similarity index 96% rename from ThirdParty/Ert/devel/libsched/src/group_index.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/group_index.h index dc8ce936c6..18d8a14376 100644 --- a/ThirdParty/Ert/devel/libsched/src/group_index.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/group_index.h @@ -22,8 +22,9 @@ #ifdef __cplusplus extern "C" { #endif -#include -#include +#include + +#include typedef struct group_index_struct group_index_type; diff --git a/ThirdParty/Ert/devel/libsched/src/gruptree.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/gruptree.h similarity index 98% rename from ThirdParty/Ert/devel/libsched/src/gruptree.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/gruptree.h index 649096e806..b676840637 100644 --- a/ThirdParty/Ert/devel/libsched/src/gruptree.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/gruptree.h @@ -23,7 +23,6 @@ extern "C" { #endif #include -#include typedef struct gruptree_struct gruptree_type; diff --git a/ThirdParty/Ert/devel/libsched/src/history.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/history.h similarity index 95% rename from ThirdParty/Ert/devel/libsched/src/history.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/history.h index dfc71345f9..f56376055d 100644 --- a/ThirdParty/Ert/devel/libsched/src/history.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/history.h @@ -26,12 +26,12 @@ extern "C" { #include #include -#include -#include +#include +#include -#include +#include -#include +#include typedef enum { diff --git a/ThirdParty/Ert/devel/libsched/src/sched_blob.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_blob.h similarity index 100% rename from ThirdParty/Ert/devel/libsched/src/sched_blob.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_blob.h diff --git a/ThirdParty/Ert/devel/libsched/src/sched_file.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_file.h similarity index 97% rename from ThirdParty/Ert/devel/libsched/src/sched_file.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_file.h index 4680308633..49c66eba55 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_file.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_file.h @@ -24,9 +24,11 @@ extern "C" { #include #include -#include -#include -#include + +#include + +#include +#include typedef struct sched_file_struct sched_file_type; typedef struct sched_block_struct sched_block_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_history.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_history.h similarity index 97% rename from ThirdParty/Ert/devel/libsched/src/sched_history.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_history.h index 8026319e7e..91d48265f4 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_history.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_history.h @@ -25,9 +25,9 @@ extern "C" { #include -#include +#include -#include +#include typedef struct sched_history_struct sched_history_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw.h similarity index 97% rename from ThirdParty/Ert/devel/libsched/src/sched_kw.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw.h index 719c0ef1b5..f900bb3f55 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw.h @@ -25,9 +25,9 @@ extern "C" { #include #include -#include +#include -#include +#include typedef struct sched_kw_struct sched_kw_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_compdat.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_compdat.h similarity index 92% rename from ThirdParty/Ert/devel/libsched/src/sched_kw_compdat.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_compdat.h index 1a7485acbc..38a0c13ac5 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_compdat.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_compdat.h @@ -19,8 +19,11 @@ #ifndef __SCHED_KW_COMPDAT_H__ #define __SCHED_KW_COMPDAT_H__ #include -#include -#include + +#include +#include + +#include typedef struct sched_kw_compdat_struct sched_kw_compdat_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_dates.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_dates.h similarity index 95% rename from ThirdParty/Ert/devel/libsched/src/sched_kw_dates.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_dates.h index 29d6e2496d..8abaa197c2 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_dates.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_dates.h @@ -24,8 +24,11 @@ extern "C" { #include #include -#include -#include + +#include + +#include + typedef struct sched_kw_dates_struct sched_kw_dates_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_gruptree.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_gruptree.h similarity index 95% rename from ThirdParty/Ert/devel/libsched/src/sched_kw_gruptree.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_gruptree.h index 432241152e..eebbbf9100 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_gruptree.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_gruptree.h @@ -22,8 +22,10 @@ extern "C" { #endif #include -#include -#include + +#include + +#include typedef struct sched_kw_gruptree_struct sched_kw_gruptree_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_include.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_include.h similarity index 94% rename from ThirdParty/Ert/devel/libsched/src/sched_kw_include.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_include.h index ebc8d80071..7ccfdd42ac 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_include.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_include.h @@ -19,8 +19,9 @@ #ifndef __SCHED_KW_INCLUDE_H__ #define __SCHED_KW_INCLDUE_H__ -#include -#include +#include + +#include typedef struct sched_kw_include_struct sched_kw_include_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_tstep.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_tstep.h similarity index 96% rename from ThirdParty/Ert/devel/libsched/src/sched_kw_tstep.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_tstep.h index b81bee175a..c3c3501580 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_tstep.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_tstep.h @@ -21,9 +21,11 @@ #ifdef __cplusplus extern "C" { #endif -#include #include -#include + +#include + +#include typedef struct sched_kw_tstep_struct sched_kw_tstep_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_untyped.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_untyped.h similarity index 96% rename from ThirdParty/Ert/devel/libsched/src/sched_kw_untyped.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_untyped.h index e0dcc11778..9b37f18797 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_untyped.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_untyped.h @@ -24,8 +24,10 @@ extern "C" { #include #include -#include -#include + +#include + +#include typedef struct sched_kw_untyped_struct sched_kw_untyped_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconhist.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconhist.h similarity index 95% rename from ThirdParty/Ert/devel/libsched/src/sched_kw_wconhist.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconhist.h index 5e90ff45c8..e18de76b4d 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconhist.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconhist.h @@ -25,13 +25,14 @@ extern "C" { #include #include -#include -#include -#include -#include +#include +#include +#include +#include + +#include +#include -#include -#include typedef struct sched_kw_wconhist_struct sched_kw_wconhist_type; typedef struct wconhist_state_struct wconhist_state_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinj.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconinj.h similarity index 91% rename from ThirdParty/Ert/devel/libsched/src/sched_kw_wconinj.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconinj.h index 22e46492ff..5a9dc804cd 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinj.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconinj.h @@ -25,9 +25,11 @@ extern "C" { #endif #include #include -#include -#include -#include + +#include +#include + +#include typedef struct sched_kw_wconinj_struct sched_kw_wconinj_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinje.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconinje.h similarity index 94% rename from ThirdParty/Ert/devel/libsched/src/sched_kw_wconinje.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconinje.h index a95be189dc..9f354ef29e 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinje.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconinje.h @@ -23,12 +23,15 @@ #ifdef __cplusplus extern "C" { #endif -#include -#include -#include #include -#include -#include + +#include +#include +#include + +#include +#include + typedef struct sched_kw_wconinje_struct sched_kw_wconinje_type; typedef struct wconinje_state_struct wconinje_state_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinjh.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconinjh.h similarity index 94% rename from ThirdParty/Ert/devel/libsched/src/sched_kw_wconinjh.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconinjh.h index d1799bc33d..578db40137 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinjh.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconinjh.h @@ -22,14 +22,16 @@ extern "C" { #endif - -#include #include #include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include + typedef struct sched_kw_wconhist_struct sched_kw_wconinjh_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconprod.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconprod.h similarity index 96% rename from ThirdParty/Ert/devel/libsched/src/sched_kw_wconprod.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconprod.h index 81219ed633..340bdc609f 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconprod.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_wconprod.h @@ -23,7 +23,7 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include typedef struct sched_kw_wconprod_struct sched_kw_wconprod_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_welspecs.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_welspecs.h similarity index 95% rename from ThirdParty/Ert/devel/libsched/src/sched_kw_welspecs.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_welspecs.h index a59558068c..fead7e5c54 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_welspecs.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_kw_welspecs.h @@ -23,8 +23,11 @@ extern "C" { #endif #include #include -#include -#include + +#include + +#include + /*************************************************************/ diff --git a/ThirdParty/Ert/devel/libsched/src/sched_macros.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_macros.h similarity index 100% rename from ThirdParty/Ert/devel/libsched/src/sched_macros.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_macros.h diff --git a/ThirdParty/Ert/devel/libsched/src/sched_time.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_time.h similarity index 97% rename from ThirdParty/Ert/devel/libsched/src/sched_time.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_time.h index 1a2c180823..b8e00391a4 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_time.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_time.h @@ -21,7 +21,7 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include typedef struct sched_time_struct sched_time_type; diff --git a/ThirdParty/Ert/devel/libsched/src/sched_types.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_types.h similarity index 100% rename from ThirdParty/Ert/devel/libsched/src/sched_types.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_types.h diff --git a/ThirdParty/Ert/devel/libsched/src/sched_util.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_util.h similarity index 98% rename from ThirdParty/Ert/devel/libsched/src/sched_util.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/sched_util.h index e9b5bf7865..5fba98d4c0 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_util.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/sched_util.h @@ -23,7 +23,8 @@ extern "C" { #endif #include #include -#include + +#include #define SCHED_KW_DEFAULT_ITEM "*" diff --git a/ThirdParty/Ert/devel/libsched/src/well_history.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/well_history.h similarity index 93% rename from ThirdParty/Ert/devel/libsched/src/well_history.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/well_history.h index 137ef42ef0..7e81e2ed2a 100644 --- a/ThirdParty/Ert/devel/libsched/src/well_history.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/well_history.h @@ -22,12 +22,12 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include -#include -#include -#include -#include +#include +#include +#include +#include typedef struct well_history_struct well_history_type; diff --git a/ThirdParty/Ert/devel/libsched/src/well_index.h b/ThirdParty/Ert/devel/libsched/include/ert/sched/well_index.h similarity index 96% rename from ThirdParty/Ert/devel/libsched/src/well_index.h rename to ThirdParty/Ert/devel/libsched/include/ert/sched/well_index.h index ef06c5070d..66ab92e5a4 100644 --- a/ThirdParty/Ert/devel/libsched/src/well_index.h +++ b/ThirdParty/Ert/devel/libsched/include/ert/sched/well_index.h @@ -22,9 +22,9 @@ #ifdef __cplusplus extern "C" { #endif -#include +#include -#include +#include typedef struct well_index_struct well_index_type; diff --git a/ThirdParty/Ert/devel/libsched/src/CMakeLists.txt b/ThirdParty/Ert/devel/libsched/src/CMakeLists.txt index 1a1dfed667..2e0ad4c657 100644 --- a/ThirdParty/Ert/devel/libsched/src/CMakeLists.txt +++ b/ThirdParty/Ert/devel/libsched/src/CMakeLists.txt @@ -5,19 +5,17 @@ set( header_files sched_history.h sched_time.h group_index.h sched_blob.h well_i include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) include_directories( ${libutil_build_path} ) include_directories( ${libutil_src_path} ) -include_directories( ${libecl_src_path} ) add_library( sched ${LIBRARY_TYPE} ${source_files} ) +set_target_properties( sched PROPERTIES VERSION 1.0 SOVERSION 1.0 ) target_link_libraries( sched ert_util ecl) #----------------------------------------------------------------- -if (SCHED_INSTALL_PREFIX) - install(TARGETS sched DESTINATION ${SCHED_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${SCHED_INSTALL_PREFIX}/include) -else() - install(TARGETS sched DESTINATION lib) - install(FILES ${header_files} DESTINATION include) -endif() +install(TARGETS sched DESTINATION ${CMAKE_INSTALL_LIBDIR}) +foreach(header ${header_files}) + install(FILES ../include/ert/sched/${header} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/ert/sched) +endforeach() + diff --git a/ThirdParty/Ert/devel/libsched/src/dependencies b/ThirdParty/Ert/devel/libsched/src/dependencies deleted file mode 100644 index 64b93f7158..0000000000 --- a/ThirdParty/Ert/devel/libsched/src/dependencies +++ /dev/null @@ -1,17 +0,0 @@ -sched_util.o : sched_util.c sched_util.h -sched_kw_wconhist.o : sched_kw_wconhist.c sched_kw_wconhist.h sched_util.o -sched_kw_wconinje.o : sched_kw_wconinje.c sched_kw_wconinje.h sched_kw_untyped.o sched_util.o -sched_kw_wconinj.o : sched_kw_wconinj.c sched_kw_wconinj.h sched_kw_untyped.o sched_util.o -sched_file.o : sched_file.c sched_file.h sched_util.o -sched_kw_compdat.o : sched_kw_compdat.c sched_kw_compdat.h sched_util.o -sched_kw_welspecs.o : sched_kw_welspecs.c sched_kw_welspecs.h sched_util.o sched_macros.h -sched_kw_wconprod.o : sched_kw_wconprod.c sched_kw_wconprod.h sched_kw_untyped.o sched_util.o -sched_kw_include.o : sched_kw_include.c sched_kw_include.h sched_util.o sched_macros.h -sched_kw_gruptree.o : sched_kw_gruptree.c sched_kw_gruptree.h sched_util.o sched_macros.h -history.o : history.c history.h gruptree.o -sched_kw.o : sched_kw.c sched_kw.h sched_util.o sched_kw_gruptree.o sched_kw_tstep.o sched_kw_dates.o sched_kw_wconhist.o sched_kw_wconinjh.o sched_kw_welspecs.o sched_kw_wconprod.o sched_kw_wconinj.o sched_kw_wconinje.o sched_kw_compdat.o sched_kw_untyped.o sched_kw_include.o sched_macros.h -gruptree.o : gruptree.c gruptree.h -sched_kw_dates.o : sched_kw_dates.c sched_kw_dates.h sched_util.o -sched_kw_untyped.o : sched_kw_untyped.c sched_kw_untyped.h sched_util.o -sched_kw_tstep.o : sched_kw_tstep.c sched_kw_tstep.h sched_util.o sched_macros.h -sched_kw_wconinjh.o : sched_kw_wconinjh.c sched_kw_wconinjh.h sched_util.o diff --git a/ThirdParty/Ert/devel/libsched/src/group_history.c b/ThirdParty/Ert/devel/libsched/src/group_history.c index 4c616e622f..50adb787bd 100644 --- a/ThirdParty/Ert/devel/libsched/src/group_history.c +++ b/ThirdParty/Ert/devel/libsched/src/group_history.c @@ -18,14 +18,15 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include + +#include +#include +#include #define GROUP_HISTORY_TYPE_ID 5100635 diff --git a/ThirdParty/Ert/devel/libsched/src/group_index.c b/ThirdParty/Ert/devel/libsched/src/group_index.c index 97915865ba..1078242c10 100644 --- a/ThirdParty/Ert/devel/libsched/src/group_index.c +++ b/ThirdParty/Ert/devel/libsched/src/group_index.c @@ -17,11 +17,13 @@ */ #include -#include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include #define GROUP_INDEX_TYPE_ID 96580631 diff --git a/ThirdParty/Ert/devel/libsched/src/gruptree.c b/ThirdParty/Ert/devel/libsched/src/gruptree.c index 5a2390a706..67da8d5bb7 100644 --- a/ThirdParty/Ert/devel/libsched/src/gruptree.c +++ b/ThirdParty/Ert/devel/libsched/src/gruptree.c @@ -18,8 +18,11 @@ #include #include -#include -#include + +#include +#include + +#include /* diff --git a/ThirdParty/Ert/devel/libsched/src/history.c b/ThirdParty/Ert/devel/libsched/src/history.c index 8e9f22e98a..2058691dd7 100644 --- a/ThirdParty/Ert/devel/libsched/src/history.c +++ b/ThirdParty/Ert/devel/libsched/src/history.c @@ -17,15 +17,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include + +#include +#include + +#include +#include +#include struct history_struct{ diff --git a/ThirdParty/Ert/devel/libsched/src/sched_blob.c b/ThirdParty/Ert/devel/libsched/src/sched_blob.c index 3eed8cc6ac..1c1b394924 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_blob.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_blob.c @@ -16,15 +16,17 @@ for more details. */ -#include #include -#include -#include -#include -#include -#include #include +#include +#include +#include + +#include +#include +#include + diff --git a/ThirdParty/Ert/devel/libsched/src/sched_file.c b/ThirdParty/Ert/devel/libsched/src/sched_file.c index 6cba9d6d84..a12f47ecc4 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_file.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_file.c @@ -16,20 +16,21 @@ for more details. */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include /* This sched_file.c contains code for internalizing an ECLIPSE schedule file. diff --git a/ThirdParty/Ert/devel/libsched/src/sched_history.c b/ThirdParty/Ert/devel/libsched/src/sched_history.c index abe6c84044..695fbf5e16 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_history.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_history.c @@ -17,27 +17,27 @@ */ #include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include struct sched_history_struct { diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw.c b/ThirdParty/Ert/devel/libsched/src/sched_kw.c index 502e86298a..8ca0a9c182 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw.c @@ -23,25 +23,25 @@ #include #include -#include -#include -#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include /* diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_compdat.c b/ThirdParty/Ert/devel/libsched/src/sched_kw_compdat.c index ed56e3ca40..54341a4b26 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_compdat.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw_compdat.c @@ -20,12 +20,15 @@ #include #include #include -#include -#include -#include -#include #include +#include +#include + +#include +#include + + #define COMPDAT_NUM_KW 14 #define SCHED_KW_COMPDAT_ID 771882 diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_dates.c b/ThirdParty/Ert/devel/libsched/src/sched_kw_dates.c index 1631073741..ff74718bf2 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_dates.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw_dates.c @@ -18,15 +18,18 @@ #include #include -#include #include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include + +#include + +#include +#include +#include +#include #define DATES_FMT " %d \'%s\' %4d / \n" // The format string used when writing dates the arguments are (day , month_string , year). diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_gruptree.c b/ThirdParty/Ert/devel/libsched/src/sched_kw_gruptree.c index 0d99cae961..5352772811 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_gruptree.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw_gruptree.c @@ -16,13 +16,16 @@ for more details. */ -#include -#include #include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include +#include + struct sched_kw_gruptree_struct { diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_include.c b/ThirdParty/Ert/devel/libsched/src/sched_kw_include.c index f81183d62b..11a58e8dd8 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_include.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw_include.c @@ -20,12 +20,15 @@ #include #include #include -#include -#include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include +#include + /** This file implemtents support for the INCLUDE keyword in the diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_tstep.c b/ThirdParty/Ert/devel/libsched/src/sched_kw_tstep.c index a81db8206a..12ce9bacca 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_tstep.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw_tstep.c @@ -19,11 +19,13 @@ #include #include #include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_untyped.c b/ThirdParty/Ert/devel/libsched/src/sched_kw_untyped.c index 13c0b778d3..2439d9dc95 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_untyped.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw_untyped.c @@ -18,12 +18,15 @@ #include #include -#include #include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include + diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconhist.c b/ThirdParty/Ert/devel/libsched/src/sched_kw_wconhist.c index 08cc0e6346..a2236b5147 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconhist.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw_wconhist.c @@ -19,17 +19,17 @@ #include #include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include -#include -#include -#include +#include +#include +#include /* diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinj.c b/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinj.c index def61f08b9..fdfb0986b9 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinj.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinj.c @@ -18,13 +18,14 @@ #include #include -#include #include -#include -#include -#include -#include -#include + +#include +#include + +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinje.c b/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinje.c index d555a6a3c6..767966238f 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinje.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinje.c @@ -19,16 +19,17 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include + +#include +#include +#include #define DEFAULT_INJECTOR_STATE OPEN diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinjh.c b/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinjh.c index 37233fbe28..42e954bb03 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinjh.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw_wconinjh.c @@ -18,16 +18,18 @@ #include #include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include #define WCONINJH_TYPE_ID 88163977 #define WCONINJH_NUM_KW 8 diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconprod.c b/ThirdParty/Ert/devel/libsched/src/sched_kw_wconprod.c index 019cc558d6..07a9549544 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_wconprod.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw_wconprod.c @@ -18,12 +18,14 @@ #include #include -#include -#include #include -#include -#include -#include + +#include +#include + +#include +#include +#include diff --git a/ThirdParty/Ert/devel/libsched/src/sched_kw_welspecs.c b/ThirdParty/Ert/devel/libsched/src/sched_kw_welspecs.c index c66c8b581a..c78a8fafda 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_kw_welspecs.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_kw_welspecs.c @@ -19,14 +19,16 @@ #include #include #include -#include -#include -#include -#include -#include -#include -#include -#include + +#include +#include +#include + +#include +#include +#include +#include + /* diff --git a/ThirdParty/Ert/devel/libsched/src/sched_time.c b/ThirdParty/Ert/devel/libsched/src/sched_time.c index 936a2c72be..d6d3ae2c11 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_time.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_time.c @@ -20,11 +20,11 @@ #include #include -#include -#include +#include +#include -#include -#include +#include +#include /*****************************************************************/ diff --git a/ThirdParty/Ert/devel/libsched/src/sched_types.c b/ThirdParty/Ert/devel/libsched/src/sched_types.c index 840a7cd841..4d98aff14b 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_types.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_types.c @@ -17,8 +17,10 @@ */ #include -#include -#include + +#include + +#include #define SCHED_KW_DEFAULT_ITEM "*" diff --git a/ThirdParty/Ert/devel/libsched/src/sched_util.c b/ThirdParty/Ert/devel/libsched/src/sched_util.c index 539ba2e274..54667586aa 100644 --- a/ThirdParty/Ert/devel/libsched/src/sched_util.c +++ b/ThirdParty/Ert/devel/libsched/src/sched_util.c @@ -19,9 +19,11 @@ #include #include #include -#include -#include -#include + +#include +#include + +#include /** This file implements small utility functions used by the rest of diff --git a/ThirdParty/Ert/devel/libsched/src/well_history.c b/ThirdParty/Ert/devel/libsched/src/well_history.c index 4e30eb29ed..41f673a9dd 100644 --- a/ThirdParty/Ert/devel/libsched/src/well_history.c +++ b/ThirdParty/Ert/devel/libsched/src/well_history.c @@ -19,19 +19,19 @@ #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include -#include -#include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include +#include +#include #define WELL_HISTORY_TYPE_ID 44431872 diff --git a/ThirdParty/Ert/devel/libsched/src/well_index.c b/ThirdParty/Ert/devel/libsched/src/well_index.c index b99e497f98..d7d35a54e5 100644 --- a/ThirdParty/Ert/devel/libsched/src/well_index.c +++ b/ThirdParty/Ert/devel/libsched/src/well_index.c @@ -18,12 +18,12 @@ #include -#include -#include -#include +#include +#include +#include -#include -#include +#include +#include #define WELL_INDEX_TYPE_ID 99780634 diff --git a/ThirdParty/Ert/devel/libwell/CMakeLists.txt b/ThirdParty/Ert/devel/libwell/CMakeLists.txt deleted file mode 100644 index 930cca1feb..0000000000 --- a/ThirdParty/Ert/devel/libwell/CMakeLists.txt +++ /dev/null @@ -1,4 +0,0 @@ -set( WELL_INSTALL_PREFIX "" CACHE STRING "Prefix for installation of libwell") - -add_subdirectory( src ) -add_subdirectory( applications ) diff --git a/ThirdParty/Ert/devel/libwell/src/CMakeLists.txt b/ThirdParty/Ert/devel/libwell/src/CMakeLists.txt deleted file mode 100644 index 3f9f3154ed..0000000000 --- a/ThirdParty/Ert/devel/libwell/src/CMakeLists.txt +++ /dev/null @@ -1,21 +0,0 @@ -set( source_files well_state.c well_conn.c well_info.c well_ts.c well_branch.c well_path.c ) -set( header_files well_state.h well_const.h well_conn.h well_info.h well_ts.h well_branch.h well_path.h ) - -include_directories( ${CMAKE_CURRENT_SOURCE_DIR} ) -include_directories( ${libgeometry_src_path} ) -include_directories( ${libecl_src_path} ) - - -add_library( well ${LIBRARY_TYPE} ${source_files} ) -target_link_libraries( well ecl ) - -#----------------------------------------------------------------- -if (WELL_INSTALL_PREFIX) - install(TARGETS well DESTINATION ${CMAKE_INSTALL_PREFIX}/${WELL_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/${WELL_INSTALL_PREFIX}/include) -else() - install(TARGETS well DESTINATION ${CMAKE_INSTALL_PREFIX}/lib) - install(FILES ${header_files} DESTINATION ${CMAKE_INSTALL_PREFIX}/include) -endif() - - diff --git a/ThirdParty/Ert/devel/python/CMakeLists.txt b/ThirdParty/Ert/devel/python/CMakeLists.txt new file mode 100644 index 0000000000..4722867c52 --- /dev/null +++ b/ThirdParty/Ert/devel/python/CMakeLists.txt @@ -0,0 +1,2 @@ +add_subdirectory( test ) +add_subdirectory( python ) \ No newline at end of file diff --git a/ThirdParty/Ert/devel/python/python/CMakeLists.txt b/ThirdParty/Ert/devel/python/python/CMakeLists.txt new file mode 100644 index 0000000000..5c2cc08914 --- /dev/null +++ b/ThirdParty/Ert/devel/python/python/CMakeLists.txt @@ -0,0 +1,2 @@ +set(PYTHON_INSTALL_PREFIX "/python") +add_subdirectory( ert ) diff --git a/ThirdParty/Ert/devel/python/python/ert/CMakeLists.txt b/ThirdParty/Ert/devel/python/python/ert/CMakeLists.txt new file mode 100644 index 0000000000..6e6f141fbc --- /dev/null +++ b/ThirdParty/Ert/devel/python/python/ert/CMakeLists.txt @@ -0,0 +1,11 @@ +add_python_target( python_ert ${PYTHON_INSTALL_PREFIX}/ert __init__ ) +add_subdirectory( config ) +add_subdirectory( cwrap ) +add_subdirectory( ecl ) +add_subdirectory( enkf ) +add_subdirectory( geo ) +add_subdirectory( job_queue ) +add_subdirectory( rms ) +add_subdirectory( sched ) +add_subdirectory( util ) +add_subdirectory( well ) diff --git a/ThirdParty/Ert/devel/python/python/ert/__init__.py b/ThirdParty/Ert/devel/python/python/ert/__init__.py index 4ef5e811a9..c0ee8c64e8 100644 --- a/ThirdParty/Ert/devel/python/python/ert/__init__.py +++ b/ThirdParty/Ert/devel/python/python/ert/__init__.py @@ -35,14 +35,14 @@ variable LD_LIBRARY_PATH. To avoid conflict with other application using the ert libraries the Python code should be able to locate the shared libraries without (necessarily) using the LD_LIBRARY_PATH variable. The default -behaviour is to try to load from the library ../../lib, but by using +behaviour is to try to load from the library ../../lib64, but by using the enviornment variable ERT_LIBRARY_PATH you can alter how ert looks for shared libraries. This module will set the ert_lib_path of the ert.cwrap.clib module; the actual loading will take place in that module. 1. By default the code will try to load the shared libraries from - '../../lib' relative to the location of this file. + '../../lib64' relative to the location of this file. 2. Depending on the value of ERT_LIBRARY_PATH two different behaviours can be imposed: @@ -53,7 +53,7 @@ module. Arbitrary value: the package will use standard load order for the operating system. -If the fixed path, given by the default ../../lib or ERT_LIBRARY_PATH +If the fixed path, given by the default ../../lib64 or ERT_LIBRARY_PATH alternative fails, the loader will try the default load behaviour before giving up completely. """ @@ -69,8 +69,8 @@ if ert_lib_path: ert_lib_path = None #else: look in ERT_LIBRARY_PATH else: - # Look in the default path "../../lib" - ert_lib_path = os.path.realpath( os.path.join(os.path.dirname( os.path.abspath( __file__)) , "../../lib") ) + # Look in the default path "../../lib64" + ert_lib_path = os.path.realpath( os.path.join(os.path.dirname( os.path.abspath( __file__)) , "../../lib64") ) if not os.path.exists( ert_lib_path ): ert_lib_path = None diff --git a/ThirdParty/Ert/devel/python/python/ert/config/CMakeLists.txt b/ThirdParty/Ert/devel/python/python/ert/config/CMakeLists.txt new file mode 100644 index 0000000000..e1749d5f3e --- /dev/null +++ b/ThirdParty/Ert/devel/python/python/ert/config/CMakeLists.txt @@ -0,0 +1 @@ +add_python_target(python_config ${PYTHON_INSTALL_PREFIX}/ert/config "config;__init__;libconfig") diff --git a/ThirdParty/Ert/devel/python/python/ert/cwrap/CMakeLists.txt b/ThirdParty/Ert/devel/python/python/ert/cwrap/CMakeLists.txt new file mode 100644 index 0000000000..d98e8e581c --- /dev/null +++ b/ThirdParty/Ert/devel/python/python/ert/cwrap/CMakeLists.txt @@ -0,0 +1 @@ +add_python_target(python_cwrap ${PYTHON_INSTALL_PREFIX}/ert/cwrap "cclass;cenum;cfile;clib;cwrap;__init__") diff --git a/ThirdParty/Ert/devel/python/python/ert/ecl/CMakeLists.txt b/ThirdParty/Ert/devel/python/python/ert/ecl/CMakeLists.txt new file mode 100644 index 0000000000..db209125ed --- /dev/null +++ b/ThirdParty/Ert/devel/python/python/ert/ecl/CMakeLists.txt @@ -0,0 +1,2 @@ +set(PYTHON_INSTALL_PREFIX "/python/ert/ecl/") +add_python_target(python_ecl ${PYTHON_INSTALL_PREFIX} "ecl_case;ecl_default;ecl_file;ecl_grav_calc;ecl_grav;ecl_grid;ecl_kw;ecl;ecl_queue;ecl_region;ecl_rft;ecl_subsidence;ecl_sum;ecl_util;fortio;__init__;libecl") diff --git a/ThirdParty/Ert/devel/python/python/ert/enkf/CMakeLists.txt b/ThirdParty/Ert/devel/python/python/ert/enkf/CMakeLists.txt new file mode 100644 index 0000000000..a300bb9803 --- /dev/null +++ b/ThirdParty/Ert/devel/python/python/ert/enkf/CMakeLists.txt @@ -0,0 +1 @@ +add_python_target(python_enkf ${PYTHON_INSTALL_PREFIX}/ert/enkf "enkf_enum;enkf_main;enkf;ens_config;__init__;libenkf") diff --git a/ThirdParty/Ert/devel/python/python/ert/geo/CMakeLists.txt b/ThirdParty/Ert/devel/python/python/ert/geo/CMakeLists.txt new file mode 100644 index 0000000000..58dff2de34 --- /dev/null +++ b/ThirdParty/Ert/devel/python/python/ert/geo/CMakeLists.txt @@ -0,0 +1 @@ +add_python_target(python_geo ${PYTHON_INSTALL_PREFIX}/ert/geo "geo_polygon;geo;__init__;libgeo") diff --git a/ThirdParty/Ert/devel/python/python/ert/job_queue/CMakeLists.txt b/ThirdParty/Ert/devel/python/python/ert/job_queue/CMakeLists.txt new file mode 100644 index 0000000000..47054d17ee --- /dev/null +++ b/ThirdParty/Ert/devel/python/python/ert/job_queue/CMakeLists.txt @@ -0,0 +1 @@ +add_python_target(pythonjob_queue ${PYTHON_INSTALL_PREFIX}/ert/job_queue "driver;__init__;job;job_queue;libjob_queue;queue") diff --git a/ThirdParty/Ert/devel/python/python/ert/rms/CMakeLists.txt b/ThirdParty/Ert/devel/python/python/ert/rms/CMakeLists.txt new file mode 100644 index 0000000000..6602b25ff3 --- /dev/null +++ b/ThirdParty/Ert/devel/python/python/ert/rms/CMakeLists.txt @@ -0,0 +1 @@ +add_python_target(python_rms ${PYTHON_INSTALL_PREFIX}/ert/rms "__init__;librms;rms") diff --git a/ThirdParty/Ert/devel/python/python/ert/sched/CMakeLists.txt b/ThirdParty/Ert/devel/python/python/ert/sched/CMakeLists.txt new file mode 100644 index 0000000000..5ebb8e443f --- /dev/null +++ b/ThirdParty/Ert/devel/python/python/ert/sched/CMakeLists.txt @@ -0,0 +1 @@ +add_python_target(python_sched ${PYTHON_INSTALL_PREFIX}/ert/sched "__init__;libsched;sched_file;sched") diff --git a/ThirdParty/Ert/devel/python/python/ert/util/CMakeLists.txt b/ThirdParty/Ert/devel/python/python/ert/util/CMakeLists.txt new file mode 100644 index 0000000000..adaa648254 --- /dev/null +++ b/ThirdParty/Ert/devel/python/python/ert/util/CMakeLists.txt @@ -0,0 +1 @@ +add_python_target(python_util ${PYTHON_INSTALL_PREFIX}/ert/util "ctime;hash;__init__;latex;libutil;lookup_table;matrix;stat;stringlist;tvector;util_func") diff --git a/ThirdParty/Ert/devel/python/python/ert/well/CMakeLists.txt b/ThirdParty/Ert/devel/python/python/ert/well/CMakeLists.txt new file mode 100644 index 0000000000..3d51ba2760 --- /dev/null +++ b/ThirdParty/Ert/devel/python/python/ert/well/CMakeLists.txt @@ -0,0 +1 @@ +add_python_target(python_well ${PYTHON_INSTALL_PREFIX}/ert/well "__init__;libwell;well_info;well;well_state;well_ts") diff --git a/ThirdParty/Ert/devel/python/test/CMakeLists.txt b/ThirdParty/Ert/devel/python/test/CMakeLists.txt new file mode 100644 index 0000000000..8194bac11f --- /dev/null +++ b/ThirdParty/Ert/devel/python/test/CMakeLists.txt @@ -0,0 +1,2 @@ +set(PYTHON_INSTALL_PREFIX "/python/test") +add_python_target(python_tests ${PYTHON_INSTALL_PREFIX} "ecl_isosurf;enkf_test;ens_config_test;file_test;fortio_test;grav_test;grdecl_test;grid_test0;grid_test;import_test;job_test;kw_test;large_mem_test;latex_test;petrel_kw;poly_test;region_test;restart_test;rft_test;sched_test;stringlist_test;sum_test;test_all;test_fast;test_util;troll_test;util_test") diff --git a/ThirdParty/Ert/devel/redhat/ert.ecl.spec b/ThirdParty/Ert/devel/redhat/ert.ecl.spec new file mode 100644 index 0000000000..cd206bfbf9 --- /dev/null +++ b/ThirdParty/Ert/devel/redhat/ert.ecl.spec @@ -0,0 +1,74 @@ +# +# spec file for package ert.ecl +# + +Name: ert.ecl +Version: 1.0 +Release: 0 +Summary: ERT - Ensemble based Reservoir Tool - ECL library +License: GPL-3+ +Group: Development/Libraries/C and C++ +Url: http://ert.nr.no +Source0: %{name}-%{version}.tar.gz +BuildRequires: lapack-devel +BuildRequires: gcc +BuildRequires: cmake28 +BuildRoot: %{_tmppath}/%{name}-%{version}-build +Requires: libert.ecl1 = %{version} + +%description +ERT - Ensemble based Reservoir Tool is a tool for managing en ensemble +of reservoir models. The initial motivation for creating ERT was a as +tool to do assisted history matching with Ensemble Kalman Filter +(EnKF). + +%package -n libert.ecl1 +Summary: ERT - Ensemble based Reservoir Tool - ECL library +Group: System/Libraries + +%description -n libert.ecl1 +ERT - Ensemble based Reservoir Tool is a tool for managing en ensemble +of reservoir models. The initial motivation for creating ERT was a as +tool to do assisted history matching with Ensemble Kalman Filter +(EnKF). + +%package devel +Summary: Development and header files for libert.ecl +Group: Development/Libraries/C and C++ +Requires: %{name} = %{version} +Requires: lapack-devel +Requires: libert.ecl1 = %{version} + +%description devel +This package contains the development and header files for ert.ecl + +%prep +%setup -q + +%build +cd devel +cmake28 -DSHARED_LIB=1 -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=%{_prefix} +make + +%install +cd devel +make install DESTDIR=${RPM_BUILD_ROOT} + +%clean +rm -rf %{buildroot} + +%post -n libert.ecl1 -p /sbin/ldconfig + +%postun -n libert.ecl1 -p /sbin/ldconfig + +%files +%doc README + +%files -n libert.ecl1 +%defattr(-,root,root,-) +%{_libdir}/*.so.* + +%files devel +%defattr(-,root,root,-) +%{_libdir}/*.so +%{_includedir}/*