Updates following Anemone software refresh

NOC-MSM · Oct 15, 2024 · 357999e · 357999e
1 parent 16934cd
commit 357999e
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 12 deletions.
diff --git a/arch/NOC/arch-Anemone-ifort-xios3.fcm b/arch/NOC/arch-Anemone-ifort-xios3.fcm
@@ -32,7 +32,7 @@
 #
 %NCDF_HOME           $EBROOTNETCDF
 %HDF5_HOME           $EBROOTHDF5
-%XIOS_HOME           /home/acc/xios3-trunk-head
+%XIOS_HOME           /dssgfs01/working/atb299/XIOS3
 #%OASIS_HOME          /not/defined
 
 %NCDF_INC            -I%NCDF_HOME/include 
@@ -45,7 +45,7 @@
 #%OASIS_LIB           -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
 
 %CPP	             cpp 
-%FC                  mpiifort -c -fpp -fpp-name:/opt/software/eb/software/GCCcore/11.2.0/bin/cpp -Dkey_xios3 -Wp,-P,-traditional
+%FC                  mpiifort -c -fpp -fpp-name:/opt/software/rocky9/eb/software/GCCcore/12.3.0/bin/cpp -Dkey_xios3 -Wp,-P,-traditional
 %FCFLAGS             -i4 -r8 -O3 -fp-model precise -fno-alias
 %FFLAGS              %FCFLAGS
 %LD                  mpiifort 

diff --git a/arch/NOC/arch-Anemone-ifort.fcm b/arch/NOC/arch-Anemone-ifort.fcm
@@ -32,7 +32,7 @@
 #
 %NCDF_HOME           $EBROOTNETCDF
 %HDF5_HOME           $EBROOTHDF5
-%XIOS_HOME           /home/acc/xios-trunk
+%XIOS_HOME           /dssgfs01/working/atb299/XIOS3
 #%OASIS_HOME          /not/defined
 
 %NCDF_INC            -I%NCDF_HOME/include 
@@ -45,7 +45,7 @@
 #%OASIS_LIB           -L%OASIS_HOME/lib -lpsmile.MPI1 -lmct -lmpeu -lscrip
 
 %CPP	             cpp 
-%FC                  mpiifort -c -fpp -fpp-name:/opt/software/eb/software/GCCcore/11.2.0/bin/cpp -Wp,-P,-traditional
+%FC                  mpiifort -c -fpp -fpp-name:/opt/software/rocky9/eb/software/GCCcore/12.3.0/bin/cpp -Wp,-P,-traditional
 %FCFLAGS             -i4 -r8 -O3 -fp-model precise -fno-alias
 %FFLAGS              %FCFLAGS
 %LD                  mpiifort 

diff --git a/cfgs/GLOBAL_QCO/eORCA025/context_nemo.xml b/cfgs/GLOBAL_QCO/eORCA025/context_nemo.xml
@@ -25,11 +25,11 @@
 
 <!-- Files definition -->
     <file_definition src="file_def_nemo-oce_1d_C6.xml"/>     <!--  NEMO ocean dynamics                     -->
-    <file_definition src="file_def_nemo-oce_5d_C6.xml"/>     <!--  NEMO ocean dynamics                     -->
+<!--    <file_definition src="file_def_nemo-oce_5d_C6.xml"/>     <!--  NEMO ocean dynamics                     -->
     <file_definition src="file_def_nemo-oce_1m_C6.xml"/>     <!--  NEMO ocean dynamics                     -->
     <file_definition src="file_def_nemo-oce_1y_C6.xml"/>     <!--  NEMO ocean dynamics                     -->
 
-    <file_definition src="./file_def_nemo-ice_5d_C6.xml"/>   <!--  NEMO ocean sea ice                      -->
+<!--    <file_definition src="./file_def_nemo-ice_5d_C6.xml"/>   <!--  NEMO ocean sea ice                      -->
     <file_definition src="./file_def_nemo-ice_1m_C6.xml"/>   <!--  NEMO ocean sea ice                      -->
     <file_definition src="./file_def_nemo-ice_1y_C6.xml"/>   <!--  NEMO ocean sea ice                      -->
 

diff --git a/cfgs/GLOBAL_QCO/eORCA025/run_nemo1326_96x_26n.slurm b/cfgs/GLOBAL_QCO/eORCA025/run_nemo1326_96x_26n.slurm
@@ -36,6 +36,7 @@ fi
 ## modules load
 
 module load NEMO/prg-env
+module load libfabric/1.18.0-GCCcore-12.3.0
 
 # ========================================================
 # Define useful functions
@@ -232,7 +233,7 @@ mkdir -p {RESTARTS,OUTPUT}
 # Link nemo
 ln -fs ../BLD/bin/nemo.exe nemo
 
-export XIO_HOME=/home/acc/xios3-trunk-head
+export XIO_HOME=/dssgfs01/working/atb299/XIOS3
 #
 export OMP_NUM_THREADS=1
 export I_MPI_SHM=off

diff --git a/cfgs/GLOBAL_QCO_MEDUSA/eORCA025/run_nemo1326_140x_26n.slurm b/cfgs/GLOBAL_QCO_MEDUSA/eORCA025/run_nemo1326_140x_26n.slurm
@@ -36,6 +36,7 @@ fi
 ## modules load
 
 module load NEMO/prg-env
+module load libfabric/1.18.0-GCCcore-12.3.0
 
 # ========================================================
 # Define useful functions
@@ -238,7 +239,7 @@ mkdir -p {RESTARTS,OUTPUT}
 # Link nemo
 ln -fs ../BLD/bin/nemo.exe nemo
 
-export XIO_HOME=/home/acc/xios3-trunk-head
+export XIO_HOME=/dssgfs01/working/atb299/XIOS3
 #
 export OMP_NUM_THREADS=1
 export I_MPI_SHM=off

diff --git a/scripts/compile_nemo_Anemone b/scripts/compile_nemo_Anemone
@@ -2,8 +2,6 @@
 
 # Set environment
 module purge
-module load lmod
-module load slurm/21.08.5
 module load NEMO/prg-env
 
 export OMP_NUM_THREADS=1

diff --git a/scripts/compile_tools_Anemone b/scripts/compile_tools_Anemone
@@ -2,8 +2,6 @@
 
 # Set environment
 module purge
-module load lmod
-module load slurm/21.08.5
 module load NEMO/prg-env
 
 export OMP_NUM_THREADS=1