add handles for mscal

Author: meihuisu

CHANGELOG.md

@@ -11,8 +11,6 @@
 
 ## 2024-02-15 Mei-Hui Su <[email protected]>
 * Converted cvms5 to use Proj
-* Added CS242 to 'accept' generated ucvm2mesh SORD triplet dat file for UCVM plugin model module 
-        (fast-Y, bottom-up axis access)
 
 ## 2023-11-01 Mei-Hui Su <[email protected]>
 * Transfer Taper to toPROJ branch

configure.ac

@@ -128,11 +128,11 @@ AC_ARG_ENABLE([model-cs248],
         [enable_model_cs248=yes],
         [enable_model_cs248=no])
 
-AC_ARG_ENABLE([model-cs242],
-        [AS_HELP_STRING([--enable-model-cs242],
-        [enable model SCEC CS242])],
-        [enable_model_cs242=yes],
-        [enable_model_cs242=no])
+AC_ARG_ENABLE([model-mscal],
+        [AS_HELP_STRING([--enable-model-mscal],
+        [enable model SCEC MSCAL])],
+        [enable_model_mscal=yes],
+        [enable_model_mscal=no])
 
 AC_ARG_ENABLE([model-cvmhlabn],
         [AS_HELP_STRING([--enable-model-cvmhlabn],
@@ -544,25 +544,25 @@ if test "x$enable_model_cs248" = xyes; then
 AC_ARG_WITH([cs248-include-path],
   [AS_HELP_STRING([--with-cs248-include-path],
     [location of the SCEC CS248 headers])],
-  [CS242_INCL="-I$withval"],
-  [CS242_INCL="/usr/include/cs248"])
+  [CS248_INCL="-I$withval"],
+  [CS248_INCL="/usr/include/cs248"])
 AC_ARG_WITH([cs248-lib-path],
   [AS_HELP_STRING([--with-cs248-lib-path], [location of the SCEC CS248 libraries])],
-  [CS242_LIB="-L$withval -lcs248 -lproj -letree"],
-  [CS242_LIB="-lcs248 -lproj -letree"])
+  [CS248_LIB="-L$withval -lcs248 -lproj -letree"],
+  [CS248_LIB="-lcs248 -lproj -letree"])
 fi
 
-# Get SCEC CS242 library and include locations
-if test "x$enable_model_cs242" = xyes; then
-AC_ARG_WITH([cs242-include-path],
-  [AS_HELP_STRING([--with-cs242-include-path],
-    [location of the SCEC CS242 headers])],
-  [CS242_INCL="-I$withval"],
-  [CS242_INCL="/usr/include/cs242"])
-AC_ARG_WITH([cs242-lib-path],
-  [AS_HELP_STRING([--with-cs242-lib-path], [location of the SCEC CS242 libraries])],
-  [CS242_LIB="-L$withval -lcs242 -lproj -letree"],
-  [CS242_LIB="-lcs242 -lproj -letree"])
+# Get SCEC MSCAL library and include locations
+if test "x$enable_model_mscal" = xyes; then
+AC_ARG_WITH([mscal-include-path],
+  [AS_HELP_STRING([--with-mscal-include-path],
+    [location of the SCEC MSCAL headers])],
+  [MSCAL_INCL="-I$withval"],
+  [MSCAL_INCL="/usr/include/mscal"])
+AC_ARG_WITH([mscal-lib-path],
+  [AS_HELP_STRING([--with-mscal-lib-path], [location of the SCEC MSCAL libraries])],
+  [MSCAL_LIB="-L$withval -lmscal -lproj -letree"],
+  [MSCAL_LIB="-lmscal -lproj -letree"])
 fi
 
 # Get SCEC CVMHLABN library and include locations
@@ -1193,19 +1193,19 @@ else
 fi
 
 if test "x$enable_static" = xyes; then
-# Check optional SCEC CS242 installation
-if test "x$enable_model_cs242" = xyes; then
+# Check optional SCEC MSCAL installation
+if test "x$enable_model_mscal" = xyes; then
    # Setup compiler/linker flags
-   CFLAGS="$CS242_INCL $CFLAGS"
-   LDFLAGS="$CS242_LIB $LDFLAGS"
+   CFLAGS="$MSCAL_INCL $CFLAGS"
+   LDFLAGS="$MSCAL_LIB $LDFLAGS"
 
-   echo "Checking for SCEC CS242"
-   AC_CHECK_HEADER(cs242.h,[],[AC_MSG_ERROR(["SCEC CS242 header not found; use --with-cs242-include-path"])],[AC_INCLUDES_DEFAULT])
+   echo "Checking for SCEC MSCAL"
+   AC_CHECK_HEADER(mscal.h,[],[AC_MSG_ERROR(["SCEC MSCAL header not found; use --with-mscal-include-path"])],[AC_INCLUDES_DEFAULT])
 else
-   AM_CONDITIONAL(UCVM_AM_ENABLE_CS242, false)
+   AM_CONDITIONAL(UCVM_AM_ENABLE_MSCAL, false)
 fi
 else
-   AM_CONDITIONAL(UCVM_AM_ENABLE_CS242, [test x"$enable_model_cs242" = xyes])
+   AM_CONDITIONAL(UCVM_AM_ENABLE_MSCAL, [test x"$enable_model_mscal" = xyes])
 fi
 
 if test "x$enable_static" = xyes; then

setup/setup.list

@@ -84,17 +84,17 @@
                         "md5sum": "de57c7cd33f6a17a787198f0d4dea033",
                         "Order": 24
                 },
