Commits

Britton Smith committed 8104ab7

Removed many unnecessary compile options and one more superfluous
source file.

Comments (0)

Files changed (4)

src/clib/Make.config.assemble

 #
 #-----------------------------------------------------------------------
 
-
-#-----------------------------------------------------------------------
-# SET PARAMETER DEFINES FOR HARKNESS VERSION 2008-05-15
-#-----------------------------------------------------------------------
-
-    ASSEMBLE_PARAMETER_DEFINES = \
-          -D__max_subgrids=$(PARAMETER_MAX_SUBGRIDS) \
-          -D__max_baryons=$(PARAMETER_MAX_BARYONS) \
-          -D__max_cpu_per_node=$(PARAMETER_MAX_TASKS_PER_NODE) \
-          -D__memory_pool_size=$(PARAMETER_MEMORY_POOL_SIZE)
-
 #-----------------------------------------------------------------------
 # DETERMINE INTEGER SIZE SETTINGS
 #-----------------------------------------------------------------------
     endif
 
 #-----------------------------------------------------------------------
-# Determine CUDA compiler
-#-----------------------------------------------------------------------
-	
-    ASSEMBLE_CUDACOMPILER = $(MACH_CUDACOMPILER)
-
-#-----------------------------------------------------------------------
-# DETERMINE OBJECT MODE SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_OBJECT_MODE = 1
-
-    # Settings for compiling 32-bit object files
-
-    ifeq ($(CONFIG_OBJECT_MODE),32)
-	ERROR_OBJECT_MODE = 0
-    endif
-
-    # Settings for compiling 64-bit object files
-
-    ifeq ($(CONFIG_OBJECT_MODE),64)
-        ERROR_OBJECT_MODE = 0
-    endif
-
-    # error if CONFIG_OBJECT_MODE is incorrect
-
-    ifeq ($(ERROR_OBJECT_MODE),1)
-       .PHONY: error_object_mode
-       error_object_mode:
-	$(error Illegal value '$(CONFIG_OBJECT_MODE)' for $$(CONFIG_OBJECT_MODE))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE TASKMAP SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_TASKMAP = 1
-
-    # Settings for using TASKMAP mods
-
-    ifeq ($(CONFIG_TASKMAP),yes)
-        ERROR_TASKMAP = 0
-        ASSEMBLE_TASKMAP_DEFINES = -DTASKMAP -DENABLE_TASKMAP
-    endif
-
-    # Settings for not using TASKMAP mods
-
-    ifeq ($(CONFIG_TASKMAP),no)
-        ERROR_TASKMAP = 0
-        ASSEMBLE_TASKMAP_DEFINES = 
-    endif
-
-    # error if CONFIG_TASKMAP is incorrect
-
-    ifeq ($(ERROR_TASKMAP),1)
-       .PHONY: error_taskmap
-       error_taskmap:
-	$(error Illegal value '$(CONFIG_TASKMAP)' for $$(CONFIG_TASKMAP))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE PACKED_AMR SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_PACKED_AMR = 1
-
-    # Settings for using PACKED_AMR mods
-
-    ifeq ($(CONFIG_PACKED_AMR),yes)
-        ERROR_PACKED_AMR = 0
-        ASSEMBLE_PACKED_AMR_DEFINES = \
-                 -DUSE_HDF5_GROUPS
-#                 -DSINGLE_HDF5_OPEN_ON_INPUT
-    endif
-
-    # Settings for not using PACKED_AMR mods
-
-    ifeq ($(CONFIG_PACKED_AMR),no)
-        ERROR_PACKED_AMR = 0
-        ASSEMBLE_PACKED_AMR_DEFINES = 
-    endif
-
-    # error if CONFIG_PACKED_AMR is incorrect
-
-    ifeq ($(ERROR_PACKED_AMR),1)
-       .PHONY: error_packed_amr
-       error_packed_amr:
-	$(error Illegal value '$(CONFIG_PACKED_AMR)' for $$(CONFIG_PACKED_AMR))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE PACKED_MEM SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_PACKED_MEM = 1
-
-    # Settings for using PACKED_MEM mods
-
-    ifeq ($(CONFIG_PACKED_MEM),yes)
-        ERROR_PACKED_MEM = 0
-        ASSEMBLE_PACKED_MEM_DEFINES = -DUSE_HDF5_OUTPUT_BUFFERING
-    endif
-
-    # Settings for not using PACKED_MEM mods
-
-    ifeq ($(CONFIG_PACKED_MEM),no)
-        ERROR_PACKED_MEM = 0
-        ASSEMBLE_PACKED_MEM_DEFINES = 
-    endif
-
-    # error if CONFIG_PACKED_MEM is incorrect
-
-    ifeq ($(ERROR_PACKED_MEM),1)
-       .PHONY: error_packed_mem
-       error_packed_mem:
-	$(error Illegal value '$(CONFIG_PACKED_MEM)' for $$(CONFIG_PACKED_MEM))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE LCAPERF SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_LCAPERF = 1
-
-    # Settings to turn lcaperf ON
-
-    ifeq ($(CONFIG_LCAPERF),yes)
-        ERROR_LCAPERF = 0
-        ASSEMBLE_LCAPERF_DEFINES = -DUSE_LCAPERF
-        ASSEMBLE_LCAPERF_INCLUDES = $(MACH_INCLUDES_LCAPERF)
-        ASSEMBLE_LCAPERF_LIBS     = $(MACH_LIBS_LCAPERF)
-	OBJS_LCAPERF_LIB = lcaperf.o
-    endif
-
-    # Settings to turn lcaperf OFF
-
-    ifeq ($(CONFIG_LCAPERF),no)
-        ERROR_LCAPERF = 0
-	OBJS_LCAPERF_LIB =
-    endif
-
-    # error if CONFIG_LCAPERF is incorrect
-
-    ifeq ($(ERROR_LCAPERF),1)
-       .PHONY: error_lcaperf
-       error_lcaperf:
-	$(error Illegal value '$(CONFIG_LCAPERF)' for $$(CONFIG_LCAPERF))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE PYTHON SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_PYTHON = 1
-
-    # Settings to turn Python ON
-
-    ifeq ($(CONFIG_PYTHON),yes)
-        ERROR_PYTHON = 0
-        ASSEMBLE_PYTHON_DEFINES = -DUSE_PYTHON
-        ASSEMBLE_PYTHON_INCLUDES = $(MACH_INCLUDES_PYTHON)
-        ASSEMBLE_PYTHON_LIBS     = $(MACH_LIBS_PYTHON)
-        PYTHON_INTERFACE_TARGETS += InitializePythonInterface_finderfunctions.inc
-    endif
-
-    # Settings to turn PYTHON OFF
-
-    ifeq ($(CONFIG_PYTHON),no)
-        ERROR_PYTHON = 0
-    endif
-
-    # error if CONFIG_PYTHON is incorrect
-
-    ifeq ($(ERROR_PYTHON),1)
-       .PHONY: error_PYTHON
-       error_PYTHON:
-	$(error Illegal value '$(CONFIG_PYTHON)' for $$(CONFIG_PYTHON))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE NEW_PROBLEM_TYPES SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_NEW_PROBLEM_TYPES = 1
-
-    # Settings to turn NEW_PROBLEM_TYPES ON
-
-    ifeq ($(CONFIG_NEW_PROBLEM_TYPES),yes)
-        ERROR_NEW_PROBLEM_TYPES = 0
-        ASSEMBLE_NEW_PROBLEM_TYPES_DEFINES = -DNEW_PROBLEM_TYPES
-        ASSEMBLE_NEW_PROBLEM_TYPES_INCLUDES = $(MACH_INCLUDES_NEW_PROBLEM_TYPES)
-        ASSEMBLE_NEW_PROBLEM_TYPES_LIBS     = $(MACH_LIBS_NEW_PROBLEM_TYPES)
-        ifeq ($(CONFIG_PYTHON),yes)
-            OBJS_PYTHON += python_bridge/problemtype_handler.o
-            OBJS_PYTHON += ProblemType_Python.o
-        endif
-    endif
-
-    # Settings to turn NEW_PROBLEM_TYPES OFF
-
-    ifeq ($(CONFIG_NEW_PROBLEM_TYPES),no)
-        ERROR_NEW_PROBLEM_TYPES = 0
-    endif
-
-    # error if CONFIG_NEW_PROBLEM_TYPES is incorrect
-
-    ifeq ($(ERROR_NEW_PROBLEM_TYPES),1)
-       .PHONY: error_NEW_PROBLEM_TYPES
-       error_NEW_PROBLEM_TYPES:
-	$(error Illegal value '$(CONFIG_NEW_PROBLEM_TYPES)' for $$(CONFIG_NEW_PROBLEM_TYPES))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE PAPI SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_PAPI = 1
-
-    # Settings to turn papi ON
-
-    ifeq ($(CONFIG_PAPI),yes)
-        ERROR_PAPI = 0
-        ASSEMBLE_PAPI_DEFINES = -DUSE_PAPI
-        ASSEMBLE_PAPI_INCLUDES = $(MACH_INCLUDES_PAPI)
-        ASSEMBLE_PAPI_LIBS     = $(MACH_LIBS_PAPI)
-    endif
-
-    # Settings to turn papi OFF
-
-    ifeq ($(CONFIG_PAPI),no)
-        ERROR_PAPI = 0
-    endif
-
-    # error if CONFIG_PAPI is incorrect
-
-    ifeq ($(ERROR_PAPI),1)
-       .PHONY: error_papi
-       error_papi:
-	$(error Illegal value '$(CONFIG_PAPI)' for $$(CONFIG_PAPI))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE OOC_BOUNDARY SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_OOC_BOUNDARY = 1
-
-    # Settings to turn out-of-core boundary conditions ON
-
-    ifeq ($(CONFIG_OOC_BOUNDARY),yes)
-        ERROR_OOC_BOUNDARY = 0
-        ASSEMBLE_OOC_BOUNDARY_DEFINES = -DOOC_BOUNDARY
-    endif
-
-    # Settings to turn out-of-core boundary conditions OFF
-
-    ifeq ($(CONFIG_OOC_BOUNDARY),no)
-        ERROR_OOC_BOUNDARY = 0
-        ASSEMBLE_OOC_BOUNDARY_DEFINES =
-    endif
-
-    # error if CONFIG_OOC_BOUNDARY is incorrect
-
-    ifeq ($(ERROR_OOC_BOUNDARY),1)
-       .PHONY: error_ooc_boundary
-       error_ooc_boundary:
-	$(error Illegal value '$(CONFIG_OOC_BOUNDARY)' for $$(CONFIG_OOC_BOUNDARY))
-    endif
-    
-#-----------------------------------------------------------------------
-# DETERMINE SET ACCELERATION BOUNDARY SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_ACCELERATION_BOUNDARY = 1
-
-    # Settings to turn ON the setting of Acceleration Boundary
-
-    ifeq ($(CONFIG_ACCELERATION_BOUNDARY),yes)
-        ERROR_ACCELERATION_BOUNDARY = 0
-        ASSEMBLE_ACCELERATION_BOUNDARY_DEFINES = -DSET_ACCELERATION_BOUNDARY
-    endif
-
-    # Settings to turn OFF the setting of Acceleration Boundary
-
-    ifeq ($(CONFIG_ACCELERATION_BOUNDARY),no)
-        ERROR_ACCELERATION_BOUNDARY = 0
-        ASSEMBLE_ACCELERATION_BOUNDARY_DEFINES =
-    endif
-
-    # error if CONFIG_ACCELERATION_BOUNDARY is incorrect
-
-    ifeq ($(ERROR_ACCELERATION_BOUNDARY),1)
-       .PHONY: error_sab
-       error_sab:
-	$(error Illegal value '$(CONFIG_ACCELERATION_BOUNDARY)' for $$(CONFIG_ACCELERATION_BOUNDARY))
-    endif
-
-
-#-----------------------------------------------------------------------
 # DETERMINE OPTIMIZATION LEVEL SETTINGS
 #-----------------------------------------------------------------------
 
 	$(error Illegal value '$(CONFIG_OPT)' for $$(CONFIG_OPT))
     endif
 
