Merge pull request #1712 from rfbgo/expmanage

eval vars per workload

Author: douglasjacobsen

lib/ramble/ramble/workspace/workspace.py

@@ -1341,12 +1341,12 @@ def process_definitions(definitions, def_type="variable"):
             exp_context.variables[workload_name_variable] = workload_names.copy()
             workload_names = [ramble.expander.Expander.expansion_str(workload_name_variable)]
 
-        missing_vars = set()
         self.software_environments = ramble.software_environments.SoftwareEnvironments(self)
         is_dry_run = self.dry_run
         self.dry_run = True
         for workload_name in workload_names:
             edited = True
+            missing_vars = set()
             exp_set = ramble.experiment_set.ExperimentSet(self)
             exp_list = exp_set.render_experiment_set(
                 app_inst.name,

var/ramble/repos/builtin/base_classes/application-base/base_class.py

@@ -4777,8 +4777,9 @@ def define_mpi_vars():
                     value = 0
 
                 if value is not None:
-                    self.missing_mpi_variables.add(var_name)
                     self.define_variable(var_name, value)
+                else:
+                    self.missing_mpi_variables.add(var_name)
 
             if mpi_required:
                 required_dict = {