Skip to content

Commit

Permalink
Remove trailing whitespace systematically
Browse files Browse the repository at this point in the history
  • Loading branch information
@henrus
henrus committed Jul 18, 2013
1 parent 9ca7002 commit 3241862
Show file tree
Hide file tree
Showing 1,246 changed files with 9,623 additions and 9,623 deletions.
12 changes: 6 additions & 6 deletions CMakeLists.txt
View file
Expand Up @@ -81,16 +81,16 @@ SET(
)

# Find out the version of the compiler being used.
# Add this information to the buildname
# Add this information to the buildname
# This is for gcc or icc because they both support the -dumpversion option
EXEC_PROGRAM($ENV{WM_CC}
ARGS -dumpversion
OUTPUT_VARIABLE COMPILER_VERSION
)
SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}")
SET(BUILDNAME "${BUILDNAME}-$ENV{WM_CC}${COMPILER_VERSION}")
#
# We will support more compilers eventually.
#
#

# Timeout for running every single test: 4 hours: 4 x 3600 seconds
#SET(
Expand Down Expand Up @@ -133,7 +133,7 @@ if(GIT_FOUND)
)
message("Git branch (mercurial): ${GIT_BRANCH_NAME}")
endif()
SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
SET(BUILDNAME "${BUILDNAME}-git-branch=${GIT_BRANCH_NAME}")
endif()

# Some last minute cleanup
Expand All @@ -158,7 +158,7 @@ set_property(
# Compile the OpenFOAM unit tests located under applications/test
# This part will not be compiled and run by default.
# This would be a good candidate for a sub-project
add_custom_target (OpenFOAM-$ENV{WM_PROJECT_VERSION}_unitTests
add_custom_target (OpenFOAM-$ENV{WM_PROJECT_VERSION}_unitTests
wmake all ${OF_ROOT}/applications/test
)

Expand All @@ -184,7 +184,7 @@ IF(BUILD_TESTING)

# Modify this variable if you want the full length test case simulations
# Beware, this might take a long time to execute.
# Otherwise, the default behaviour is to run each tutorial for 1 "timestep"
# Otherwise, the default behaviour is to run each tutorial for 1 "timestep"
#SET(RUN_FROM_ONE_TIMESTEP 0)
SET(RUN_FROM_ONE_TIMESTEP 1)

Expand Down
2 changes: 1 addition & 1 deletion ContributionsForNextRelease.txt
View file
Expand Up @@ -14,7 +14,7 @@ Contributions:
- TU Braunschweig: real gas thermo
- Kornev, Rostock: inlet turbulence generator; locDynV2F hybrid turbulence model
- Christoph Goniva: and multi-mixer dynamic mesh class
-
-


- segregated pressure-based turbomachinery (Wikki)
Expand Down
236 changes: 118 additions & 118 deletions ExtendProjectPreamble
View file
@@ -1,118 +1,118 @@
The OpenFOAM-Extend Project
Web site: http://www.extend-project.de/
The goal of the OpenFOAM -Extend Project is to open the OpenFOAM CFD toolbox
to community contributed extensions in the spirit of the Open Source
development model.
Software under the name OpenFOAM has been developed by a large group of
volunteers starting in 1991 and has spread through scientific and engineering
community in the late 1990s and early 2000s. Its main strength was the spirit
of open collaboration in the community: the aim of the OpenFOAM-Extend Project
is to formalize this spirit.
* Trademark notice
Currently, the word "OpenFOAM" is held as a trademark by a commercial
company, not associated with the Open Source development effort of this
software. While the author acknowledges the existence of Trademark,
association of trademarked phrase with the the code developed by third
parties and including the author is misleading in terms of authorship,
ownership of intellectual property of the source code.
In the absence of a legal resolution, we shall refer to the project as the
-Extend project and software as "OpenFOAM", as per agreement between
Prof. Hrvoje Jasak and Mr. Henry G. Weller of 30 September 2004.
The excerpts below are from the correspondences of Dr.Jasak and are to
his knowledge all the relevant writings about this topic. Although
this topic has been discussed before in public forums there exists no
'official' answer by OpenCFD on this issue. In the interest of
fairness a reference (link) to such an answer will be added to this
document as soon as we come aware of it.
09/30/2004 01:45 PM
Dear Dr. Jasak,
I propose that we make FOAM open-source and shutdown Nabla, that way we
are free to pursue whatever future we wish independently.
Henry G. Weller
Managing Director
Nabla Ltd
The first release of the OpenFOAM source code of 10 December 2004
and subsequent clarification of 16 February 2005.
Hi Henry,
...
Regarding the new setup, I would like to thank you for your effort i
n making FOAM public domain, with crucial comments regarding some
important details.
- in the header files for the open version of foam there exists a line
which claims copyright for OpenCFD Ltd:
Copyright (C) 1991-2004 OpenCFD Ltd.
I am not sure whether it is possible to claim copyright over a GPL piece
of software, but this is at least misleading. In order for this
statement to be true, OpenCFD Ltd. would need to purchase the copyright
from Nabla Ltd. and from you and me personally (due to unresolved
ownership and the remaining payments Nabla Ltd. needs to make to us
regarding the original transfer of copyright). I can offer a number
of solutions acceptable to me as follows:
1) no Copyright statement apart from the required GPL statement
2) Copyright OpenFOAM.org
3) Copyright Henry Weller, Hrvoje Jasak et al
4) Copyright OpenCFD and Hrvoje Jasak
5) List of authors instead of the copyright statement
I am also prepared to consider any other reasonable ideas along the same
lines (including the sale of copyright, which would be a bit pointless
at this stage) - please advise.
02/17/2005 11:09 PM
Under the GPL there has to be an organization in place to enforce the GPL
if there are violation, these are part of the rules. OpenCFD undertakes
that responsibility hence the copyright.
Henry G. Weller
Managing Director
12 November 2010
From the above it is clear that OpenCFD does not own the rights or
authorship of the source code, which is currently concealed in public.
For further details, I have been attempting to get a formal response by
this company for 6 years now, without success. It is time to move on.
The current Copyright notice does not fairly describe the authorship of
the software. In the spirit of the open source development model, the
-Extend project wishes to formally acknowledge all contributors and
developers of OpenFOAM from its inception to today.
As this issue still remains unresolved, and the list of contributors
has been removed from the OpenFOAM source code by Mr. Weller in 2006,
we shall re-base OpenFOAM as an Open Source community-based project
and associate the authorship and Copyright in each case with the
original author.
Hrvoje Jasak
This offering is not affiliated with OpenCFD Limited, owner of the OpenFOAM
trade mark.
Please find the official website of OpenCFD Limited at http://www.openfoam.org
In particular, OpenCFD Limited hosts the following legal statements:
- licensing and intellectual property: http://www.openfoam.com/legal/index.php
- trademark policy: http://www.openfoam.com/legal/trademark-policy.php
The OpenFOAM-Extend Project