-#-----------------------------------------------------------------------
-# DETERMINE TEST SUITE HOOK SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_TESTING = 1
-
-    # Settings for test suite hooks on
-
-    ifeq ($(CONFIG_TESTING),yes)
-        ERROR_TESTING = 0
-        ASSEMBLE_TESTING_DEFINES = -DCONFIG_TESTING
-    endif
-
-    # Settings for test suite hooks off
-
-    ifeq ($(CONFIG_TESTING),no)
-        ERROR_TESTING = 0
-        ASSEMBLE_TESTING_DEFINES = 
-    endif
-
-    # error if CONFIG_TESTING is incorrect
-
-    ifeq ($(ERROR_TESTING),1)
-       .PHONY: error_testing
-       error_testing:
-	$(error Illegal value '$(CONFIG_TESTING)' for $$(CONFIG_TESTING))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE TRACER PARTICLE VELOCITY OUTPUT SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_TPVEL = 1
-
-    # Settings to turn isolated gravity boundary conditions ON
-
-    ifeq ($(CONFIG_TPVEL),yes)
-        ERROR_TPVEL = 0
-        ASSEMBLE_TPVEL_DEFINES = -DTP_VELOCITY
-    endif
-
-    # Settings to turn isolated gravity boundary conditions OFF
-
-    ifeq ($(CONFIG_TPVEL),no)
-        ERROR_TPVEL = 0
-        ASSEMBLE_TPVEL_DEFINES =
-    endif
-
-    # error if CONFIG_TPVEL is incorrect
-
-    ifeq ($(ERROR_TPVEL),1)
-       .PHONY: error_tpvel
-       error_tpvel:
-	$(error Illegal value '$(CONFIG_TPVEL)' for $$(CONFIG_TPVEL))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE RADIATIVE TRANSFER SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_PHOTON = 1
-
-    # Settings to turn radiative transfer ON
-
-    ifeq ($(CONFIG_PHOTON),yes)
-        ERROR_PHOTON = 0
-        ASSEMBLE_PHOTON_DEFINES = -DTRANSFER
-	OBJS_PHOTON_LIB = $(POBJS_CONFIG_LIB)
-    endif
-
-    # Settings to turn radiative transfer OFF
-
-    ifeq ($(CONFIG_PHOTON),no)
-        ERROR_PHOTON = 0
-        ASSEMBLE_PHOTON_DEFINES =
-	OBJS_PHOTON_LIB = 
-    endif
-
-    # error if CONFIG_PHOTON is incorrect
-
-    ifeq ($(ERROR_PHOTON),1)
-       .PHONY: error_transfer
-       error_transfer:
-	$(error Illegal value '$(CONFIG_PHOTON)' for $$(CONFIG_PHOTON))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE EMISSIVITY FIELD SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_EMISSIVITY = 1
-
-    # Settings to turn emissivity field ON
-
-    ifeq ($(CONFIG_EMISSIVITY),yes)
-        ERROR_EMISSIVITY = 0
-        ASSEMBLE_EMISSIVITY_DEFINES = -DEMISSIVITY
-    endif
-
-    # Settings to turn emissivity field OFF
-
-    ifeq ($(CONFIG_EMISSIVITY),no)
-        ERROR_EMISSIVITY = 0
-        ASSEMBLE_EMISSIVITY_DEFINES =
-    endif
-
-    # error if CONFIG_EMISSIVITY is incorrect
-
-    ifeq ($(ERROR_EMISSIVITY),1)
-       .PHONY: error_emissivity
-       error_emissivity:
-	$(error Illegal value '$(CONFIG_EMISSIVITY)' for $$(CONFIG_EMISSIVITY))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE GRID IO SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_NEW_GRID_IO = 1
-
-    # Settings to turn fast sibling search ON
-
-    ifeq ($(CONFIG_NEW_GRID_IO),yes)
-        ERROR_NEW_GRID_IO = 0
-        ASSEMBLE_NEW_GRID_IO_DEFINES = -DNEW_GRID_IO
-    endif
-
-    # Settings to turn new grid IO OFF
-
-    ifeq ($(CONFIG_NEW_GRID_IO),no)
-        ERROR_NEW_GRID_IO = 0
-        ASSEMBLE_NEW_GRID_IO_DEFINES =
-    endif
-
-    # error if CONFIG_NEW_GRID_IO is incorrect
-
-    ifeq ($(ERROR_NEW_GRID_IO),1)
-       .PHONY: error_NEW_GRID_IO
-       error_NEW_GRID_IO:
-	$(error Illegal value '$(CONFIG_NEW_GRID_IO)' for $$(CONFIG_NEW_GRID_IO))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE HYPRE SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_HYPRE = 1
-
-    # Settings to turn HYPRE bindings on
-
-    ifeq ($(CONFIG_HYPRE),yes)
-        ERROR_HYPRE = 0
-        ASSEMBLE_HYPRE_DEFINES = -DUSE_HYPRE
-        ASSEMBLE_HYPRE_INCLUDES = $(MACH_INCLUDES_HYPRE)
-        ASSEMBLE_HYPRE_LIBS     = $(MACH_LIBS_HYPRE)
-    endif
-
-    # Settings to turn HYPRE bindings OFF
-
-    ifeq ($(CONFIG_HYPRE),no)
-        ERROR_HYPRE = 0
-        ASSEMBLE_HYPRE_DEFINES =
-        ASSEMBLE_HYPRE_INCLUDES =
-        ASSEMBLE_HYPRE_LIBS =
-    endif
-
-    # error if CONFIG_HYPRE is incorrect
-
-    ifeq ($(ERROR_HYPRE),1)
-       .PHONY: error_hypre
-       error_hypre:
-	$(error Illegal value '$(CONFIG_HYPRE)' for $$(CONFIG_HYPRE))
-    endif
-
-
-#-----------------------------------------------------------------------
-# DETERMINE FAST SIBLING SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_FAST_SIB = 1
-
-    # Settings to turn fast sibling search ON
-
-    ifeq ($(CONFIG_FAST_SIB),yes)
-        ERROR_FAST_SIB = 0
-        ASSEMBLE_FAST_SIB_DEFINES = -DFAST_SIB
-    endif
-
-    # Settings to turn fast sibling search OFF
-
-    ifeq ($(CONFIG_FAST_SIB),no)
-        ERROR_FAST_SIB = 0
-        ASSEMBLE_FAST_SIB_DEFINES =
-    endif
-
-    # error if CONFIG_FAST_SIBis incorrect
-
-    ifeq ($(ERROR_FAST_SIB),1)
-       .PHONY: error_fast_sib
-       error_fast_sib:
-	$(error Illegal value '$(CONFIG_FAST_SIB)' for $$(CONFIG_FAST_SIB))
-    endif
-
-
-#-----------------------------------------------------------------------
-# DETERMINE BITWISE IDENTICALITY SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_BITWISE_IDENTICALITY = 1
-
-    # Settings to turn blocking gravity ON
-
-    ifeq ($(CONFIG_BITWISE_IDENTICALITY),yes)
-        ERROR_BITWISE_IDENTICALITY = 0
-        ASSEMBLE_BITWISE_IDENTICALITY_DEFINES = -DBITWISE_IDENTICALITY
-    endif
-
-    # Settings to turn blocking gravity OFF
-
-    ifeq ($(CONFIG_BITWISE_IDENTICALITY),no)
-        ERROR_BITWISE_IDENTICALITY = 0
-        ASSEMBLE_BITWISE_IDENTICALITY_DEFINES =
-    endif
-
-    # error if CONFIG_BITWISE_IDENTICALITYis incorrect
-
-    ifeq ($(ERROR_BITWISE_IDENTICALITY),1)
-       .PHONY: error_BITWISE_IDENTICALITY
-       error_BITWISE_IDENTICALITY:
-	$(error Illegal value '$(CONFIG_BITWISE_IDENTICALITY)' for $$(CONFIG_BITWISE_IDENTICALITY))
-    endif
-
-
-#-----------------------------------------------------------------------
-# DETERMINE CUDA (GPU computing) Settings
-# When compiling with CUDA support it just compiles the necessary routines. 
-# but only uses it if you set UseCUDA = 1 in your parameter files.
-#-----------------------------------------------------------------------
-
-    ERROR_ECUDA = 1
-
-    # Settings to compile CUDA kernels 
-
-    ifeq ($(CONFIG_ECUDA),yes)
-        ERROR_ECUDA = 0
-	    ASSEMBLE_ECUDA_DEFINES = -DECUDA
-	    ASSEMBLE_CUDA_LIBS = $(MACH_LIBS_CUDA)
-	    ASSEMBLE_CUDA_INCLUDES = $(MACH_LIBS_INCLUDES)
-	    OBJS_ECUDA_LIB = $(OBJS_ECUDA_ALL)
-    endif
-
-    # Settings to tell the make system not to compile CUDA routines
-
-    ifeq ($(CONFIG_ECUDA),no)
-        ERROR_ECUDA = 0
-        ASSEMBLE_ECUDA_DEFINES = 
-	OBJS_ECUDA_LIB = 
-    endif
-
-    # error if 
-
-    ifeq ($(ERROR_ECUDA),1)
-       .PHONY: error_ecuda
-       error_ecuda:
-	$(error Illegal value '$(CONFIG_ECUDA)' for $$(CONFIG_ECUDA))
-    endif
-
-
-#-----------------------------------------------------------------------
-# DETERMINE FLUX FIX SETTINGS
-#-----------------------------------------------------------------------
-
-    ERROR_FLUX_FIX = 1
-
-    # Settings to turn FLUX FIX on
-
-    ifeq ($(CONFIG_FLUX_FIX),yes)
-        ERROR_FLUX_FIX = 0
-        ASSEMBLE_FLUX_FIX_DEFINES = -DFLUX_FIX
-    endif
-
-    # Settings to turn FLUX FIX off
-
-    ifeq ($(CONFIG_FLUX_FIX),no)
-        ERROR_FLUX_FIX = 0
-        ASSEMBLE_FLUX_FIX_DEFINES =
-    endif
-
-    # error if CONFIG_FLUX_FIX is incorrect
-
-    ifeq ($(ERROR_FLUX_FIX),1)
-       .PHONY: error_transfer
-       error_tpvel:
-	$(error Illegal value '$(CONFIG_FLUX_FIX)' for $$(CONFIG_FLUX_FIX))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE HDF4 USAGE
-#-----------------------------------------------------------------------
-
-    ERROR_USE_HDF4 = 1
-
-    # compilers and settings if USE_HDF4 is yes
-
-    ifeq ($(CONFIG_USE_HDF4),yes)
-        ERROR_USE_HDF4 = 0
-        ASSEMBLE_HDF4_DEFINES  = -DUSE_HDF4
-    endif
-
-    # compilers and settings if USE_HDF4 is no
-
-    ifeq ($(CONFIG_USE_HDF4),no)
-        ERROR_USE_HDF4 = 0
-        ASSEMBLE_HDF4_DEFINES  =
-    endif
-
-    # error if CONFIG_USE_HDF4 is incorrect
-
-    ifeq ($(ERROR_USE_HDF4),1)
-       .PHONY: error_compilers
-       error_compilers:
-	$(error Illegal value '$(CONFIG_USE_HDF4)' for $$(CONFIG_USE_HDF4))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE GRAVITY SOLVER
-#-----------------------------------------------------------------------
-
-    ERROR_GRAVITY_4S = 1
-
-    # compilers and settings if GRAVITY_4S is yes
-
-    ifeq ($(CONFIG_GRAVITY_4S),yes)
-        ERROR_GRAVITY_4S = 0
-        ASSEMBLE_GRAVITY_4S_DEFINES  = -DGRAVITY_4S 
-    endif
-
-    # compilers and settings if GRAVITY_4S is no
-
-    ifeq ($(CONFIG_GRAVITY_4S),no)
-        ERROR_GRAVITY_4S = 0
-        ASSEMBLE_GRAVITY_4S_DEFINES  =
-    endif
-
-    # error if CONFIG_GRAVITY_4S is incorrect
-
-    ifeq ($(ERROR_GRAVITY_4S),1)
-       .PHONY: error_compilers
-       error_compilers:
-	$(error Illegal value '$(CONFIG_GRAVITY_4S)' for $$(CONFIG_GRAVITY_4S))
-    endif
-
-#-----------------------------------------------------------------------
-# DETERMINE ENZO PERFORMANCE
-#-----------------------------------------------------------------------
-
-    ERROR_ENZO_PERFORMANCE = 1
-
-    # compilers and settings if ENZO_PERFORMANCE is yes
-
-    ifeq ($(CONFIG_ENZO_PERFORMANCE),yes)
-        ERROR_ENZO_PERFORMANCE = 0
-        ASSEMBLE_ENZO_PERFORMANCE_DEFINES  = -DENZO_PERFORMANCE 
-    endif
-
-    # compilers and settings if GRAVITY_4S is no
-
-    ifeq ($(CONFIG_ENZO_PERFORMANCE),no)
-        ERROR_ENZO_PERFORMANCE = 0
-        ASSEMBLE_ENZO_PERFORMANCE_DEFINES  =
-    endif
-
-    # error if CONFIG_ENZO_PERFORMANCE is incorrect
-
-    ifeq ($(ERROR_ENZO_PERFORMANCE),1)
-       .PHONY: error_compilers
-       error_compilers:
-	$(error Illegal value '$(CONFIG_ENZO_PERFORMANCE)' for $$(CONFIG_ENZO_PERFORMANCE))
-    endif
-
-
-
 #=======================================================================
 # ASSIGN ALL OUTPUT VARIABLES
 #=======================================================================
                $(ASSEMBLE_OPT_FLAGS)
 
     DEFINES = $(MACH_DEFINES) \
