Changeset 27757

Timestamp:

05/16/23 14:41:24 (22 months ago)

Author:

jdquinn

Message:

BUG: Resolved blocking of certain runtime errors under macOS; typos

Location:

issm/trunk-jpl

Files:

• m4/issm_options.m4 (modified) (1 diff)
• src/c/modules/QmuStatisticsx/QmuStatisticsx.cpp (modified) (3 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -200 +200 @@
                         export CFLAGS="-Wno-deprecated-register -Wno-return-type"
                         export CXXFLAGS="-Wno-deprecated-register -Wno-return-type"
-                        if test "${LDFLAGS}" == ""; then
-                                export LDFLAGS="-Wl,-no_compact_unwind"
-                        else
-                                export LDFLAGS="${LDFLAGS} -Wl,-no_compact_unwind"
-                        fi
+                        dnl NOTE: Commenting out the following, for now, as ISSM seems to 
+                        dnl       compile and run fine, but certain errors (e.g. file not 
+                        dnl       found) were not bubbling up, and instead causing MATLAB 
+                        dnl       to crash.
+                        dnl
+#                       if test "${LDFLAGS}" == ""; then
+#                               export LDFLAGS="-Wl,-no_compact_unwind"
+#                       else
+#                               export LDFLAGS="${LDFLAGS} -Wl,-no_compact_unwind"
+#                       fi
                 ;;
                 *)

issm/trunk-jpl/src/c/modules/QmuStatisticsx/QmuStatisticsx.cpp

@@ -85 +85 @@
                 }
         }
-        if(found==0)_error_("cound not find " << field << " at step " << step  << "\n");
+        if(found==0)_error_("could not find " << field << " at step " << step  << "\n");
 
         /*assign output pointers:*/
@@ -170 +170 @@
                 _printf0_("    opening file: " << file << "\n");
                 FILE* fid=fopen(file,"rb");
-                if(fid==NULL)_error_("cound not open file: " << file << "\n");
+                if(fid==NULL)_error_("could not open file: " << file << "\n");
 
                 /*figure out size of file, and read the whole thing:*/
@@ -403 +403 @@
                 _printf0_("    opening file:\n");
                 FILE* fid=fopen(file,"rb");
-                if(fid==NULL)_error_("cound not open file: " << file << "\n");
+                if(fid==NULL)_error_("could not open file: " << file << "\n");
 
                 /*figure out size of file, and read the whole thing:*/