Commit 481aa4d8 authored by Elia Merzari's avatar Elia Merzari

Update 1/1 Bringin in sync with working version

parent cb870daf
......@@ -19,19 +19,43 @@
[AuxVariables]
[./heat_flux_scalar_f_0_l]
family = SCALAR
order = FIFTH
order = TENTH
[../]
[./heat_flux_scalar_f_1_l]
family = SCALAR
order = FIFTH
order = TENTH
[../]
[./heat_flux_scalar_f_2_l]
family = SCALAR
order = TENTH
[../]
[./heat_flux_scalar_f_3_l]
family = SCALAR
order = TENTH
[../]
[./heat_flux_scalar_f_4_l]
family = SCALAR
order = TENTH
[../]
[./temp_bc_scalar_f_0_l]
family = SCALAR
order = FIFTH
order = TENTH
[../]
[./temp_bc_scalar_f_1_l]
family = SCALAR
order = FIFTH
order = TENTH
[../]
[./temp_bc_scalar_f_2_l]
family = SCALAR
order = TENTH
[../]
[./temp_bc_scalar_f_3_l]
family = SCALAR
order = TENTH
[../]
[./temp_bc_scalar_f_4_l]
family = SCALAR
order = TENTH
[../]
[]
......@@ -39,7 +63,7 @@
[./v_ic]
type = ScalarComponentIC
variable = 'temp_bc_scalar_f_0_l'
values = '1.0 0.0 0.0 0.0 0.0'
values = '1.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0'
[../]
[./temp_ic]
type = FunctionIC
......@@ -79,12 +103,12 @@
[../]
[./fl_reconstruction]
type = FourierLegendreReconstruction
l_order = 5
f_order = 2
l_order = 10
f_order = 5
l_direction = 2
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
poly_scalars = 'temp_bc_scalar_f_0_l temp_bc_scalar_f_1_l'
poly_scalars = 'temp_bc_scalar_f_0_l temp_bc_scalar_f_1_l temp_bc_scalar_f_2_l temp_bc_scalar_f_3_l temp_bc_scalar_f_4_l'
[../]
[]
......@@ -107,19 +131,19 @@
[./k]
type = GenericConstantMaterial
prop_names = 'thermal_conductivity'
prop_values = '1'
prop_values = '1.0'
block = 'interior'
[../]
[./cp]
type = GenericConstantMaterial
prop_names = 'specific_heat'
prop_values = '1'
prop_values = '1.0'
block = 'interior'
[../]
[./rho]
type = GenericConstantMaterial
prop_names = 'density'
prop_values = '1'
prop_values = '1.0'
block = 'interior'
[../]
[]
......@@ -191,6 +215,71 @@
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_0_l_5]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 5
f_order = 0
aux_scalar_name = heat_flux_scalar_f_0_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_0_l_6]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 6
f_order = 0
aux_scalar_name = heat_flux_scalar_f_0_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_0_l_7]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 7
f_order = 0
aux_scalar_name = heat_flux_scalar_f_0_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_0_l_8]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 8
f_order = 0
aux_scalar_name = heat_flux_scalar_f_0_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_0_l_9]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 9
f_order = 0
aux_scalar_name = heat_flux_scalar_f_0_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
# Legendre functions with Fourier order 1
[./nek_f_1_l_0]
type = NekSideIntegralVariableUserObject
......@@ -257,6 +346,463 @@
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_1_l_5]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 5
f_order = 1
aux_scalar_name = heat_flux_scalar_f_1_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_1_l_6]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 6
f_order = 1
aux_scalar_name = heat_flux_scalar_f_1_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_1_l_7]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 7
f_order = 1
aux_scalar_name = heat_flux_scalar_f_1_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_1_l_8]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 8
f_order = 1
aux_scalar_name = heat_flux_scalar_f_1_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_1_l_9]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 9
f_order = 1
aux_scalar_name = heat_flux_scalar_f_1_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
# Legendre functions with Fourier order 2
[./nek_f_2_l_0]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 0
f_order = 2
aux_scalar_name = heat_flux_scalar_f_2_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_2_l_1]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 1
f_order = 2
aux_scalar_name = heat_flux_scalar_f_2_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_2_l_2]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 2
f_order = 2
aux_scalar_name = heat_flux_scalar_f_2_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_2_l_3]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 3
f_order = 2
aux_scalar_name = heat_flux_scalar_f_2_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_2_l_4]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 4
f_order = 2
aux_scalar_name = heat_flux_scalar_f_2_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_2_l_5]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 5
f_order = 2
aux_scalar_name = heat_flux_scalar_f_2_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_2_l_6]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 6
f_order = 2
aux_scalar_name = heat_flux_scalar_f_2_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_2_l_7]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 7
f_order = 2
aux_scalar_name = heat_flux_scalar_f_2_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_2_l_8]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 8
f_order = 2
aux_scalar_name = heat_flux_scalar_f_2_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_2_l_9]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 9
f_order = 2
aux_scalar_name = heat_flux_scalar_f_2_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
# Legendre functions with Fourier order 3
[./nek_f_3_l_0]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 0
f_order = 3
aux_scalar_name = heat_flux_scalar_f_3_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_3_l_1]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 1
f_order = 3
aux_scalar_name = heat_flux_scalar_f_3_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_3_l_2]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 2
f_order = 3
aux_scalar_name = heat_flux_scalar_f_3_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_3_l_3]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 3
f_order = 3
aux_scalar_name = heat_flux_scalar_f_3_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_3_l_4]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 4
f_order = 3
aux_scalar_name = heat_flux_scalar_f_3_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_3_l_5]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 5
f_order = 3
aux_scalar_name = heat_flux_scalar_f_3_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_3_l_6]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 6
f_order = 3
aux_scalar_name = heat_flux_scalar_f_3_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_3_l_7]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 7
f_order = 3
aux_scalar_name = heat_flux_scalar_f_3_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_3_l_8]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 8
f_order = 3
aux_scalar_name = heat_flux_scalar_f_3_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_3_l_9]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 9
f_order = 3
aux_scalar_name = heat_flux_scalar_f_3_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_4_l_0]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 0
f_order = 4
aux_scalar_name = heat_flux_scalar_f_4_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_4_l_1]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 1
f_order = 4
aux_scalar_name = heat_flux_scalar_f_4_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_4_l_2]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 2
f_order = 4
aux_scalar_name = heat_flux_scalar_f_4_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_4_l_3]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 3
f_order = 4
aux_scalar_name = heat_flux_scalar_f_4_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_4_l_4]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 4
f_order = 4
aux_scalar_name = heat_flux_scalar_f_4_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_4_l_5]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 5
f_order = 4
aux_scalar_name = heat_flux_scalar_f_4_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_4_l_6]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 6
f_order = 4
aux_scalar_name = heat_flux_scalar_f_4_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_4_l_7]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 7
f_order = 4
aux_scalar_name = heat_flux_scalar_f_4_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_4_l_8]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 8
f_order = 4
aux_scalar_name = heat_flux_scalar_f_4_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[./nek_f_4_l_9]
type = NekSideIntegralVariableUserObject
variable = temp
boundary = wall
legendre_function_name = 'legendre_function'
fourier_function_name = 'fourier_function'
l_direction = 2
l_order = 9
f_order = 4
aux_scalar_name = heat_flux_scalar_f_4_l
diffusion_coefficient_name = 'thermal_conductivity'
surface_area_pp = 'surf_area'
[../]
[]
[Postprocessors]
......@@ -272,8 +818,8 @@
scheme = 'Explicit-Euler' # Others available: backward Euler, Crank-Nicholson, etc.
dt = 0.001 # Initial timestep size
start_time = 0 # Starting time
num_steps = 3900 # Number of Steps
nl_rel_tol = 1e-8 # Nonlinear relative tolerance
num_steps = 5000 # Number of Steps
nl_rel_tol = 1e-6 # Nonlinear relative tolerance
l_tol = 1e-6 # Linear tolerance
petsc_options_iname = '-pc_type -pc_hypre_type'
......@@ -301,7 +847,7 @@
type = MultiAppPolynomialToNek
direction = to_multiapp
multi_app = sub
source_variable = 'heat_flux_scalar_f_0_l heat_flux_scalar_f_1_l'
source_variable = 'heat_flux_scalar_f_0_l heat_flux_scalar_f_1_l heat_flux_scalar_f_2_l heat_flux_scalar_f_3_l heat_flux_scalar_f_4_l '
to_aux_scalar = 'foo'
[../]
......@@ -310,6 +856,6 @@
direction = from_multiapp
multi_app = sub
source_variable = 'foo'
to_aux_scalar = 'temp_bc_scalar_f_0_l temp_bc_scalar_f_1_l'
to_aux_scalar = 'temp_bc_scalar_f_0_l temp_bc_scalar_f_1_l temp_bc_scalar_f_2_l temp_bc_scalar_f_3_l temp_bc_scalar_f_4_l'
[../]
[]
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -69,9 +69,9 @@ c-----------------------------------------------------------------------
ifflow=.false.
if (istep.eq.0) then
call rzero(t,n1)
endif
c if (istep.eq.0) then
c call rzero(t,n1)
c endif
sint1=0.0
sarea1=0.0
......@@ -108,6 +108,8 @@ c-----------------------------------------------------------------------
call gop(sarea1,wtmp,'+ ',1)
flux_moose=sint1/sarea1
call heat_balance(flux_moose)
if (nid.eq.0) then
write(6,*)"*** Temperature: ",tmin," - ",tmax
......@@ -116,9 +118,9 @@ c-----------------------------------------------------------------------
endif
c Will this be overwritten -----------------
write(6,*)"*** Setting polynomial orders ..."
n_legendre=5
m_fourier=2
c write(6,*)"*** Setting polynomial orders ..."
n_legendre=10
m_fourier=5
c-----------------------------------------------
c This is for testing -----------
......@@ -338,6 +340,8 @@ C=======================================================================
<