-              $(MAKEFILE_DEFINES) \
-              $(ASSEMBLE_PARAMETER_DEFINES) \
-              $(ASSEMBLE_INITS_DEFINES) \
               $(ASSEMBLE_INTEGER_DEFINES) \
-	      $(ASSEMBLE_IDS_DEFINES) \
               $(ASSEMBLE_IO_DEFINES) \
-              $(ASSEMBLE_LCAPERF_DEFINES) \
-              $(ASSEMBLE_PYTHON_DEFINES) \
-              $(ASSEMBLE_NEW_PROBLEM_TYPES_DEFINES) \
               $(ASSEMBLE_MPI_DEFINES) \
-              $(ASSEMBLE_OOC_BOUNDARY_DEFINES) \
-              $(ASSEMBLE_PAPI_DEFINES) \
               $(ASSEMBLE_PARTICLES_DEFINES) \
-              $(ASSEMBLE_PRECISION_DEFINES) \
-              $(ASSEMBLE_TASKMAP_DEFINES) \
-              $(ASSEMBLE_PACKED_AMR_DEFINES) \
-              $(ASSEMBLE_PACKED_MEM_DEFINES) \
-              $(ASSEMBLE_TESTING_DEFINES) \
-              $(ASSEMBLE_TPVEL_DEFINES) \
-              $(ASSEMBLE_PHOTON_DEFINES) \
-              $(ASSEMBLE_HYPRE_DEFINES) \
-              $(ASSEMBLE_EMISSIVITY_DEFINES) \
-              $(ASSEMBLE_NEW_GRID_IO_DEFINES) \
-              $(ASSEMBLE_FAST_SIB_DEFINES) \
-              $(ASSEMBLE_BITWISE_IDENTICALITY_DEFINES) \
-              $(ASSEMBLE_FLUX_FIX_DEFINES) \
-              $(ASSEMBLE_ECUDA_DEFINES) \
-              $(ASSEMBLE_CUDADEBUG_DEFINES) \
-              $(ASSEMBLE_HDF4_DEFINES) \
-              $(ASSEMBLE_GRAVITY_4S_DEFINES) \
-              $(ASSEMBLE_ENZO_PERFORMANCE_DEFINES) \
-              $(ASSEMBLE_ACCELERATION_BOUNDARY_DEFINES)
+              $(ASSEMBLE_PRECISION_DEFINES)
 
     INCLUDES = $(MACH_INCLUDES) \
     	       $(ASSEMBLE_MPI_INCLUDES) \
