Commit d130bf6a authored by Ron Rahaman's avatar Ron Rahaman
Browse files

Merge branch 'develop' into moosenek-makefile

parents 62da7fa2 7dc20293
......@@ -161,7 +161,8 @@ all : nek5000
objdir:
@mkdir $(OBJDIR) 2>/dev/null; cat /dev/null
nek5000: objdir $(CASEDIR)/${CASENAME}.o $(NOBJS)
nek5000: objdir $(NOBJS)
$(F77) -c $(FL2) $(CASEDIR)/${CASENAME}.f $(MOABNEK_INCLUDES) $(VISITNEK_INCLUDES) $(IMESH_INCLUDES) -o ${OBJDIR}/${CASENAME}.o
$(F77) -o ${BINNAME} $G ${OBJDIR}/${CASENAME}.o $(NOBJS) $(lFLAGS)
@if test -f ${BINNAME}; then \
echo "#############################################################"; \
......@@ -178,9 +179,6 @@ ifeq ($(IFMPI),false)
@rm -rf $S/mpif.h
endif
${OBJDIR}/${CASENAME}.o: objdir $(CASEDIR)/${CASENAME}.f
$(F77) -c $(FL2) $(CASEDIR)/${CASENAME}.f $(MOABNEK_INCLUDES) $(VISITNEK_INCLUDES) $(IMESH_INCLUDES) -o ${OBJDIR}/${CASENAME}.o
lib: objdir $(NOBJS)
$(F77) -shared -o ${LIBNAME}.so $(NOBJS)
......
#!/bin/bash
# Nek5000 build config file
# (c) 2008,2009,2010 UCHICAGO ARGONNE, LLC
set -o pipefail
# source path
SOURCE_ROOT=$(dirname $(dirname $(pwd)))/Nek5000
......@@ -89,5 +88,5 @@ fi
# do some checks and create makefile
source $SOURCE_ROOT_CORE/makenek.inc
# compile
# make -j4 -f makefile.nek nek5000 lib 2>&1 | tee compiler.out
exit $?
make -j4 -f makefile.nek nek5000 lib 2>&1 | tee compiler.out
exit 0
......@@ -495,8 +495,8 @@ fi
if [ -f .makefile ]; then
sed -e "1i\\
### makefile automatically created by makenek `date +"%m/%d/%Y %T"` ###" \
-e "s:^CASEDIR[ ]*=.*:CASEDIR\=${CASEDIR}:" \
-e "s:^CASENAME[ ]*=.*:CASENAME\=${CASENAME}:" .makefile > makefile.nek
-e "s:^CASEDIR[ ]*=.*:CASEDIR\:=${CASEDIR}:" \
-e "s:^CASENAME[ ]*=.*:CASENAME\:=${CASENAME}:" .makefile > makefile.nek
else
echo "ERROR: Nek Makefile could not be created!"
exit 1
......
......@@ -3,7 +3,7 @@ C
C HCUBE array dimensions
C
parameter (ldim=3)
parameter (lx1=5,ly1=lx1,lz1=lx1,lelt=480,lelv=lelt)
parameter (lx1=5,ly1=lx1,lz1=lx1,lelt=960,lelv=lelt)
parameter (lxd=8,lyd=lxd,lzd=lxd)
parameter (lelx=1,lely=1,lelz=1)
......@@ -17,7 +17,7 @@ C
parameter (lz3=lz1)
parameter (lp = 32)
parameter (lelg = 500)
parameter (lelg = 1000)
c
c parameter (lpelv=lelv,lpelt=lelt,lpert=3) ! perturbation
c parameter (lpx1=lx1,lpy1=ly1,lpz1=lz1) ! array sizes
......
......@@ -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