From 5849dc2fcd54a7de4f7cb6840c886b4ab865cbe2 Mon Sep 17 00:00:00 2001 From: Nadine Wieters Date: Wed, 25 Mar 2026 13:20:35 +0100 Subject: [PATCH 1/2] Fix merge conflict. --- reval.py | 4 +++- scripts/part6_ice_conc_timeseries.py | 8 ++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/reval.py b/reval.py index 789382e..9058066 100644 --- a/reval.py +++ b/reval.py @@ -32,6 +32,7 @@ import argparse from natsort import natsorted import shutil +from bg_routines.config_loader import model_version ############################ # Slurm Configuration # @@ -42,7 +43,8 @@ #SBATCH --job-name={job_name} #SBATCH --output=logs/{job_name}.log #SBATCH --error=logs/{job_name}.log -#SBATCH --time=01:00:00 +#SBATCH --time=02:00:00 +#SBATCH --mem=64G #SBATCH --ntasks=128 #SBATCH --ntasks-per-node=128 #SBATCH --partition=compute diff --git a/scripts/part6_ice_conc_timeseries.py b/scripts/part6_ice_conc_timeseries.py index 513091c..faa8175 100644 --- a/scripts/part6_ice_conc_timeseries.py +++ b/scripts/part6_ice_conc_timeseries.py @@ -122,7 +122,7 @@ def tick_values(self, vmin, vmax): #fig.text(-0.04, 0.5, 'Sea ice extent [$1000 km^2$]', fontsize=13, va='center', rotation=90) #fig.text(0.5, -0.02, 'Year', fontsize=13, ha='center', rotation=0) -ax1.set_ylabel('Sea ice extent [$1000 km^2$]', fontsize=17) +ax1.set_ylabel('Sea ice extent [$Mio. km^2$]', fontsize=17) ax1.set_xlabel('Year', fontsize=17) ax1.yaxis.grid(color='gray', linestyle='dashed') @@ -142,7 +142,7 @@ def tick_values(self, vmin, vmax): ax1.xaxis.set_minor_locator(MultipleLocator(10)) legend=['Arctic March','Arctic September','Antarctic March','Antarctic September'] -plt.legend(legend,loc='upper left',fontsize=15) +plt.legend(legend,loc='upper left', bbox_to_anchor=(0., 1.35),fontsize=15) plt.savefig(out_path+"sea_ice_extent_comparison.png",dpi=300,bbox_inches = "tight")#%%capture runs=[spinup_name, historic_name, pi_ctrl_name] @@ -253,7 +253,7 @@ def tick_values(self, vmin, vmax): #fig.text(-0.04, 0.5, 'Sea ice extent [$1000 km^2$]', fontsize=13, va='center', rotation=90) #fig.text(0.5, -0.02, 'Year', fontsize=13, ha='center', rotation=0) -ax1.set_ylabel('Sea ice extent [$1000 km^2$]', fontsize=17) +ax1.set_ylabel('Sea ice extent [$Mio. km^2$]', fontsize=17) ax1.set_xlabel('Year', fontsize=17) ax1.yaxis.grid(color='gray', linestyle='dashed') @@ -273,7 +273,7 @@ def tick_values(self, vmin, vmax): ax1.xaxis.set_minor_locator(MultipleLocator(10)) legend=['Arctic March','Arctic September','Antarctic March','Antarctic September'] -plt.legend(legend,loc='upper left',fontsize=15) +plt.legend(legend,loc='upper left', bbox_to_anchor=(0., 1.35),fontsize=15) plt.savefig(out_path+"sea_ice_extent_comparison.png",dpi=300,bbox_inches = "tight") From d00314497046ed87d9afa54b6de59f3ddaea72f6 Mon Sep 17 00:00:00 2001 From: Nadine Wieters Date: Wed, 25 Mar 2026 13:31:28 +0100 Subject: [PATCH 2/2] Reverse changes in reval.py --- reval.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/reval.py b/reval.py index 9058066..789382e 100644 --- a/reval.py +++ b/reval.py @@ -32,7 +32,6 @@ import argparse from natsort import natsorted import shutil -from bg_routines.config_loader import model_version ############################ # Slurm Configuration # @@ -43,8 +42,7 @@ #SBATCH --job-name={job_name} #SBATCH --output=logs/{job_name}.log #SBATCH --error=logs/{job_name}.log -#SBATCH --time=02:00:00 -#SBATCH --mem=64G +#SBATCH --time=01:00:00 #SBATCH --ntasks=128 #SBATCH --ntasks-per-node=128 #SBATCH --partition=compute