-               $(ASSEMBLE_HYPRE_INCLUDES) \
-               $(ASSEMBLE_LCAPERF_INCLUDES) \
-               $(ASSEMBLE_PYTHON_INCLUDES) \
-               $(ASSEMBLE_NEW_PROBLEM_TYPES_INCLUDES) \
-               $(ASSEMBLE_PAPI_INCLUDES) \
                $(MAKEFILE_INCLUDES)   -I.
 
     OBJS_LIB = $(OBJS_CONFIG_LIB) \
 	       $(OBJS_PYTHON) 
 
     LIBS = $(MACH_LIBS) \
-           $(ASSEMBLE_MPI_LIBS) \
-           $(ASSEMBLE_HYPRE_LIBS) \
-           $(ASSEMBLE_LCAPERF_LIBS) \
-           $(ASSEMBLE_PAPI_LIBS) \
-           $(ASSEMBLE_PYTHON_LIBS) \
-           $(ASSEMBLE_NEW_PROBLEM_TYPES_LIBS) \
-           $(ASSEMBLE_CUDA_LIBS)
-
-
+           $(ASSEMBLE_MPI_LIBS)

src/clib/Make.config.settings

 # Description: settings and parameter values
 #=======================================================================
 #
-# Parameters:
-#
-#    PARAMETER_MAX_SUBGRIDS
-#    PARAMETER_MAX_BARYONS
-#    PARAMETER_MAX_TASKS_PER_NODE
-#
 # Configuration settings
 # 
 #    CONFIG_INTEGERS
 #    CONFIG_INITS
 #    CONFIG_IO
 #    CONFIG_USE_MPI
-#    CONFIG_OBJECT_MODE
-#    CONFIG_TASKMAP
-#    CONFIG_PACKED_AMR
-#    CONFIG_PACKED_MEM
-#    CONFIG_LCAPERF
-#    CONFIG_PYTHON
-#    CONFIG_NEW_PROBLEM_TYPES
-#    CONFIG_PAPI
-#    CONFIG_OOC_BOUNDARY
-#    CONFIG_ACCELERATION_BOUNDARY
 #    CONFIG_OPT
-#    CONFIG_TESTING
-#    CONFIG_TPVEL
-#    CONFIG_PHOTON
-#    CONFIG_HYPRE
-#    CONFIG_EMISSIVITY
-#    CONFIG_NEW_GRID_IO
-#    CONFIG_FAST_SIB
-#    CONFIG_FLUX_FIX
-#    CONFIG_USE_HDF4	
-#    CONFIG_BITWISE_IDENTICALITY
-#    CONFIG_USE_ECUDA
-#    CONFIG_SET_ACCELERATION_BOUNDARY
-#    CONFIG_ENZO_PERFORMANCE
 #
 #=======================================================================
 
-    PARAMETER_MAX_SUBGRIDS       = 100000
-    PARAMETER_MAX_BARYONS        = 30
-    PARAMETER_MAX_TASKS_PER_NODE = 8
-    PARAMETER_MEMORY_POOL_SIZE   = 100000
-
 #=======================================================================
 # CONFIG_INTEGERS
 #=======================================================================
      CONFIG_USE_MPI = yes
 
 #=======================================================================
-# CONFIG_OBJECT_MODE
-#=======================================================================
-#    32            compile using 32-bit object format
-#    64            compile using 64-bit object format
-#-----------------------------------------------------------------------
-
-     CONFIG_OBJECT_MODE = 64
-
-#=======================================================================
-# CONFIG_TASKMAP
-#=======================================================================
-#    yes           use unigrid taskmapping
-#    no            don't use unigrid taskmapping
-#-----------------------------------------------------------------------
-
-     CONFIG_TASKMAP = no
-
-#=======================================================================
-# CONFIG_PACKED_AMR
-#=======================================================================
-#    yes           use packed AMR
-#    no            don't use packed AMR
-#-----------------------------------------------------------------------
-
-     CONFIG_PACKED_AMR = yes
-
-#=======================================================================
-# CONFIG_PACKED_MEM
-#=======================================================================
-#    yes           use packed mem with packed AMR
-#    no            don't use packed mem with packed AMR
-#-----------------------------------------------------------------------
-
-     CONFIG_PACKED_MEM = no
-
-#=======================================================================
-# CONFIG_LCAPERF
-#=======================================================================
-#    yes           use lcaperf performance profiling package
-#    no            don't use lcaperf performance profiling package
-#-----------------------------------------------------------------------
-
-     CONFIG_LCAPERF = no
-
-#=======================================================================
-# CONFIG_PAPI
-#=======================================================================
-#    yes           use PAPI hardware counter package with lcaperf
-#    no            don't use PAPI hardware counter package with lcaperf
-#-----------------------------------------------------------------------
-
-     CONFIG_PAPI = no
-
-#=======================================================================
-# CONFIG_PYTHON
-#=======================================================================
-#    yes           use embedded Python interpreter
-#    no            don't use embedded Python interpreter
-#-----------------------------------------------------------------------
-
-     CONFIG_PYTHON = no
-
-#=======================================================================
-# CONFIG_NEW_PROBLEM_TYPES
-#=======================================================================
-#    yes           use the new problem initializers
-#    no            don't use the new problem initializers
-#-----------------------------------------------------------------------
-
-     CONFIG_NEW_PROBLEM_TYPES = no
-
-#=======================================================================
-# CONFIG_OOC_BOUNDARY
-#=======================================================================
-#    yes           use out-of-core top-grid boundary conditions
-#    no            don't use out-of-core top-grid boundary conditions
-#-----------------------------------------------------------------------
-
-     CONFIG_OOC_BOUNDARY = no
-
-#=======================================================================
-# CONFIG_ACCELERATION_BOUNDARY
-#=======================================================================
-#    yes           Set the boundary on the acceleration field.
-#    no            Don't set acceleration boundary
-#-----------------------------------------------------------------------
-
-     CONFIG_ACCELERATION_BOUNDARY = yes
-
-#=======================================================================
-# CONFIG_ENZO_PERFORMANCE
-#=======================================================================
-#    yes           Turn on performance/timing measurements
-#    no            Turn off performance/timing measurements
-#-----------------------------------------------------------------------
-
-     CONFIG_ENZO_PERFORMANCE = yes
-
-#=======================================================================
 # CONFIG_OPT
 #=======================================================================
 #    warn          Write out verbose warnings when compiling
 
      CONFIG_OPT = debug
 
-#=======================================================================
-# CONFIG_TESTING
-#=======================================================================
-#    yes           Include hooks for test suites
-#    no            Do not include hooks for test suites
-#-----------------------------------------------------------------------
-
-     CONFIG_TESTING = no
-
-#=======================================================================
-# CONFIG_TPVEL
-#=======================================================================
-#    yes           Include tracer particle velocity info printout
-#    no            Do not include tracer particle velocity info printout
-#-----------------------------------------------------------------------
-
-     CONFIG_TPVEL = no
-
-#=======================================================================
-# CONFIG_PHOTON
-#=======================================================================
-#    yes           Include adaptive ray tracing for radiative transfer
-#    no            Do not include adaptive ray tracing
-#-----------------------------------------------------------------------
-
-     CONFIG_PHOTON = yes
-
-#=======================================================================
-# CONFIG_HYPRE
-#=======================================================================
-#    yes           Include HYPRE bindings for implicit solvers
-#    no            Do not include HYPRE bindings
-#-----------------------------------------------------------------------
-
-     CONFIG_HYPRE = no
-
-#=======================================================================
-# CONFIG_EMISSIVITY
-#=======================================================================
-#    yes           Include emissivity field allocation
-#    no            Do not include emissivity field allocation
-#-----------------------------------------------------------------------
-
-     CONFIG_EMISSIVITY = no
-
-#=======================================================================
-# CONFIG_NEW_GRID_IO
-#=======================================================================
-#    yes           Use the new, simpler Grid IO routines
-#    no            Original (no checkpointing, more obtuse) Grid IO
-#-----------------------------------------------------------------------
-
-     CONFIG_NEW_GRID_IO = yes
-
-#=======================================================================
-# CONFIG_FAST_SIB
-#=======================================================================
-#    yes           Include the Fast Sibling Locator
-#    no            Original (slow) n^2 neighbor search
-#-----------------------------------------------------------------------
-
-     CONFIG_FAST_SIB = yes
-
-#=======================================================================
-# CONFIG_FLUX_FIX
-#=======================================================================
-#    yes           Include the SUBling (Subgrid of Sibling) Flux Correction Fix
-#    no            Skip this step
-#-----------------------------------------------------------------------
-
-     CONFIG_FLUX_FIX = yes
-
-#======================================================================= 
-# CONFIG_USE_HDF4
-#======================================================================= 
-#    yes           For some users (hdf4)
-#    no            For most of the users (hdf5)
-#----------------------------------------------------------------------- 
- 
-     CONFIG_USE_HDF4 = no
-
-#======================================================================= 
-# CONFIG_BITWISE_IDENTICALITY
-#======================================================================= 
-#    yes           Use blocking potential solves in the gravity solver
-#    no            Allow non-blocking, potentially divergent summations
-#----------------------------------------------------------------------- 
- 
-     CONFIG_BITWISE_IDENTICALITY = no
-
-#======================================================================= 
-# CONFIG_ECUDA
-#======================================================================= 
-#    yes           For some architectures (CUDA-GPU computing)
-#    no            For most of the machines (don't have graphics card)
-#----------------------------------------------------------------------- 
- 
-     CONFIG_ECUDA = no
-
-#======================================================================= 
-# CONFIG_GRAVITY_4S
-#======================================================================= 
-#    yes           Use new 4th-order gravity 
-#    no            Use enzo standard gravity 
-#----------------------------------------------------------------------- 
- 
-     CONFIG_GRAVITY_4S = no

