Skip to content

Commit 9cadc39

Browse files
skhayrulinskhayrulin
committed
Merge pull request #53 from openworm/development
Development
2 parents 004df02 + 5ebe832 commit 9cadc39

24 files changed

+102
-1849
lines changed

‎.cproject‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,18 @@
11
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2-
<?fileVersion 4.0.0?>
3-
4-
<cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
2+
<?fileVersion 4.0.0?><cproject storage_type_id="org.eclipse.cdt.core.XmlProjectDescriptionStorage">
53
<storageModule moduleId="org.eclipse.cdt.core.settings">
64
<cconfiguration id="cdt.managedbuild.config.gnu.exe.release.2025909945">
75
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.release.2025909945" moduleId="org.eclipse.cdt.core.settings" name="Build">
86
<externalSettings>
97
<externalSetting/>
108
</externalSettings>
119
<extensions>
12-
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
1310
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
1411
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
1512
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
1613
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
1714
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
15+
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
1816
</extensions>
1917
</storageModule>
2018
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -29,6 +27,7 @@
2927
<option id="gnu.cpp.compiler.exe.release.option.debugging.level.1679425131" name="Debug Level" superClass="gnu.cpp.compiler.exe.release.option.debugging.level" value="gnu.cpp.compiler.debugging.level.none" valueType="enumerated"/>
3028
<option id="gnu.cpp.compiler.option.include.paths.997000422" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
3129
<listOptionValue builtIn="false" value="/usr/include/python2.7"/>
30+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
3231
</option>
3332
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.1448416343" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
3433
</tool>
@@ -54,6 +53,9 @@
5453
</inputType>
5554
</tool>
5655
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.release.1756360065" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.release">
56+
<option id="gnu.both.asm.option.include.paths.1804308571" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath">
57+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/Smoothed-Particle-Hydrodynamics/inc}&quot;"/>
58+
</option>
5759
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.612136578" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
5860
</tool>
5961
</toolChain>
@@ -66,12 +68,12 @@
6668
<storageModule buildSystemId="org.eclipse.cdt.managedbuilder.core.configurationDataProvider" id="cdt.managedbuild.config.gnu.exe.debug.333205532" moduleId="org.eclipse.cdt.core.settings" name="debug">
6769
<externalSettings/>
6870
<extensions>
69-
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
7071
<extension id="org.eclipse.cdt.core.GmakeErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
7172
<extension id="org.eclipse.cdt.core.CWDLocator" point="org.eclipse.cdt.core.ErrorParser"/>
7273
<extension id="org.eclipse.cdt.core.GCCErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
7374
<extension id="org.eclipse.cdt.core.GASErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
7475
<extension id="org.eclipse.cdt.core.GLDErrorParser" point="org.eclipse.cdt.core.ErrorParser"/>
76+
<extension id="org.eclipse.cdt.core.ELF" point="org.eclipse.cdt.core.BinaryParser"/>
7577
</extensions>
7678
</storageModule>
7779
<storageModule moduleId="cdtBuildSystem" version="4.0.0">
@@ -81,11 +83,12 @@
8183
<targetPlatform id="cdt.managedbuild.target.gnu.platform.exe.debug.884686243" name="Debug Platform" superClass="cdt.managedbuild.target.gnu.platform.exe.debug"/>
8284
<builder autoBuildTarget="all" buildPath="${workspace_loc:/Smoothed-Particle-Hydrodynamics/debug}" cleanBuildTarget="clean" enableAutoBuild="false" enableCleanBuild="true" enabledIncrementalBuild="true" id="cdt.managedbuild.target.gnu.builder.exe.debug.1189096949" incrementalBuildTarget="all" keepEnvironmentInBuildfile="false" managedBuildOn="true" name="Gnu Make Builder" superClass="cdt.managedbuild.target.gnu.builder.exe.debug"/>
8385
<tool id="cdt.managedbuild.tool.gnu.archiver.base.1441642354" name="GCC Archiver" superClass="cdt.managedbuild.tool.gnu.archiver.base"/>
84-
<tool id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1106861907" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
86+
<tool command="g++" commandLinePattern="${COMMAND} ${FLAGS} ${OUTPUT_FLAG} ${OUTPUT_PREFIX}${OUTPUT} ${INPUTS}" id="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug.1106861907" name="GCC C++ Compiler" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.exe.debug">
8587
<option id="gnu.cpp.compiler.exe.debug.option.optimization.level.921234671" name="Optimization Level" superClass="gnu.cpp.compiler.exe.debug.option.optimization.level" value="gnu.cpp.compiler.optimization.level.none" valueType="enumerated"/>
8688
<option id="gnu.cpp.compiler.exe.debug.option.debugging.level.1358949615" name="Debug Level" superClass="gnu.cpp.compiler.exe.debug.option.debugging.level" value="gnu.cpp.compiler.debugging.level.max" valueType="enumerated"/>
8789
<option id="gnu.cpp.compiler.option.include.paths.521963291" name="Include paths (-I)" superClass="gnu.cpp.compiler.option.include.paths" valueType="includePath">
8890
<listOptionValue builtIn="false" value="/usr/include/python2.7"/>
91+
<listOptionValue builtIn="false" value="&quot;${workspace_loc:/${ProjName}/inc}&quot;"/>
8992
</option>
9093
<inputType id="cdt.managedbuild.tool.gnu.cpp.compiler.input.2098511886" superClass="cdt.managedbuild.tool.gnu.cpp.compiler.input"/>
9194
</tool>
@@ -110,6 +113,7 @@
110113
</inputType>
111114
</tool>
112115
<tool id="cdt.managedbuild.tool.gnu.assembler.exe.debug.250299533" name="GCC Assembler" superClass="cdt.managedbuild.tool.gnu.assembler.exe.debug">
116+
<option id="gnu.both.asm.option.include.paths.1091188493" name="Include paths (-I)" superClass="gnu.both.asm.option.include.paths" valueType="includePath"/>
113117
<inputType id="cdt.managedbuild.tool.gnu.assembler.input.95686167" superClass="cdt.managedbuild.tool.gnu.assembler.input"/>
114118
</tool>
115119
</toolChain>
@@ -143,12 +147,12 @@
143147
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.2025909945;cdt.managedbuild.config.gnu.exe.release.2025909945.;cdt.managedbuild.tool.gnu.cpp.compiler.exe.release.37396283;cdt.managedbuild.tool.gnu.cpp.compiler.input.1448416343">
144148
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
145149
</scannerConfigBuildInfo>
146-
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.2025909945;cdt.managedbuild.config.gnu.exe.release.2025909945.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1665591112;cdt.managedbuild.tool.gnu.c.compiler.input.1611269568">
147-
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
148-
</scannerConfigBuildInfo>
149150
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.cross.exe.release.1456821005;cdt.managedbuild.config.gnu.cross.exe.release.1456821005.;cdt.managedbuild.tool.gnu.cross.cpp.compiler.1917076731;cdt.managedbuild.tool.gnu.cpp.compiler.input.1889670210">
150151
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileCPP"/>
151152
</scannerConfigBuildInfo>
153+
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.release.2025909945;cdt.managedbuild.config.gnu.exe.release.2025909945.;cdt.managedbuild.tool.gnu.c.compiler.exe.release.1665591112;cdt.managedbuild.tool.gnu.c.compiler.input.1611269568">
154+
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
155+
</scannerConfigBuildInfo>
152156
<scannerConfigBuildInfo instanceId="cdt.managedbuild.config.gnu.exe.debug.333205532;cdt.managedbuild.config.gnu.exe.debug.333205532.;cdt.managedbuild.tool.gnu.c.compiler.exe.debug.745142970;cdt.managedbuild.tool.gnu.c.compiler.input.1706681846">
153157
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="org.eclipse.cdt.managedbuilder.core.GCCManagedMakePerProjectProfileC"/>
154158
</scannerConfigBuildInfo>

