From 44d0fbd594a94aefb7ae2eafcc3ea99f0364ab3e Mon Sep 17 00:00:00 2001
From: Henry <Henry>
Date: Thu, 11 Aug 2011 21:56:55 +0100
Subject: [PATCH] fvsPatchFields: Added "value" entry to all types and check on
read
---
.../basic/calculated/calculatedFvsPatchField.C | 11 -----------
.../basic/calculated/calculatedFvsPatchField.H | 4 ----
.../basic/coupled/coupledFvsPatchField.C | 10 ----------
.../basic/coupled/coupledFvsPatchField.H | 4 ----
.../basic/fixedValue/fixedValueFvsPatchField.C | 8 --------
.../basic/fixedValue/fixedValueFvsPatchField.H | 4 ----
.../basic/sliced/slicedFvsPatchField.C | 10 ----------
.../basic/sliced/slicedFvsPatchField.H | 4 ----
.../constraint/cyclic/cyclicFvsPatchField.C | 2 +-
.../fvsPatchFields/fvsPatchField/fvsPatchField.C | 13 ++++++++++++-
10 files changed, 13 insertions(+), 57 deletions(-)
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
index a43a8e934cd..1cbff3f0f46 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.C
@@ -128,17 +128,6 @@ tmp<fvsPatchField<Type> > fvsPatchField<Type>::NewCalculatedType
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-// Write
-template<class Type>
-void calculatedFvsPatchField<Type>::write(Ostream& os) const
-{
- fvsPatchField<Type>::write(os);
- this->writeEntry("value", os);
-}
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
index 2fc126b1141..c5a2dd5d73e 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/calculated/calculatedFvsPatchField.H
@@ -130,10 +130,6 @@ public:
{
return true;
}
-
-
- //- Write
- virtual void write(Ostream&) const;
};
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C
index 5c6ad21b6da..7ee66d7f3b3 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.C
@@ -101,16 +101,6 @@ coupledFvsPatchField<Type>::coupledFvsPatchField
{}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-template<class Type>
-void coupledFvsPatchField<Type>::write(Ostream& os) const
-{
- fvsPatchField<Type>::write(os);
- this->writeEntry("value", os);
-}
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H
index b35ae72cb06..f0dc4bfe1dc 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/coupled/coupledFvsPatchField.H
@@ -126,10 +126,6 @@ public:
{
return true;
}
-
-
- //- Write
- virtual void write(Ostream&) const;
};
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
index 98011d7a491..8d2c4ce52c4 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.C
@@ -128,14 +128,6 @@ tmp<Field<Type> > fixedValueFvsPatchField<Type>::gradientBoundaryCoeffs() const
}
-template<class Type>
-void fixedValueFvsPatchField<Type>::write(Ostream& os) const
-{
- fvsPatchField<Type>::write(os);
- this->writeEntry("value", os);
-}
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
index 31a3655d20c..691201ce49c 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/fixedValue/fixedValueFvsPatchField.H
@@ -158,10 +158,6 @@ public:
virtual tmp<Field<Type> > gradientBoundaryCoeffs() const;
- //- Write
- virtual void write(Ostream&) const;
-
-
// Member operators
virtual void operator=(const UList<Type>&) {}
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
index 83663319ef7..32dfb59d3c7 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.C
@@ -159,16 +159,6 @@ slicedFvsPatchField<Type>::~slicedFvsPatchField<Type>()
}
-// * * * * * * * * * * * * * * * Member Functions * * * * * * * * * * * * * //
-
-template<class Type>
-void slicedFvsPatchField<Type>::write(Ostream& os) const
-{
- fvsPatchField<Type>::write(os);
- this->writeEntry("value", os);
-}
-
-
// * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
} // End namespace Foam
diff --git a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
index 76e6c4e87ae..b32c9c0d531 100644
--- a/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
+++ b/src/finiteVolume/fields/fvsPatchFields/basic/sliced/slicedFvsPatchField.H
@@ -136,10 +136,6 @@ public:
}
- //- Write
- virtual void write(Ostream&) const;
-
-
// Member operators
virtual void operator=(const UList<Type>&) {}
diff --git a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
index 01849b8f1b0..4d0b4a08a7d 100644
--- a/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/constraint/cyclic/cyclicFvsPatchField.C
@@ -94,7 +94,7 @@ cyclicFvsPatchField<Type>::cyclicFvsPatchField
"cyclicFvsPatchField<Type>::cyclicFvsPatchField\n"
"(\n"
" const fvPatch& p,\n"
- " const Field<Type>& field,\n"
+ " const DimensionedField<Type, surfaceMesh>& iF,\n"
" const dictionary& dict\n"
")\n",
dict
diff --git a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
index 55c5e6b33de..36d459271ec 100644
--- a/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
+++ b/src/finiteVolume/fields/fvsPatchFields/fvsPatchField/fvsPatchField.C
@@ -98,7 +98,17 @@ fvsPatchField<Type>::fvsPatchField
}
else
{
- fvsPatchField<Type>::operator=(pTraits<Type>::zero);
+ FatalIOErrorIn
+ (
+ "fvsPatchField<Type>::fvsPatchField\n"
+ "(\n"
+ " const fvPatch& p,\n"
+ " const DimensionedField<Type, surfaceMesh>& iF,\n"
+ " const dictionary& dict\n"
+ ")\n",
+ dict
+ ) << "essential value entry not provided"
+ << exit(FatalIOError);
}
}
@@ -177,6 +187,7 @@ template<class Type>
void fvsPatchField<Type>::write(Ostream& os) const
{
os.writeKeyword("type") << type() << token::END_STATEMENT << nl;
+ this->writeEntry("value", os);
}
--
GitLab