Switch to good old Intel 2018.1 and /temp

itpplasma · Feb 11, 2025 · c484790 · c484790
1 parent ee5cbba
commit c484790
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 27 deletions.
diff --git a/modules/gpec/git b/modules/gpec/git
@@ -9,7 +9,7 @@ proc ModulesHelp { } {
 
 module-whatis "GPEC (development version)"
 
-prereq-all intel/compiler/2025.0.1 intel/mkl/2025.0 netcdf-fortran/4.6.1-intel
+prereq-all intel/compiler/2018.1 netcdf-fortran/4.6.1-intel
 
 setenv       GPECHOME        $env(CODE)/external/GPEC
 prepend-path PATH            $env(GPECHOME)/bin

diff --git a/modules/hdf5/1.14.5-intel b/modules/hdf5/1.14.5-intel
@@ -2,9 +2,9 @@
 
 module-whatis "HDF5 (Intel compiler)"
 
-prereq intel/compiler/2025.0.0 intel/mkl/2025.0
+prereq intel/compiler/2018.1
 
-setenv HDF5_ROOT $env(CODE)/external/intel/hdf5-1.14.5/build
+setenv HDF5_ROOT /temp/AG-plasma/opt/intel/hdf5-1.14.5/build
 prepend-path LD_LIBRARY_PATH $env(HDF5_ROOT)/lib
 prepend-path PATH            $env(HDF5_ROOT)/bin
 prepend-path -d " " CFLAGS   -I$env(HDF5_ROOT)/include

diff --git a/modules/hdf5/1.14.5-nvidia b/modules/hdf5/1.14.5-nvidia
@@ -2,9 +2,9 @@
 
 module-whatis "HDF5 (NVIDIA compiler)"
 
-prereq nvhpc/24.5
+prereq nvhpc/24.1
 
-setenv HDF5_ROOT $env(CODE)/external/nvidia/hdf5-1.14.5/build
+setenv HDF5_ROOT /temp/AG-plasma/opt/nvidia/hdf5-1.14.5/build
 prepend-path LD_LIBRARY_PATH $env(HDF5_ROOT)/lib
 prepend-path PATH            $env(HDF5_ROOT)/bin
 prepend-path -d " " CFLAGS   -I$env(HDF5_ROOT)/include

diff --git a/modules/netcdf-fortran/4.6.1-intel b/modules/netcdf-fortran/4.6.1-intel
@@ -4,7 +4,7 @@ module-whatis "NetCDF Fortran (Intel compiler)"
 
 prereq netcdf/4.9.2-intel
 
-setenv NETCDF_FORTRAN_HOME $env(CODE)/external/intel/netcdf-fortran-4.6.1/build
+setenv NETCDF_FORTRAN_HOME /temp/AG-plasma/opt/intel/netcdf-fortran-4.6.1/build
 prepend-path LD_LIBRARY_PATH $env(NETCDF_FORTRAN_HOME)/lib
 prepend-path PATH            $env(NETCDF_FORTRAN_HOME)/bin
 prepend-path -d " " FFLAGS   -I$env(NETCDF_FORTRAN_HOME)/include

diff --git a/modules/netcdf-fortran/4.6.1-nvidia b/modules/netcdf-fortran/4.6.1-nvidia
@@ -5,7 +5,7 @@ module-whatis "NetCDF Fortran (NVIDIA compiler)"
 prereq nvhpc/24.5
 prereq netcdf/4.9.2-nvidia
 
-setenv NETCDF_FORTRAN_HOME $env(CODE)/external/nvidia/netcdf-fortran-4.6.1/build
+setenv NETCDF_FORTRAN_HOME /temp/AG-plasma/opt/nvidia/netcdf-fortran-4.6.1/build
 prepend-path LD_LIBRARY_PATH $env(NETCDF_FORTRAN_HOME)/lib
 prepend-path PATH            $env(NETCDF_FORTRAN_HOME)/bin
 prepend-path -d " " FFLAGS   -I$env(NETCDF_FORTRAN_HOME)/include

diff --git a/modules/netcdf/4.9.2-intel b/modules/netcdf/4.9.2-intel
@@ -4,7 +4,7 @@ module-whatis "NetCDF (Intel compiler)"
 
 prereq hdf5/1.14.5-intel
 
-setenv NETCDFHOME $env(CODE)/external/intel/netcdf-c-4.9.2/build
+setenv NETCDFHOME /temp/AG-plasma/opt/intel/netcdf-c-4.9.2/build
 prepend-path LD_LIBRARY_PATH $env(NETCDFHOME)/lib
 prepend-path PATH            $env(NETCDFHOME)/bin
 prepend-path -d " " CFLAGS   -I$env(NETCDFHOME)/include

diff --git a/modules/netcdf/4.9.2-nvidia b/modules/netcdf/4.9.2-nvidia
@@ -2,10 +2,10 @@
 
 module-whatis "NetCDF (NVIDIA compiler)"
 
-prereq nvhpc/24.5
+prereq nvhpc/24.1
 prereq hdf5/1.14.3-nvidia
 
-setenv NETCDFHOME $env(CODE)/external/nvidia/netcdf-c-4.9.2/build
+setenv NETCDFHOME /temp/AG-plasma/opt/nvidia/netcdf-c-4.9.2/build
 prepend-path LD_LIBRARY_PATH $env(NETCDFHOME)/lib
 prepend-path PATH            $env(NETCDFHOME)/bin
 prepend-path -d " " CFLAGS   -I$env(NETCDFHOME)/include

diff --git a/modules/omfit/git b/modules/omfit/git
@@ -15,14 +15,6 @@ set    OMFIT_ROOT /temp/AG-plasma/opt/OMFIT-source
 setenv OMFIT_ROOT $OMFIT_ROOT
 prepend-path PATH $OMFIT_ROOT/bin
 
-puts stdout "source $env(CODE)/scripts/OMFIT/init_conda.sh;"
-
-proc module-unload { } {
-    exec mamba deactivate
-    exec mamba deactivate
-    source-sh bash $env(CODE)/activate.sh
-}
-
 # Local Variables:
 # mode: tcl
 # End:
diff --git a/scripts/setup/gpec.sh b/scripts/setup/gpec.sh
@@ -7,10 +7,10 @@ export NETCDF_LIBS="-lnetcdf -lnetcdff"
 
 if [[ $(module list 2>&1) == *"intel/compiler"* ]]; then
     # Intel compiler (recommended)
-    export CC=icx
-    export CXX=icpx
-    export FC=ifx
-    export MKLROOT=/opt/intel/oneapi/mkl/2025.0
+    export CC=icc
+    export CXX=icpc
+    export FC=ifort
+    export MKLROOT=/afs/itp.tugraz.at/opt/intel/2018.1/mkl
     export OMPFLAG="-qopenmp"
     module load netcdf-fortran/4.6.1-intel
 else
@@ -40,9 +40,7 @@ else
     export OMPFLAG="-fopenmp"
 fi
 
-pushd $CODE/external
-    git clone -b master [email protected]:plasma/codes/gpec.git GPEC
-    pushd GPEC/install
-        make NETCDFLIBS="-lnetcdff -lnetcdf"
-    popd
+git clone -b master [email protected]:plasma/codes/gpec.git GPEC
+pushd GPEC/install
+    make NETCDFLIBS="-lnetcdff -lnetcdf"
 popd