diff --git a/src/fieldSources/Make/files b/src/fvOptions/Make/files
similarity index 98%
rename from src/fieldSources/Make/files
rename to src/fvOptions/Make/files
index e4d2baa6a34e5d808341747887e3104810292533..d6c2e970a5ebe7393e7f251f0583d2a8ad7057af 100644
--- a/src/fieldSources/Make/files
+++ b/src/fvOptions/Make/files
@@ -45,4 +45,4 @@ $(derivedConstraints)/fixedTemperatureConstraint/fixedTemperatureConstraint.C
$(derivedConstraints)/temperatureLimitsConstraint/temperatureLimitsConstraint.C
-LIB = $(FOAM_LIBBIN)/libfieldSources
+LIB = $(FOAM_LIBBIN)/libfvOptions
diff --git a/src/fieldSources/Make/options b/src/fvOptions/Make/options
similarity index 100%
rename from src/fieldSources/Make/options
rename to src/fvOptions/Make/options
diff --git a/src/fieldSources/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
similarity index 100%
rename from src/fieldSources/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
rename to src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.C
diff --git a/src/fieldSources/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H b/src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
similarity index 100%
rename from src/fieldSources/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
rename to src/fvOptions/constraints/derived/fixedTemperatureConstraint/fixedTemperatureConstraint.H
diff --git a/src/fieldSources/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C
similarity index 100%
rename from src/fieldSources/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C
rename to src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.C
diff --git a/src/fieldSources/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H b/src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H
similarity index 100%
rename from src/fieldSources/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H
rename to src/fvOptions/constraints/derived/temperatureLimitsConstraint/temperatureLimitsConstraint.H
diff --git a/src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValue.C b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.C
similarity index 100%
rename from src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValue.C
rename to src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.C
diff --git a/src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValue.H b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H
similarity index 100%
rename from src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValue.H
rename to src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValue.H
diff --git a/src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValueIO.C b/src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C
similarity index 100%
rename from src/fieldSources/constraints/general/explicitSetValue/ExplicitSetValueIO.C
rename to src/fvOptions/constraints/general/explicitSetValue/ExplicitSetValueIO.C
diff --git a/src/fieldSources/constraints/general/explicitSetValue/explicitSetValue.C b/src/fvOptions/constraints/general/explicitSetValue/explicitSetValue.C
similarity index 100%
rename from src/fieldSources/constraints/general/explicitSetValue/explicitSetValue.C
rename to src/fvOptions/constraints/general/explicitSetValue/explicitSetValue.C
diff --git a/src/fieldSources/fvOptions/fvIOoptionList.C b/src/fvOptions/fvOptions/fvIOoptionList.C
similarity index 100%
rename from src/fieldSources/fvOptions/fvIOoptionList.C
rename to src/fvOptions/fvOptions/fvIOoptionList.C
diff --git a/src/fieldSources/fvOptions/fvIOoptionList.H b/src/fvOptions/fvOptions/fvIOoptionList.H
similarity index 100%
rename from src/fieldSources/fvOptions/fvIOoptionList.H
rename to src/fvOptions/fvOptions/fvIOoptionList.H
diff --git a/src/fieldSources/fvOptions/fvOption.C b/src/fvOptions/fvOptions/fvOption.C
similarity index 100%
rename from src/fieldSources/fvOptions/fvOption.C
rename to src/fvOptions/fvOptions/fvOption.C
diff --git a/src/fieldSources/fvOptions/fvOption.H b/src/fvOptions/fvOptions/fvOption.H
similarity index 100%
rename from src/fieldSources/fvOptions/fvOption.H
rename to src/fvOptions/fvOptions/fvOption.H
diff --git a/src/fieldSources/fvOptions/fvOptionI.H b/src/fvOptions/fvOptions/fvOptionI.H
similarity index 100%
rename from src/fieldSources/fvOptions/fvOptionI.H
rename to src/fvOptions/fvOptions/fvOptionI.H
diff --git a/src/fieldSources/fvOptions/fvOptionIO.C b/src/fvOptions/fvOptions/fvOptionIO.C
similarity index 100%
rename from src/fieldSources/fvOptions/fvOptionIO.C
rename to src/fvOptions/fvOptions/fvOptionIO.C
diff --git a/src/fieldSources/fvOptions/fvOptionList.C b/src/fvOptions/fvOptions/fvOptionList.C
similarity index 100%
rename from src/fieldSources/fvOptions/fvOptionList.C
rename to src/fvOptions/fvOptions/fvOptionList.C
diff --git a/src/fieldSources/fvOptions/fvOptionList.H b/src/fvOptions/fvOptions/fvOptionList.H
similarity index 100%
rename from src/fieldSources/fvOptions/fvOptionList.H
rename to src/fvOptions/fvOptions/fvOptionList.H
diff --git a/src/fieldSources/fvOptions/fvOptionListTemplates.C b/src/fvOptions/fvOptions/fvOptionListTemplates.C
similarity index 100%
rename from src/fieldSources/fvOptions/fvOptionListTemplates.C
rename to src/fvOptions/fvOptions/fvOptionListTemplates.C
diff --git a/src/fieldSources/fvOptions/makeFvOption.H b/src/fvOptions/fvOptions/makeFvOption.H
similarity index 100%
rename from src/fieldSources/fvOptions/makeFvOption.H
rename to src/fvOptions/fvOptions/makeFvOption.H
diff --git a/src/fieldSources/include/createFvOptions.H b/src/fvOptions/include/createFvOptions.H
similarity index 100%
rename from src/fieldSources/include/createFvOptions.H
rename to src/fvOptions/include/createFvOptions.H
diff --git a/src/fieldSources/sources/derived/MRFSource/MRFSource.C b/src/fvOptions/sources/derived/MRFSource/MRFSource.C
similarity index 100%
rename from src/fieldSources/sources/derived/MRFSource/MRFSource.C
rename to src/fvOptions/sources/derived/MRFSource/MRFSource.C
diff --git a/src/fieldSources/sources/derived/MRFSource/MRFSource.H b/src/fvOptions/sources/derived/MRFSource/MRFSource.H
similarity index 100%
rename from src/fieldSources/sources/derived/MRFSource/MRFSource.H
rename to src/fvOptions/sources/derived/MRFSource/MRFSource.H
diff --git a/src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSource.C b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
similarity index 100%
rename from src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSource.C
rename to src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.C
diff --git a/src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSource.H b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
similarity index 100%
rename from src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSource.H
rename to src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSource.H
diff --git a/src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C b/src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
similarity index 100%
rename from src/fieldSources/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
rename to src/fvOptions/sources/derived/actuationDiskSource/actuationDiskSourceTemplates.C
diff --git a/src/fieldSources/sources/derived/explicitPorositySource/explicitPorositySource.C b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
similarity index 100%
rename from src/fieldSources/sources/derived/explicitPorositySource/explicitPorositySource.C
rename to src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.C
diff --git a/src/fieldSources/sources/derived/explicitPorositySource/explicitPorositySource.H b/src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
similarity index 100%
rename from src/fieldSources/sources/derived/explicitPorositySource/explicitPorositySource.H
rename to src/fvOptions/sources/derived/explicitPorositySource/explicitPorositySource.H
diff --git a/src/fieldSources/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C b/src/fvOptions/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C
similarity index 100%
rename from src/fieldSources/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C
rename to src/fvOptions/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.C
diff --git a/src/fieldSources/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H b/src/fvOptions/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H
similarity index 100%
rename from src/fieldSources/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H
rename to src/fvOptions/sources/derived/interRegionHeatTransferModel/constantHeatTransfer/constantHeatTransfer.H
diff --git a/src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C b/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
similarity index 100%
rename from src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
rename to src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.C
diff --git a/src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H b/src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H
similarity index 100%
rename from src/fieldSources/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H
rename to src/fvOptions/sources/derived/interRegionHeatTransferModel/interRegionHeatTransferModel/interRegionHeatTransferModel.H
diff --git a/src/fieldSources/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C b/src/fvOptions/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C
similarity index 100%
rename from src/fieldSources/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C
rename to src/fvOptions/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.C
diff --git a/src/fieldSources/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H b/src/fvOptions/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H
similarity index 100%
rename from src/fieldSources/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H
rename to src/fvOptions/sources/derived/interRegionHeatTransferModel/tabulatedHeatTransfer/tabulatedHeatTransfer.H
diff --git a/src/fieldSources/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C b/src/fvOptions/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
similarity index 100%
rename from src/fieldSources/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
rename to src/fvOptions/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.C
diff --git a/src/fieldSources/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H b/src/fvOptions/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H
similarity index 100%
rename from src/fieldSources/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H
rename to src/fvOptions/sources/derived/interRegionHeatTransferModel/variableHeatTransfer/variableHeatTransfer.H
diff --git a/src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
similarity index 100%
rename from src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
rename to src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.C
diff --git a/src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
similarity index 100%
rename from src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
rename to src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSource.H
diff --git a/src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C b/src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
similarity index 100%
rename from src/fieldSources/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
rename to src/fvOptions/sources/derived/pressureGradientExplicitSource/pressureGradientExplicitSourceIO.C
diff --git a/src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C
similarity index 100%
rename from src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C
rename to src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.C
diff --git a/src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
similarity index 100%
rename from src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
rename to src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSource.H
diff --git a/src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C b/src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
similarity index 100%
rename from src/fieldSources/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
rename to src/fvOptions/sources/derived/radialActuationDiskSource/radialActuationDiskSourceTemplates.C
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/bladeModel/bladeModel.C b/src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
similarity index 98%
rename from src/fieldSources/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
rename to src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
index af12f6b0ce2117e43de7b5cc9769d873b0ad0761..490e8f49511e306200471246e4c39974d3390fda 100644
--- a/src/fieldSources/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/bladeModel/bladeModel.H b/src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.H
similarity index 98%
rename from src/fieldSources/sources/derived/rotorDiskSource/bladeModel/bladeModel.H
rename to src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.H
index dcb3d5dd213433c575c49cb31a76bbf517953a2c..0dc28c6036a63b084678c009dca1eb444d7efe4e 100644
--- a/src/fieldSources/sources/derived/rotorDiskSource/bladeModel/bladeModel.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/bladeModel/bladeModel.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
similarity index 98%
rename from src/fieldSources/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
rename to src/fvOptions/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
index 93e54bc8efe5e636e80bc237c7180783e330fb6d..1719768a0b54a0757a6cbb9203b2c82d78252fab 100644
--- a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H
similarity index 98%
rename from src/fieldSources/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H
rename to src/fvOptions/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H
index bee45e4f22c7645328b8b7425e3e61fa92124a23..71d89d30e658928883b133d8a9297495684b7f55 100644
--- a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/lookup/lookupProfile.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModel.C b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C
similarity index 97%
rename from src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModel.C
rename to src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C
index edb509b9cdf5d8bc5276343644f414d723c1bdef..b70c677423b0935fc07d4dc98e5d6d3bfdae54bd 100644
--- a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModel.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModel.H b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.H
similarity index 100%
rename from src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModel.H
rename to src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModel.H
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModelList.C b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModelList.C
similarity index 98%
rename from src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModelList.C
rename to src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModelList.C
index e1c3dffb2d34ebb9f53e2caaccf0378703b050b6..7b7a2bed5da39bdfb32d0f78d791c4e60b846b99 100644
--- a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModelList.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModelList.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModelList.H b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModelList.H
similarity index 97%
rename from src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModelList.H
rename to src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModelList.H
index ff794b2be2d35e48f88790ccbc4c2506329aaace..a6e1cd91179737868386064b171cf93fd78b0d2e 100644
--- a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/profileModelList.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/profileModelList.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.C b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
similarity index 98%
rename from src/fieldSources/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
rename to src/fvOptions/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
index 5c8a20c108d02e5b79e2ff97ab9668651cb4cd6c..56750e8d86d965cf53ce4ac1feee77d4a5de0af2 100644
--- a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
+++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.C
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.H b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.H
similarity index 98%
rename from src/fieldSources/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.H
rename to src/fvOptions/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.H
index 5e2611d6c3a0503683e916f326a591333f2f2786..9af303017ae085317c02e3c2855512f2e148b134 100644
--- a/src/fieldSources/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.H
+++ b/src/fvOptions/sources/derived/rotorDiskSource/profileModel/series/seriesProfile.H
@@ -2,7 +2,7 @@
========= |
\\ / F ield | OpenFOAM: The Open Source CFD Toolbox
\\ / O peration |
- \\ / A nd | Copyright (C) 2011-2012 OpenFOAM Foundation
+ \\ / A nd | Copyright (C) 2011-2013 OpenFOAM Foundation
\\/ M anipulation |
-------------------------------------------------------------------------------
License
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSource.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
similarity index 100%
rename from src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSource.C
rename to src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.C
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSource.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
similarity index 100%
rename from src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSource.H
rename to src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSource.H
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSourceI.H b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceI.H
similarity index 100%
rename from src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSourceI.H
rename to src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceI.H
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C b/src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
similarity index 100%
rename from src/fieldSources/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
rename to src/fvOptions/sources/derived/rotorDiskSource/rotorDiskSourceTemplates.C
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C
similarity index 100%
rename from src/fieldSources/sources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C
rename to src/fvOptions/sources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.C
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H
similarity index 100%
rename from src/fieldSources/sources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H
rename to src/fvOptions/sources/derived/rotorDiskSource/trimModel/fixed/fixedTrim.H
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
similarity index 100%
rename from src/fieldSources/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
rename to src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.C
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H
similarity index 100%
rename from src/fieldSources/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H
rename to src/fvOptions/sources/derived/rotorDiskSource/trimModel/targetCoeff/targetCoeffTrim.H
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/trimModel/trimModel/trimModel.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModel.C
similarity index 100%
rename from src/fieldSources/sources/derived/rotorDiskSource/trimModel/trimModel/trimModel.C
rename to src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModel.C
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/trimModel/trimModel/trimModel.H b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModel.H
similarity index 100%
rename from src/fieldSources/sources/derived/rotorDiskSource/trimModel/trimModel/trimModel.H
rename to src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModel.H
diff --git a/src/fieldSources/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C b/src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
similarity index 100%
rename from src/fieldSources/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
rename to src/fvOptions/sources/derived/rotorDiskSource/trimModel/trimModel/trimModelNew.C
diff --git a/src/fieldSources/sources/general/codedSource/CodedSource.C b/src/fvOptions/sources/general/codedSource/CodedSource.C
similarity index 100%
rename from src/fieldSources/sources/general/codedSource/CodedSource.C
rename to src/fvOptions/sources/general/codedSource/CodedSource.C
diff --git a/src/fieldSources/sources/general/codedSource/CodedSource.H b/src/fvOptions/sources/general/codedSource/CodedSource.H
similarity index 100%
rename from src/fieldSources/sources/general/codedSource/CodedSource.H
rename to src/fvOptions/sources/general/codedSource/CodedSource.H
diff --git a/src/fieldSources/sources/general/codedSource/CodedSourceIO.C b/src/fvOptions/sources/general/codedSource/CodedSourceIO.C
similarity index 100%
rename from src/fieldSources/sources/general/codedSource/CodedSourceIO.C
rename to src/fvOptions/sources/general/codedSource/CodedSourceIO.C
diff --git a/src/fieldSources/sources/general/codedSource/codedSource.C b/src/fvOptions/sources/general/codedSource/codedSource.C
similarity index 100%
rename from src/fieldSources/sources/general/codedSource/codedSource.C
rename to src/fvOptions/sources/general/codedSource/codedSource.C
diff --git a/src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
similarity index 100%
rename from src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSource.C
rename to src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.C
diff --git a/src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSource.H b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
similarity index 100%
rename from src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSource.H
rename to src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSource.H
diff --git a/src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSourceI.H b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceI.H
similarity index 100%
rename from src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSourceI.H
rename to src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceI.H
diff --git a/src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSourceIO.C b/src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C
similarity index 100%
rename from src/fieldSources/sources/general/semiImplicitSource/SemiImplicitSourceIO.C
rename to src/fvOptions/sources/general/semiImplicitSource/SemiImplicitSourceIO.C
diff --git a/src/fieldSources/sources/general/semiImplicitSource/semiImplicitSource.C b/src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.C
similarity index 100%
rename from src/fieldSources/sources/general/semiImplicitSource/semiImplicitSource.C
rename to src/fvOptions/sources/general/semiImplicitSource/semiImplicitSource.C