Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ threed1.*
threed1.*
timings.txt
.aider*
thirdparty/gvec
thirdparty/pyplot_module.F90

*.html
Expand Down
17 changes: 0 additions & 17 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,6 @@ endif()
option(ENABLE_PYTHON_INTERFACE "Enables the Python-Wrapper." ON)
option(SIMPLE_TESTING "Enable testing." ON)
option(ENABLE_OPENMP "Enable OpenMP compiler flags." ON)
option(ENABLE_GVEC "Enable GVEC field support (experimental)" OFF)
option(ENABLE_COVERAGE "Enable code coverage analysis (Debug/Profile builds only)" OFF)
option(SIMPLE_DETERMINISTIC_FP "Disable fast-math for reproducible floating-point" OFF)
option(SIMPLE_ENABLE_PYTHON_TOOLS "Enable Python helpers (tests/data generation)" ON)
Expand Down Expand Up @@ -112,21 +111,6 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC")
endif()
endif()

# Conditionally fetch GVEC if enabled
if(ENABLE_GVEC)
message(STATUS "GVEC support enabled - fetching GVEC library")
include(FetchContent)
FetchContent_Declare(
gvec
GIT_REPOSITORY https://gitlab.mpcdf.mpg.de/calbert/gvec.git
GIT_TAG develop
)
set(GVEC_FOR_SIMPLE TRUE CACHE BOOL "Build minimal GVEC for SIMPLE")
FetchContent_MakeAvailable(gvec)
else()
message(STATUS "GVEC support disabled")
endif()

set(CMAKE_MACOSX_RPATH 1)

find_program(NC_CONFIG "nf-config")
Expand Down Expand Up @@ -248,7 +232,6 @@ message(STATUS "CMake build type: " ${CMAKE_BUILD_TYPE})
include_directories ($ENV{NETCDFF_INCLUDE} ${NFINC})
link_directories ($ENV{NETCDF_LIB} $ENV{NETCDFF_LIB} ${NFLIBS})

# Set SIMPLE-specific compiler flags after GVEC to avoid affecting it
# Compiler-specific flags (not applied to subprojects)
if(CMAKE_Fortran_COMPILER_ID STREQUAL "GNU")
set(SIMPLE_COMPILE_OPTIONS
Expand Down
7 changes: 4 additions & 3 deletions python/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
cmake_minimum_required(VERSION 3.22)

set(SIMPLE_PYTHON_INTERFACE_BUILT OFF PARENT_SCOPE)

# Grab Python
find_package(Python COMPONENTS Interpreter Development NumPy)

Expand Down Expand Up @@ -135,9 +137,6 @@ set(GENERATED_MODULE_FILE "${F2PY_MODULE_NAME}.${Python_SOABI}")
set(F2PY_WRAPPERS "${CMAKE_CURRENT_BINARY_DIR}/${F2PY_MODULE_C}")

set(SIMPLE_F90PP_DEFINES)
if(ENABLE_GVEC)
list(APPEND SIMPLE_F90PP_DEFINES -DGVEC_AVAILABLE)
endif()
if(CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC")
list(APPEND SIMPLE_F90PP_DEFINES -DSIMPLE_NVHPC)
endif()
Expand Down Expand Up @@ -223,3 +222,5 @@ add_custom_target(

install(TARGETS ${F2PY_MODULE_NAME} DESTINATION .)
install(FILES ${CMAKE_BINARY_DIR}/simple_backend.py DESTINATION .)

set(SIMPLE_PYTHON_INTERFACE_BUILT ON PARENT_SCOPE)
4 changes: 0 additions & 4 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,3 @@ netCDF4==1.7.2
matplotlib==3.9.4
scipy==1.15.2
shapely==2.0.5

# map2disc is required for map2disc-based chartmap generation via libneo
# Pin to a specific commit for reproducibility.
map2disc @ git+https://gitlab.mpcdf.mpg.de/gvec-group/map2disc.git@14da2f094ab2505a639b9cd04af57f5c0dbfaa54
19 changes: 0 additions & 19 deletions src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -99,14 +99,6 @@ list(APPEND SOURCES
diag/diag_orbit.f90
)

# Add GVEC-specific sources if enabled
if(ENABLE_GVEC)
list(APPEND SOURCES
field/field_gvec.f90
field/vmec_field_adapter.f90
)
endif()

add_library (simple STATIC ${SOURCES})

if(SIMPLE_ENABLE_CGAL)
Expand Down Expand Up @@ -142,17 +134,6 @@ if(CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC")
)
endif()

# Conditionally link GVEC if enabled
if(ENABLE_GVEC)
target_include_directories(simple PRIVATE
${gvec_BINARY_DIR}/include
)
target_link_libraries(simple PUBLIC
gveclib
)
target_compile_definitions(simple PUBLIC GVEC_AVAILABLE)
endif()

# Link fortplot (when available)
if(NOT CMAKE_Fortran_COMPILER_ID STREQUAL "NVHPC")
target_link_libraries(simple PUBLIC
Expand Down
4 changes: 0 additions & 4 deletions src/boozer_converter.F90
Original file line number Diff line number Diff line change
Expand Up @@ -482,11 +482,7 @@ subroutine compute_boozer_data
use binsrc_sub, only: binsrc
use plag_coeff_sub, only: plag_coeff
use spline_vmec_sub
#ifdef GVEC_AVAILABLE
use vmec_field_adapter
#else
use vmec_field_eval
#endif

implicit none

Expand Down
24 changes: 0 additions & 24 deletions src/field.F90
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,6 @@ module field
use field_vmec, only: vmec_field_t, create_vmec_field
use field_coils, only: coils_field_t, create_coils_field
use field_splined, only: splined_field_t, create_splined_field
#ifdef GVEC_AVAILABLE
use field_gvec, only: gvec_field_t, create_gvec_field
#endif

implicit none

Expand Down Expand Up @@ -45,16 +42,6 @@ subroutine field_clone(source, dest)
class default
error stop 'field_clone: Allocation failure (splined)'
end select
#ifdef GVEC_AVAILABLE
type is (gvec_field_t)
allocate (gvec_field_t :: dest)
select type (dest)
type is (gvec_field_t)
dest = source
class default
error stop 'field_clone: Allocation failure (gvec)'
end select
#endif
class default
error stop 'field_clone: Unsupported field type'
end select
Expand All @@ -74,9 +61,6 @@ subroutine field_from_file(filename, field)
type(vmec_field_t) :: vmec_field
integer :: file_type, ierr
character(len=2048) :: message
#ifdef GVEC_AVAILABLE
class(gvec_field_t), allocatable :: gvec_temp
#endif

stripped_name = strip_directory(filename)

Expand Down Expand Up @@ -116,14 +100,6 @@ subroutine field_from_file(filename, field)
allocate (splined_coils)
call create_splined_field(raw_coils, ref_coords, splined_coils)
call move_alloc(splined_coils, field)
else if (endswith(filename, '.dat')) then
#ifdef GVEC_AVAILABLE
call create_gvec_field(filename, gvec_temp)
call move_alloc(gvec_temp, field)
#else
print *, 'ERROR: GVEC support not compiled. Rebuild with -DENABLE_GVEC=ON'
error stop
#endif
else
print *, 'field_from_file: Unknown file name format ', filename
error stop
Expand Down
213 changes: 0 additions & 213 deletions src/field/field_gvec.f90

This file was deleted.

Loading
Loading