From e0500fb28d90cfa50672939baffedc06142a80a6 Mon Sep 17 00:00:00 2001 From: Alex Lindsay Date: Tue, 8 Jan 2019 15:16:57 -0700 Subject: [PATCH] Organize input files --- .../2nd-order-2d-jacobian-tester.i | 0 .../2nd-order-jacobian-tester.i | 0 .../kc_jacobian_tester.i | 0 test/tests/kc/{ => jacobian-testing}/tests | 0 .../cold-no-surface-tension.i | 0 .../hot-no-surface-tension.i | 0 .../2d-one-spot-scaled-1st-order.i} | 56 +-- .../2d-one-spot-scaled-2nd-order.i | 448 ++++++++++++++++++ .../2d-one-spot-unscaled-2nd-order.i | 440 +++++++++++++++++ .../3d-one-spot-unscaled-1st-order.i} | 0 .../cold-start-twice-around-circle.i | 0 .../surface-tension}/hot-once-around-circle.i | 0 test/tests/kc/{ => profiling}/kc-profiling.i | 0 13 files changed, 902 insertions(+), 42 deletions(-) rename test/tests/kc/{ => jacobian-testing}/2nd-order-2d-jacobian-tester.i (100%) rename test/tests/kc/{ => jacobian-testing}/2nd-order-jacobian-tester.i (100%) rename test/tests/kc/{ => jacobian-testing}/kc_jacobian_tester.i (100%) rename test/tests/kc/{ => jacobian-testing}/tests (100%) rename test/tests/kc/{ => physics/no-surface-tension}/cold-no-surface-tension.i (100%) rename test/tests/kc/{ => physics/no-surface-tension}/hot-no-surface-tension.i (100%) rename test/tests/kc/{condition-number-testing.i => physics/surface-tension/2d-one-spot-scaled-1st-order.i} (88%) create mode 100644 test/tests/kc/physics/surface-tension/2d-one-spot-scaled-2nd-order.i create mode 100644 test/tests/kc/physics/surface-tension/2d-one-spot-unscaled-2nd-order.i rename test/tests/kc/{one-spot.i => physics/surface-tension/3d-one-spot-unscaled-1st-order.i} (100%) rename test/tests/kc/{ => physics/surface-tension}/cold-start-twice-around-circle.i (100%) rename test/tests/kc/{ => physics/surface-tension}/hot-once-around-circle.i (100%) rename test/tests/kc/{ => profiling}/kc-profiling.i (100%) diff --git a/test/tests/kc/2nd-order-2d-jacobian-tester.i b/test/tests/kc/jacobian-testing/2nd-order-2d-jacobian-tester.i similarity index 100% rename from test/tests/kc/2nd-order-2d-jacobian-tester.i rename to test/tests/kc/jacobian-testing/2nd-order-2d-jacobian-tester.i diff --git a/test/tests/kc/2nd-order-jacobian-tester.i b/test/tests/kc/jacobian-testing/2nd-order-jacobian-tester.i similarity index 100% rename from test/tests/kc/2nd-order-jacobian-tester.i rename to test/tests/kc/jacobian-testing/2nd-order-jacobian-tester.i diff --git a/test/tests/kc/kc_jacobian_tester.i b/test/tests/kc/jacobian-testing/kc_jacobian_tester.i similarity index 100% rename from test/tests/kc/kc_jacobian_tester.i rename to test/tests/kc/jacobian-testing/kc_jacobian_tester.i diff --git a/test/tests/kc/tests b/test/tests/kc/jacobian-testing/tests similarity index 100% rename from test/tests/kc/tests rename to test/tests/kc/jacobian-testing/tests diff --git a/test/tests/kc/cold-no-surface-tension.i b/test/tests/kc/physics/no-surface-tension/cold-no-surface-tension.i similarity index 100% rename from test/tests/kc/cold-no-surface-tension.i rename to test/tests/kc/physics/no-surface-tension/cold-no-surface-tension.i diff --git a/test/tests/kc/hot-no-surface-tension.i b/test/tests/kc/physics/no-surface-tension/hot-no-surface-tension.i similarity index 100% rename from test/tests/kc/hot-no-surface-tension.i rename to test/tests/kc/physics/no-surface-tension/hot-no-surface-tension.i diff --git a/test/tests/kc/condition-number-testing.i b/test/tests/kc/physics/surface-tension/2d-one-spot-scaled-1st-order.i similarity index 88% rename from test/tests/kc/condition-number-testing.i rename to test/tests/kc/physics/surface-tension/2d-one-spot-scaled-1st-order.i index 713c3ea3..42abfbc0 100644 --- a/test/tests/kc/condition-number-testing.i +++ b/test/tests/kc/physics/surface-tension/2d-one-spot-scaled-1st-order.i @@ -1,17 +1,19 @@ endtime=500 timestep=.5 surfacetemp=.3 +bottomtemp=.3 pooldepth=2 [GlobalParams] gravity = '0 0 0' pspg = true - supg = true + # supg = true laplace = true integrate_p_by_parts = true convective_term = true transient_term = true temperature = T + order = FIRST [] [Mesh] @@ -24,22 +26,15 @@ pooldepth=2 nx = 4 ny = 1 displacements = 'disp_x disp_y' - elem_type = QUAD9 - uniform_refine = 1 + uniform_refine = 4 [] [Problem] kernel_coverage_check = false [] -[AuxVariables] - [./random] - [../] -[] - [Variables] [./vel_x] - order = SECOND [./InitialCondition] type = ConstantIC value = 1e-15 @@ -47,7 +42,6 @@ pooldepth=2 [../] [./vel_y] - order = SECOND [./InitialCondition] type = ConstantIC value = 1e-15 @@ -55,17 +49,14 @@ pooldepth=2 [../] [./T] - order = SECOND [../] [./p] - # order = SECOND + order = FIRST [../] [./disp_x] - order = SECOND [../] [./disp_y] - order = SECOND [../] [] @@ -73,11 +64,7 @@ pooldepth=2 [./T] type = FunctionIC variable = T - function = '(${surfacetemp} - .3) / ${pooldepth} * z + ${surfacetemp}' - [../] - [./random] - type = RandomIC - variable = random + function = '(${surfacetemp} - ${bottomtemp}) / ${pooldepth} * z + ${surfacetemp}' [../] [] @@ -210,7 +197,7 @@ pooldepth=2 type = DirichletBC variable = T boundary = 'bottom' - value = .3 + value = ${bottomtemp} [../] [] @@ -219,7 +206,7 @@ pooldepth=2 type = RadiationEnergyFluxBC variable = T boundary = 'top' - ff_temp = .3 + ff_temp = ${bottomtemp} sb_constant = 'sb_constant' absorptivity = 'abs' use_displaced_mesh = true @@ -310,7 +297,7 @@ pooldepth=2 [./const] type = GenericConstantMaterial prop_names = 'abs sb_constant' - prop_values = '1 5.67e3' + prop_values = '1 5.67e-5' [../] [] @@ -326,10 +313,10 @@ pooldepth=2 type = Transient end_time = ${endtime} dtmin = 1e-3 - num_steps = 1 + num_steps = 12 petsc_options = '-snes_converged_reason -ksp_converged_reason -options_left -ksp_monitor_singular_value' - petsc_options_iname = '-ksp_max_it -ksp_gmres_restart -pc_type -sub_pc_factor_levels' - petsc_options_value = '1000 200 asm 1' + petsc_options_iname = '-ksp_max_it -ksp_gmres_restart -pc_type' + petsc_options_value = '1000 200 asm' line_search = 'none' nl_max_its = 12 @@ -363,14 +350,11 @@ pooldepth=2 [Adaptivity] - # marker = combo - marker = errorfrac_random - max_h_level = 1 + marker = combo + max_h_level = 5 initial_steps = 0 [./Indicators] - # active = 'error_x error_y error_T error_dispx error_dispy' - active = 'random_indicator' [./error_x] type = GradientJumpIndicator variable = vel_x @@ -395,15 +379,9 @@ pooldepth=2 type = GradientJumpIndicator variable = disp_y [../] - [./random_indicator] - type = ElementIntegralIndicator - variable = random - [../] [../] [./Markers] - # active = 'errorfrac_x errorfrac_y errorfrac_T errorfrac_dispx errorfrac_dispy combo' - active = 'errorfrac_random' [./errorfrac_x] type = ErrorFractionMarker refine = 0.4 @@ -444,12 +422,6 @@ pooldepth=2 type = ComboMarker markers = 'errorfrac_x errorfrac_y errorfrac_T errorfrac_dispx errorfrac_dispy' [../] - [./errorfrac_random] - type = ErrorFractionMarker - refine = 0.4 - coarsen = 0.2 - indicator = random_indicator - [../] [../] [] diff --git a/test/tests/kc/physics/surface-tension/2d-one-spot-scaled-2nd-order.i b/test/tests/kc/physics/surface-tension/2d-one-spot-scaled-2nd-order.i new file mode 100644 index 00000000..a733287d --- /dev/null +++ b/test/tests/kc/physics/surface-tension/2d-one-spot-scaled-2nd-order.i @@ -0,0 +1,448 @@ +endtime=500 +timestep=.5 +surfacetemp=.3 +bottomtemp=.3 +pooldepth=2 + +[GlobalParams] + gravity = '0 0 0' + # pspg = true + # supg = true + laplace = true + integrate_p_by_parts = true + convective_term = true + transient_term = true + temperature = T + order = SECOND +[] + +[Mesh] + type = GeneratedMesh + dim = 2 + xmin = -4 + xmax = 4 + ymin = -2 + ymax = 0 + nx = 4 + ny = 1 + displacements = 'disp_x disp_y' + elem_type = QUAD9 + uniform_refine = 2 +[] + +[Problem] + kernel_coverage_check = false +[] + +[Variables] + [./vel_x] + [./InitialCondition] + type = ConstantIC + value = 1e-15 + [../] + [../] + + [./vel_y] + [./InitialCondition] + type = ConstantIC + value = 1e-15 + [../] + [../] + + [./T] + [../] + + [./p] + order = FIRST + [../] + [./disp_x] + [../] + [./disp_y] + [../] +[] + +[ICs] + [./T] + type = FunctionIC + variable = T + function = '(${surfacetemp} - ${bottomtemp}) / ${pooldepth} * z + ${surfacetemp}' + [../] +[] + +[Kernels] + [./disp_x] + type = Diffusion + variable = disp_x + [../] + [./disp_y] + type = Diffusion + variable = disp_y + [../] +[] + +[ADKernels] + [./mesh_x] + type = INSConvectedMesh + variable = vel_x + disp_x = disp_x + disp_y = disp_y + use_displaced_mesh = true + [../] + [./mesh_y] + type = INSConvectedMesh + variable = vel_y + disp_x = disp_x + disp_y = disp_y + use_displaced_mesh = true + [../] + [./mesh_T] + type = INSTemperatureConvectedMesh + variable = T + disp_x = disp_x + disp_y = disp_y + use_displaced_mesh = true + [../] + + # mass + [./mass] + type = INSADMass + variable = p + u = vel_x + v = vel_y + p = p + use_displaced_mesh = true + [../] + + # x-momentum, time + [./x_momentum_time] + type = INSADMomentumTimeDerivative + variable = vel_x + use_displaced_mesh = true + [../] + + # x-momentum, space + [./x_momentum_space] + type = INSADMomentumBase + variable = vel_x + u = vel_x + v = vel_y + p = p + component = 0 + use_displaced_mesh = true + [../] + + # y-momentum, time + [./y_momentum_time] + type = INSADMomentumTimeDerivative + variable = vel_y + use_displaced_mesh = true + [../] + + # y-momentum, space + [./y_momentum_space] + type = INSADMomentumBase + variable = vel_y + u = vel_x + v = vel_y + p = p + component = 1 + use_displaced_mesh = true + [../] + + # temperature + [./temperature_time] + type = INSADTemperatureTimeDerivative + variable = T + use_displaced_mesh = true + [../] + + [./temperature_space] + type = INSADTemperature + variable = T + u = vel_x + v = vel_y + p = p + use_displaced_mesh = true + [../] +[] + +[BCs] + [./x_no_disp] + type = DirichletBC + variable = disp_x + boundary = 'bottom' + value = 0 + [../] + [./y_no_disp] + type = DirichletBC + variable = disp_y + boundary = 'bottom' + value = 0 + [../] + + [./x_no_slip] + type = DirichletBC + variable = vel_x + boundary = 'bottom right left' + value = 0.0 + [../] + + [./y_no_slip] + type = DirichletBC + variable = vel_y + boundary = 'bottom right left' + value = 0.0 + [../] + + [./T_cold] + type = DirichletBC + variable = T + boundary = 'bottom' + value = ${bottomtemp} + [../] +[] + +[ADBCs] + [./radiation_flux] + type = RadiationEnergyFluxBC + variable = T + boundary = 'top' + ff_temp = ${bottomtemp} + sb_constant = 'sb_constant' + absorptivity = 'abs' + use_displaced_mesh = true + [../] + + [./weld_flux] + type = GaussianWeldEnergyFluxBC + variable = T + boundary = 'top' + reff = 0.6 + F0 = 2.546e0 + R = 1 + x_beam_coord = 0 + y_beam_coord = 0 + z_beam_coord = 0 + use_displaced_mesh = true + [../] + + [./vapor_recoil_x] + type = VaporRecoilPressureMomentumFluxBC + variable = vel_x + boundary = 'top' + component = 0 + use_displaced_mesh = true + [../] + + [./vapor_recoil_y] + type = VaporRecoilPressureMomentumFluxBC + variable = vel_y + boundary = 'top' + component = 1 + use_displaced_mesh = true + [../] + + # [./surface_x] + # type = SurfaceTensionBC + # variable = vel_x + # boundary = 'top' + # component = 0 + # use_displaced_mesh = true + # [../] + + # [./surface_y] + # type = SurfaceTensionBC + # variable = vel_y + # boundary = 'top' + # component = 1 + # use_displaced_mesh = true + # [../] + + [./displace_x_top] + type = DisplaceBoundaryBC + boundary = 'top' + variable = 'disp_x' + velocity = 'vel_x' + [../] + [./displace_y_top] + type = DisplaceBoundaryBC + boundary = 'top' + variable = 'disp_y' + velocity = 'vel_y' + [../] +[] + +[ADMaterials] + [./kc_fits] + type = CrazyKCPlantFits + temperature = T + beta = 1e7 + length_unit_exponent = '-4' + temperature_unit_exponent = 3 + mass_unit_exponent = '-6' + time_unit_exponent = '-5' + [../] + [./boundary] + type = CrazyKCPlantFitsBoundary + boundary = 'top' + temperature = T + use_displaced_mesh = true + length_unit_exponent = '-4' + temperature_unit_exponent = 3 + mass_unit_exponent = '-6' + time_unit_exponent = '-5' + [../] +[] + +[Materials] + [./const] + type = GenericConstantMaterial + prop_names = 'abs sb_constant' + prop_values = '1 5.67e-5' + [../] +[] + +[Preconditioning] + [./SMP] + type = FDP + full = true + solve_type = 'NEWTON' + [../] +[] + +[Executioner] + type = Transient + end_time = ${endtime} + dtmin = 1e-3 + num_steps = 12 + petsc_options = '-snes_converged_reason -ksp_converged_reason -options_left -ksp_monitor_singular_value' + petsc_options_iname = '-ksp_max_it -ksp_gmres_restart -pc_type' + petsc_options_value = '1000 200 asm' + + line_search = 'none' + nl_max_its = 12 + l_tol = 1e-3 + [./TimeStepper] + type = IterationAdaptiveDT + optimal_iterations = 7 + dt = ${timestep} + linear_iteration_ratio = 1e6 + growth_factor = 1.5 + [../] +[] + +[Outputs] + print_linear_residuals = false + [./exodus] + type = Exodus + output_material_properties = true + show_material_properties = 'mu surface_term_curvature surface_term_gradient1 surface_term_gradient2' + [../] + [./dofmap] + type = DOFMap + execute_on = 'initial' + [../] + checkpoint = true +[] + +[Debug] + show_var_residual_norms = true +[] + + +[Adaptivity] + marker = combo + max_h_level = 3 + initial_steps = 0 + + [./Indicators] + [./error_x] + type = GradientJumpIndicator + variable = vel_x + [../] + [./error_y] + type = GradientJumpIndicator + variable = vel_y + [../] + # [./error_p] + # type = GradientJumpIndicator + # variable = p + # [../] + [./error_T] + type = GradientJumpIndicator + variable = T + [../] + [./error_dispx] + type = GradientJumpIndicator + variable = disp_x + [../] + [./error_dispy] + type = GradientJumpIndicator + variable = disp_y + [../] + [../] + + [./Markers] + [./errorfrac_x] + type = ErrorFractionMarker + refine = 0.4 + coarsen = 0.2 + indicator = error_x + [../] + [./errorfrac_y] + type = ErrorFractionMarker + refine = 0.4 + coarsen = 0.2 + indicator = error_y + [../] + # [./errorfrac_p] + # type = ErrorFractionMarker + # refine = 0.7 + # coarsen = 0.3 + # indicator = error_p + # [../] + [./errorfrac_T] + type = ErrorFractionMarker + refine = 0.4 + coarsen = 0.2 + indicator = error_T + [../] + [./errorfrac_dispx] + type = ErrorFractionMarker + refine = 0.4 + coarsen = 0.2 + indicator = error_dispx + [../] + [./errorfrac_dispy] + type = ErrorFractionMarker + refine = 0.4 + coarsen = 0.2 + indicator = error_dispy + [../] + [./combo] + type = ComboMarker + markers = 'errorfrac_x errorfrac_y errorfrac_T errorfrac_dispx errorfrac_dispy' + [../] + [../] +[] + +[Postprocessors] + [./num_dofs] + type = NumDOFs + system = 'NL' + [../] + [./nl] + type = NumNonlinearIterations + [../] + [./tot_nl] + type = CumulativeValuePostprocessor + postprocessor = 'nl' + [../] + [./linear] + type = NumLinearIterations + [../] + [./tot_linear] + type = CumulativeValuePostprocessor + postprocessor = 'linear' + [../] +[] diff --git a/test/tests/kc/physics/surface-tension/2d-one-spot-unscaled-2nd-order.i b/test/tests/kc/physics/surface-tension/2d-one-spot-unscaled-2nd-order.i new file mode 100644 index 00000000..16121583 --- /dev/null +++ b/test/tests/kc/physics/surface-tension/2d-one-spot-unscaled-2nd-order.i @@ -0,0 +1,440 @@ +endtime=500e-5 +timestep=.5e-5 +surfacetemp=300 +bottomtemp=300 +pooldepth=2e-4 + +[GlobalParams] + gravity = '0 0 0' + pspg = true + supg = true + laplace = true + integrate_p_by_parts = true + convective_term = true + transient_term = true + temperature = T + order = SECOND +[] + +[Mesh] + type = GeneratedMesh + dim = 2 + xmin = -4e-4 + xmax = 4e-4 + ymin = -2e-4 + ymax = 0 + nx = 4 + ny = 1 + displacements = 'disp_x disp_y' + elem_type = QUAD9 + uniform_refine = 1 +[] + +[Problem] + kernel_coverage_check = false +[] + +[Variables] + [./vel_x] + [./InitialCondition] + type = ConstantIC + value = 1e-15 + [../] + [../] + + [./vel_y] + [./InitialCondition] + type = ConstantIC + value = 1e-15 + [../] + [../] + + [./T] + [../] + + [./p] + order = FIRST + [../] + [./disp_x] + [../] + [./disp_y] + [../] +[] + +[ICs] + [./T] + type = FunctionIC + variable = T + function = '(${surfacetemp} - ${bottomtemp}) / ${pooldepth} * z + ${surfacetemp}' + [../] +[] + +[Kernels] + [./disp_x] + type = Diffusion + variable = disp_x + [../] + [./disp_y] + type = Diffusion + variable = disp_y + [../] +[] + +[ADKernels] + [./mesh_x] + type = INSConvectedMesh + variable = vel_x + disp_x = disp_x + disp_y = disp_y + use_displaced_mesh = true + [../] + [./mesh_y] + type = INSConvectedMesh + variable = vel_y + disp_x = disp_x + disp_y = disp_y + use_displaced_mesh = true + [../] + [./mesh_T] + type = INSTemperatureConvectedMesh + variable = T + disp_x = disp_x + disp_y = disp_y + use_displaced_mesh = true + [../] + + # mass + [./mass] + type = INSADMass + variable = p + u = vel_x + v = vel_y + p = p + use_displaced_mesh = true + [../] + + # x-momentum, time + [./x_momentum_time] + type = INSADMomentumTimeDerivative + variable = vel_x + use_displaced_mesh = true + [../] + + # x-momentum, space + [./x_momentum_space] + type = INSADMomentumBase + variable = vel_x + u = vel_x + v = vel_y + p = p + component = 0 + use_displaced_mesh = true + [../] + + # y-momentum, time + [./y_momentum_time] + type = INSADMomentumTimeDerivative + variable = vel_y + use_displaced_mesh = true + [../] + + # y-momentum, space + [./y_momentum_space] + type = INSADMomentumBase + variable = vel_y + u = vel_x + v = vel_y + p = p + component = 1 + use_displaced_mesh = true + [../] + + # temperature + [./temperature_time] + type = INSADTemperatureTimeDerivative + variable = T + use_displaced_mesh = true + [../] + + [./temperature_space] + type = INSADTemperature + variable = T + u = vel_x + v = vel_y + p = p + use_displaced_mesh = true + [../] +[] + +[BCs] + [./x_no_disp] + type = DirichletBC + variable = disp_x + boundary = 'bottom' + value = 0 + [../] + [./y_no_disp] + type = DirichletBC + variable = disp_y + boundary = 'bottom' + value = 0 + [../] + + [./x_no_slip] + type = DirichletBC + variable = vel_x + boundary = 'bottom right left' + value = 0.0 + [../] + + [./y_no_slip] + type = DirichletBC + variable = vel_y + boundary = 'bottom right left' + value = 0.0 + [../] + + [./T_cold] + type = DirichletBC + variable = T + boundary = 'bottom' + value = ${bottomtemp} + [../] +[] + +[ADBCs] + [./radiation_flux] + type = RadiationEnergyFluxBC + variable = T + boundary = 'top' + ff_temp = ${bottomtemp} + sb_constant = 'sb_constant' + absorptivity = 'abs' + use_displaced_mesh = true + [../] + + [./weld_flux] + type = GaussianWeldEnergyFluxBC + variable = T + boundary = 'top' + reff = 0.6 + F0 = 2.546e9 + R = 1e-4 + x_beam_coord = 0 + y_beam_coord = 0 + z_beam_coord = 0 + use_displaced_mesh = true + [../] + + [./vapor_recoil_x] + type = VaporRecoilPressureMomentumFluxBC + variable = vel_x + boundary = 'top' + component = 0 + use_displaced_mesh = true + [../] + + [./vapor_recoil_y] + type = VaporRecoilPressureMomentumFluxBC + variable = vel_y + boundary = 'top' + component = 1 + use_displaced_mesh = true + [../] + + [./surface_x] + type = SurfaceTensionBC + variable = vel_x + boundary = 'top' + component = 0 + use_displaced_mesh = true + [../] + + [./surface_y] + type = SurfaceTensionBC + variable = vel_y + boundary = 'top' + component = 1 + use_displaced_mesh = true + [../] + + [./displace_x_top] + type = DisplaceBoundaryBC + boundary = 'top' + variable = 'disp_x' + velocity = 'vel_x' + [../] + [./displace_y_top] + type = DisplaceBoundaryBC + boundary = 'top' + variable = 'disp_y' + velocity = 'vel_y' + [../] +[] + +[ADMaterials] + [./kc_fits] + type = CrazyKCPlantFits + temperature = T + beta = 1e7 + [../] + [./boundary] + type = CrazyKCPlantFitsBoundary + boundary = 'top' + temperature = T + use_displaced_mesh = true + [../] +[] + +[Materials] + [./const] + type = GenericConstantMaterial + prop_names = 'abs sb_constant' + prop_values = '1 5.67e-8' + [../] +[] + +[Preconditioning] + [./SMP] + type = SMP + full = true + solve_type = 'NEWTON' + [../] +[] + +[Executioner] + type = Transient + end_time = ${endtime} + dtmin = 1e-8 + num_steps = 3 + petsc_options = '-snes_converged_reason -ksp_converged_reason -options_left -ksp_monitor_singular_value' + petsc_options_iname = '-ksp_max_it -ksp_gmres_restart -pc_type' + petsc_options_value = '1000 200 asm' + + line_search = 'none' + nl_max_its = 12 + l_tol = 1e-3 + [./TimeStepper] + type = IterationAdaptiveDT + optimal_iterations = 7 + dt = ${timestep} + linear_iteration_ratio = 1e6 + growth_factor = 1.5 + [../] +[] + +[Outputs] + print_linear_residuals = false + [./exodus] + type = Exodus + output_material_properties = true + show_material_properties = 'mu surface_term_curvature surface_term_gradient1 surface_term_gradient2' + [../] + [./dofmap] + type = DOFMap + execute_on = 'initial' + [../] + checkpoint = true +[] + +[Debug] + show_var_residual_norms = true +[] + + +[Adaptivity] + marker = combo + max_h_level = 1 + initial_steps = 0 + + [./Indicators] + [./error_x] + type = GradientJumpIndicator + variable = vel_x + [../] + [./error_y] + type = GradientJumpIndicator + variable = vel_y + [../] + # [./error_p] + # type = GradientJumpIndicator + # variable = p + # [../] + [./error_T] + type = GradientJumpIndicator + variable = T + [../] + [./error_dispx] + type = GradientJumpIndicator + variable = disp_x + [../] + [./error_dispy] + type = GradientJumpIndicator + variable = disp_y + [../] + [../] + + [./Markers] + [./errorfrac_x] + type = ErrorFractionMarker + refine = 0.4 + coarsen = 0.2 + indicator = error_x + [../] + [./errorfrac_y] + type = ErrorFractionMarker + refine = 0.4 + coarsen = 0.2 + indicator = error_y + [../] + # [./errorfrac_p] + # type = ErrorFractionMarker + # refine = 0.7 + # coarsen = 0.3 + # indicator = error_p + # [../] + [./errorfrac_T] + type = ErrorFractionMarker + refine = 0.4 + coarsen = 0.2 + indicator = error_T + [../] + [./errorfrac_dispx] + type = ErrorFractionMarker + refine = 0.4 + coarsen = 0.2 + indicator = error_dispx + [../] + [./errorfrac_dispy] + type = ErrorFractionMarker + refine = 0.4 + coarsen = 0.2 + indicator = error_dispy + [../] + [./combo] + type = ComboMarker + markers = 'errorfrac_x errorfrac_y errorfrac_T errorfrac_dispx errorfrac_dispy' + [../] + [../] +[] + +[Postprocessors] + [./num_dofs] + type = NumDOFs + system = 'NL' + [../] + [./nl] + type = NumNonlinearIterations + [../] + [./tot_nl] + type = CumulativeValuePostprocessor + postprocessor = 'nl' + [../] + [./linear] + type = NumLinearIterations + [../] + [./tot_linear] + type = CumulativeValuePostprocessor + postprocessor = 'linear' + [../] +[] diff --git a/test/tests/kc/one-spot.i b/test/tests/kc/physics/surface-tension/3d-one-spot-unscaled-1st-order.i similarity index 100% rename from test/tests/kc/one-spot.i rename to test/tests/kc/physics/surface-tension/3d-one-spot-unscaled-1st-order.i diff --git a/test/tests/kc/cold-start-twice-around-circle.i b/test/tests/kc/physics/surface-tension/cold-start-twice-around-circle.i similarity index 100% rename from test/tests/kc/cold-start-twice-around-circle.i rename to test/tests/kc/physics/surface-tension/cold-start-twice-around-circle.i diff --git a/test/tests/kc/hot-once-around-circle.i b/test/tests/kc/physics/surface-tension/hot-once-around-circle.i similarity index 100% rename from test/tests/kc/hot-once-around-circle.i rename to test/tests/kc/physics/surface-tension/hot-once-around-circle.i diff --git a/test/tests/kc/kc-profiling.i b/test/tests/kc/profiling/kc-profiling.i similarity index 100% rename from test/tests/kc/kc-profiling.i rename to test/tests/kc/profiling/kc-profiling.i