Index: /issm/trunk/src/c/Makefile.am =================================================================== --- /issm/trunk/src/c/Makefile.am (revision 8467) +++ /issm/trunk/src/c/Makefile.am (revision 8468) @@ -87,4 +87,6 @@ ./objects/KML/KML_Feature.cpp\ ./objects/KML/KML_Feature.h\ + ./objects/KML/KML_File.cpp\ + ./objects/KML/KML_File.h\ ./objects/KML/KML_Folder.cpp\ ./objects/KML/KML_Folder.h\ @@ -752,4 +754,6 @@ ./objects/KML/KML_Feature.cpp\ ./objects/KML/KML_Feature.h\ + ./objects/KML/KML_File.cpp\ + ./objects/KML/KML_File.h\ ./objects/KML/KML_Folder.cpp\ ./objects/KML/KML_Folder.h\ Index: /issm/trunk/src/c/modules/KMLMeshWritex/KMLFileReadx.cpp =================================================================== --- /issm/trunk/src/c/modules/KMLMeshWritex/KMLFileReadx.cpp (revision 8467) +++ /issm/trunk/src/c/modules/KMLMeshWritex/KMLFileReadx.cpp (revision 8468) @@ -18,4 +18,5 @@ KML_Object* kobj=NULL; KML_Document* kdoc=NULL; + KML_File* kfil=NULL; clock_t clock0,clock1; @@ -32,5 +33,5 @@ while (kstr=KMLFileToken(fid)) { if (!strncmp(kstr,"Read(fid,kstr); +// kfil->DeepEcho(); + kobj=kfil; + } // _printf_(true,"%s\n",kstr); Index: /issm/trunk/src/c/objects/KML/KML_Overlay.cpp =================================================================== --- /issm/trunk/src/c/objects/KML/KML_Overlay.cpp (revision 8467) +++ /issm/trunk/src/c/objects/KML/KML_Overlay.cpp (revision 8468) @@ -131,4 +131,5 @@ kstr, fid); + else if (!strncmp(kstr," NLHS) { + KMLFileReadUsage(); + _error_("KMLFileRead usage error"); + } + if (nrhs < NRHS) { + KMLFileReadUsage(); + _error_("KMLFileRead usage error"); + } + + /*Input datasets: */ + if (verbose) printf("Fetching inputs:\n"); + FetchData(&filnam,FILENAME); + if (verbose) printf(" filnam =\"%s\"\n",filnam); + + if (verbose) printf("Parsing options:\n"); + options=new Options(NRHS,nrhs,prhs); + if (options->Size()) for(i=0;iSize();i++) ((Option*)options->GetObjectByOffset(i))->DeepEcho(); + options->Get(&echo ,"echo" ,"no"); + options->Get(&deepecho,"deepecho","no"); + options->Get(&write ,"write" ,"no"); + + /*some checks*/ + if (verbose) printf("Checking inputs:\n"); + + if (!strlen(filnam)) + strcpy(filnam,"stdout"); + + if (verbose) printf("Opening file \"%s\".\n",filnam); + fidi=fopen(filnam,"r"); + + /* Run core computations: */ + if (verbose) printf("Calling core:\n"); + kobj=KMLFileReadx(fidi); + + if (verbose) printf("Closing file \"%s\".\n",filnam); + fclose(fidi); + + if (kobj) { + if (!strncmp(echo ,"y",1) || !strncmp(echo ,"on",2)) + kobj->Echo(); + if (!strncmp(deepecho,"y",1) || !strncmp(deepecho,"on",2)) + kobj->DeepEcho(); + if (strncmp(write,"no",2) && strncmp(write,"off",3)) { + if (verbose) printf("Opening file \"%s\".\n",write); + fido=fopen(write,"w"); + + kobj->Write(fido,""); + + if (verbose) printf("Closing file \"%s\".\n",write); + fclose(fido); + } + + delete kobj; + } + + /*Write data: */ + WriteData(ERRORFLAG,ierror); + + /*Clean-up*/ + xfree((void**)&write); + xfree((void**)&deepecho); + xfree((void**)&echo); + delete options; + + /*end module: */ + MODULEEND(); +} + +void KMLFileReadUsage(void) +{ + _printf_(true,"KMLFileRead - KML file reader module:\n"); + _printf_(true,"\n"); + _printf_(true," This module reads a KML file.\n"); + _printf_(true,"\n"); + _printf_(true," Usage:\n"); + _printf_(true," ierror=KMLMeshWrite(name,notes,elem,nodecon,lat,long,part,data,cmap,kmlfile);\n"); + _printf_(true,"\n"); + _printf_(true," name model name (string, may be empty)\n"); + _printf_(true," notes model notes (string or cell array of strings, may be empty)\n"); + _printf_(true," elem elements (double array)\n"); + _printf_(true," nodecon nodal connectivity array (double array, may be empty)\n"); + _printf_(true," lat nodal latititudes (double vector)\n"); + _printf_(true," long nodal longitudes (double vector)\n"); + _printf_(true," part nodal partitions (double vector, may be empty)\n"); + _printf_(true," data nodal or element data (double vector, may be empty)\n"); + _printf_(true," cmap color map (double nx3 array, may be empty)\n"); + _printf_(true," kmlfile KML file name (string)\n"); + _printf_(true,"\n"); + _printf_(true," ierror error flag (double, non-zero for error)\n"); + _printf_(true,"\n"); + _printf_(true," Example:\n"); + _printf_(true," KMLMeshWrite(md.name,md.notes,md.elements,md.nodeconnectivity,md.lat,md.long,md.part,md.fm_criterion,options.cmap,filekml);\n"); + _printf_(true,"\n"); +} + Index: /issm/trunk/src/mex/KMLMeshWrite/KMLFileRead.h =================================================================== --- /issm/trunk/src/mex/KMLMeshWrite/KMLFileRead.h (revision 8468) +++ /issm/trunk/src/mex/KMLMeshWrite/KMLFileRead.h (revision 8468) @@ -0,0 +1,31 @@ +/*!\file KMLFileRead.h + * \brief: prototype for KML file reader mex module. + */ + +#ifndef _KMLFILEREAD_H +#define _KMLFILEREAD_H + +/* local prototypes: */ +void KMLFileReadUsage(void); + +#include "../../c/modules/modules.h" +#include "../../c/Container/Container.h" +#include "../../c/shared/shared.h" + +#undef __FUNCT__ +#define __FUNCT__ "KMLFileRead" + + +/* serial input macros: */ +#define FILENAME prhs[0] + +/* serial output macros: */ +#define ERRORFLAG (mxArray**)&plhs[0] + +/* serial arg counts: */ +#undef NRHS +#define NRHS 1 +#undef NLHS +#define NLHS 1 + +#endif Index: /issm/trunk/src/mex/Makefile.am =================================================================== --- /issm/trunk/src/mex/Makefile.am (revision 8467) +++ /issm/trunk/src/mex/Makefile.am (revision 8468) @@ -42,4 +42,5 @@ InterpFromMeshToGrid \ InterpFromMesh2d \ + KMLFileRead \ KMLMeshWrite \ Mergesolutionfromftog\ @@ -221,4 +222,7 @@ InterpFromMesh2d/InterpFromMesh2d.h +KMLFileRead_SOURCES = KMLMeshWrite/KMLFileRead.cpp\ + KMLMeshWrite/KMLFileRead.h + KMLMeshWrite_SOURCES = KMLMeshWrite/KMLMeshWrite.cpp\ KMLMeshWrite/KMLMeshWrite.h