src/clib/Make.config.targets

 	@echo "      gmake use-mpi-yes"
 	@echo "      gmake use-mpi-no"
 	@echo
-	@echo "   Set address/pointer size"
-	@echo
-	@echo "      gmake object-mode-32"
-	@echo "      gmake object-mode-64"
-	@echo
-	@echo "   Set whether to use unigrid taskmap performance mod"
-	@echo
-	@echo "      gmake taskmap-yes"
-	@echo "      gmake taskmap-no"
-	@echo
-	@echo "   Set whether to use 'packed AMR' mods"
-	@echo
-	@echo "      gmake packed-amr-yes"
-	@echo "      gmake packed-amr-no"
-	@echo
-	@echo "   Set whether to use 'packed memory' mods (requires packed AMR)"
-	@echo
-	@echo "      gmake packed-mem-yes"
-	@echo "      gmake packed-mem-no"
-	@echo
-	@echo "   Set whether to call lcaperf performance tool"
-	@echo
-	@echo "      gmake lcaperf-yes"
-	@echo "      gmake lcaperf-no"
-	@echo
-	@echo "   Set whether to use the PAPI library with lcaperf"
-	@echo
-	@echo "      gmake papi-yes"
-	@echo "      gmake papi-no"
-	@echo
-	@echo "   Set whether to use embedded Python interpreter"
-	@echo
-	@echo "      gmake python-yes"
-	@echo "      gmake python-no"
-	@echo
-	@echo "   Set whether to use the new problem initializers"
-	@echo
-	@echo "      gmake new-problem-types-yes"
-	@echo "      gmake new-problem-types-no"
-	@echo
-	@echo "   Set whether to perform unigrid communication transpose"
-	@echo
-	@echo "      gmake unigrid-transpose-yes"
-	@echo "      gmake unigrid-transpose-no"
-	@echo
-	@echo "   Set whether to use out-of-core handling of the boundary"
-	@echo
-	@echo "      gmake ooc-boundary-yes"
-	@echo "      gmake ooc-boundary-no"
-	@echo
-	@echo "   Set whether to set the acceleration boundary"
-	@echo
-	@echo "      gmake acceleration-boundary-yes"
-	@echo "      gmake acceleration-boundary-no"
-	@echo
 	@echo "   Set optimization/debug/warning levels"
 	@echo
 	@echo "      gmake opt-warn"
 	@echo "      gmake opt-high"
 	@echo "      gmake opt-aggressive"
 	@echo
-	@echo "   Include hooks for test suites"
-	@echo
-	@echo "      gmake testing-yes"
-	@echo "      gmake testing-no"
-	@echo
-	@echo "   Include isolated boundary conditions"
-	@echo 
-	@echo "      gmake isolated-bcs-yes"
-	@echo "      gmake isolated-bcs-no"
-	@echo
-	@echo "   Include tracer particle velocity information"
-	@echo
-	@echo "      gmake tpvel-yes"
-	@echo "      gmake tpvel-no"
-	@echo 
-	@echo "   Include radiative transfer (adaptive ray tracing)"
-	@echo
-	@echo "      gmake photon-yes"
-	@echo "      gmake photon-no"
-	@echo 
-	@echo "   Use the new Grid IO routines"
-	@echo
-	@echo "      gmake newgridio-yes"
-	@echo "      gmake newgridio-no"
-	@echo 
-	@echo "   Include fast sibling search"
-	@echo
-	@echo "      gmake fastsib-yes"
-	@echo "      gmake fastsib-no"
-	@echo 
-	@echo "   Turn on blocking-gravity for bitwise identical runs"
-	@echo
-	@echo "      gmake bitwise-yes"
-	@echo "      gmake bitwise-no"
-	@echo 
-	@echo "   Include sibling subgrid boundary fix"
-	@echo
-	@echo "      gmake fluxfix-yes"
-	@echo "      gmake fluxfix-no"
-	@echo 
-	@echo "   Set whether to use HDF4"
-	@echo
-	@echo "      gmake use-hdf4-yes"
-	@echo "      gmake use-hdf4-no"
-	@echo
-	@echo "   Set whether to use inline python"
-	@echo
-	@echo "      gmake python-yes"
-	@echo "      gmake python-no"
-	@echo
-	@echo "   Include HYPRE libraries (implicit RT solvers)"
-	@echo
-	@echo "      gmake hypre-yes"
-	@echo "      gmake hypre-no"
-	@echo
-	@echo "   Include emissivity field"
-	@echo
-	@echo "      gmake emissivity-yes"
-	@echo "      gmake emissivity-no"
-	@echo
-	@echo "   Set whether to use CUDA (GPU-computing)"
-	@echo
-	@echo "      gmake cuda-yes"
-	@echo "      gmake cuda-no"
-	@echo
-	@echo "   Set whether to use 4th-order gravity"
-	@echo
-	@echo "      gmake gravity-4s-yes"
-	@echo "      gmake gravity-4s-no"
-	@echo
-	@echo "   Set whether to use performance/timing measurements"
-	@echo
-	@echo "      gmake enzo-performance-yes"
-	@echo "      gmake enzo-performance-no"
-	@echo
 
 #-----------------------------------------------------------------------
 
 	@echo "   MACHINE: $(MACH_TEXT)"
 	@echo "   MACHINE-NAME: $(CONFIG_MACHINE)"
 	@echo
-	@echo "   PARAMETER_MAX_SUBGRIDS  [max-subgrids-###]                : $(PARAMETER_MAX_SUBGRIDS)"
-	@echo "   PARAMETER_MAX_BARYONS  [max-baryons-###]                  : $(PARAMETER_MAX_BARYONS)"
-	@echo "   PARAMETER_MAX_TASKS_PER_NODE  [max-tasks-per-node-###]    : $(PARAMETER_MAX_TASKS_PER_NODE)"
-	@echo "   PARAMETER_MEMORY_POOL_SIZE  [memory-pool-###]             : $(PARAMETER_MEMORY_POOL_SIZE)"
-	@echo
 	@echo "   CONFIG_PRECISION  [precision-{32,64}]                     : $(CONFIG_PRECISION)"
 	@echo "   CONFIG_PARTICLES  [particles-{32,64,128}]                 : $(CONFIG_PARTICLES)"
 	@echo "   CONFIG_INTEGERS  [integers-{32,64}]                       : $(CONFIG_INTEGERS)" 
 	@echo "   CONFIG_IO  [io-{32,64}]                                   : $(CONFIG_IO)"
 	@echo "   CONFIG_USE_MPI  [use-mpi-{yes,no}]                        : $(CONFIG_USE_MPI)"
-	@echo "   CONFIG_OBJECT_MODE  [object-mode-{32,64}]                 : $(CONFIG_OBJECT_MODE)"
-	@echo "   CONFIG_TASKMAP  [taskmap-{yes,no}]                        : $(CONFIG_TASKMAP)"
-	@echo "   CONFIG_PACKED_AMR  [packed-amr-{yes,no}]                  : $(CONFIG_PACKED_AMR)"
-	@echo "   CONFIG_PACKED_MEM  [packed-mem-{yes,no}]                  : $(CONFIG_PACKED_MEM)"
-	@echo "   CONFIG_LCAPERF  [lcaperf-{yes,no}]                        : $(CONFIG_LCAPERF)"
-	@echo "   CONFIG_PAPI  [papi-{yes,no}]                              : $(CONFIG_PAPI)"
-	@echo "   CONFIG_PYTHON  [python-{yes,no}]                          : $(CONFIG_PYTHON)"
-	@echo "   CONFIG_NEW_PROBLEM_TYPES  [new-problem-types-{yes,no}]    : $(CONFIG_NEW_PROBLEM_TYPES)"
-	@echo "   CONFIG_ECUDA  [cuda-{yes,no}]                             : $(CONFIG_ECUDA)"
-	@echo "   CONFIG_OOC_BOUNDARY  [ooc-boundary-{yes,no}]              : $(CONFIG_OOC_BOUNDARY)"
-	@echo "   CONFIG_ACCELERATION_BOUNDARY  [acceleration-boundary-{yes,no}]              : $(CONFIG_ACCELERATION_BOUNDARY)"
 	@echo "   CONFIG_OPT  [opt-{warn,debug,cudadebug,high,aggressive}]  : $(CONFIG_OPT)"
