Merge pull request #67 from joakim-hove/run-id-trivia

Run id trivia
equinor · Jul 26, 2017 · b392a22 · b392a22
2 parents 335d4eb + 01aab21
commit b392a22
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/libenkf/include/ert/enkf/analysis_config.h b/libenkf/include/ert/enkf/analysis_config.h
@@ -51,7 +51,7 @@ bool                   analysis_config_get_module_option( const analysis_config_
 bool                   analysis_config_load_external_module( analysis_config_type * config , const char * lib_name, const char * user_name);
 void                   analysis_config_load_all_external_modules_from_config ( analysis_config_type * analysis_config, const config_content_type * config);
 
-stringlist_type      * analysis_config_alloc_module_names( analysis_config_type * config );
+stringlist_type      * analysis_config_alloc_module_names( const analysis_config_type * config );
 const char           * analysis_config_get_log_path( const analysis_config_type * config );
 void                   analysis_config_init( analysis_config_type * analysis , const config_content_type * config);
 analysis_config_type * analysis_config_alloc(void);

diff --git a/libenkf/src/analysis_config.c b/libenkf/src/analysis_config.c
@@ -175,7 +175,7 @@ static void analysis_config_set_min_realisations( analysis_config_type * config
 }
 
 
-stringlist_type * analysis_config_alloc_module_names( analysis_config_type * config ) {
+stringlist_type * analysis_config_alloc_module_names( const analysis_config_type * config ) {
   return hash_alloc_stringlist( config->analysis_modules );
 }
 

diff --git a/libenkf/src/queue_config.c b/libenkf/src/queue_config.c
@@ -104,7 +104,7 @@ queue_config_type * queue_config_alloc_local_copy( queue_config_type * queue_con
     queue_config_copy->user_mode = queue_config->user_mode;
 
     if (queue_config_has_job_script(queue_config)) {
-        queue_config_copy->job_script = util_alloc_copy(queue_config->job_script, strlen( queue_config->job_script) + 1);        
+        queue_config_copy->job_script = util_alloc_string_copy( queue_config->job_script );
     }
     else
         queue_config_copy->job_script = NULL;

diff --git a/python/python/res/job_queue/forward_model.py b/python/python/res/job_queue/forward_model.py
@@ -54,8 +54,8 @@ def clear(self):
     def free(self):
         self._free( )
 
-    def formatted_fprintf(self, path, global_args, unmask):
-        self._formatted_fprintf(path, global_args, unmask)
+    def formatted_fprintf(self, path, global_args, umask):
+        self._formatted_fprintf(path, global_args, umask)
 
     def __repr__(self):
         return self._create_repr('joblist=%s' % self.joblist())
diff --git a/share/site-config b/share/site-config
@@ -5,3 +5,4 @@ WORKFLOW_JOB_DIRECTORY workflows/jobs/internal-gui/config
 JOB_SCRIPT ../bin/job_dispatch.py
 QUEUE_OPTION LOCAL MAX_RUNNING 1
 
+
-Original file line number
+Diff line change
@@ Expand Up @@
     }
-    stringlist_type * analysis_config_alloc_module_names( analysis_config_type * config ) {
+    stringlist_type * analysis_config_alloc_module_names( const analysis_config_type * config ) {
       return hash_alloc_stringlist( config->analysis_modules );
     }
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
Expand Up		@@ -5,3 +5,4 @@ WORKFLOW_JOB_DIRECTORY workflows/jobs/internal-gui/config
		JOB_SCRIPT ../bin/job_dispatch.py
		QUEUE_OPTION LOCAL MAX_RUNNING 1