Merge branch 'development' of github.com:pabloprf/MITIM-fusion into development

Author: pabloprf

src/mitim_tools/gacode_tools/CGYROtools.py

@@ -208,8 +208,9 @@ def run_full(
             )
 
             subfolder = "scan0"
+            queue = "-queue " + self.cgyro_job.machineSettings['slurm']['partition'] if "partition" in self.cgyro_job.machineSettings['slurm'] else ""
 
-            CGYROcommand = f'gacode_qsub -e {subfolder} -n {n} -nomp {nomp} -queue {self.cgyro_job.machineSettings['slurm']['partition']} -w 0:{minutes}:00 -s'
+            CGYROcommand = f'gacode_qsub -e {subfolder} -n {n} -nomp {nomp} {queue} -w 0:{minutes}:00 -s'
 
             if "account" in self.cgyro_job.machineSettings["slurm"] and self.cgyro_job.machineSettings["slurm"]["account"] is not None:
                 CGYROcommand += f" -repo {self.cgyro_job.machineSettings['slurm']['account']}"

src/mitim_tools/misc_tools/FARMINGtools.py

@@ -1067,7 +1067,8 @@ def create_slurm_execution_files(
         commandSBATCH.append("#SBATCH --mail-user=" + email)
 
     # ******* Partition / Billing
-    commandSBATCH.append(f"#SBATCH --partition {partition}")
+    if partition is not None:
+        commandSBATCH.append(f"#SBATCH --partition {partition}")
 
     if account is not None:
         commandSBATCH.append(f"#SBATCH --account {account}")