SimulationEnginePrototype.sln renamed to Sibernetic.sln

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 10.00
33
# Visual Studio 2008
4-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SimulationEnginePrototype", "SimulationEnginePrototype.vcproj", "{01EA498F-06C1-4F67-8B98-E1105F9311A2}"
4+
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sibernetic", "Sibernetic.vcproj", "{01EA498F-06C1-4F67-8B98-E1105F9311A2}"
55
EndProject
66
Global
77
GlobalSection(SolutionConfigurationPlatforms) = preSolution

SimulationEnginePrototype.vcproj renamed to Sibernetic.vcproj

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,6 @@
267267
RelativePath=".\src\owWorldSimulation.cpp"
268268
>
269269
</File>
270-
<File
271-
RelativePath=".\src\PyramidalSimulation.cpp"
272-
>
273-
</File>
274270
<File
275271
RelativePath=".\src\test\owPhysicTest.cpp"
276272
>
@@ -300,39 +296,35 @@
300296
UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
301297
>
302298
<File
303-
RelativePath=".\src\owHelper.h"
304-
>
305-
</File>
306-
<File
307-
RelativePath=".\src\owOpenCLConstant.h"
299+
RelativePath=".\inc\owHelper.h"
308300
>
309301
</File>
310302
<File
311-
RelativePath=".\src\owOpenCLSolver.h"
303+
RelativePath=".\inc\owOpenCLConstant.h"
312304
>
313305
</File>
314306
<File
315-
RelativePath=".\src\owPhysicsConstant.h"
307+
RelativePath=".\inc\owOpenCLSolver.h"
316308
>
317309
</File>
318310
<File
319-
RelativePath=".\src\owPhysicsFluidSimulator.h"
311+
RelativePath=".\inc\owPhysicsConstant.h"
320312
>
321313
</File>
322314
<File
323-
RelativePath=".\src\owWorldSimulation.h"
315+
RelativePath=".\inc\owPhysicsFluidSimulator.h"
324316
>
325317
</File>
326318
<File
327-
RelativePath=".\src\PyramidalSimulation.h"
319+
RelativePath=".\inc\owWorldSimulation.h"
328320
>
329321
</File>
330322
<File
331-
RelativePath=".\src\VectorMath.h"
323+
RelativePath=".\inc\VectorMath.h"
332324
>
333325
</File>
334326
<File
335-
RelativePath=".\src\test\owPhysicTest.h"
327+
RelativePath=".\inc\owPhysicTest.h"
336328
>
337329
</File>
338330
</Filter>

