Extend deprecation date

framework/include/constraints/NodalConstraint.h

@@ -35,7 +35,7 @@ class NodalConstraint : public Constraint,
   std::vector<dof_id_type> & getMasterNodeId()
   {
     mooseDeprecated(
-        "'getPrimaryNodeId' is deprecated and will be removed on July 1st, 2020. Please "
+        "'getPrimaryNodeId' is deprecated and will be removed on September 1st, 2020. Please "
         "use 'getPrimaryNodeId' instead.");
     return _primary_node_vector;
   }
@@ -53,7 +53,7 @@ class NodalConstraint : public Constraint,
   std::vector<dof_id_type> & getSlaveNodeId()
   {
     mooseDeprecated(
-        "'getSecondaryNodeId' is deprecated and will be removed on July 1st, 2020. Please "
+        "'getSecondaryNodeId' is deprecated and will be removed on September 1st, 2020. Please "
         "use 'getSecondaryNodeId' instead.");
     return _connected_nodes;
   }

framework/src/constraints/EqualValueBoundaryConstraint.C

@@ -62,21 +62,23 @@ EqualValueBoundaryConstraint::validParams()
       "master",
       std::numeric_limits<unsigned int>::max(),
       "The ID of the primary node. If no ID is provided, first node of secondary set is chosen.",
-      "The 'master' param is deprecated and will be removed on July 1, 2020. Please use the "
+      "The 'master' param is deprecated and will be removed on September 1, 2020. Please use the "
       "'primary' parameter instead.");
   params.addParam<std::vector<unsigned int>>("secondary_node_ids", "The IDs of the secondary node");
   params.addParam<BoundaryName>(
       "secondary", "NaN", "The boundary ID associated with the secondary side");
   params.addDeprecatedParam<std::vector<unsigned int>>(
       "slave_node_ids",
       "The IDs of the slave node",
-      "The 'slave_node_ids' param is deprecated and will be removed on July 1, 2020. Please use "
+      "The 'slave_node_ids' param is deprecated and will be removed on September 1, 2020. Please "
+      "use "
       "the 'secondary_node_ids' param instead");
-  params.addDeprecatedParam<BoundaryName>("slave",
-                                          "NaN",
-                                          "The boundary ID associated with the slave side",
-                                          "The 'slave' param is deprecated and will be removed on "
-                                          "July 1, 2020. Please use the 'secondary' param instead");
+  params.addDeprecatedParam<BoundaryName>(
+      "slave",
+      "NaN",
+      "The boundary ID associated with the slave side",
+      "The 'slave' param is deprecated and will be removed on "
+      "September 1, 2020. Please use the 'secondary' param instead");
   params.addRequiredParam<Real>("penalty", "The penalty used for the boundary term");
   return params;
 }

framework/src/constraints/NodeFaceConstraint.C

@@ -28,14 +28,14 @@ NodeFaceConstraint::validParams()
   InputParameters params = Constraint::validParams();
   params.addParam<BoundaryName>("secondary", "The boundary ID associated with the secondary side");
   params.addParam<BoundaryName>("primary", "The boundary ID associated with the primary side");
-  params.addDeprecatedParam<BoundaryName>(
-      "slave",
-      "The boundary ID associated with the secondary side",
-      "This parameter is deprecated in favor of 'secondary' and will be removed on July 1st, 2020");
-  params.addDeprecatedParam<BoundaryName>(
-      "master",
-      "The boundary ID associated with the primary side",
-      "This parameter is deprecated in favor of 'primary' and will be removed on July 1st, 2020");
+  params.addDeprecatedParam<BoundaryName>("slave",
+                                          "The boundary ID associated with the secondary side",
+                                          "This parameter is deprecated in favor of 'secondary' "
+                                          "and will be removed on September 1st, 2020");
+  params.addDeprecatedParam<BoundaryName>("master",
+                                          "The boundary ID associated with the primary side",
+                                          "This parameter is deprecated in favor of 'primary' and "
+                                          "will be removed on September 1st, 2020");
   params.addParam<Real>("tangential_tolerance",
                         "Tangential distance to extend edges of contact surfaces");
   params.addParam<Real>(
@@ -47,9 +47,10 @@ NodeFaceConstraint::validParams()
 
   params.addCoupledVar("primary_variable", "The variable on the primary side of the domain");
   params.addDeprecatedCoupledVar("master_variable",
+                                 "primary_variable",
                                  "The variable on the primary side of the domain",
                                  "This parameter is deprecated in favor of 'primary_variable' and "
-                                 "will be removed on July 1st, 2020");
+                                 "will be removed on September 1st, 2020");
   params.addRequiredParam<NonlinearVariableName>(
       "variable", "The name of the variable that this constraint is applied to.");
 

modules/contact/src/actions/ContactAction.C

@@ -45,14 +45,16 @@ ContactAction::validParams()
 
   params.addParam<BoundaryName>("primary", "The primary surface");
   params.addParam<BoundaryName>("secondary", "The secondary surface");