-                "CS242": {
+                "MSCAL": {
                         "Version": "1.0",
-                        "Abbreviation": "cs242",
-                        "Size": "4.7M",
-                        "Path": "cs242",
-                        "URL": "https://g-3a9041.a78b8.36fe.data.globus.org/ucvm/v24_3/model/cs242.tar.gz",
+                        "Abbreviation": "mscal",
+                        "Size": "1M",
+                        "Path": "mscal",
+                        "URL": "https://g-3a9041.a78b8.36fe.data.globus.org/ucvm/v25_1/model/mscal.tar.gz",
                         "ConfigureEnv": [ "UCVM_INSTALL_PATH"],
-                        "ConfigureFlags": "--with-etree-libdir=${UCVM_INSTALL_PATH}/lib/euclid3/lib --with-etree-incdir=${UCVM_INSTALL_PATH}/lib/euclid3/include  --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-cs242 --with-cs242-lib-path=${UCVM_INSTALL_PATH}/model/cs242/lib --with-cs242-include-path=${UCVM_INSTALL_PATH}/model/cs242/include",
+                        "ConfigureFlags": "",
+                        "UCVMConfigureFlags": "--enable-model-mscal --with-mscal-lib-path=${UCVM_INSTALL_PATH}/model/mscal/lib --with-mscal-include-path=${UCVM_INSTALL_PATH}/model/mscal/include",
                         "Ask": "no",
-                        "Libraries": ["euclid3", "proj"],
+                        "Libraries": [],
                         "md5sum": "9861b6ccbde582807a1488bbd696fb25",
                         "Order": 23
                 },

src/ucvm/Makefile.am

@@ -137,9 +137,9 @@ if UCVM_AM_ENABLE_SJFZ
 AM_CFLAGS += -D_UCVM_ENABLE_SJFZ
 endif
 
-# CS242 includes
-if UCVM_AM_ENABLE_CS242
-AM_CFLAGS += -D_UCVM_ENABLE_CS242
+# MSCAL includes
+if UCVM_AM_ENABLE_MSCAL
+AM_CFLAGS += -D_UCVM_ENABLE_MSCAL
 endif
 
 

src/ucvm/ucvm.c

@@ -1338,9 +1338,9 @@ int ucvm_get_resources(ucvm_resource_t *res, int *len)
     return(UCVM_CODE_ERROR);
   }
 #endif
