Changeset 21104

Timestamp:

08/05/16 16:17:34 (9 years ago)

Author:

seroussi

Message:

DEL: removing some wrappers that are never used

Location:

issm/trunk-jpl/src

Files:

• m/classes/plumebasalforcings.m (modified) (1 diff)
• wrappers/Exp2Kml (deleted)
• wrappers/KMLFileRead (deleted)
• wrappers/KMLMeshWrite (deleted)
• wrappers/KMLOverlay (deleted)
• wrappers/Kml2Exp (deleted)
• wrappers/Shp2Kml (deleted)
• wrappers/matlab/Makefile.am (modified) (4 diffs)

issm/trunk-jpl/src/m/classes/plumebasalforcings.m

@@ -77 +77 @@
                                 md = checkfield(md,'fieldname','basalforcings.groundedice_melting_rate','NaN',1,'timeseries',1);
                                 md = checkfield(md,'fieldname','basalforcings.floatingice_melting_rate','NaN',1,'timeseries',1);
-                                md = checkfield(md,'fieldname','basalforcings.mantleconductivity','>',0,'numel',1);
+                                md = checkfield(md,'fieldname','basalforcings.mantleconductivity','>=',0,'numel',1);
                                 md = checkfield(md,'fieldname','basalforcings.nusselt','>',0,'numel',1);
                                 md = checkfield(md,'fieldname','basalforcings.dtbg','>',0,'numel',1);

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

@@ -71 +71 @@
 endif
 if KML
-lib_LTLIBRARIES +=  KMLFileRead_matlab.la\
-                                   KMLMeshWrite_matlab.la\
-                                   KMLOverlay_matlab.la\
-                                   Exp2Kml_matlab.la\
-                                   Kml2Exp_matlab.la\
-                                   ShpRead_matlab.la\
-                                   Shp2Kml_matlab.la
+lib_LTLIBRARIES += ShpRead_matlab.la
 endif
 #}}}
@@ -201 +195 @@
 IssmConfig_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB)
 
-KMLFileRead_matlab_la_SOURCES = ../KMLFileRead/KMLFileRead.cpp
-KMLFileRead_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
-KMLFileRead_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
-
-KMLMeshWrite_matlab_la_SOURCES = ../KMLMeshWrite/KMLMeshWrite.cpp
-KMLMeshWrite_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
-KMLMeshWrite_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
-
-KMLOverlay_matlab_la_SOURCES = ../KMLOverlay/KMLOverlay.cpp
-KMLOverlay_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
-KMLOverlay_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
-
 Xy2ll_matlab_la_SOURCES = ../Xy2ll/Xy2ll.cpp
 Xy2ll_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
@@ -225 +207 @@
 ExpSimplify_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
 
-Exp2Kml_matlab_la_SOURCES = ../Exp2Kml/Exp2Kml.cpp
-Exp2Kml_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
-Exp2Kml_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
-
-Kml2Exp_matlab_la_SOURCES = ../Kml2Exp/Kml2Exp.cpp
-Kml2Exp_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
-Kml2Exp_matlab_la_LIBADD = ${deps} $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
-
 Kriging_matlab_la_SOURCES = ../Kriging/Kriging.cpp
 Kriging_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
@@ -269 +243 @@
 ShpRead_matlab_la_LIBADD = ${deps} $(SHAPELIBLIB) $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
 
-Shp2Kml_matlab_la_SOURCES = ../Shp2Kml/Shp2Kml.cpp
-Shp2Kml_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}
-Shp2Kml_matlab_la_LIBADD = ${deps} $(SHAPELIBLIB) $(MPILIB) $(PETSCLIB) $(GSLLIB) $(PROJ4LIB)
-
 TriMesh_matlab_la_SOURCES = ../TriMesh/TriMesh.cpp
 TriMesh_matlab_la_CXXFLAGS = ${AM_CXXFLAGS}