Web site: http://www.extend-project.de/

The goal of the OpenFOAM -Extend Project is to open the OpenFOAM CFD toolbox
to community contributed extensions in the spirit of the Open Source
development model.

Software under the name OpenFOAM has been developed by a large group of
volunteers starting in 1991 and has spread through scientific and engineering
community in the late 1990s and early 2000s. Its main strength was the spirit
of open collaboration in the community: the aim of the OpenFOAM-Extend Project
is to formalize this spirit.

* Trademark notice
Currently, the word "OpenFOAM" is held as a trademark by a commercial
company, not associated with the Open Source development effort of this
software. While the author acknowledges the existence of Trademark,
association of trademarked phrase with the the code developed by third
parties and including the author is misleading in terms of authorship,
ownership of intellectual property of the source code.

In the absence of a legal resolution, we shall refer to the project as the
-Extend project and software as "OpenFOAM", as per agreement between
Prof. Hrvoje Jasak and Mr. Henry G. Weller of 30 September 2004.

The excerpts below are from the correspondences of Dr.Jasak and are to
his knowledge all the relevant writings about this topic. Although
this topic has been discussed before in public forums there exists no
'official' answer by OpenCFD on this issue. In the interest of
fairness a reference (link) to such an answer will be added to this
document as soon as we come aware of it.

09/30/2004 01:45 PM

Dear Dr. Jasak,

I propose that we make FOAM open-source and shutdown Nabla, that way we
are free to pursue whatever future we wish independently.

Henry G. Weller
Managing Director
Nabla Ltd

The first release of the OpenFOAM source code of 10 December 2004
and subsequent clarification of 16 February 2005.

Hi Henry,

...

Regarding the new setup, I would like to thank you for your effort i
n making FOAM public domain, with crucial comments regarding some
important details.

- in the header files for the open version of foam there exists a line
which claims copyright for OpenCFD Ltd:

Copyright (C) 1991-2004 OpenCFD Ltd.

I am not sure whether it is possible to claim copyright over a GPL piece
of software, but this is at least misleading. In order for this
statement to be true, OpenCFD Ltd. would need to purchase the copyright
from Nabla Ltd. and from you and me personally (due to unresolved
ownership and the remaining payments Nabla Ltd. needs to make to us
regarding the original transfer of copyright). I can offer a number
of solutions acceptable to me as follows:

1) no Copyright statement apart from the required GPL statement
2) Copyright OpenFOAM.org
3) Copyright Henry Weller, Hrvoje Jasak et al
4) Copyright OpenCFD and Hrvoje Jasak
5) List of authors instead of the copyright statement

I am also prepared to consider any other reasonable ideas along the same
lines (including the sale of copyright, which would be a bit pointless
at this stage) - please advise.


02/17/2005 11:09 PM

Under the GPL there has to be an organization in place to enforce the GPL
if there are violation, these are part of the rules. OpenCFD undertakes
that responsibility hence the copyright.

