diff --git a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C index 248ac3e3d0..3d14464e71 100644 --- a/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C +++ b/applications/utilities/surface/surfaceMeshConvert/surfaceMeshConvert.C @@ -206,8 +206,8 @@ int main(int argc, char *argv[]) { const word csName = args["from"]; - label csId = csLst.find(csName); - if (csId < 0) + const label csIndex = csLst.findIndex(csName); + if (csIndex < 0) { FatalErrorIn(args.executable()) << "Cannot find -from " << csName << nl @@ -215,15 +215,15 @@ int main(int argc, char *argv[]) << exit(FatalError); } - fromCsys.reset(new coordinateSystem(csLst[csId])); + fromCsys.reset(new coordinateSystem(csLst[csIndex])); } if (args.optionFound("to")) { const word csName = args["to"]; - label csId = csLst.find(csName); - if (csId < 0) + const label csIndex = csLst.findIndex(csName); + if (csIndex < 0) { FatalErrorIn(args.executable()) << "Cannot find -to " << csName << nl @@ -231,7 +231,7 @@ int main(int argc, char *argv[]) << exit(FatalError); } - toCsys.reset(new coordinateSystem(csLst[csId])); + toCsys.reset(new coordinateSystem(csLst[csIndex])); } diff --git a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C index 3995031b53..0631f195e2 100644 --- a/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C +++ b/applications/utilities/surface/surfaceMeshExport/surfaceMeshExport.C @@ -195,8 +195,8 @@ int main(int argc, char *argv[]) { const word csName = args["from"]; - label csId = csLst.find(csName); - if (csId < 0) + const label csIndex = csLst.findIndex(csName); + if (csIndex < 0) { FatalErrorIn(args.executable()) << "Cannot find -from " << csName << nl @@ -204,15 +204,15 @@ int main(int argc, char *argv[]) << exit(FatalError); } - fromCsys.reset(new coordinateSystem(csLst[csId])); + fromCsys.reset(new coordinateSystem(csLst[csIndex])); } if (args.optionFound("to")) { const word csName = args["to"]; - label csId = csLst.find(csName); - if (csId < 0) + const label csIndex = csLst.findIndex(csName); + if (csIndex < 0) { FatalErrorIn(args.executable()) << "Cannot find -to " << csName << nl @@ -220,7 +220,7 @@ int main(int argc, char *argv[]) << exit(FatalError); } - toCsys.reset(new coordinateSystem(csLst[csId])); + toCsys.reset(new coordinateSystem(csLst[csIndex])); } diff --git a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C index 853becfc89..3aee72a52d 100644 --- a/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C +++ b/applications/utilities/surface/surfaceMeshImport/surfaceMeshImport.C @@ -208,8 +208,8 @@ int main(int argc, char *argv[]) { const word csName = args["from"]; - label csId = csLst.find(csName); - if (csId < 0) + const label csIndex = csLst.findIndex(csName); + if (csIndex < 0) { FatalErrorIn(args.executable()) << "Cannot find -from " << csName << nl @@ -217,15 +217,15 @@ int main(int argc, char *argv[]) << exit(FatalError); } - fromCsys.reset(new coordinateSystem(csLst[csId])); + fromCsys.reset(new coordinateSystem(csLst[csIndex])); } if (args.optionFound("to")) { const word csName = args["to"]; - label csId = csLst.find(csName); - if (csId < 0) + const label csIndex = csLst.findIndex(csName); + if (csIndex < 0) { FatalErrorIn(args.executable()) << "Cannot find -to " << csName << nl @@ -233,7 +233,7 @@ int main(int argc, char *argv[]) << exit(FatalError); } - toCsys.reset(new coordinateSystem(csLst[csId])); + toCsys.reset(new coordinateSystem(csLst[csIndex])); } diff --git a/bin/tools/pre-commit-hook b/bin/tools/pre-commit-hook index be4bb69b24..7d41b2e11c 100755 --- a/bin/tools/pre-commit-hook +++ b/bin/tools/pre-commit-hook @@ -200,6 +200,34 @@ checkLineLengthNonComments() dieOnBadFiles "Limit code to 80 columns before pushing" } +# +# limit line length to 80-columns, except #directive lines +# +checkLineLengthNonDirective() +{ + badFiles=$( + for f in $fileList + do + # limit to *.[CH] files + case "$f" in + (*.[CH]) + # parse line numbers from this (strip comment lines): + # path/fileName:: contents + lines=$(git grep --cached -n -e ".\{81,\}" -- "$f" | + sed -n \ + -e '\@^[^:]*:[^:]*: *#.*@b' \ + -e 's@^[^:]*:\([0-9]*\):.*@\1@p' | + tr '\n' ' ' + ) + [ -n "$lines" ] && echo "$Indent$f -- lines: $lines" + ;; + esac + done + ) + + dieOnBadFiles "Limit code to 80 columns before pushing" +} + # do all checks @@ -215,7 +243,7 @@ checkIllegalCode checkCopyright # ensure code conforms to 80 columns max -checkLineLength +checkLineLengthNonDirective exit 0 diff --git a/debian/changelog b/debian/changelog deleted file mode 100644 index 42676cb62e..0000000000 --- a/debian/changelog +++ /dev/null @@ -1,11 +0,0 @@ -openfoam170 (0-1ubuntu1) lucid; urgency=low - - * some change - - -- opencfd Wed, 14 Jul 2010 10:44:35 +0100 - -openfoam170 (0-1) unstable; urgency=low - - * Initial release - - -- OpenCFD Ltd. Mon, 14 Jun 2010 16:50:46 +0100 diff --git a/debian/compat b/debian/compat deleted file mode 100644 index 7f8f011eb7..0000000000 --- a/debian/compat +++ /dev/null @@ -1 +0,0 @@ -7 diff --git a/debian/control b/debian/control deleted file mode 100644 index c5957a03ec..0000000000 --- a/debian/control +++ /dev/null @@ -1,19 +0,0 @@ -Source: openfoam170 -Section: optional -Priority: optional -Maintainer: OpenCFD Ltd. -Build-Depends: debhelper (>= 7), quilt -Standards-Version: 3.8.4 -Homepage: http://www.openfoam.com - -Package: openfoam170 -Architecture: any -Depends: csh,g++,${shlibs:Depends}, ${misc:Depends},binutils-dev,flex,libscotch-dev,libopenmpi-dev,libxt-dev,openmpi-bin -Description: OpenFOAM - OpenFOAM is a free, open source CFD software package produced by a - commercial company, OpenCFD Ltd. It has a large user base across - most areas of engineering and science, from both commercial and academic - organisations. OpenFOAM has an extensive range of features to solve - anything from complex fluid flows involving chemical reactions, turbulence - and heat transfer, to solid dynamics and electromagnetics. - diff --git a/debian/copyright b/debian/copyright deleted file mode 100644 index 32d2cc7ff8..0000000000 --- a/debian/copyright +++ /dev/null @@ -1,30 +0,0 @@ -This work was packaged for Debian by: - - OpenCFD Ltd. on Mon, 14 Jun 2010 16:50:46 +0100 - -Copyright: - - Copyright (C) 1991-2010 OpenCFD Ltd. - -License: - - This file is part of OpenFOAM. - - OpenFOAM is free software: you can redistribute it and/or modify it - under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - OpenFOAM is distributed in the hope that it will be useful, but WITHOUT - ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - for more details. - - You should have received a copy of the GNU General Public License - along with OpenFOAM. If not, see . - -The Debian packaging is: - - Copyright (C) 2010 OpenCFD Ltd. - - and is licensed under the GPL version 3 diff --git a/debian/docs b/debian/docs deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/debian/postinst b/debian/postinst deleted file mode 100755 index f4a492c84a..0000000000 --- a/debian/postinst +++ /dev/null @@ -1,48 +0,0 @@ -#!/bin/sh -# postinst script for OpenFOAM -# -# see: dh_installdeb(1) - -set -e - -# summary of how this script can be called: -# * `configure' -# * `abort-upgrade' -# * `abort-remove' `in-favour' -# -# * `abort-remove' -# * `abort-deconfigure' `in-favour' -# `removing' -# -# for details, see http://www.debian.org/doc/debian-policy/ or -# the debian-policy package - - -case "$1" in - configure) - #echo "** postinst called with $*" - echo "" - echo "** To use OpenFOAM please add" - echo "**" - echo "** . /opt/openfoam170/etc/bashrc" - echo "**" - echo "** To your ~/.bashrc" - echo "" - ;; - - abort-upgrade|abort-remove|abort-deconfigure) - ;; - - *) - echo "postinst called with unknown argument \`$1'" >&2 - exit 1 - ;; -esac - -# dh_installdeb will replace this with shell code automatically -# generated by other debhelper scripts. - -#DEBHELPER# - -exit 0 - diff --git a/debian/rules b/debian/rules deleted file mode 100755 index 9b678d8ad4..0000000000 --- a/debian/rules +++ /dev/null @@ -1,109 +0,0 @@ -#!/usr/bin/make -f -#-*- makefile -*- -# After debian/rules from less package - -include /usr/share/quilt/quilt.make - -# Uncomment this to turn on verbose mode. -export DH_VERBOSE=1 - -# This is the debhelper compatibility version to use. - -#DEB_BUILD_GNU_TYPE = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -#DEB_HOST_GNU_TYPE = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -#ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE)) -#CONFARGS= --host=$(DEB_HOST_GNU_TYPE) -#endif -# -#CFLAGS = -Wall -g #-D_LARGEFILE_SOURCE -D_FILE_OFFSET_BITS=64 -# -#ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) -#CFLAGS += -O0 -#else -#CFLAGS += -O2 -#endif - -DEB_BUILD_ARCH_BITS = $(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS) -foamArch= -ifeq ($(DEB_BUILD_ARCH_BITS),64) -foamArch=linux64GccDPOpt -else -foamArch=linuxGccDPOpt -endif - -packageName = $(shell dh_listpackages) -installDir = debian/$(packageName)/opt/$(packageName) -paraviewInstallDir = /opt/paraviewopenfoam380 - -DEB_DH_SHLIBDEPS_ARGS=-L$(installDir)/lib/$(foamArch) - -build: patch build-stamp -build-stamp: - dh_testdir - - # Add here commands to compile the package. - #./Allwmake - - touch build-stamp - -clean: unpatch - dh_testdir - dh_testroot - rm -f build-stamp - - # Add here commands to clean up after the build process. - #./Allwclean - #set - - dh_clean - -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - - # Install source files into debian/. - install -d $(installDir) - tar cf - `bin/foamSourceFiles .` | (cd $(installDir); tar xfp -) - (cd $(installDir); bin/tools/foamConfigurePaths --foamInstall /opt --projectName $(packageName) --paraviewInstall $(paraviewInstallDir) ) - - # Install binary files into debian/. - tar cf - `bin/foamBinDirs . $(foamArch)` | (cd $(installDir); tar xfp -) - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_installdebconf - dh_installdocs - dh_installexamples - dh_installmenu -# dh_installemacsen -# dh_installinit - dh_installmime - dh_installcron - #dh_installman debian/lesspipe.1 - #dh_undocumented - dh_installchangelogs - #dh_link - #dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb -# dh_perl - dh_shlibdeps -- --ignore-missing-info #We depend on vtk libs without info - dh_gencontrol - dh_md5sums - dh_builddeb - -source diff: - @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C index babb31b6e8..7df85dc6d5 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C +++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.C @@ -26,6 +26,7 @@ License #include "ZoneMesh.H" #include "entry.H" #include "demandDrivenData.H" +#include "stringListOps.H" // * * * * * * * * * * * * * Private Member Functions * * * * * * * * * * * // @@ -241,6 +242,66 @@ Foam::wordList Foam::ZoneMesh::names() const } +template +Foam::labelList Foam::ZoneMesh::findIndices +( + const keyType& key +) const +{ + labelList indices; + if (key.isPattern()) + { + indices = findStrings(key, this->names()); + } + else + { + indices.setSize(this->size()); + label nFound = 0; + forAll(*this, i) + { + if (key == operator[](i).name()) + { + indices[nFound++] = i; + } + } + indices.setSize(nFound); + } + + return indices; +} + + +template +Foam::label Foam::ZoneMesh::findIndex +( + const keyType& key +) const +{ + if (key.isPattern()) + { + labelList indices = this->findIndices(key); + // return first element + if (!indices.empty()) + { + return indices[0]; + } + } + else + { + forAll(*this, i) + { + if (key == operator[](i).name()) + { + return i; + } + } + } + + // not found + return -1; +} + + template Foam::label Foam::ZoneMesh::findZoneID ( @@ -265,7 +326,7 @@ Foam::label Foam::ZoneMesh::findZoneID << "List of available zone names: " << names() << endl; } - // A dummy return to keep the compiler happy + // not found return -1; } diff --git a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H index 03b9c216be..8854d9533b 100644 --- a/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H +++ b/src/OpenFOAM/meshes/polyMesh/zones/ZoneMesh/ZoneMesh.H @@ -121,8 +121,8 @@ public: // Return -1 if the object is not in the zone const Map