Fix LSF RESOURCE(S)

equinor · Apr 11, 2018 · cebff63 · cebff63
1 parent 1d12dce
commit cebff63
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/lib/enkf/config_keys.c b/lib/enkf/config_keys.c
@@ -38,8 +38,8 @@ const char * config_keys_get_queue_option_key() {
   return QUEUE_OPTION_KEY;
 }
 
-const char * config_keys_get_lsf_resource_key() {
-  return LSF_RESOURCE_KEY;
+const char * config_keys_get_lsf_resources_key() {
+  return LSF_RESOURCES_KEY;
 }
 
 const char * config_keys_get_lsf_server_key() {

diff --git a/lib/enkf/site_config.c b/lib/enkf/site_config.c
@@ -685,7 +685,7 @@ void site_config_add_config_items(config_parser_type * config, bool site_mode) {
   item = config_add_schema_item(config, LSF_QUEUE_KEY, false);
   config_schema_item_set_argc_minmax(item, 1, 1);
 
-  item = config_add_schema_item(config, LSF_RESOURCE_KEY, false);
+  item = config_add_schema_item(config, LSF_RESOURCES_KEY, false);
   config_schema_item_set_argc_minmax(item, 1, CONFIG_DEFAULT_ARG_MAX);
 
   item = config_add_schema_item(config, MAX_RUNNING_LSF_KEY, false);

diff --git a/lib/include/ert/enkf/config_keys.h b/lib/include/ert/enkf/config_keys.h
@@ -103,7 +103,7 @@ extern "C" {
 #define  LOG_FILE_KEY                      "LOG_FILE"
 #define  LOG_LEVEL_KEY                     "LOG_LEVEL"
 #define  LSF_QUEUE_KEY                     "LSF_QUEUE" // The queue name, e.g. "mr"
-#define  LSF_RESOURCE_KEY                  "LSF_RESOURCE" // LSF resource requirements
+#define  LSF_RESOURCES_KEY                 "LSF_RESOURCE" // LSF resource requirements
 #define  LSF_SERVER_KEY                    "LSF_SERVER"
 #define  TORQUE_QUEUE_KEY                  "TORQUE_QUEUE"
 #define  MAX_RESAMPLE_KEY                  "MAX_RESAMPLE"

diff --git a/python/res/enkf/config_keys.py b/python/res/enkf/config_keys.py
@@ -30,7 +30,7 @@ class ConfigKeys:
     _simulation_job_key   = ResPrototype("char* config_keys_get_simulation_job_key()", bind=False)
     _log_file_key         = ResPrototype("char* config_keys_get_log_file_key()", bind=False)
     _log_level_key        = ResPrototype("char* config_keys_get_log_level_key()", bind=False)
-    _lsf_resource_key     = ResPrototype("char* config_keys_get_lsf_resource_key()", bind=False)
+    _lsf_resources_key    = ResPrototype("char* config_keys_get_lsf_resources_key()", bind=False)
     _lsf_server_key       = ResPrototype("char* config_keys_get_lsf_server_key()", bind=False)
     _lsf_queue_key        = ResPrototype("char* config_keys_get_lsf_queue_key()", bind=False)
     _update_log_path      = ResPrototype("char* config_keys_get_update_log_path_key()", bind=False)
@@ -88,7 +88,7 @@ class ConfigKeys:
     SIMULATION_JOB   = _simulation_job_key()
     LOG_FILE         = _log_file_key()
     LOG_LEVEL        = _log_level_key()
-    LSF_RESOURCE_KEY = _lsf_resource_key()
+    LSF_RESOURCE_KEY = _lsf_resources_key()
     LSF_QUEUE_NAME_KEY = _lsf_queue_key()
     LSF_SERVER_KEY   = _lsf_server_key()
     LSF_KEY          = 'LSF'