-	@echo "   CONFIG_TESTING  [testing-{yes,no}]                        : $(CONFIG_TESTING)"
-	@echo "   CONFIG_TPVEL  [tpvel-{yes,no}]]                           : $(CONFIG_TPVEL)"
-	@echo "   CONFIG_PHOTON  [photon-{yes,no}]                          : $(CONFIG_PHOTON)"
-	@echo "   CONFIG_HYPRE  [hypre-{yes,no}]                            : $(CONFIG_HYPRE)"
-	@echo "   CONFIG_EMISSIVITY  [emissivity-{yes,no}]                  : $(CONFIG_EMISSIVITY)"
-	@echo "   CONFIG_USE_HDF4  [use-hdf4-{yes,no}]                      : $(CONFIG_USE_HDF4)"
-	@echo "   CONFIG_NEW_GRID_IO  [newgridio-{yes,no}]                  : $(CONFIG_NEW_GRID_IO)"
-	@echo "   CONFIG_BITWISE_IDENTICALITY  [bitwise-{yes,no}]           : $(CONFIG_BITWISE_IDENTICALITY)"
-	@echo "   CONFIG_FAST_SIB  [fastsib-{yes,no}]                       : $(CONFIG_FAST_SIB)"
-	@echo "   CONFIG_FLUX_FIX  [fluxfix-{yes,no}]                       : $(CONFIG_FLUX_FIX)"
-	@echo "   CONFIG_GRAVITY_4S  [gravity-4s-{yes,no}]                  : $(CONFIG_GRAVITY_4S)"
-	@echo "   CONFIG_ENZO_PERFORMANCE  [enzo-performance-{yes,no}]      : $(CONFIG_ENZO_PERFORMANCE)"
+
 	@echo
 
 #-----------------------------------------------------------------------
 
 #-----------------------------------------------------------------------
 
-max-subgrids-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v PARAMETER_MAX_SUBGRIDS $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "PARAMETER_MAX_SUBGRIDS = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep PARAMETER_MAX_SUBGRIDS; \
-	echo
-
-
-#-----------------------------------------------------------------------
-
-max-baryons-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v PARAMETER_MAX_BARYONS $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "PARAMETER_MAX_BARYONS = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep PARAMETER_MAX_BARYONS; \
-	echo
-
-
-#-----------------------------------------------------------------------
-
-max-tasks-per-node-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v PARAMETER_MAX_TASKS_PER_NODE $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "PARAMETER_MAX_TASKS_PER_NODE = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep PARAMETER_MAX_TASKS_PER_NODE; \
-	echo
-
-
-#-----------------------------------------------------------------------
-
-memory-pool-%:
-	@tmp=.config.temp; \
-        grep -v PARAMETER_MEMORY_POOL_SIZE $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "PARAMETER_MEMORY_POOL_SIZE = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	touch $(TOP_DIR)/src/enzo/enzo.C $(TOP_DIR)/src/enzo/EvolvePhotons.C; \
-	$(MAKE)  show-config | grep PARAMETER_MEMORY_POOL_SIZE; \
-	echo
-
-
-#-----------------------------------------------------------------------
-
 machine-%: suggest-clean
 	@if [ -e $(ENZO_DIR)/Make.mach.$* ] || [ -e $(HOME)/.enzo/Make.mach.$* ]; then \
            tmp=.config.temp; \
 
 #-----------------------------------------------------------------------
 
-VALID_IDS = particle-id-32 particle-id-64
-.PHONY: $(VALID_IDS)
-
-particle-id-32: CONFIG_PARTICLE_IDS-32
-particle-id-64: CONFIG_PARTICLE_IDS-64
-particle-id-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_IDS)]\n\n"
-CONFIG_PARTICLE_IDS-%: suggest-clean
-	@tmp=.config.temp; \
-	grep -v CONFIG_PARTICLE_IDS $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-	mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-	echo "CONFIG_PARTICLE_IDS = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_PARTICLE_IDS; \
-	echo
-
-#-----------------------------------------------------------------------
-
 VALID_PRECISION = precision-32 precision-64
 .PHONY: $(VALID_PRECISION)
 
 
 #-----------------------------------------------------------------------
 
-VALID_OBJECT-MODE = object-mode-32 object-mode-64
-.PHONY: $(VALID_OBJECT-MODE)
-
-object-mode-32: CONFIG_OBJECT-MODE-32
-object-mode-64: CONFIG_OBJECT-MODE-64
-object-mode-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_OBJECT-MODE)]\n\n"
-CONFIG_OBJECT-MODE-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_OBJECT_MODE $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_OBJECT_MODE = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_OBJECT_MODE; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_TASKMAP = taskmap-yes taskmap-no
-.PHONY: $(VALID_TASKMAP)
-
-taskmap-yes: CONFIG_TASKMAP-yes
-taskmap-no: CONFIG_TASKMAP-no
-taskmap-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_TASKMAP)]\n\n"
-CONFIG_TASKMAP-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_TASKMAP $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_TASKMAP = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_TASKMAP; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_PACKED-AMR = packed-amr-yes packed-amr-no
-.PHONY: $(VALID_PACKED-AMR)
-
-packed-amr-yes: CONFIG_PACKED-AMR-yes
-packed-amr-no: CONFIG_PACKED-AMR-no
-packed-amr-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_PACKED-AMR)]\n\n"
-CONFIG_PACKED-AMR-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_PACKED_AMR $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_PACKED_AMR = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_PACKED_AMR; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_PACKED-MEM = packed-mem-yes packed-mem-no
-.PHONY: $(VALID_PACKED-MEM)
-
-packed-mem-yes: CONFIG_PACKED-MEM-yes
-packed-mem-no: CONFIG_PACKED-MEM-no
-packed-mem-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_PACKED-MEM)]\n\n"
-CONFIG_PACKED-MEM-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_PACKED_MEM $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_PACKED_MEM = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_PACKED_MEM; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_LCAPERF = lcaperf-yes lcaperf-no
-.PHONY: $(VALID_LCAPERF)
-
-lcaperf-yes: CONFIG_LCAPERF-yes
-lcaperf-no: CONFIG_LCAPERF-no
-lcaperf-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_LCAPERF)]\n\n"
-CONFIG_LCAPERF-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_LCAPERF $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_LCAPERF = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_LCAPERF; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_PAPI = papi-yes papi-no
-.PHONY: $(VALID_PAPI)
-
-papi-yes: CONFIG_PAPI-yes
-papi-no: CONFIG_PAPI-no
-papi-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_PAPI)]\n\n"
-CONFIG_PAPI-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_PAPI $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_PAPI = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_PAPI; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_PYTHON = python-yes python-no
-.PHONY: $(VALID_PYTHON)
-
-python-yes: CONFIG_PYTHON-yes
-python-no: CONFIG_PYTHON-no
-python-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_PYTHON)]\n\n"
-CONFIG_PYTHON-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_PYTHON $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_PYTHON = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_PYTHON; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_PROBLEM_TYPES = new-problem-types-yes new-problem-types-no
-.PHONY: $(VALID_PROBLEM_TYPES)
-
-new-problem-types-yes: CONFIG_NEW_PROBLEM_TYPES-yes
-new-problem-types-no: CONFIG_NEW_PROBLEM_TYPES-no
-new-problem-types-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_NEW_PROBLEM_TYPES)]\n\n"
-CONFIG_NEW_PROBLEM_TYPES-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_NEW_PROBLEM_TYPES $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_NEW_PROBLEM_TYPES = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_NEW_PROBLEM_TYPES; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_ECUDA = cuda-yes cuda-no
-.PHONY: $(VALID_ECUDA)
-
-cuda-yes: CONFIG_ECUDA-yes
-cuda-no: CONFIG_ECUDA-no
-cuda-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_ECUDA)]\n\n"
-CONFIG_ECUDA-%: suggest-clean
-	@tmp=.config.temp; \
-        echo ""; \
-        grep -v CONFIG_ECUDA $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_ECUDA = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_ECUDA; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_OOC-BOUNDARY = ooc-boundary-yes ooc-boundary-no
-.PHONY: $(VALID_OOC-BOUNDARY)
-
-ooc-boundary-yes: CONFIG_OOC-BOUNDARY-yes
-ooc-boundary-no: CONFIG_OOC-BOUNDARY-no
-ooc-boundary-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_OOC-BOUNDARY)]\n\n"
-CONFIG_OOC-BOUNDARY-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_OOC_BOUNDARY $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_OOC_BOUNDARY = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_OOC_BOUNDARY; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_ACCELERATION-BOUNDARY = acceleration-boundary-yes acceleration-boundary-no
-.PHONY: $(VALID_ACCELERATION-BOUNDARY)
-
-acceleration-boundary-yes: CONFIG_ACCELERATION-BOUNDARY-yes
-acceleration-boundary-no: CONFIG_ACCELERATION-BOUNDARY-no
-acceleration-boundary-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_ACCELERATION-BOUNDARY)]\n\n"
-CONFIG_ACCELERATION-BOUNDARY-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_ACCELERATION_BOUNDARY $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_ACCELERATION_BOUNDARY = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_ACCELERATION_BOUNDARY; \
-	echo
-
-#-----------------------------------------------------------------------
-
 VALID_OPT = opt-warn opt-debug opt-cudadebug opt-high opt-aggressive
 .PHONY: $(VALID_OPT)
 
 	echo
 
 #-----------------------------------------------------------------------