-  params.addDeprecatedParam<BoundaryName>("master",
-                                          "The primary surface",
-                                          "The 'master' parameter will be removed on July 1, 2020. "
-                                          "Please use the 'primary' parameter instead.");
-  params.addDeprecatedParam<BoundaryName>("slave",
-                                          "The secondary surface",
-                                          "The 'slave' parameter will be removed on July 1, 2020. "
-                                          "Please use the 'secondary' parameter instead.");
+  params.addDeprecatedParam<BoundaryName>(
+      "master",
+      "The primary surface",
+      "The 'master' parameter will be removed on September 1, 2020. "
+      "Please use the 'primary' parameter instead.");
+  params.addDeprecatedParam<BoundaryName>(
+      "slave",
+      "The secondary surface",
+      "The 'slave' parameter will be removed on September 1, 2020. "
+      "Please use the 'secondary' parameter instead.");
 
   params.addParam<MeshGeneratorName>("mesh", "", "The mesh generator for mortar method");
 

modules/contact/src/constraints/MechanicalContactConstraint.C

@@ -36,11 +36,11 @@ MechanicalContactConstraint::validParams()
 
   params.addRequiredParam<BoundaryName>("boundary", "The primary boundary");
   params.addParam<BoundaryName>("secondary", "The secondary boundary");
-  params.addDeprecatedParam<BoundaryName>(
-      "slave",
-      "The secondary boundary",
-      "The 'slave' parameter is deprecated and will be removed on July 1, 2020. Please use the "
-      "'secondary' parameter instead");
+  params.addDeprecatedParam<BoundaryName>("slave",
+                                          "The secondary boundary",
+                                          "The 'slave' parameter is deprecated and will be removed "
+                                          "on September 1, 2020. Please use the "
+                                          "'secondary' parameter instead");
   params.addRequiredParam<unsigned int>("component",
                                         "An integer corresponding to the direction "
                                         "the variable this kernel acts in. (0 for x, "

modules/contact/src/dampers/ContactSlipDamper.C

@@ -27,13 +27,13 @@ ContactSlipDamper::validParams()
   params.addDeprecatedParam<std::vector<int>>(
       "master",
       "IDs of the primary surfaces for which slip reversals should be damped",
-      "The 'master' param is deprecated and will be removed on July 1, 2020. Please use the "
+      "The 'master' param is deprecated and will be removed on September 1, 2020. Please use the "
       "'primary' parameter instead.");
   params.addDeprecatedParam<std::vector<int>>(
       "slave",
       "IDs of the secondary surfaces for which slip reversals should be damped",
       "The 'slave' param is deprecated and will be removed on "
-      "July 1, 2020. Please use the 'secondary' param instead");
+      "September 1, 2020. Please use the 'secondary' param instead");
   params.addParam<Real>(
       "max_iterative_slip", std::numeric_limits<Real>::max(), "Maximum iterative slip");
   params.addRangeCheckedParam<Real>("min_damping_factor",

modules/heat_conduction/src/actions/ThermalContactAction.C

@@ -38,14 +38,16 @@ ThermalContactAction::validParams()
   params.addRequiredParam<NonlinearVariableName>("variable", "The variable for thermal contact");
   params.addParam<BoundaryName>("primary", "The primary surface");
   params.addParam<BoundaryName>("secondary", "The secondary surface");
-  params.addDeprecatedParam<BoundaryName>("master",
-                                          "The primary surface",
-                                          "The 'master' parameter will be removed on July 1, 2020. "
-                                          "Please use the 'primary' parameter instead.");
-  params.addDeprecatedParam<BoundaryName>("slave",
-                                          "The secondary surface",
-                                          "The 'slave' parameter will be removed on July 1, 2020. "
-                                          "Please use the 'secondary' parameter instead.");
+  params.addDeprecatedParam<BoundaryName>(
+      "master",
+      "The primary surface",
+      "The 'master' parameter will be removed on September 1, 2020. "
+      "Please use the 'primary' parameter instead.");
+  params.addDeprecatedParam<BoundaryName>(
+      "slave",
+      "The secondary surface",
+      "The 'slave' parameter will be removed on September 1, 2020. "
+      "Please use the 'secondary' parameter instead.");
   params.addRangeCheckedParam<Real>("tangential_tolerance",
                                     "tangential_tolerance>=0",
                                     "Tangential distance to extend edges of contact surfaces");

modules/heat_conduction/src/dirackernels/GapHeatPointSourceMaster.C

@@ -24,11 +24,11 @@ GapHeatPointSourceMaster::validParams()
   InputParameters params = DiracKernel::validParams();
   params.addParam<BoundaryName>("boundary", "The primary boundary");
   params.addParam<BoundaryName>("secondary", "The secondary boundary");
-  params.addDeprecatedParam<BoundaryName>(
-      "slave",
-      "The secondary boundary",
-      "The 'slave' parameter is deprecated and will be removed on July 1, 2020. Please use the "
-      "'secondary' parameter instead");
+  params.addDeprecatedParam<BoundaryName>("slave",
+                                          "The secondary boundary",
+                                          "The 'slave' parameter is deprecated and will be removed "
+                                          "on September 1, 2020. Please use the "
+                                          "'secondary' parameter instead");
   params.addParam<MooseEnum>("order", orders, "The finite element order");
   params.set<bool>("use_displaced_mesh") = true;
   params.addParam<Real>("tangential_tolerance",