Merge pull request #668 from joakim-hove/ERT-781-CSV

Ert 781 csv
Ensembles · Dec 16, 2014 · 598efaf · 598efaf
2 parents ef6548e + 6a40c61
commit 598efaf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/devel/libecl/include/ert/ecl/ecl_sum_vector.h b/devel/libecl/include/ert/ecl/ecl_sum_vector.h
@@ -32,7 +32,7 @@ typedef struct ecl_sum_vector_struct ecl_sum_vector_type;
   bool ecl_sum_vector_add_key( ecl_sum_vector_type * keylist, const char * key);
   void ecl_sum_vector_add_keys( ecl_sum_vector_type * keylist, const char * pattern);
 
-  bool ecl_sum_vector_iget(const ecl_sum_vector_type * ecl_sum_vector, int index);
+  bool ecl_sum_vector_iget_is_rate(const ecl_sum_vector_type * ecl_sum_vector, int index);
   int ecl_sum_vector_iget_param_index(const ecl_sum_vector_type * ecl_sum_vector, int index);
   int ecl_sum_vector_get_size(const ecl_sum_vector_type * ecl_sum_vector);
 

diff --git a/devel/libecl/src/ecl_sum_data.c b/devel/libecl/src/ecl_sum_data.c
@@ -1125,10 +1125,11 @@ void ecl_sum_data_write_csv_file(const ecl_sum_data_type * data , time_t sim_tim
     double weight1 , weight2;
     int    time_index1 , time_index2;
     double value = 0.0;
-    ecl_sum_data_init_interp_from_sim_time( data , sim_time , &time_index1 , &time_index2 , &weight1 , &weight2);
     int i;
+
+    ecl_sum_data_init_interp_from_sim_time( data , sim_time , &time_index1 , &time_index2 , &weight1 , &weight2);
     for(i = 0; i< num_keywords; i++  ){
-        bool is_rate = ecl_sum_vector_iget(keylist, i);
+        bool is_rate = ecl_sum_vector_iget_is_rate(keylist, i);
         int params_index = ecl_sum_vector_iget_param_index(keylist , i);
         if(is_rate){
             int time_index;

diff --git a/devel/libecl/src/ecl_sum_vector.c b/devel/libecl/src/ecl_sum_vector.c
@@ -85,7 +85,7 @@ int ecl_sum_vector_get_size(const ecl_sum_vector_type * ecl_sum_vector){
     return int_vector_size(ecl_sum_vector->node_index_list);
 }
 
-bool ecl_sum_vector_iget(const ecl_sum_vector_type * ecl_sum_vector, int index){
+bool ecl_sum_vector_iget_is_rate(const ecl_sum_vector_type * ecl_sum_vector, int index){
     return bool_vector_iget(ecl_sum_vector->is_rate_list, index);
 }