-
-VALID_TESTING = testing-yes testing-no
-.PHONY: $(VALID_TESTING)
-
-testing-yes: CONFIG_TESTING-yes
-testing-no: CONFIG_TESTING-no
-testing-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_TESTING)]\n\n"
-CONFIG_TESTING-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_TESTING $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_TESTING = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_TESTING; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_TPVEL = tpvel-yes tpvel-no
-.PHONY: $(VALID_TPVEL)
-
-tpvel-yes: CONFIG_TPVEL-yes
-tpvel-no: CONFIG_TPVEL-no
-tpvel-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_TPVEL)]\n\n"
-CONFIG_TPVEL-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_TPVEL $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_TPVEL = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE) show-config | grep CONFIG_TPVEL; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_PHOTON = photon-yes photon-no
-.PHONY: $(VALID_PHOTON)
-
-photon-yes: CONFIG_PHOTON-yes
-photon-no: CONFIG_PHOTON-no
-photon-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_PHOTON)]\n\n"
-CONFIG_PHOTON-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_PHOTON $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_PHOTON = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE) show-config | grep CONFIG_PHOTON; \
-	echo
-
-
-#-----------------------------------------------------------------------
-
-VALID_HYPRE = hypre-yes hypre-no
-.PHONY: $(VALID_HYPRE)
-
-hypre-yes: CONFIG_HYPRE-yes
-hypre-no: CONFIG_HYPRE-no
-hypre-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_HYPRE)]\n\n"
-CONFIG_HYPRE-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_HYPRE $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_HYPRE = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE) show-config | grep CONFIG_HYPRE; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_EMISSIVITY = emissivity-yes emissivity-no
-.PHONY: $(VALID_EMISSIVITY)
-
-emissivity-yes: CONFIG_EMISSIVITY-yes
-emissivity-no: CONFIG_EMISSIVITY-no
-emissivity-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_EMISSIVITY)]\n\n"
-CONFIG_EMISSIVITY-%:
-	@tmp=.config.temp; \
-        grep -v CONFIG_EMISSIVITY $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_EMISSIVITY = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE) show-config | grep CONFIG_EMISSIVITY; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_NEW_GRID_IO = newgridio-yes newgridio-no
-.PHONY: $(VALID_NEW_GRID_IO)
-
-newgridio-yes: CONFIG_NEW_GRID_IO-yes
-newgridio-no: CONFIG_NEW_GRID_IO-no
-newgridio-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_NEW_GRID_IO)]\n\n"
-CONFIG_NEW_GRID_IO-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_NEW_GRID_IO $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_NEW_GRID_IO = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_NEW_GRID_IO; \
-	echo
-
-#-----------------------------------------------------------------------
-
-VALID_FAST_SIB = fastsib-yes fastsib-no
-.PHONY: $(VALID_FAST_SIB)
-
-fastsib-yes: CONFIG_FAST_SIB-yes
-fastsib-no: CONFIG_FAST_SIB-no
-fastsib-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_FAST_SIB)]\n\n"
-CONFIG_FAST_SIB-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_FAST_SIB $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_FAST_SIB = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_FAST_SIB; \
-	echo
-
-
-#-----------------------------------------------------------------------
-
-VALID_BITWISE_IDENTICALITY = bitwise-yes bitwise-no
-.PHONY: $(VALID_BITWISE_IDENTICALITY)
-
-bitwise-yes: CONFIG_BITWISE_IDENTICALITY-yes
-bitwise-no: CONFIG_BITWISE_IDENTICALITY-no
-bitwise-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_BITWISE_IDENTICALITY)]\n\n"
-CONFIG_BITWISE_IDENTICALITY-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_BITWISE_IDENTICALITY $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_BITWISE_IDENTICALITY = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_BITWISE_IDENTICALITY; \
-	echo
-
-
-#-----------------------------------------------------------------------
-
-VALID_FLUX_FIX = fluxfix-yes fluxfix-no
-.PHONY: $(VALID_FLUX_FIX)
-
-fluxfix-yes: CONFIG_FLUX_FIX-yes
-fluxfix-no: CONFIG_FLUX_FIX-no
-fluxfix-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_FLUX_FIX)]\n\n"
-CONFIG_FLUX_FIX-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_FLUX_FIX $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_FLUX_FIX = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_FLUX_FIX; \
-	echo
-
-
-#-----------------------------------------------------------------------
-
-VALID_USE-HDF4 = use-hdf4-yes use-hdf4-no
-.PHONY: $(VALID_USE-HDF4)
-
-use-hdf4-yes: CONFIG_USE-HDF4-yes
-use-hdf4-no: CONFIG_USE-HDF4-no
-use-hdf4-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_USE-HDF4)]\n\n"
-CONFIG_USE-HDF4-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_USE_HDF4 $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_USE_HDF4 = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_USE_HDF4; \
-	echo
-
-
-#-----------------------------------------------------------------------
-
-
-VALID_GRAVITY_4S = gravity-4s-yes gravity-4s-no
-.PHONY: $(VALID_GRAVITY_4S)
-
-gravity-4s-yes: CONFIG_GRAVITY_4S-yes
-gravity-4s-no: CONFIG_GRAVITY_4S-no
-gravity-4s-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_GRAVITY_4S)]\n\n"
-CONFIG_GRAVITY_4S-%: suggest-clean
-	@tmp=.config.temp; \
-        grep -v CONFIG_GRAVITY_4S $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_GRAVITY_4S = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_GRAVITY_4S; \
-	echo
-
-
-#-----------------------------------------------------------------------
-
-VALID_ENZO_PERFORMANCE = enzo-performance-yes enzo-performance-no
-.PHONY: $(VALID_ENZO_PERFORMANCE)
-
-enzo-performance-yes: CONFIG_ENZO_PERFORMANCE-yes
-enzo-performance-no: CONFIG_ENZO_PERFORMANCE-no
-enzo-performance-%:
-	@printf "\n\tInvalid target: $@\n\n\tValid targets: [$(VALID_ENZO_PERFORMANCE)]\n\n"
-CONFIG_ENZO_PERFORMANCE-%:
-	@tmp=.config.temp; \
-        grep -v CONFIG_ENZO_PERFORMANCE $(MAKE_CONFIG_OVERRIDE) > $${tmp}; \
-        mv $${tmp} $(MAKE_CONFIG_OVERRIDE); \
-        echo "CONFIG_ENZO_PERFORMANCE = $*" >> $(MAKE_CONFIG_OVERRIDE); \
-	$(MAKE)  show-config | grep CONFIG_ENZO_PERFORMANCE; \
-	echo
-
-
-#-----------------------------------------------------------------------
-

src/clib/comp_accel.F

