Merge branch 'master' into update-input-file

stellaGK · Feb 27, 2025 · ae86e9c · ae86e9c
2 parents 8f3b2c8 + 0c6e09f
commit ae86e9c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 18 deletions.
diff --git a/AUTOMATIC_TESTS/Makefile b/AUTOMATIC_TESTS/Makefile
@@ -54,6 +54,7 @@ test-tools: check-tests-dependencies $(PROJECT_DIR)/stella
 	@echo "Running: test stella tools"
 	@python3 -m pytest -v -rF -W ignore::DeprecationWarning $(TEST_DIR)/test_tools/
 
+
 # Run the automated stella tests (the -r flag shows the full stella output and -rf shows extra info about the failed outputs)
 pyrokinetics-tests: check-tests-dependencies $(PROJECT_DIR)/stella
 	@echo "Running: automated stella tests for pyrokinetics"

diff --git a/COMPILATION/Makefiles/Makefile.dirac b/COMPILATION/Makefiles/Makefile.dirac
@@ -1,29 +1,27 @@
 # Host: Marconi
 
 helplocal:
-		# GK_SYSTEM = marconi
-		# You are using  Makefile.marconi to build gs2 executables on MARCONI.
+		# GK_SYSTEM = dirac
+		# You are using Makefile.dirac to build gs2 executables on CSD3 Icelake.
 
 define STANDARD_SYSTEM_CONFIGURATION
-module purge;\
-module load intel/mkl/2020.2;\
-module load intel/impi/2020.2/intel;\
+module load rhel8/default-ccl;\
+module load intel-oneapi-mkl-cluster/2024.1.0/intel/r55ddo3z;\
 module load openblas/0.2.15;\
-module load netlib-scalapack-2.0.2-intel-17.0.4-wwvkcj6;\
-module load szip-2.1.1-gcc-5.4.0-6vkwvdj;\
-module load zlib/1.2.11;\
-module load hdf5-1.10.4-intel-17.0.4-swn7n43;\
-module load netcdf-4.4.1.1-intel-17.0.4-zysrbqw;\
-module load netcdf-fortran-4.4.4-intel-17.0.4-cesnirf;\
-module load fftw-3.3.6-pl2-intel-17.0.4-qssvkuw;\
-export MAKEFLAGS='-j -IMakefiles'
+module load netcdf-fortran/4.6.1/intel/intel-oneapi-mpi/kqukipdf;\
+module load fftw/3.3.10/intel/intel-oneapi-mpi/hwbiyhzw;\
+module load python/3.11.0-icl;\
+export MAKEFLAGS='-IMakefiles'
 endef
 
 COMPILER=intel
 CHIP=skylake
 
 USE_FFT = fftw3
 USE_NETCDF = on
+USE_LOCAL_SPFUNC=on
+
+MODULE_FLAG = -module
 
 # This line disables the automated checking
 # of the intel version which is slow
@@ -49,10 +47,11 @@ USE_HDF5=
 #unfortunately some clash with values we use
 ifdef USE_NETCDF
   NETCDF_LIB= -lnetcdff -lnetcdf
+  F90FLAGS = -DNETCDF
 endif
 
 ifdef USE_LAPACK
-  LAPACK_LIB = -mkl
+  LAPACK_LIB = -qmkl
 endif
 
 ifdef USE_SFINCS

diff --git a/STELLA_CODE/geometry/geometry_miller.f90 b/STELLA_CODE/geometry/geometry_miller.f90
@@ -83,12 +83,12 @@ subroutine init_local_defaults
       nzed_local = 128
       rhoc = 0.5
       rhoc0 = 0.5
-      rmaj = 3.0
-      rgeo = 3.0
+      rmaj = 2.77778
+      rgeo = 2.77778
       qinp = 1.4
-      shat = 0.8
+      shat = 0.796
       shift = 0.0
-      kappa = 0.0
+      kappa = 1.0
       kapprim = 0.0
       tri = 0.0
       triprim = 0.0