OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

MswRollUp: Updated Ert to commit 1fea6b00f3 master Fixed an Api change

Browse Source 
This is an intermediate commit and does not compile
p4#: 22222
This commit is contained in:
Jacob Støren
2013-08-26 14:44:03 +02:00
parent 441ac1e3d9
commit d7d5d2942b
335 changed files with 10440 additions and 5876 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ThirdParty/Ert/devel/libenkf/applications/ert_tui/CMakeLists.txt vendored
View File

@@ -31,6 +31,9 @@ set_source_files_properties( main.c PROPERTIES COMPILE_DEFINITIONS "COMPILE_TIME
add_executable( ert ${src_list} )
target_link_libraries( ert enkf sched rms ecl config plot job_queue analysis ert_util )
if (USE_RUNPATH)
add_runpath( ert )
endif()
if (ERT_INSTALL_PREFIX)
set (destination ${CMAKE_INSTALL_PREFIX}/${ERT_INSTALL_PREFIX}/bin)

40
ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_analysis.c vendored
View File

@@ -65,6 +65,17 @@ void enkf_tui_analysis_analyze_selected__(void * arg) {
}
}
void enkf_tui_analysis_scale_observation_std__(void * arg) {
enkf_main_type * enkf_main = enkf_main_safe_cast(arg);
double scale_factor = enkf_tui_util_scanf_double_with_lower_limit("Global scaling factor", PROMPT_LEN, 0);
if (enkf_main_have_obs(enkf_main)) {
enkf_obs_type * observations = enkf_main_get_obs(enkf_main);
enkf_obs_scale_std(observations, scale_factor);
}
}
/**
@@ -228,19 +239,26 @@ void enkf_tui_analysis_menu(void * arg) {
arg_pack_type * arg_pack = arg_pack_alloc();
arg_pack_append_ptr( arg_pack , enkf_main );
arg_pack_append_ptr( arg_pack , menu );
{
enkf_tui_analysis_update_title( enkf_main , menu );
menu_add_item(menu , "Analyze one step manually" , "aA" , enkf_tui_analysis_analyze__ , enkf_main , NULL);
menu_add_item(menu , "Analyze interval manually" , "iI" , enkf_tui_analysis_smooth__ , enkf_main , NULL);
menu_add_item(menu , "Analyze selected steps manually" , "nN" , enkf_tui_analysis_analyze_selected__ , enkf_main , NULL);
menu_add_separator( menu );
menu_add_item(menu , "Select analysis module" , "sS" , enkf_tui_analysis_select_module__ , arg_pack , NULL);
menu_add_item(menu , "List available modules" , "lL" , enkf_tui_analysis_list_modules__ , enkf_main , NULL);
menu_add_item(menu , "Modify analysis module parameters" , "mM" , enkf_tui_analysis_update_module__ , enkf_main , NULL);
menu_add_item(menu , "Reload current module (external only)" , "rR" , enkf_tui_analysis_reload_module__ , enkf_main , NULL);
enkf_tui_analysis_update_title(enkf_main, menu);
menu_add_item(menu, "Analyze one step manually", "aA", enkf_tui_analysis_analyze__, enkf_main, NULL);
menu_add_item(menu, "Analyze interval manually", "iI", enkf_tui_analysis_smooth__, enkf_main, NULL);
menu_add_item(menu, "Analyze selected steps manually", "nN", enkf_tui_analysis_analyze_selected__, enkf_main, NULL);
menu_add_separator(menu);
{
menu_item_type * item = menu_add_item(menu, "Global scaling of uncertainty", "gG", enkf_tui_analysis_scale_observation_std__, enkf_main, NULL);
if (!enkf_main_have_obs(enkf_main)) {
menu_item_disable(item);
}
}
menu_add_separator(menu);
menu_add_item(menu, "Select analysis module", "sS", enkf_tui_analysis_select_module__, arg_pack, NULL);
menu_add_item(menu, "List available modules", "lL", enkf_tui_analysis_list_modules__, enkf_main, NULL);
menu_add_item(menu, "Modify analysis module parameters", "mM", enkf_tui_analysis_update_module__, enkf_main, NULL);
menu_add_item(menu, "Reload current module (external only)", "rR", enkf_tui_analysis_reload_module__, enkf_main, NULL);
}
menu_run(menu);
menu_free(menu);
arg_pack_free( arg_pack );
arg_pack_free(arg_pack);
}

8
ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_main.c vendored
View File

@@ -20,9 +20,9 @@
#include <stdbool.h>
#include <stdio.h>
#include <string.h>
#include <util.h>
#include <ert/util/util.h>
#include <ctype.h>
#include <menu.h>
#include <ert/util/menu.h>
#include <enkf_tui_run.h>
#include <enkf_tui_export.h>
#include <enkf_tui_plot.h>
@@ -34,8 +34,8 @@
#include <enkf_tui_misc.h>
#include <enkf_tui_simple.h>
#include <enkf_tui_workflow.h>
#include <enkf_main.h>
#include <enkf_sched.h>
#include <ert/enkf/enkf_main.h>
#include <ert/enkf/enkf_sched.h>
/**

2
ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_main.h vendored
View File

@@ -18,7 +18,7 @@
#ifndef __ENKF_INTER_MAIN_H__
#define __ENKF_INTER_MAIN_H__
#include <enkf_main.h>
#include <ert/enkf/enkf_main.h>
void enkf_tui_main_menu(void * arg);

2
ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_plot_rft.h vendored
View File

@@ -23,7 +23,7 @@
extern "C" {
#endif
#include <enkf_main.h>
#include <ert/enkf/enkf_main.h>
void enkf_tui_plot_RFT_sim_all_MD( void * arg);
void enkf_tui_plot_RFT_sim_all_TVD( void * arg);

13
ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_util.c vendored
View File

@@ -434,6 +434,19 @@ bool enkf_tui_util_sscanf_active_list( bool_vector_type * iactive , const char *
}
}
/**
The limit is not inclusive
*/
double enkf_tui_util_scanf_double_with_lower_limit(const char * prompt , int prompt_len , double min_value) {
double value;
char * new_prompt = util_alloc_sprintf("%s (greater than %g)" , prompt , min_value );
do {
value = util_scanf_double(new_prompt , prompt_len);
} while (value <= min_value);
free(new_prompt);
return value;
}
/*****************************************************************/

2
ThirdParty/Ert/devel/libenkf/applications/ert_tui/enkf_tui_util.h vendored
View File

@@ -41,6 +41,6 @@ char * enkf_tui_util_scanf_report_step_as_char(int , cons
void enkf_tui_util_msg(const char * , ...);
int enkf_tui_util_scanf_int_with_default(const char * prompt , int prompt_len , bool * default_used);
int enkf_tui_util_scanf_int_with_default_return_to_menu(const char * prompt , int prompt_len , bool * default_used);
double enkf_tui_util_scanf_double_with_lower_limit(const char * prompt , int prompt_len , double min_value);
bool enkf_tui_util_sscanf_active_list( bool_vector_type * iactive , const char * select_string , int ens_size );
#endif