added Spherepack into SCHISM for SAL; not working yet

Author: josephzhang8

cmake/SCHISM.local.build

@@ -19,6 +19,7 @@ set(SH_MEM_COMM ON CACHE BOOLEAN "Use shared memory communicator")
 set(NO_PARMETIS OFF CACHE BOOLEAN "Turn off ParMETIS")
 
 #   Algorithm choices
+set (USE_SPK ON CACHE BOOLEAN "Use sphere harmonic for SAL via spherepack - not working")
 # TVD_LIM must be one of SB, VL, MM or OS for Superbee, Van Leer, Minmod, or Osher.")
 set (TVD_LIM VL CACHE STRING "Flux limiter")
 #Turn OLDIO off to use the new scribe based I/O

cmake/SCHISM.local.james

@@ -3,7 +3,7 @@
 set (SCHISM_EXE_BASENAME pschism_JAMES CACHE STRING "Base name (modules and file extension to be added of the executable. If you want a machine name, add it here")
 
 ###Relative paths won't work
-set(CMAKE_Fortran_COMPILER ifort CACHE PATH "Path to serial Fortran compiler")
+set(CMAKE_Fortran_COMPILER ifx CACHE PATH "Path to serial Fortran compiler")
 set(NetCDF_FORTRAN_DIR "$ENV{NETCDF_FORTRAN}" CACHE PATH "Path to NetCDF Fortran library")
 set(NetCDF_C_DIR  "$ENV{NETCDF}"  CACHE PATH "Path to NetCDF C library")
 ###Compile flags. If USE_WWM, change to -O2

src/CMakeLists.txt

@@ -52,6 +52,7 @@ add_compile_options(${C_PREPROCESS_FLAG})
 message(STATUS "\n### Processing algorithmic switches and build options involving functionality for main project")
 
 # Defined early in the list to allow use as a default for others
+define_opt(USE_SPK "Use Spherepack to compute SAL" OFF)
 define_opt(USE_BMI "Build a library that can be used from BMI, with sources and some b.c. provided by BMI" OFF)
 
 define_opt(NO_PARMETIS "Disable ParMETIS" OFF)

src/Core/CMakeLists.txt

@@ -134,6 +134,10 @@ if(${USE_PAHM})
   set (core_extra_src ${core_extra_src} PaHM/PaHM_Global.F90 PaHM/csv_module.F90 PaHM/csv_parameters.F90 PaHM/csv_utilities.F90 PaHM/PaHM_Sizes.F90 PaHM/PaHM_Messages.F90 PaHM/PaHM_Utilities.F90 PaHM/PaHM_Vortex.F90 PaHM/parwind.F90 PaHM/SortUtils.F90 PaHM/TimeDateUtils.F90)
 endif()
 