src/VectorMath.h renamed to inc/VectorMath.h

File renamed without changes.

src/owConfigProperty.h renamed to inc/owConfigProperty.h

File renamed without changes.

src/owHelper.h renamed to inc/owHelper.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@ class owHelper
5656
public:
5757
owHelper(void);
5858
~owHelper(void);
59-
static void generateConfiguration( int stage, float *position, float *velocity, float *& elasticConnectionsData_cpp, int *membraneData_cpp, int & numOfLiquidP, int & numOfElasticP, int & numOfBoundaryP, int & numOfElasticConnections, int & numOfMembranes, int * particleMembranesList_cpp, owConfigProrerty * config);
6059
static void preLoadConfiguration( int & numOfMembranes, owConfigProrerty * config, int & numOfLiquidP, int & numOfElasticP, int & numOfBoundaryP );
6160
static void loadConfiguration( float *position_cpp, float *velocity_cpp, float *& elasticConnections,int & numOfLiquidP, int & numOfElasticP, int & numOfBoundaryP, int & numOfElasticConnections, int & numOfMembranes,int * membraneData_cpp, int *& particleMembranesList_cpp, owConfigProrerty * config );
6261
static void loadConfigurationFromOneFile(float * position, float * velocity, float *& elasticConnectionsData_cpp, int & numOfLiquidP, int & numOfElasticP, int & numOfBoundaryP, int & numOfElasticConnections);

src/owOpenCLConstant.h renamed to inc/owOpenCLConstant.h

File renamed without changes.

src/owOpenCLSolver.h renamed to inc/owOpenCLSolver.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class owOpenCLSolver
100100
void read_velocity_buffer( float * velocity_cpp, owConfigProrerty * config) { copy_buffer_from_device( velocity_cpp, velocity, config->getParticleCount() * sizeof( float ) * 4 ); };
101101
void read_density_buffer( float * density_cpp, owConfigProrerty * config ) { copy_buffer_from_device( density_cpp, rho, config->getParticleCount() * sizeof( float ) * 1 ); }; // This need only for visualization current density of particle (graphic effect)
102102
void read_particleIndex_buffer( unsigned int * particleIndexBuffer, owConfigProrerty * config ) { copy_buffer_from_device( particleIndexBuffer, particleIndex, config->getParticleCount() * sizeof( unsigned int ) * 2 ); }; // This need only for visualization current density of particle (graphic effect)
103-
void refresh(const float * position_cpp, const float * velocity_cpp, owConfigProrerty * config, const float * elasticConnectionsData_cpp = NULL, const int * membraneData_cpp = NULL, const int * particleMembranesList_cpp = NULL);
103+
void reset(const float * position_cpp, const float * velocity_cpp, owConfigProrerty * config, const float * elasticConnectionsData_cpp = NULL, const int * membraneData_cpp = NULL, const int * particleMembranesList_cpp = NULL);
104104
private:
105105
void create_ocl_kernel( const char *name, cl::Kernel &k );
106106
void create_ocl_buffer(const char *name, cl::Buffer &b, const cl_mem_flags flags,const int size);

src/test/owPhysicTest.h renamed to inc/owPhysicTest.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
#ifndef OWPHYSICTEST_H_
99
#define OWPHYSICTEST_H_
1010

11+
#include "owPhysicsFluidSimulator.h"
12+
1113
void test_energy_conservation();
1214

1315

src/owPhysicsConstant.h renamed to inc/owPhysicsConstant.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,6 @@
3838

3939
#include "owOpenCLConstant.h"
4040

41-
#define generateWormBodyConfiguration 0 //or load from file otherwise [0/1]
42-
4341
#ifndef M_PI
4442
#define M_PI 3.1415927f
4543
#endif

0 commit comments

Comments
 (0)