Context Navigation

← Previous Changeset
Next Changeset →

Changeset 14948

Timestamp:

05/07/13 14:37:23 (12 years ago)

Author:

Eric.Larour

Message:

CHG: moved globals.h into src/c/main, where it makes more sense, as it's only used to build wrappers or the main issm.exe and krigging.exe

Location:

issm/trunk-jpl

Files:

: 1 deleted
: 42 edited
: 1 copied

src/c/Makefile.am (modified) (1 diff)
src/c/include (deleted)
src/c/main/globals.h (copied) (copied from issm/trunk-jpl/src/c/include/globals.h )
src/c/main/issm.h (modified) (1 diff)
src/wrappers/AverageFilter/AverageFilter.h (modified) (1 diff)
src/wrappers/BamgConvertMesh/BamgConvertMesh.h (modified) (1 diff)
src/wrappers/BamgMesher/BamgMesher.h (modified) (1 diff)
src/wrappers/BamgTriangulate/BamgTriangulate.h (modified) (1 diff)
src/wrappers/Chaco/Chaco.h (modified) (1 diff)
src/wrappers/ContourToMesh/ContourToMesh.h (modified) (1 diff)
src/wrappers/ContourToNodes/ContourToNodes.h (modified) (1 diff)
src/wrappers/EdgeDetection/EdgeDetection.h (modified) (1 diff)
src/wrappers/ElementConnectivity/ElementConnectivity.h (modified) (1 diff)
src/wrappers/EnumToString/EnumToString.h (modified) (1 diff)
src/wrappers/Exp2Kml/Exp2Kml.h (modified) (1 diff)
src/wrappers/ExpSimplify/ExpSimplify.h (modified) (1 diff)
src/wrappers/HoleFiller/HoleFiller.h (modified) (1 diff)
src/wrappers/InternalFront/InternalFront.h (modified) (1 diff)
src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.h (modified) (1 diff)
src/wrappers/InterpFromMesh2d/InterpFromMesh2d.h (modified) (1 diff)
src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.h (modified) (1 diff)
src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h (modified) (1 diff)
src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h (modified) (1 diff)
src/wrappers/KMLFileRead/KMLFileRead.h (modified) (1 diff)
src/wrappers/KMLMeshWrite/KMLMeshWrite.h (modified) (1 diff)
src/wrappers/KMLOverlay/KMLOverlay.h (modified) (1 diff)
src/wrappers/Kml2Exp/Kml2Exp.h (modified) (1 diff)
src/wrappers/Kriging/Kriging.h (modified) (1 diff)
src/wrappers/Ll2xy/Ll2xy.h (modified) (1 diff)
src/wrappers/MeshPartition/MeshPartition.h (modified) (1 diff)
src/wrappers/MeshProfileIntersection/MeshProfileIntersection.h (modified) (1 diff)
src/wrappers/NodeConnectivity/NodeConnectivity.h (modified) (1 diff)
src/wrappers/PointCloudFindNeighbors/PointCloudFindNeighbors.h (modified) (1 diff)
src/wrappers/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h (modified) (1 diff)
src/wrappers/Scotch/Scotch.h (modified) (1 diff)
src/wrappers/Shp2Exp/Shp2Exp.h (modified) (1 diff)
src/wrappers/Shp2Kml/Shp2Kml.h (modified) (1 diff)
src/wrappers/StringToEnum/StringToEnum.h (modified) (1 diff)
src/wrappers/TriMesh/TriMesh.h (modified) (1 diff)
src/wrappers/TriMeshProcessRifts/TriMeshProcessRifts.h (modified) (1 diff)
src/wrappers/TriaSearch/TriaSearch.h (modified) (1 diff)
src/wrappers/Xy2ll/Xy2ll.h (modified) (1 diff)
test/NightlyRun/test101.m (modified) (1 diff)
test/NightlyRun/test3001.m (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

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

r14921	r14948
20	20	#Core sources{{{
21	21	core_sources = ./main/issm.h\
	22	./main/globals.h\
22	23	./classes/classes.h\
23	24	./classes/objects.h\

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

r14921	r14948
12	12	#endif
13	13
14		#include ".~~./include~~/globals.h" //only include this header file once!
	14	#include "./globals.h" //only include this header file once!
15	15	#include "../shared/shared.h"
16	16	#include "../classes/classes.h"

issm/trunk-jpl/src/wrappers/AverageFilter/AverageFilter.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/BamgConvertMesh/BamgConvertMesh.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/BamgMesher/BamgMesher.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/BamgTriangulate/BamgTriangulate.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/Chaco/Chaco.h

r14776	r14948
22	22	#include <string.h> /* strcasecmp */
23	23	#include <time.h> /* clock,time,difftime */
24		#include "../../c/~~include~~/globals.h"
	24	#include "../../c/main/globals.h"
25	25	#include "../../c/modules/modules.h"
26	26	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/ContourToMesh/ContourToMesh.h

r14917	r14948
19	19	/Header files: /
20	20	#include "../bindings.h"
21		#include "../../c/~~include~~/globals.h"
	21	#include "../../c/main/globals.h"
22	22	#include "../../c/toolkits/toolkits.h"
23	23	#include "../../c/modules/modules.h"

issm/trunk-jpl/src/wrappers/ContourToNodes/ContourToNodes.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/EdgeDetection/EdgeDetection.h

r14917	r14948
19	19	/Header files: /
20	20	#include "../bindings.h"
21		#include "../../c/~~include~~/globals.h"
	21	#include "../../c/main/globals.h"
22	22	#include "../../c/toolkits/toolkits.h"
23	23	#include "../../c/modules/modules.h"

issm/trunk-jpl/src/wrappers/ElementConnectivity/ElementConnectivity.h

r14917	r14948
19	19	/Header files: /
20	20	#include "../bindings.h"
21		#include "../../c/~~include~~/globals.h"
	21	#include "../../c/main/globals.h"
22	22	#include "../../c/toolkits/toolkits.h"
23	23	#include "../../c/modules/modules.h"

issm/trunk-jpl/src/wrappers/EnumToString/EnumToString.h

r14776	r14948
19	19	/Header files: /
20	20	#include "../bindings.h"
21		#include "../../c/~~include~~/globals.h"
	21	#include "../../c/main/globals.h"
22	22	#include "../../c/modules/modules.h"
23	23	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/Exp2Kml/Exp2Kml.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/ExpSimplify/ExpSimplify.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/HoleFiller/HoleFiller.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/InternalFront/InternalFront.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/shared/shared.h"
22	22	#include "../../c/io/io.h"

issm/trunk-jpl/src/wrappers/InterpFromGridToMesh/InterpFromGridToMesh.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/InterpFromMesh2d/InterpFromMesh2d.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/InterpFromMeshToGrid/InterpFromMeshToGrid.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh2d/InterpFromMeshToMesh2d.h

r14917	r14948
19	19	/Header files: /
20	20	#include "../bindings.h"
21		#include "../../c/~~include~~/globals.h"
	21	#include "../../c/main/globals.h"
22	22	#include "../../c/toolkits/toolkits.h"
23	23	#include "../../c/modules/modules.h"

issm/trunk-jpl/src/wrappers/InterpFromMeshToMesh3d/InterpFromMeshToMesh3d.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/KMLFileRead/KMLFileRead.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/KMLMeshWrite/KMLMeshWrite.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/KMLOverlay/KMLOverlay.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/Kml2Exp/Kml2Exp.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/Kriging/Kriging.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/shared/shared.h"

issm/trunk-jpl/src/wrappers/Ll2xy/Ll2xy.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/MeshPartition/MeshPartition.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/MeshProfileIntersection/MeshProfileIntersection.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/NodeConnectivity/NodeConnectivity.h

r14917	r14948
22	22	/Header files: /
23	23	#include "../bindings.h"
24		#include "../../c/~~include~~/globals.h"
	24	#include "../../c/main/globals.h"
25	25	#include "../../c/toolkits/toolkits.h"
26	26	#include "../../c/modules/modules.h"

issm/trunk-jpl/src/wrappers/PointCloudFindNeighbors/PointCloudFindNeighbors.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/PropagateFlagsFromConnectivity/PropagateFlagsFromConnectivity.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/Scotch/Scotch.h

r14776	r14948
10	10	#include <string.h> /* strcasecmp */
11	11	#include <time.h> /* clock,time,difftime */
12		#include "../../c/~~include~~/globals.h"
	12	#include "../../c/main/globals.h"
13	13	#include "../../c/modules/modules.h"
14	14	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/Shp2Exp/Shp2Exp.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/Shp2Kml/Shp2Kml.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/StringToEnum/StringToEnum.h

r14776	r14948
19	19	/Header files: /
20	20	#include "../bindings.h"
21		#include "../../c/~~include~~/globals.h"
	21	#include "../../c/main/globals.h"
22	22	#include "../../c/modules/modules.h"
23	23	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/TriMesh/TriMesh.h

r14917	r14948
19	19	/Header files: /
20	20	#include "../bindings.h"
21		#include "../../c/~~include~~/globals.h"
	21	#include "../../c/main/globals.h"
22	22	#include "../../c/toolkits/toolkits.h"
23	23	#include "../../c/modules/modules.h"

issm/trunk-jpl/src/wrappers/TriMeshProcessRifts/TriMeshProcessRifts.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/TriaSearch/TriaSearch.h

r14776	r14948
17	17
18	18	#include "../bindings.h"
19		#include "../../c/~~include~~/globals.h"
	19	#include "../../c/main/globals.h"
20	20	#include "../../c/modules/modules.h"
21	21	#include "../../c/Container/Container.h"

issm/trunk-jpl/src/wrappers/Xy2ll/Xy2ll.h

r14776	r14948
18	18
19	19	#include "../bindings.h"
20		#include "../../c/~~include~~/globals.h"
	20	#include "../../c/main/globals.h"
21	21	#include "../../c/modules/modules.h"
22	22	#include "../../c/Container/Container.h"

issm/trunk-jpl/test/NightlyRun/test101.m

r14732	r14948
4	4	md=setflowequation(md,'macayeal','all');
5	5	md.cluster=generic('name',oshostname(),'np',3);
	6	md.toolkits.DefaultAnalysis=issmsolver();
6	7	md.diagnostic.requested_outputs=StressTensorEnum();
7	8	md=solve(md,DiagnosticSolutionEnum());

issm/trunk-jpl/test/NightlyRun/test3001.m

r14879	r14948
4	4	md=setflowequation(md,'macayeal','all');
5	5	md.cluster=generic('name',oshostname(),'np',1);
	6	md.toolkits.DefaultAnalysis=issmsolver();
6	7	md.diagnostic.requested_outputs=StressTensorEnum();
7	8	md.autodiff.isautodiff=true;

Note: See TracChangeset for help on using the changeset viewer.

Context Navigation

Changeset 14948

Legend:

Download in other formats: