NEO-stella with a clean history.

Author: OJ Robertson

AUTOMATIC_TESTS/run_local_stella_simulation.py

@@ -594,10 +594,10 @@ def process_error(variable):
     dydalpha_new = float(variables[7])
     exb_nonlin_new = float(variables[8])
     fluxfac_new = float(variables[9])
-    oneovernablerho_new = float(variables[10])
 
     # Read arrays in new *.geometry file
-    data = np.loadtxt(local_geometry_file,skiprows=4,dtype='float').reshape(-1, 12)
+    if with_btor: data = np.loadtxt(local_geometry_file,skiprows=4,dtype='float').reshape(-1, 15)
+    if not with_btor: data = np.loadtxt(local_geometry_file,skiprows=4,dtype='float').reshape(-1, 15)
     alpha_new = data[:,0]
     zed_new = data[:,1]
     zeta_new = data[:,2]
@@ -606,10 +606,13 @@ def process_error(variable):
     grady_dot_grady_new = data[:,5]
     gradx_dot_grady_new = data[:,6]
     gradx_dot_gradx_new = data[:,7]
-    B_times_gradB_dot_grady_new = data[:,8]
-    B_times_kappa_dot_grady_new = data[:,9]
-    B_times_gradB_dot_gradx_new = data[:,10]
-    bmag_psi0_new = data[:,11]
+    gds23_new = data[:,8]
+    gds24_new = data[:,9]
+    B_times_gradB_dot_grady_new = data[:,10]
+    B_times_kappa_dot_grady_new = data[:,11]
+    B_times_gradB_dot_gradx_new = data[:,12]
+    bmag_psi0_new = data[:,13]
+    if with_btor: btor_new = data[:,14]
 
     # New definitions
     gds2_new = grady_dot_grady_new
@@ -656,6 +659,8 @@ def process_error(variable):
     if not (np.allclose(cvdrift_old, cvdrift_new, equal_nan=True)): error = process_error('cvdrift')
     if not (np.allclose(gbdrift0_old, gbdrift0_new, equal_nan=True)): error = process_error('gbdrift0')
     if not (np.allclose(bmag_psi0_old, bmag_psi0_new, equal_nan=True)): error = process_error('bmag_psi0')
+    if with_btor: 
+        if not (np.allclose(btor_old, btor_new, equal_nan=True)): error = process_error('btor')
     assert (not error), f'The geometry data does not match in the *.geometry file.'
 
     # Do not compare gds23 and gds24 it was badly defined in Miller and VMEC

COMPILATION/CMakeLists.txt

@@ -262,12 +262,6 @@ else()
 endif()
 
 if (STELLA_ENABLE_NETCDF)
-
-  # As the netcdf installed in the Mac GitHub runners itself depends on HDF5
-  # and HDF5 needs to check for the existence of threads, we need to enable a basic systems language like C/C++
-  # These lines are only needed for Mac systems on Github since January 2025
-  # For some reason CMake could not find the hdf5 libraries anymore after a Github update
-  enable_language(C)
   find_package(netCDFFortran REQUIRED)
   add_subdirectory(../EXTERNALS/neasyf ${CMAKE_CURRENT_BINARY_DIR}/EXTERNALS/neasyf)
   target_link_libraries(libstella PUBLIC netCDF::netcdff neasyf::neasyf)
@@ -313,6 +307,13 @@ target_compile_definitions(libstella PRIVATE
   )
 
 
+# Find hdf5 packages (their CMake file needs the C language)
+# These lines are only needed for Mac systems on Github since January 2025
+# For some reason CMake could not find the hdf5 libraries anymore after a Github update
+ENABLE_LANGUAGE(C)
+find_package(HDF5 REQUIRED)
+target_link_libraries(libstella PUBLIC ${HDF5_LIBRARIES}) 
+
 ############################################################
 # Add some extra flags for Debug configs
 ############################################################