adjust python calls to new cluster

remindmodel · Jun 28, 2024 · 1e8e92a · 1e8e92a
1 parent 3a216da
commit 1e8e92a
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 9 deletions.
diff --git a/scripts/input/climate_assessment_run.R b/scripts/input/climate_assessment_run.R
@@ -204,15 +204,15 @@ if (any(!alreadySet)) do.call(Sys.setenv, as.list(environmentVariables[!alreadyS
 # BUILD climate-assessment RUN COMMANDS
 #
 runHarmoniseAndInfillCmd <- paste(
-  "python", file.path(scriptsDir, "run_harm_inf.py"),
+  "python3.9", file.path(scriptsDir, "run_harm_inf.py"),
   climateAssessmentEmi,
   climateTempDir,
   "--no-inputcheck",
   "--infilling-database", infillingDatabaseFile
 )
 
 runClimateEmulatorCmd <- paste(
-  "python", file.path(scriptsDir, "run_clim.py"),
+  "python3.9", file.path(scriptsDir, "run_clim.py"),
   normalizePath(file.path(climateTempDir, paste0(baseFn, "_harmonized_infilled.csv"))),
   climateTempDir,
   "--num-cfgs", nparsets,

diff --git a/scripts/input/climate_assessment_temperatureImpulseResponse.R b/scripts/input/climate_assessment_temperatureImpulseResponse.R
@@ -178,7 +178,7 @@ fileAllPulsesClimate <- paste0(normalizePath(climateTempDir), "/allpulses_IAMC_c
 
 # BUILD climate-assessment RUN COMMAND
 runClimateEmulatorCmd <- paste(
-  "python", file.path(scriptsDir, "run_clim.py"),
+  "python3.9", file.path(scriptsDir, "run_clim.py"),
   fileAllPulsesScen,
   climateTempDir,
   # Note: Option --year-filter-last requires https://github.com/gabriel-abrahao/climate-assessment/tree/yearfilter

diff --git a/scripts/output/single/MAGICC7_AR6.R b/scripts/output/single/MAGICC7_AR6.R
@@ -143,16 +143,16 @@ Sys.setenv(MAGICC_WORKER_NUMBER = 1) # TODO: Get this from slurm or nproc
 #deactivate_venv_cmd <- "deactivate"
 
 runHarmoniseAndInfillCmd <- paste(
-  "python", file.path(scriptsFolder, "run_harm_inf.py"),
+  "python3.9", file.path(scriptsFolder, "run_harm_inf.py"),
   climateAssessmentEmi,
   climateAssessmentFolder,
   "--no-inputcheck",
   "--infilling-database", infillingDatabaseFile
 )
 
 runClimateEmulatorCmd <- paste(
-  "python", file.path(scriptsFolder, "run_clim.py"),
-  normalizePath(file.path(climateAssessmentFolder, paste0(baseFileName, "_harmonized_infilled.csv"))),
+  "python3.9", file.path(scriptsFolder, "run_clim.py"),
+  normalizePath(file.path(climateAssessmentFolder, paste0(baseFileName, "_harmonized_infilled.csv")), mustWork = FALSE),
   climateAssessmentFolder,
   "--num-cfgs", nparsets,
   "--scenario-batch-size", 1,
@@ -172,7 +172,7 @@ logmsg <- paste0(
   "  MAGICC_WORKER_ROOT_DIR = ", Sys.getenv("MAGICC_WORKER_ROOT_DIR") ,"\n",
   "  MAGICC_WORKER_NUMBER   = ", Sys.getenv("MAGICC_WORKER_NUMBER") ,"\n",
   date(), " =================== RUN climate-assessment infilling & harmonization ===================\n",
-  runHarmoniseAndInfillCmd, "'\n"
+  runHarmoniseAndInfillCmd, "\n"
 )
 cat(logmsg)
 capture.output(cat(logmsg), file = logFile, append = TRUE)

diff --git a/scripts/utils/checkSetup.R b/scripts/utils/checkSetup.R
@@ -23,7 +23,7 @@ if (length(missingDeps) > 0) {
   message("all required R packages are installed")
 }
 
-if (Sys.which("python3") != ""
+if (Sys.which("python3.9") != ""
     || (Sys.which("python.exe") != ""
         && suppressWarnings(isTRUE(startsWith(system2("python.exe", "--version", stdout = TRUE), "Python 3"))))) {
   message("checking for Python 3 - ok")

diff --git a/scripts/utils/climate_assessment/submit_climate_assessment.sh b/scripts/utils/climate_assessment/submit_climate_assessment.sh
@@ -8,4 +8,4 @@
 #SBATCH --output=PYTHONLOG-%x.%j.out
 # Replace this with the resulting xls of output.R -> export -> xlsx_IIASA -> AR6
 filename="../../../output/export/REMIND_gabrielAR6SHAPE_2023-05-17_05.12.52.xlsx"
-python source_climate_assessment.py $filename
+python3.9 source_climate_assessment.py $filename