Move tests (idaholab#5039)

dschwen · Jan 30, 2018 · b41e973 · b41e973
1 parent 1e7c1a8
commit b41e973
Show file tree

Hide file tree

Showing 12 changed files with 29 additions and 48 deletions.
diff --git a/framework/src/base/Moose.C b/framework/src/base/Moose.C
@@ -170,9 +170,12 @@
 #include "VectorPostprocessorFunction.h"
 
 // materials
+#include "DerivativeParsedMaterial.h"
+#include "DerivativeSumMaterial.h"
 #include "GenericConstantMaterial.h"
 #include "GenericConstantRankTwoTensor.h"
 #include "GenericFunctionMaterial.h"
+#include "ParsedMaterial.h"
 #include "PiecewiseLinearInterpolationMaterial.h"
 
 // PPS
@@ -657,9 +660,12 @@ registerObjects(Factory & factory)
   registerFunction(VectorPostprocessorFunction);
 
   // materials
+  registerMaterial(DerivativeParsedMaterial);
+  registerMaterial(DerivativeSumMaterial);
   registerMaterial(GenericConstantMaterial);
   registerMaterial(GenericConstantRankTwoTensor);
   registerMaterial(GenericFunctionMaterial);
+  registerMaterial(ParsedMaterial);
   registerMaterial(PiecewiseLinearInterpolationMaterial);
 
   // PPS

diff --git a/modules/phase_field/src/base/PhaseFieldApp.C b/modules/phase_field/src/base/PhaseFieldApp.C
@@ -139,8 +139,6 @@
 #include "CrossTermBarrierFunctionMaterial.h"
 #include "DeformedGrainMaterial.h"
 #include "DerivativeMultiPhaseMaterial.h"
-#include "DerivativeParsedMaterial.h"
-#include "DerivativeSumMaterial.h"
 #include "DerivativeTwoPhaseMaterial.h"
 #include "DiscreteNucleation.h"
 #include "ElasticEnergyMaterial.h"
@@ -159,7 +157,6 @@
 #include "MathFreeEnergy.h"
 #include "MixedSwitchingFunctionMaterial.h"
 #include "MultiBarrierFunctionMaterial.h"
-#include "ParsedMaterial.h"
 #include "PFCRFFMaterial.h"
 #include "PFCTradMaterial.h"
 #include "PFFracBulkRateMaterial.h"
@@ -439,8 +436,6 @@ PhaseFieldApp::registerObjects(Factory & factory)
   registerMaterial(CrossTermBarrierFunctionMaterial);
   registerMaterial(DeformedGrainMaterial);
   registerMaterial(DerivativeMultiPhaseMaterial);
-  registerMaterial(DerivativeParsedMaterial);
-  registerMaterial(DerivativeSumMaterial);
   registerMaterial(DerivativeTwoPhaseMaterial);
   registerMaterial(DiscreteNucleation);
   registerMaterial(ElasticEnergyMaterial);
@@ -459,7 +454,6 @@ PhaseFieldApp::registerObjects(Factory & factory)
   registerMaterial(MathFreeEnergy);
   registerMaterial(MixedSwitchingFunctionMaterial);
   registerMaterial(MultiBarrierFunctionMaterial);
-  registerMaterial(ParsedMaterial);
   registerMaterial(PFCRFFMaterial);
   registerMaterial(PFCTradMaterial);
   registerMaterial(PFFracBulkRateMaterial);

diff --git a/modules/phase_field/test/tests/phase_field_kernels/gold/ConstructionOrder_out.e b/modules/phase_field/test/tests/phase_field_kernels/gold/ConstructionOrder_out.e
diff --git a/modules/phase_field/test/tests/phase_field_kernels/gold/ParsedMaterial_out.e b/modules/phase_field/test/tests/phase_field_kernels/gold/ParsedMaterial_out.e
diff --git a/modules/phase_field/test/tests/phase_field_kernels/tests b/modules/phase_field/test/tests/phase_field_kernels/tests
@@ -1,10 +1,4 @@
 [Tests]
-  [./matproptest]
-    type = CSVDiff
-    input = 'matproptest.i'
-    csvdiff = 'matproptest_out.csv'
-  [../]
-
   [./CahnHilliard]
     type = 'Exodiff'
     input = 'CahnHilliard.i'
@@ -50,17 +44,6 @@
     #skip = 'see #3847'
   [../]
 
-  [./ParsedMaterial]
-    type = 'Exodiff'
-    input = 'ParsedMaterial.i'
-    exodiff = 'ParsedMaterial_out.e'
-  [../]
-  [./ConstructionOrder]
-    type = 'Exodiff'
-    input = 'ConstructionOrder.i'
-    exodiff = 'ConstructionOrder_out.e'
-  [../]
-
   [./SimpleSplitCHWRes]
     type = 'Exodiff'
     input = 'SimpleSplitCHWRes.i'

diff --git a/...s/phase_field_kernels/ConstructionOrder.i → ...sts/materials/parsed/construction_order.i b/...s/phase_field_kernels/ConstructionOrder.i → ...sts/materials/parsed/construction_order.i
@@ -22,16 +22,9 @@
 
 [Variables]
   [./c]
-    order = FIRST
-    family = LAGRANGE
     [./InitialCondition]
-      type = SmoothCircleIC
-      x1 = 0.0
-      y1 = 0.0
-      radius = 0.5
-      invalue = 1.0
-      outvalue = 0.0
-      int_width = 1.0
+      type = FunctionIC
+      function = x
     [../]
   [../]
 []

diff --git a/test/tests/materials/parsed/gold/construction_order_out.e b/test/tests/materials/parsed/gold/construction_order_out.e
diff --git a/...se_field_kernels/gold/matproptest_out.csv → ...als/parsed/gold/material_chaining_out.csv b/...se_field_kernels/gold/matproptest_out.csv → ...als/parsed/gold/material_chaining_out.csv
diff --git a/test/tests/materials/parsed/gold/parsed_material_out.e b/test/tests/materials/parsed/gold/parsed_material_out.e
diff --git a/...t/tests/phase_field_kernels/matproptest.i → ...ests/materials/parsed/material_chaining.i b/...t/tests/phase_field_kernels/matproptest.i → ...ests/materials/parsed/material_chaining.i
diff --git a/...ests/phase_field_kernels/ParsedMaterial.i → .../tests/materials/parsed/parsed_material.i b/...ests/phase_field_kernels/ParsedMaterial.i → .../tests/materials/parsed/parsed_material.i
@@ -4,31 +4,19 @@
 
 [Mesh]
   type = GeneratedMesh
-  dim = 2
+  dim = 1
   nx = 10
-  ny = 10
-  nz = 0
   xmin = 0
-  xmax = 50
-  ymin = 0
-  ymax = 50
-  zmin = 0
-  zmax = 50
-  elem_type = QUAD4
+  xmax = 1
 []
 
 [AuxVariables]
   [./eta]
     order = FIRST
     family = LAGRANGE
     [./InitialCondition]
-      type = SmoothCircleIC
-      x1 = 25.0
-      y1 = 25.0
-      radius = 15.0
-      invalue = 1.0
-      outvalue = 0.0
-      int_width = 20.0
+      type = FunctionIC
+      function = x
     [../]
   [../]
 []

diff --git a/test/tests/materials/parsed/tests b/test/tests/materials/parsed/tests
@@ -0,0 +1,17 @@
+[Tests]
+  [./material_chaining]
+    type = CSVDiff
+    input = 'material_chaining.i'
+    csvdiff = 'material_chaining_out.csv'
+  [../]
+  [./parsed_material]
+    type = 'Exodiff'
+    input = 'parsed_material.i'
+    exodiff = 'parsed_material_out.e'
+  [../]
+    [./construction_order]
+    type = 'Exodiff'
+    input = 'construction_order.i'
+    exodiff = 'construction_order_out.e'
+  [../]
+[]