-c=======================================================================
-c/////////////////////////  SUBROUTINE COMP_ACCEL  \\\\\\\\\\\\\\\\\\\\\
-c
-      subroutine comp_accel(source, dest1, dest2, dest3, ndim, iflag,
-     &                      sdim1, sdim2, sdim3, ddim1, ddim2, ddim3, 
-     &                      start1, start2, start3, delx, dely, delz)
-c
-c  DIFFERENCE POTENTIAL TO GET ACCELERATION
-c
-c  written by: Greg Bryan
-c  date:       January, 1998
-c  modified1:  Oliver Hahn, 
-c  date:       February, 2010
-c
-c  PURPOSE:
-c
-c  INPUTS:
-c     source       - source field
-c     sdim1-3      - source dimension
-c     ddim1-3      - destination dimension
-c     ndim         - rank of fields
-c     start1-3     - dest start index in destination cells
-c
-c  OUTPUT ARGUMENTS: 
-c     dest1-3      - acceleration fields
-c
-c  EXTERNALS: 
-c
-c  LOCALS:
-c
-c-----------------------------------------------------------------------
-c
-      implicit NONE
-c
-c-----------------------------------------------------------------------
-c
-c  argument declarations
-c
-      integer ddim1, ddim2, ddim3, sdim1, sdim2, sdim3, ndim,
-     &        start1, start2, start3, iflag
-      real    source(sdim1, sdim2, sdim3), delx, dely, delz,
-     &        dest1(ddim1, ddim2, ddim3), dest2(ddim1, ddim2, ddim3),
-     &        dest3(ddim1, ddim2, ddim3)
-c
-c  locals
-c
-      integer i, j, k
-      real    fact1, fact2, fact3
-
-
-#if defined(GRAVITY_4S) && !defined(GRAVITY_6S)
-c
-c\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\///////////////////////////////
-c=======================================================================
-c     -- standard 4th order derivative operators --
-c
-      fact1 = -1.d0/delx/12.d0
-      fact2 = -1.d0/dely/12.d0
-      fact3 = -1.d0/delz/12.d0
-      
-      if (iflag.ne.1) then
-      	write(*,*) 'Error: Need symmetric gravity for 4th order.'
-        write(*,*) '       Do not use ZEUS for hydro.'
-      	return
-      endif
-c
-c     1) 1D
-c
-      if (ndim .eq. 1) then
-         do k=1, ddim3
-            do j=1, ddim2
-               do i=1, ddim1
-                  dest1(i,j,k) = fact1*(
-     &                  - 1.d0 * source(i+start1+2,j+start2,k+start3) 
-     &			+ 8.d0 * source(i+start1+1,j+start2,k+start3)
-     &			- 8.d0 * source(i+start1-1,j+start2,k+start3)
-     &                  + 1.d0 * source(i+start1-2,j+start2,k+start3))
-               enddo
-            enddo
-         enddo
-      endif
-c
-c     2) 2D
-c
-      if (ndim .eq. 2) then
-         do k=1, ddim3
-            do j=1, ddim2
-               do i=1, ddim1
-               
-	              dest1(i,j,k) = fact1*(
-     &                  - 1.d0 * source(i+start1+2,j+start2,k+start3) 
-     &			+ 8.d0 * source(i+start1+1,j+start2,k+start3)
-     &			- 8.d0 * source(i+start1-1,j+start2,k+start3)
-     &                  + 1.d0 * source(i+start1-2,j+start2,k+start3))
-     
-     
-     		      dest2(i,j,k) = fact1*(
-     &			- 1.d0 * source(i+start1,j+start2+2,k+start3)
-     &			+ 8.d0 * source(i+start1,j+start2+1,k+start3)
-     &		       	- 8.d0 * source(i+start1,j+start2-1,k+start3)
-     &			+ 1.d0 * source(i+start1,j+start2-2,k+start3))
-     			  		
-               enddo
-            enddo
-         enddo
-      endif
-c
-c     2) 3D
-c
-      if (ndim .eq. 3) then
-         do k=1, ddim3
-            do j=1, ddim2
-               do i=1, ddim1
-                         
-                  dest1(i,j,k) = fact1*(
-     &                  - 1.d0 * source(i+start1+2,j+start2,k+start3) 
-     &			+ 8.d0 * source(i+start1+1,j+start2,k+start3)
-     &			- 8.d0 * source(i+start1-1,j+start2,k+start3)
-     &                  + 1.d0 * source(i+start1-2,j+start2,k+start3))
-     
-     
-     		  dest2(i,j,k) = fact1*(
-     &			- 1.d0 * source(i+start1,j+start2+2,k+start3)
-     &			+ 8.d0 * source(i+start1,j+start2+1,k+start3)
-     &			- 8.d0 * source(i+start1,j+start2-1,k+start3)
-     &			+ 1.d0 * source(i+start1,j+start2-2,k+start3))
-     
-     
-     		  dest3(i,j,k) = fact1*(
-     &			- 1.d0 * source(i+start1,j+start2,k+start3+2) 
-     &                  + 8.d0 * source(i+start1,j+start2,k+start3+1)
-     &			- 8.d0 * source(i+start1,j+start2,k+start3-1)
-     &			+ 1.d0 * source(i+start1,j+start2,k+start3-2))
-     
-               enddo
-            enddo
-         enddo
-      endif
-      
-      
-#elif defined(GRAVITY_6S)
-c
-c\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\///////////////////////////////
-c=======================================================================
-c     -- standard 6th order derivative operators --
-c
-      fact1 = -1.d0/delx/60.d0
-      fact2 = -1.d0/dely/60.d0
-      fact3 = -1.d0/delz/60.d0
-      
-      if (iflag.ne.1) then
-      	write(*,*) 'Error: Need symmetric gravity for 6th order.'
-        write(*,*) '       Do not use ZEUS for hydro.'
-      	return
-      endif
-c
-c     1) 1D
-c
-      if (ndim .eq. 1) then
-         do k=1, ddim3
-            do j=1, ddim2
-               do i=1, ddim1
-                  dest1(i,j,k) = fact1*(
-     &                    1.d0 * source(i+start1+3,j+start2,k+start3) 
-     &			 -9.d0 * source(i+start1+2,j+start2,k+start3)
-     &			+45.d0 * source(i+start1+1,j+start2,k+start3)
-     &			-45.d0 * source(i+start1-1,j+start2,k+start3)
-     &			 +9.d0 * source(i+start1-2,j+start2,k+start3)
-     &                   -1.d0 * source(i+start1-3,j+start2,k+start3))
-               enddo
-            enddo
-         enddo
-      endif
-c
-c     2) 2D
-c
-      if (ndim .eq. 2) then
-         do k=1, ddim3
-            do j=1, ddim2
-               do i=1, ddim1
-               
-	              dest1(i,j,k) = fact1*(
-     &                    1.d0 * source(i+start1+3,j+start2,k+start3) 
-     &			 -9.d0 * source(i+start1+2,j+start2,k+start3)
-     &			+45.d0 * source(i+start1+1,j+start2,k+start3)
-     &			-45.d0 * source(i+start1-1,j+start2,k+start3)
-     &			 +9.d0 * source(i+start1-2,j+start2,k+start3)     
-     &                   -1.d0 * source(i+start1-3,j+start2,k+start3))
-     
-     
-     		      dest2(i,j,k) = fact1*(
-     &	  		  1.d0 * source(i+start1,j+start2+3,k+start3)
-     &			 -9.d0 * source(i+start1,j+start2+2,k+start3)
-     &			+45.d0 * source(i+start1,j+start2+1,k+start3)
-     &		 	-45.d0 * source(i+start1,j+start2-1,k+start3)
-     &		 	 +9.d0 * source(i+start1,j+start2-2,k+start3)
-     &			 -1.d0 * source(i+start1,j+start2-3,k+start3))
-     			  		
-               enddo
-            enddo
-         enddo
-      endif
-c
-c     2) 3D
-c
-      if (ndim .eq. 3) then
-         do k=1, ddim3
-            do j=1, ddim2
-               do i=1, ddim1
-                         
-			dest1(i,j,k) = fact1*(
-     &                    1.d0 * source(i+start1+3,j+start2,k+start3) 
-     &			 -9.d0 * source(i+start1+2,j+start2,k+start3)
-     &			+45.d0 * source(i+start1+1,j+start2,k+start3)
-     &			-45.d0 * source(i+start1-1,j+start2,k+start3)
-     &			 +9.d0 * source(i+start1-2,j+start2,k+start3)
-     &                   -1.d0 * source(i+start1-3,j+start2,k+start3))
-     
-     
-     			dest2(i,j,k) = fact1*(
-     &			  1.d0 * source(i+start1,j+start2+3,k+start3)
-     &			 -9.d0 * source(i+start1,j+start2+2,k+start3)
-     &			+45.d0 * source(i+start1,j+start2+1,k+start3)
-     &			-45.d0 * source(i+start1,j+start2-1,k+start3)
-     &			 +9.d0 * source(i+start1,j+start2-2,k+start3)
-     &			 -1.d0 * source(i+start1,j+start2-3,k+start3))
-     
-     
-                        dest3(i,j,k) = fact1*(
-     &			  1.d0 * source(i+start1,j+start2,k+start3+3) 
-     &                   -9.d0 * source(i+start1,j+start2,k+start3+2)
-     &                  +45.d0 * source(i+start1,j+start2,k+start3+1)
-     &			-45.d0 * source(i+start1,j+start2,k+start3-1)
-     &			 +9.d0 * source(i+start1,j+start2,k+start3-2)
-     &			 -1.d0 * source(i+start1,j+start2,k+start3-3))
-     
-               enddo
-            enddo
-         enddo
-      endif
-
-#else
-c
-c\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\///////////////////////////////
-c=======================================================================
-c     -- standard 2nd order derivative operators --
-c
-      fact1 = -1.d0/(real(iflag+1)*delx)
-      fact2 = -1.d0/(real(iflag+1)*dely)
-      fact3 = -1.d0/(real(iflag+1)*delz)
-c
-c     1) 1D
-c
-      if (ndim .eq. 1) then
-         do k=1, ddim3
-            do j=1, ddim2
-               do i=1, ddim1
-                  dest1(i,j,k) = fact1*(
-     &                    source(i+start1+iflag,j+start2,k+start3) - 
-     &                    source(i+start1-1    ,j+start2,k+start3)  )
-               enddo
-            enddo
-         enddo
-      endif
-c
-c     2) 2D
-c
-      if (ndim .eq. 2) then
-         do k=1, ddim3
-            do j=1, ddim2
-               do i=1, ddim1
-                  dest1(i,j,k) = fact1*(
-     &                    source(i+start1+iflag,j+start2,k+start3) - 
-     &                    source(i+start1-1    ,j+start2,k+start3)  )
-                  dest2(i,j,k) = fact2*(
-     &                    source(i+start1,j+start2+iflag,k+start3) - 
-     &                    source(i+start1,j+start2-1    ,k+start3)  )
-               enddo
-            enddo
-         enddo
-      endif
-c
-c     2) 3D
-c
-      if (ndim .eq. 3) then
-         do k=1, ddim3
-            do j=1, ddim2
-               do i=1, ddim1
-                  dest1(i,j,k) = fact1*(
-     &                    source(i+start1+iflag,j+start2,k+start3) - 
-     &                    source(i+start1-1    ,j+start2,k+start3)  )
-                  dest2(i,j,k) = fact2*(
-     &                    source(i+start1,j+start2+iflag,k+start3) - 
-     &                    source(i+start1,j+start2-1    ,k+start3)  )
-                  dest3(i,j,k) = fact3*(
-     &                    source(i+start1,j+start2,k+start3+iflag) - 
-     &                    source(i+start1,j+start2,k+start3-1    )  )
-               enddo
-            enddo
-         enddo
-      endif
-
-#endif
-
-c
-c
-      return
-      end