Changeset 13831

Timestamp:

10/25/12 12:22:22 (12 years ago)

Author:

Mathieu Morlighem

Message:

CHG: renamed libISSMWrappers libISSMModules

Location:

issm/trunk-jpl/src

Files:

• c/Makefile.am (modified) (4 diffs)
• c/shared/Wrapper (deleted)
• c/shared/shared.h (modified) (1 diff)
• m/os/issmscpin.m (modified) (1 diff)
• m/os/issmscpout.m (modified) (1 diff)
• wrappers/matlab/Makefile.am (modified) (2 diffs)
• wrappers/python/Makefile.am (modified) (2 diffs)

issm/trunk-jpl/src/c/Makefile.am

@@ -11 +11 @@
 if WRAPPERS
 if SHAREDLIBS
-lib_LTLIBRARIES += libISSMWrappers.la
-endif
-lib_LIBRARIES += libISSMWrappers.a 
+lib_LTLIBRARIES += libISSMModules.la
+endif
+lib_LIBRARIES += libISSMModules.a 
 endif
 #}}}
@@ -215 +215 @@
                                         ./shared/String/sharedstring.h\
                                         ./shared/String/DescriptorIndex.cpp\
-                                        ./shared/Wrapper/wrappershared.h\
-                                        ./shared/Wrapper/ModuleBoot.cpp\
-                                        ./shared/Wrapper/ModuleEnd.cpp\
                                         ./toolkits/metis/metisincludes.h\
                                         ./toolkits/issm/issmtoolkit.h\
@@ -755 +752 @@
                                         ./toolkits/metis/patches/METIS_PartMeshNodalPatch.cpp
 #}}}
-#Wrappers sources{{{
-wrapper_sources= ./shared/Threads/issm_threads.h\
+#Modules sources{{{
+modules_sources= ./shared/Threads/issm_threads.h\
                         ./shared/Threads/LaunchThread.cpp\
                         ./shared/Threads/PartitionRange.cpp\
@@ -927 +924 @@
 
 if WRAPPERS
-libISSMWrappers_a_SOURCES = $(wrapper_sources)
-libISSMWrappers_a_SOURCES += $(bamg_sources)
+libISSMModules_a_SOURCES = $(modules_sources)
+libISSMModules_a_SOURCES += $(bamg_sources)
 if KRIGING
-libISSMWrappers_a_SOURCES += $(kriging_sources)
+libISSMModules_a_SOURCES += $(kriging_sources)
 endif
 if KML
-libISSMWrappers_a_SOURCES += $(kml_sources)
-endif
-libISSMWrappers_a_CXXFLAGS = $(ALLCXXFLAGS)
-libISSMWrappers_a_LIBADD = ./libISSMCore.a
+libISSMModules_a_SOURCES += $(kml_sources)
+endif
+libISSMModules_a_CXXFLAGS = $(ALLCXXFLAGS)
+libISSMModules_a_LIBADD = ./libISSMCore.a
 if SHAREDLIBS
-libISSMWrappers_la_SOURCES = $(libISSMWrappers_a_SOURCES)
+libISSMModules_la_SOURCES = $(libISSMModules_a_SOURCES)
 endif
 endif

issm/trunk-jpl/src/c/shared/shared.h

@@ -19 +19 @@
 #include "./Threads/issm_threads.h"
 #include "./TriMesh/trimesh.h"
-#include "./Wrapper/wrappershared.h"
 
 #endif

issm/trunk-jpl/src/m/os/issmscpin.m

@@ -61 +61 @@
                         string=[string packages{end} '\}'];
                 end
+                disp('-------------- file: issmscpin.m line: 63'); 
 
                 if port,
+                        ['!scp -P ' num2str(port) ' ' login '@localhost:' path '/' string ' ./']
                         eval(['!scp -P ' num2str(port) ' ' login '@localhost:' path '/' string ' ./']);
                 else

issm/trunk-jpl/src/m/os/issmscpout.m

@@ -50 +50 @@
 
                 if port,
+                        ['!scp -P ' num2str(port) ' ' string ' ' login '@localhost:' path]
                         eval(['!scp -P ' num2str(port) ' ' string ' ' login '@localhost:' path]);
                 else

issm/trunk-jpl/src/wrappers/matlab/Makefile.am

@@ -84 +84 @@
 #Flags and libraries {{{
 #if SHAREDLIBS
-#deps = ../../c/libISSMCore.la ../../c/libISSMWrappers.la
+#deps = ../../c/libISSMCore.la ../../c/libISSMModules.la
 #else
-#deps = ../../c/libISSMCore.a ../../c/libISSMWrappers.a
+#deps = ../../c/libISSMCore.a ../../c/libISSMModules.a
 #endif
 #deps +=  $(MATHLIB) ${MEXLIB}
@@ -113 +113 @@
 deps +=
 else
-deps += ../../c/libISSMWrappers.a ../../c/libISSMCore.a  
+deps += ../../c/libISSMModules.a ../../c/libISSMCore.a  
 if ADOLC
 deps += $(ADOLCLIB)

issm/trunk-jpl/src/wrappers/python/Makefile.am

@@ -41 +41 @@
 #Flags and libraries {{{
 #if SHAREDLIBS
-#deps = ../../c/libISSMCore.la ../../c/libISSMWrappers.la
+#deps = ../../c/libISSMCore.la ../../c/libISSMModules.la
 #else
-#deps = ../../c/libISSMCore.a ../../c/libISSMWrappers.a
+#deps = ../../c/libISSMCore.a ../../c/libISSMModules.a
 #endif
 #deps +=  $(MATHLIB) ${PYTHONLIB}
@@ -73 +73 @@
 deps +=                  
 else             
-deps += ../../c/libISSMWrappers.a ../../c/libISSMCore.a                  
+deps += ../../c/libISSMModules.a ../../c/libISSMCore.a           
 endif