Henry G. Weller
Managing Director


12 November 2010

From the above it is clear that OpenCFD does not own the rights or
authorship of the source code, which is currently concealed in public.
For further details, I have been attempting to get a formal response by
this company for 6 years now, without success. It is time to move on.

The current Copyright notice does not fairly describe the authorship of
the software. In the spirit of the open source development model, the
-Extend project wishes to formally acknowledge all contributors and
developers of OpenFOAM from its inception to today.

As this issue still remains unresolved, and the list of contributors
has been removed from the OpenFOAM source code by Mr. Weller in 2006,
we shall re-base OpenFOAM as an Open Source community-based project
and associate the authorship and Copyright in each case with the
original author.

Hrvoje Jasak


This offering is not affiliated with OpenCFD Limited, owner of the OpenFOAM
trade mark.


Please find the official website of OpenCFD Limited at http://www.openfoam.org
In particular, OpenCFD Limited hosts the following legal statements:
- licensing and intellectual property: http://www.openfoam.com/legal/index.php
- trademark policy: http://www.openfoam.com/legal/trademark-policy.php
14 changes: 7 additions & 7 deletions HowToContribute
View file
Expand Up @@ -10,7 +10,7 @@ git Repository: Henrik Rusche (h.rusche@wikki.co.uk)
Martin Beaudoin (beaudoin.martin@ireq.ca)

1. SourceForge Access
~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~

To make contributions to the -extend project, you should first obtain an
account at SourceForge.net. (SourceForge will suggest a username
Expand Down Expand Up @@ -46,7 +46,7 @@ git Repository: Henrik Rusche (h.rusche@wikki.co.uk)

The article listed above should be considered mandatory reading material
for those planning to make contributions to the repository. Some links about
the general usage of GIT can be found in Section 8.
the general usage of GIT can be found in Section 8.

Please do not hesitate to ask one of the "git Repository" contacts at the top
of this document if you are not sure about specific operation relative to the git
Expand Down Expand Up @@ -81,14 +81,14 @@ git Repository: Henrik Rusche (h.rusche@wikki.co.uk)
+ git checkout -b my-feature-branch

Feature branches should be named after the fix or feature that they contain,
*not* named after the author. There may be more than one author, after all, and
*not* named after the author. There may be more than one author, after all, and
this information is recorded in the commit anyway. As an example, a bug fix
to the mesquite package should be committed to a branch named "hotfix/mesquite".

Carefully organized commits and branches, clear commit messages, and well-chosen
branch names will make it easier for the release committee to review and merge
each contribution.
each contribution.

When you have a feature branch that is ready to be merged, push it to the server
using a command such as this:

Expand Down Expand Up @@ -125,7 +125,7 @@ git Repository: Henrik Rusche (h.rusche@wikki.co.uk)

The feature branches provided by users will be merged by the release committee
into an integration branch called "nextRelease", and then both the local
and remote copy of the feature branch will be deleted. The merge will be performed
and remote copy of the feature branch will be deleted. The merge will be performed
using a "git merge --no-ff" command, which forces the creation of a merge commit
even in the case where the merge could be accomplished by fast-forward.
Note that the automated test loop will be run off of this integration branch.
Expand All @@ -136,7 +136,7 @@ git Repository: Henrik Rusche (h.rusche@wikki.co.uk)
and hotfixes.

Note that hotfixes should be branched off of the master branch and should be merged
twice - once into the integration branch and once into the master branch - in order to
twice - once into the integration branch and once into the master branch - in order to
guarantee that a merge of the integration branch into the master branch can be
accomplished by a fast-forward.

Expand Down
6 changes: 3 additions & 3 deletions README
View file
Expand Up @@ -93,7 +93,7 @@
of the OpenFOAM installation.

* Building the ThirdParty packages from Sources
A new way of compiling and installing the ThirdParty suite of packages is proposed with OpenFOAM-1.6-ext.
A new way of compiling and installing the ThirdParty suite of packages is proposed with OpenFOAM-1.6-ext.
Please consult the file ThirdParty/README.ThirdParty a for more information.

* Building from Sources (Optional)
Expand Down Expand Up @@ -154,7 +154,7 @@

* Reporting Bugs in OpenFOAM
Please report all bugs and feature requests using our bug tracking system:
http://sourceforge.net/apps/mantisbt/openfoam-extend/main_page.php or
http://sourceforge.net/apps/mantisbt/openfoam-extend/main_page.php or
http://www.extend-project.de/project-final/openfoam-extend-bug-tracker
Please also report bugs at the CFD-Online User Forum.

Expand Down Expand Up @@ -188,7 +188,7 @@
David Hill
Niklas Wikstrom
Dubravko Matijasevic
Darrin Stephens
Darrin Stephens
Christian Beck
Oliver Borm
James Criner
Expand Down

0 comments on commit 3241862

Please sign in to comment.