-#ifdef _UCVM_ENABLE_CS242
+#ifdef _UCVM_ENABLE_MSCAL
   if (ucvm_save_resource(UCVM_RESOURCE_MODEL, UCVM_MODEL_CRUSTAL,
-                     UCVM_MODEL_CS242, "", res, numinst++, *len)
+                     UCVM_MODEL_MSCAL, "", res, numinst++, *len)
       != UCVM_CODE_SUCCESS) {
     return(UCVM_CODE_ERROR);
   }

src/ucvm/ucvm_dtypes.h

@@ -85,7 +85,8 @@
 #define UCVM_MODEL_CCA "cca"
 #define UCVM_MODEL_SJFZ "sjfz"
 #define UCVM_MODEL_CS248 "cs248"
-#define UCVM_MODEL_CS242 "cs242"
+
+#define UCVM_MODEL_MSCAL "mscal"
 
 #define UCVM_MODEL_SFCVM "sfcvm"
 #define UCVM_MODEL_UWLINCA "uwlinca"

src/ucvm/ucvm_model_plugin.c

@@ -75,12 +75,12 @@
      extern int cs248_version;
      extern int cs248_config;
 #endif
-#ifdef _UCVM_ENABLE_CS242
-     extern int cs242_init;
-     extern int cs242_query;
-     extern int cs242_finalize;
-     extern int cs242_version;
-     extern int cs242_config;
+#ifdef _UCVM_ENABLE_MSCAL
+     extern int mscal_init;
+     extern int mscal_query;
+     extern int mscal_finalize;
+     extern int mscal_version;
+     extern int mscal_config;
 #endif
 #ifdef _UCVM_ENABLE_CVMHLABN
      extern int cvmhlabn_init;
@@ -436,13 +436,13 @@ int ucvm_plugin_model_init(int id, ucvm_modelconf_t *conf) {
                 }
         }
 #endif
-#ifdef _UCVM_ENABLE_CS242
-        if (strcmp(conf->label, UCVM_MODEL_CS242) == 0) {
-                pptr->model_init = &cs242_init;
-                pptr->model_query = &cs242_query;
-                pptr->model_finalize = &cs242_finalize;
-                pptr->model_version = &cs242_version;
-                pptr->model_config = &cs242_config;
+#ifdef _UCVM_ENABLE_MSCAL
+        if (strcmp(conf->label, UCVM_MODEL_MSCAL) == 0) {
+                pptr->model_init = &mscal_init;
+                pptr->model_query = &mscal_query;
+                pptr->model_finalize = &mscal_finalize;
+                pptr->model_version = &mscal_version;
+                pptr->model_config = &mscal_config;
                 if ((*pptr->model_init)(conf->config, conf->label) != 0) {
                         fprintf(stderr, "Failed to initialize model, %s.\n", conf->label);
                         return UCVM_CODE_ERROR;

ucvm_setup.py

@@ -625,8 +625,8 @@ def _addInstallNameTool_bash(modelsToInstall, librariesToInstall):
         str=str+"install_name_tool -change libcca.so ${MY_UCVM_INSTALL_PATH}/model/cca/lib/libcca.so $1\n"
     if "CS248" in modelsToInstall:
         str=str+"install_name_tool -change libcs248.so ${MY_UCVM_INSTALL_PATH}/model/cs248/lib/libcs248.so $1\n"
-    if "CS242" in modelsToInstall:
-        str=str+"install_name_tool -change libcs242.so ${MY_UCVM_INSTALL_PATH}/model/cs242/lib/libcs242.so $1\n"
+    if "MSCAL" in modelsToInstall:
+        str=str+"install_name_tool -change libmscal.so ${MY_UCVM_INSTALL_PATH}/model/mscal/lib/libmscal.so $1\n"
     if "SJFZ" in modelsToInstall:
         str=str+"install_name_tool -change libsjfz.so ${MY_UCVM_INSTALL_PATH}/model/sjfz/lib/libsjfz.so $1\n"
     return str