+if(${USE_SPK})
+  set (core_extra_src ${core_extra_src} Spherepack/colatitudinal_derivative_gaussian_grid.f90 Spherepack/colatitudinal_derivative_gaussian_grid_saved.f90 Spherepack/colatitudinal_derivative_regular_grid.f90 Spherepack/colatitudinal_derivative_regular_grid_saved.f90 Spherepack/colatitudinal_derivative_routines.f90 Spherepack/coordinate_transfer_routines.f90 Spherepack/divergence_gaussian_grid.f90 Spherepack/divergence_gaussian_grid_saved.f90 Spherepack/divergence_regular_grid.f90 Spherepack/divergence_regular_grid_saved.f90 Spherepack/divergence_routines.f90 Spherepack/gaussian_latitudes_and_weights_routines.f90 Spherepack/gradient_gaussian_grid.f90 Spherepack/gradient_gaussian_grid_saved.f90 Spherepack/gradient_regular_grid.f90 Spherepack/gradient_regular_grid_saved.f90 Spherepack/gradient_routines.f90 Spherepack/grid_transfer_routines.f90 Spherepack/grid_transfer_scalar_shift.f90 Spherepack/grid_transfer_scalar_transform.f90 Spherepack/grid_transfer_vector_shift.f90 Spherepack/grid_transfer_vector_transform.f90 Spherepack/icosahedral_geodesic_routines.f90 Spherepack/idvtec.f90 Spherepack/idvtes.f90 Spherepack/idvtgc.f90 Spherepack/idvtgs.f90 Spherepack/invert_divergence_gaussian_grid.f90 Spherepack/invert_divergence_gaussian_grid_saved.f90 Spherepack/invert_divergence_regular_grid.f90 Spherepack/invert_divergence_regular_grid_saved.f90 Spherepack/invert_gradient_gaussian_grid.f90 Spherepack/invert_gradient_gaussian_grid_saved.f90 Spherepack/invert_gradient_regular_grid.f90 Spherepack/invert_gradient_regular_grid_saved.f90 Spherepack/invert_scalar_laplacian_gaussian_grid.f90 Spherepack/invert_scalar_laplacian_gaussian_grid_saved.f90 Spherepack/invert_scalar_laplacian_regular_grid.f90 Spherepack/invert_scalar_laplacian_regular_grid_saved.f90 Spherepack/invert_vector_laplacian_gaussian_grid.f90 Spherepack/invert_vector_laplacian_gaussian_grid_saved.f90 Spherepack/invert_vector_laplacian_regular_grid.f90 Spherepack/invert_vector_laplacian_regular_grid_saved.f90 Spherepack/invert_vorticity_gaussian_grid.f90 Spherepack/invert_vorticity_gaussian_grid_saved.f90 Spherepack/invert_vorticity_regular_grid.f90 Spherepack/invert_vorticity_regular_grid_saved.f90 Spherepack/isfvpec.f90 Spherepack/isfvpes.f90 Spherepack/isfvpgc.f90 Spherepack/isfvpgs.f90 Spherepack/scalar_analysis_gaussian_grid.f90 Spherepack/scalar_analysis_gaussian_grid_saved.f90 Spherepack/scalar_analysis_regular_grid.f90 Spherepack/scalar_analysis_regular_grid_saved.f90 Spherepack/scalar_analysis_routines.f90 Spherepack/scalar_laplacian_gaussian_grid.f90 Spherepack/scalar_laplacian_gaussian_grid_saved.f90 Spherepack/scalar_laplacian_regular_grid.f90 Spherepack/scalar_laplacian_regular_grid_saved.f90 Spherepack/scalar_laplacian_routines.f90 Spherepack/scalar_projection_gaussian_grid.f90 Spherepack/scalar_projection_regular_grid.f90 Spherepack/scalar_projection_routines.f90 Spherepack/scalar_synthesis_gaussian_grid.f90 Spherepack/scalar_synthesis_gaussian_grid_saved.f90 Spherepack/scalar_synthesis_regular_grid.f90 Spherepack/scalar_synthesis_regular_grid_saved.f90 Spherepack/scalar_synthesis_routines.f90 Spherepack/sfvpec.f90 Spherepack/sfvpes.f90 Spherepack/sfvpgc.f90 Spherepack/sfvpgs.f90 Spherepack/spherepack.f90 Spherepack/spherepack_interfaces.f90 Spherepack/spherepack_precision.f90 Spherepack/type_AssociatedLegendrePolynomialGenerator.f90 Spherepack/type_FastFourierTransform.f90 Spherepack/type_GaussianGrid.f90 Spherepack/type_GaussianSphere.f90 Spherepack/type_GaussianWorkspace.f90 Spherepack/type_RealHarmonicCoefficients.f90 Spherepack/type_RealPeriodicFastFourierTransform.f90 Spherepack/type_RegularGrid.f90 Spherepack/type_RegularSphere.f90 Spherepack/type_RegularWorkspace.f90 Spherepack/type_ScalarHarmonic.f90 Spherepack/type_Sphere.f90 Spherepack/type_SpherepackUtility.f90 Spherepack/type_SphericalGrid.f90 Spherepack/type_SphericalUnitVectors.f90 Spherepack/type_TrigonometricTable.f90 Spherepack/type_Vector3D.f90 Spherepack/type_VectorHarmonic.f90 Spherepack/type_VectorHarmonicCoefficients.f90 Spherepack/type_WavetableUtility.f90 Spherepack/type_Workspace.f90 Spherepack/vector_analysis_gaussian_grid.f90 Spherepack/vector_analysis_gaussian_grid_saved.f90 Spherepack/vector_analysis_regular_grid.f90 Spherepack/vector_analysis_regular_grid_saved.f90 Spherepack/vector_analysis_routines.f90 Spherepack/vector_laplacian_gaussian_grid.f90 Spherepack/vector_laplacian_gaussian_grid_saved.f90 Spherepack/vector_laplacian_regular_grid.f90 Spherepack/vector_laplacian_regular_grid_saved.f90 Spherepack/vector_laplacian_routines.f90 Spherepack/vector_synthesis_gaussian_grid.f90 Spherepack/vector_synthesis_gaussian_grid_saved.f90 Spherepack/vector_synthesis_regular_grid.f90 Spherepack/vector_synthesis_regular_grid_saved.f90 Spherepack/vector_synthesis_routines.f90 Spherepack/vorticity_gaussian_grid.f90 Spherepack/vorticity_gaussian_grid_saved.f90 Spherepack/vorticity_regular_grid.f90 Spherepack/vorticity_regular_grid_saved.f90 Spherepack/vorticity_routines.f90)
+endif()
+
 add_library(core ${local_extra_code}
                  schism_glbl.F90
                  schism_msgp.F90