Changeset 3682

Timestamp:

Jan 18, 2019 5:01:54 PM (6 years ago)

Author:

knoop

Message:

Extended palmtest to use custom MPI execution commands

Location:

palm/trunk/SCRIPTS

Files:

• .palm.config.default.in (modified) (1 diff)
• palmrun (modified) (1 diff)
• palmtest (modified) (1 diff)

palm/trunk/SCRIPTS/.palm.config.default.in

@@ -37 +37 @@
 %compiler_options    @PALM_COMPILER_OPTIONS@
 %linker_options      @PALM_LINKER_OPTIONS@
-%execute_command     mpirun -n {{mpi_tasks}} ./palm
+%execute_command     @PALM_EXECUTE_COMMAND@ ./palm
 #%memory              2300
 #%module_commands     module switch craype-ivybridge craype-haswell; module load fftw cray-hdf5-parallel cray-netcdf-hdf5parallel

palm/trunk/SCRIPTS/palmrun

@@ -631 +631 @@
     locat=config_file; exit
  fi
- if [[ "$linker_options" = "" ]]
- then
-    printf "\n  +++ no linker options found in $config_file"
-    printf "\n      Please add line \"linker_options ...\" to that file."
-    locat=config_file; exit
- fi
  if [[ "$execute_command" = "" ]]
  then

palm/trunk/SCRIPTS/palmtest

@@ -788 +788 @@
 
             environment = available_environments[c_id]
+
+            if 'mpi_execution_command' in environment:
+                template = template.replace('@PALM_EXECUTE_COMMAND@', environment['mpi_execution_command'])
+            else:
+                template = template.replace('@PALM_EXECUTE_COMMAND@', 'mpirun -n {{mpi_tasks}}')
+
             if 'executable' not in environment:
                 return True, colored('[palmtest.yml environment \"' + c_id + '\" has no \"executable\"]', 'red')