add UWPKFCVM

Author: meihuisu

configure.ac

@@ -194,6 +194,12 @@ AC_ARG_ENABLE([model-uwlinca],
         [enable_model_uwlinca=yes],
         [enable_model_uwlinca=no])
 
+AC_ARG_ENABLE([model-uwpkfcvm],
+        [AS_HELP_STRING([--enable-model-uwpkfcvm],
+        [enable model SCEC UWLINCA])],
+        [enable_model_uwpkfcvm=yes],
+        [enable_model_uwpkfcvm=no])
+
 AC_ARG_ENABLE([model-uwsfbcvm],
         [AS_HELP_STRING([--enable-model-uwsfbcvm],
         [enable model SCEC UWSFBCVM])],
@@ -735,6 +741,23 @@ AC_ARG_WITH([uwlinca-model-path],
   [UWLINCA_MODEL="/usr/uwlinca/src"])
 fi
 
+# Get SCEC UWPKFCVM library and include locations
+if test "x$enable_model_uwpkfcvm" = xyes; then
+AC_ARG_WITH([uwpkfcvm-include-path],
+  [AS_HELP_STRING([--with-uwpkfcvm-include-path],
+    [location of the SCEC UWPKFCVM headers])],
+  [UWLINCA_INCL="-I$withval"],
+  [UWLINCA_INCL="/usr/include/uwpkfcvm"])
+AC_ARG_WITH([uwpkfcvm-lib-path],
+  [AS_HELP_STRING([--with-uwpkfcvm-lib-path], [location of the SCEC UWPKFCVM libraries])],
+  [UWLINCA_LIB="-L$withval -luwpkfcvm"],
+  [UWLINCA_LIB="-luwpkfcvm"])
+AC_ARG_WITH([uwpkfcvm-model-path],
+  [AS_HELP_STRING([--with-uwpkfcvm-model-path], [location of the UWPKFCVM model files])],
+  [UWLINCA_MODEL="$withval"],
+  [UWLINCA_MODEL="/usr/uwpkfcvm/src"])
+fi      
+
 # Get SCEC CANVAS library and include locations
 if test "x$enable_model_canvas" = xyes; then
 AC_ARG_WITH([canvas-include-path],
@@ -1368,6 +1391,23 @@ else
    AM_CONDITIONAL(UCVM_AM_ENABLE_UWLINCA, [test x"$enable_model_uwlinca" = xyes])
 fi
 
+if test "x$enable_static" = xyes; then
+# Check optional SCEC UWPKFCVM installation
+if test "x$enable_model_uwpkfcvm" = xyes; then
+   # Setup compiler/linker flags
+   CFLAGS="$UWPKFCVM_INCL $CFLAGS"
+   LDFLAGS="$UWPKFCVM_LIB $LDFLAGS"
+
+   echo "Checking for SCEC UWPKFCVM"
+   AC_CHECK_HEADER(uwpkfcvm.h,[],[AC_MSG_ERROR(["SCEC UWPKFCVM header not found; use --with-uwpkfcvm-include-path"])],[AC_INCLUDES_DEFAULT])
+else
+   AM_CONDITIONAL(UCVM_AM_ENABLE_UWPKFCVM, false)
+fi
+else
+   AM_CONDITIONAL(UCVM_AM_ENABLE_UWPKFCVM, [test x"$enable_model_uwpkfcvm" = xyes])
+fi
+
+
 if test "x$enable_static" = xyes; then
 # Check optional SCEC CANVAS installation
 if test "x$enable_model_canvas" = xyes; then

examples/programs/ucvm/Makefile.am

@@ -18,6 +18,11 @@ bin_PROGRAMS += run_ucvm_query_uwlinca.sh
 run_ucvm_query_uwlinca_sh_SOURCES = run_ucvm_query_uwlinca.sh
 endif
 
+if UCVM_AM_ENABLE_UWPKFCVM
+bin_PROGRAMS += run_ucvm_query_UWPKFCVM.sh
+run_ucvm_query_uwpkfcvm_sh_SOURCES = run_ucvm_query_uwpkfcvm.sh
+endif
+
 if UCVM_AM_ENABLE_SJFZ
 bin_PROGRAMS += run_ucvm_query_sjfz.sh
 run_ucvm_query_sjfz_sh_SOURCES = run_ucvm_query_sjfz.sh

examples/programs/ucvm/run_ucvm_query_uwpkfcvm.sh

@@ -0,0 +1,32 @@
+#!/bin/bash
+
+if [ -z "$UCVM_INSTALL_PATH" ]; then
+  echo "Need to set UCVM_INSTALL_PATH to run >" ${0##*/} 
+  exit
+fi
+source $UCVM_INSTALL_PATH/conf/ucvm_env.sh
+
+BIN_DIR=${UCVM_INSTALL_PATH}/bin
+CONF_DIR=${UCVM_INSTALL_PATH}/conf
+TEST_DIR=${UCVM_INSTALL_PATH}/tests/inputs
+MODEL=uwpkfcvm
+
+expect=$(mktemp) || exit 1
+result=$(mktemp) || (trap 'rm -f "$expect"'; exit 1)
+
+${BIN_DIR}/ucvm_query -m ${MODEL} -f ${CONF_DIR}/ucvm.conf < ${TEST_DIR}/test_latlons.txt  > $result 2>&1
+${BIN_DIR}/ucvm_query -m ${MODEL} -f ${CONF_DIR}/ucvm.conf < ${TEST_DIR}/test_latlons_uwpkfcvm_gd.txt  >> $result 2>&1
+
+cat > $expect << EOF_EXPECTED_RESULT
+EOF_EXPECTED_RESULT
+
+echo "Running examples_programs_ucvm ucvm_query_uwpkfcvm"
+if diff $result $expect > /dev/null 2>&1
+then
+  echo [SUCCESS]
+else
+  echo [FAILURE]
+fi
+
+trap 'rm -f "$expect" "$result"' exit
+

setup/setup.list

@@ -3,6 +3,20 @@
                "Version": "25.7"
                },
 	"models": {
+                "UWPKFCVM": {
+                        "Version": "1.0.0",
+                        "Abbreviation": "uwpkfcvm",
+                        "Size": "8.2M",
+                        "Path": "uwpkfcvm",
+                        "URL": "https://g-3a9041.a78b8.36fe.data.globus.org/ucvm/v26_2/model/uwpkfcvm.tar.gz",
+                        "ConfigureEnv": [ "UCVM_INSTALL_PATH","UCVM_SRC_PATH"],
+                        "ConfigureFlags": "--with-proj-libdir=${UCVM_INSTALL_PATH}/lib/proj/lib --with-proj-incdir=${UCVM_INSTALL_PATH}/lib/proj/include --with-tiff-libdir=${UCVM_INSTALL_PATH}/lib/tiff/lib --with-tiff-incdir=${UCVM_INSTALL_PATH}/lib/tiff/include --with-sqlite-libdir=${UCVM_INSTALL_PATH}/lib/sqlite/lib --with-sqlite-incdir=${UCVM_INSTALL_PATH}/lib/sqlite/include",
+                        "UCVMConfigureFlags": "--enable-model-uwpkfcvm --with-uwpkfcvm-lib-path=${UCVM_INSTALL_PATH}/model/uwpkfcvm/lib --with-uwpkfcvm-include-path=${UCVM_INSTALL_PATH}/model/uwpkfcvm/include",
+                        "Ask": "yes",
+                        "Libraries": ["proj"],
+                        "md5sum": "26544214e1ca416b300faf31dbcf9b9e",
+                        "Order": 29 
+               },
                "UWSFBCVM": {
                         "Version": "1.0",
                         "Abbreviation": "uwsfbcvm",

src/ucvm/Makefile.am

@@ -91,6 +91,11 @@ if UCVM_AM_ENABLE_UWLINCA
 AM_CFLAGS += -D_UCVM_ENABLE_UWLINCA
 endif
 
+# UWPKFCVM includes
+if UCVM_AM_ENABLE_UWPKFCVM
+AM_CFLAGS += -D_UCVM_ENABLE_UWPKFCVM
+endif
+
 # CANVAS includes
 if UCVM_AM_ENABLE_CANVAS
 AM_CFLAGS += -D_UCVM_ENABLE_CANVAS

src/ucvm/ucvm_dtypes.h

@@ -90,6 +90,7 @@
 
 #define UCVM_MODEL_SFCVM "sfcvm"
 #define UCVM_MODEL_UWLINCA "uwlinca"
+#define UCVM_MODEL_UWPKFCVM "uwpkfcvm"
 #define UCVM_MODEL_CANVAS "canvas"
 #define UCVM_MODEL_UWSFBCVM "uwsfbcvm"
 

src/ucvm/ucvm_model_plugin.c

@@ -143,6 +143,15 @@
         extern int uwlinca_setparam;
 #endif
 
+#ifdef _UCVM_ENABLE_UWPKFCVM
+        extern int uwpkfcvm_init;
+        extern int uwpkfcvm_query;
+        extern int uwpkfcvm_finalize;
+        extern int uwpkfcvm_version;
+        extern int uwpkfcvm_config;
+        extern int uwpkfcvm_setparam;
+#endif
+
 #ifdef _UCVM_ENABLE_CANVAS
         extern int canvas_init;
         extern int canvas_query;
@@ -519,6 +528,20 @@ int ucvm_plugin_model_init(int id, ucvm_modelconf_t *conf) {
                 }
         }
 #endif
+#ifdef _UCVM_ENABLE_UWPKFCVM
+        if (strcmp(conf->label, UCVM_MODEL_UWPKFCVM) == 0) {
+                pptr->model_init = &uwpkfcvm_init;
+                pptr->model_query = &uwpkfcvm_query;
+                pptr->model_finalize = &uwpkfcvm_finalize;
+                pptr->model_version = &uwpkfcvm_version;
+                pptr->model_config = &uwpkfcvm_config;
+                pptr->model_setparam = &uwpkfcvm_setparam;
+                if ((*pptr->model_init)(conf->config, conf->label) != 0) {
+                        fprintf(stderr, "Failed to initialize model, %s.\n", conf->label);
+                        return UCVM_CODE_ERROR;
+                }
+        }
+#endif
 #ifdef _UCVM_ENABLE_CANVAS
         if (strcmp(conf->label, UCVM_MODEL_CANVAS) == 0) {
                 pptr->model_init = &canvas_init;

test/inputs/test_latlons_uwpkfcvm_gd.txt

@@ -0,0 +1,13 @@
+-122.087 37.8179 0.0
+-122.087 37.8179 100.0
+-122.087 37.8179 287.734
+-122.087 37.8179 500.0
+-122.087 37.8179 1000.0
+-122.087 37.8179 2000.0
+-122.087 37.8179 5000.0
+-121.5435 37.572 0.0
+-121.5435 37.572 500.0
+-121.5435 37.572 790.849
+-121.5435 37.572 1000.0
+-121.5435 37.572 2000.0
+-121.5435 37.572 5000.0

ucvm_setup.py

@@ -236,7 +236,7 @@ def installConfigMakeInstall(tarname, ucvmpath, type, config_data):
     os.chdir(workpath + "/" + config_data["Path"])
     callAndRecord(["cd", workpath + "/" + config_data["Path"]], True)
 
-    libtoolize_list=["sfcvm","cvms5","cvmh","cs248","uwlinca"]
+    libtoolize_list=["sfcvm","cvms5","cvmh","cs248","uwlinca","uwpkfcvm"]
     autoreconf_list=["sfcvm","cca","cs248"]
     skip_conf_list = ["openssl","netcdf"]
 
@@ -595,6 +595,8 @@ def _addInstallNameTool_bash(modelsToInstall, librariesToInstall):
         str=str+"install_name_tool -change libcvmhvbn.so ${MY_UCVM_INSTALL_PATH}/model/cvmhvbn/lib/libcvmhvbn.so $1\n"
     if "SFCVM" in modelsToInstall:
         str=str+"install_name_tool -change libsfcvm.so ${MY_UCVM_INSTALL_PATH}/model/sfcvm/lib/libsfcvm.so $1\n"
+    if "UWPKFCVM" in modelsToInstall:
+        str=str+"install_name_tool -change libuwpkfcvm.so ${MY_UCVM_INSTALL_PATH}/model/uwpkfcvm/lib/libuwpkfcvm.so $1\n"
     if "UWLINCA" in modelsToInstall:
         str=str+"install_name_tool -change libuwlinca.so ${MY_UCVM_INSTALL_PATH}/model/uwlinca/lib/libuwlinca.so $1\n"
     if "CVMHSMBN" in modelsToInstall: