Always specify node count if resources are set since it may be possible for a node_count to not be set, which would prevent the resource specification from appearing in the script.

Add `mpiprocs` resource, since `ncpus` alone does not affect nodefile generation.
Use computed PPN for `ncpus` and also use PPN for `ncpus` since it refers to the number of CPUs for each slot.

Author: hategan

src/psij/executors/batch/pbs/pbs_classic.mustache

@@ -10,9 +10,7 @@
 {{/job.spec.inherit_environment}}
 
 {{#job.spec.resources}}
-    {{#process_count}}
-#PBS -l nodes={{job.spec.resources.computed_node_count}}:ppn={{.}}{{#job.spec.resources.gpu_cores_per_process}}:gpus={{.}}{{/job.spec.resources.gpu_cores_per_process}}
-    {{/process_count}}
+#PBS -l nodes={{computed_node_count}}:ppn={{computed_processes_per_node}}{{#gpu_cores_per_process}}:gpus={{.}}{{/gpu_cores_per_process}}
     {{#exclusive_node_use}}
 #PBS -n
     {{/exclusive_node_use}}

src/psij/executors/batch/pbs/pbspro.mustache

@@ -10,9 +10,7 @@
 {{/job.spec.inherit_environment}}
 
 {{#job.spec.resources}}
-    {{#process_count}}
-#PBS -l select={{job.spec.resources.computed_node_count}}:ncpus={{.}}:mpiprocs={{.}}
-    {{/process_count}}
+#PBS -l select={{computed_node_count}}:ncpus={{computed_processes_per_node}}:mpiprocs={{computed_processes_per_node}}
     {{#exclusive_node_use}}
 #PBS -l place=scatter:exclhost
     {{/exclusive_node_use}}