Commit ebe0d49f authored by Uwe Schulzweida's avatar Uwe Schulzweida
Browse files

Removed ENABLE_DATA.

parent ae9771dc
Pipeline #3340 passed with stages
in 14 minutes and 13 seconds
...@@ -165,15 +165,6 @@ AS_IF([test x$enable_fortran = 'xno'],[AC_SUBST([ENABLE_FORTRAN],[false])],[AC_S ...@@ -165,15 +165,6 @@ AS_IF([test x$enable_fortran = 'xno'],[AC_SUBST([ENABLE_FORTRAN],[false])],[AC_S
AM_CONDITIONAL([USE_F77],[test -n "$F77" -a X"$F77" != Xno -a x"$acx_cv_cfortran_works" = xyes]) AM_CONDITIONAL([USE_F77],[test -n "$F77" -a X"$F77" != Xno -a x"$acx_cv_cfortran_works" = xyes])
AS_IF([test x$acx_cv_cfortran_works = 'xno'],[AC_SUBST([FORTRAN_WORKS],[no])],[AC_SUBST([FORTRAN_WORKS],[yes])]) AS_IF([test x$acx_cv_cfortran_works = 'xno'],[AC_SUBST([FORTRAN_WORKS],[no])],[AC_SUBST([FORTRAN_WORKS],[yes])])
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
# Enable DATA support
AC_MSG_CHECKING([for DATA support])
AC_ARG_ENABLE([data], AS_HELP_STRING([--enable-data],[DATA support [default=yes]]))
AS_IF([test "x$enable_data" != 'xno'], [
AC_DEFINE(ENABLE_DATA, [1], [Define to 1 for DATA support])
])
AC_MSG_RESULT([$enable_data])
AS_IF([test x$enable_data = 'xno'],[AC_SUBST([ENABLE_DATA],[false])],[AC_SUBST([ENABLE_DATA],[true])])
# ----------------------------------------------------------------------
CFLAGS="$CFLAGS ${OPENMP_CFLAGS}" CFLAGS="$CFLAGS ${OPENMP_CFLAGS}"
CXXFLAGS="$CXXFLAGS ${OPENMP_CFLAGS}" CXXFLAGS="$CXXFLAGS ${OPENMP_CFLAGS}"
# ---------------------------------------------------------------------- # ----------------------------------------------------------------------
......
...@@ -23,10 +23,6 @@ ...@@ -23,10 +23,6 @@
Vargen stdatm Field values for pressure and temperature for the standard atmosphere Vargen stdatm Field values for pressure and temperature for the standard atmosphere
*/ */
#ifdef HAVE_CONFIG_H
#include "config.h" // ENABLE_DATA
#endif
#include <cstdlib> #include <cstdlib>
#include <cassert> #include <cassert>
#include <cdi.h> #include <cdi.h>
...@@ -43,7 +39,6 @@ ...@@ -43,7 +39,6 @@
#include "timebase.h" #include "timebase.h"
#include "param_conversion.h" #include "param_conversion.h"
#ifdef ENABLE_DATA
static constexpr double etopo_scale = 3.0; static constexpr double etopo_scale = 3.0;
static constexpr double etopo_offset = 11000.0; static constexpr double etopo_offset = 11000.0;
static constexpr unsigned short etopo[] = { static constexpr unsigned short etopo[] = {
...@@ -61,7 +56,6 @@ static constexpr double mask_offset = 0.0; ...@@ -61,7 +56,6 @@ static constexpr double mask_offset = 0.0;
static constexpr unsigned short mask[] = { static constexpr unsigned short mask[] = {
#include "mask.dat" #include "mask.dat"
}; };
#endif
// Some Constants for creating temperatur and pressure for the standard atmosphere // Some Constants for creating temperatur and pressure for the standard atmosphere
constexpr double T_ZERO = 213.0; constexpr double T_ZERO = 213.0;
...@@ -502,7 +496,6 @@ Vargen(void *process) ...@@ -502,7 +496,6 @@ Vargen(void *process)
} }
else if (operatorID == TOPO || operatorID == TEMP || operatorID == MASK) else if (operatorID == TOPO || operatorID == TEMP || operatorID == MASK)
{ {
#ifdef ENABLE_DATA
const auto datasize = gridInqSize(gridIDdata); const auto datasize = gridInqSize(gridIDdata);
Varray<double> data(datasize); Varray<double> data(datasize);
...@@ -520,9 +513,6 @@ Vargen(void *process) ...@@ -520,9 +513,6 @@ Vargen(void *process)
{ {
for (size_t i = 0; i < gridsize; ++i) array[i] = data[i]; for (size_t i = 0; i < gridsize; ++i) array[i] = data[i];
} }
#else
cdoAbort("Operator support disabled!");
#endif
} }
else if (operatorID == SEQ) else if (operatorID == SEQ)
{ {
......
...@@ -52,6 +52,7 @@ extern "C" ...@@ -52,6 +52,7 @@ extern "C"
// HAVE_OPENMP4 // HAVE_OPENMP4
#include "process_int.h" #include "process_int.h"
#include "cdo_features.h" #include "cdo_features.h"
#include "cimdOmp.h"
#include <thread> // std::thread::hardware_concurrency() #include <thread> // std::thread::hardware_concurrency()
...@@ -65,15 +66,6 @@ printFeatures(void) ...@@ -65,15 +66,6 @@ printFeatures(void)
if (memory_size > 0) fprintf(stderr, " %zuGB", memory_size); if (memory_size > 0) fprintf(stderr, " %zuGB", memory_size);
fprintf(stderr, " %uthreads", std::thread::hardware_concurrency()); fprintf(stderr, " %uthreads", std::thread::hardware_concurrency());
fprintf(stderr, " C++%d", (int) ((__cplusplus - (__cplusplus / 10000) * 10000) / 100)); fprintf(stderr, " C++%d", (int) ((__cplusplus - (__cplusplus / 10000) * 10000) / 100));
#ifdef HAVE_CF_INTERFACE
fprintf(stderr, " Fortran");
#endif
#ifdef ENABLE_DATA
fprintf(stderr, " DATA");
#endif
#ifdef HAVE_LIBPTHREAD
fprintf(stderr, " PTHREADS");
#endif
#ifdef _OPENMP #ifdef _OPENMP
fprintf(stderr, " OpenMP"); fprintf(stderr, " OpenMP");
#if defined(HAVE_OPENMP45) #if defined(HAVE_OPENMP45)
...@@ -84,6 +76,12 @@ printFeatures(void) ...@@ -84,6 +76,12 @@ printFeatures(void)
fprintf(stderr, "3"); fprintf(stderr, "3");
#endif #endif
#endif #endif
#ifdef HAVE_CF_INTERFACE
fprintf(stderr, " Fortran");
#endif
#ifdef HAVE_LIBPTHREAD
fprintf(stderr, " PTHREADS");
#endif
#ifdef HAVE_LIBHDF5 #ifdef HAVE_LIBHDF5
fprintf(stderr, " HDF5"); fprintf(stderr, " HDF5");
#endif #endif
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment