Skip to content

Commit

Permalink
Squashed commit of the following:
Browse files Browse the repository at this point in the history 
commit 3c42365
Author: Weston Ortiz <[email protected]>
Date:   Thu Aug 8 14:59:31 2024 -0600

    add clang format script

commit 67506ab
Merge: 2f60388 e33cc79
Author: Weston Ortiz <[email protected]>
Date:   Thu Aug 8 14:48:18 2024 -0600

    Merge remote-tracking branch 'wortiz/line_search' into next

commit 2f60388
Merge: a08cb0f 616486c
Author: Weston Ortiz <[email protected]>
Date:   Wed Aug 7 09:31:48 2024 -0600

    Merge remote-tracking branch 'wortiz/autodiff' into next

commit 616486c
Author: Weston Ortiz <[email protected]>
Date:   Wed Jun 26 12:29:59 2024 -0600

    tmp

commit 26d9d0e
Merge: 5230681 85ebd3f
Author: Weston Ortiz <[email protected]>
Date:   Tue Jun 25 15:41:14 2024 -0600

    Merge remote-tracking branch 'wortiz/autodiff' into autodiff

commit 85ebd3f
Author: Weston Ortiz <[email protected]>
Date:   Tue May 21 15:07:52 2024 -0600

    tmp

commit be006fd
Merge: d419e32 ef327c6
Author: Weston Ortiz <[email protected]>
Date:   Wed Apr 17 10:44:36 2024 -0600

    Merge remote-tracking branch 'origin/main' into turb_ad

commit d419e32
Author: Weston Ortiz <[email protected]>
Date:   Wed Apr 17 10:43:36 2024 -0600

    tmp2

commit 93d78ee
Author: Weston Ortiz <[email protected]>
Date:   Fri Apr 12 07:58:40 2024 -0600

    seems to be working

commit eba9432
Merge: 64e7005 4b42444
Author: Weston Ortiz <[email protected]>
Date:   Thu Apr 11 16:17:06 2024 -0600

    Merge remote-tracking branch 'origin/main' into turb_ad

commit 64e7005
Author: Weston Ortiz <[email protected]>
Date:   Thu Apr 11 16:16:30 2024 -0600

    tmp

commit fac923d
Author: Weston Ortiz <[email protected]>
Date:   Mon Apr 8 10:03:45 2024 -0600

    strat

commit bbf6385
Merge: 98c3a6a ee57170
Author: Weston Ortiz <[email protected]>
Date:   Mon Apr 8 10:01:58 2024 -0600

    Merge remote-tracking branch 'wortiz/turb_ad' into turb_ad

commit ee57170
Author: Weston Ortiz <[email protected]>
Date:   Mon Apr 8 09:57:51 2024 -0600

    clang format

commit 98c3a6a
Author: Weston Ortiz <[email protected]>
Date:   Mon Apr 8 09:50:50 2024 -0600

    clang format

commit fad2976
Author: Weston Ortiz <[email protected]>
Date:   Mon Apr 8 09:42:49 2024 -0600

    tmpone

commit 649233a
Author: Weston Ortiz <[email protected]>
Date:   Thu Mar 21 13:45:08 2024 -0600

    tmp

commit 3eaef70
Author: Weston Ortiz <[email protected]>
Date:   Tue Mar 12 09:51:47 2024 -0600

    basic backtracking appears to work

commit e15b067
Author: Weston Ortiz <[email protected]>
Date:   Thu Mar 21 13:47:05 2024 -0600

    tmp

commit de6a130
Author: Weston Ortiz <[email protected]>
Date:   Thu Mar 7 17:06:01 2024 -0700

    backtrack print

commit 1b1e970
Author: Weston Ortiz <[email protected]>
Date:   Thu Mar 7 16:55:24 2024 -0700

    backtrace_start

commit 2a1ec86
Author: Weston Ortiz <[email protected]>
Date:   Thu Feb 22 09:41:02 2024 -0700

    semi working stabilization for sqrt_Conf

commit a00abfc
Author: Weston Ortiz <[email protected]>
Date:   Mon Feb 19 12:06:42 2024 -0700

    not working for sharkskin

commit 4e038ca
Author: Weston Ortiz <[email protected]>
Date:   Fri Feb 9 15:50:17 2024 -0700

    tmp

commit b43acb5
Author: Weston Ortiz <[email protected]>
Date:   Fri Feb 9 13:54:53 2024 -0700

    tmp update

commit 78c7206
Author: Weston Ortiz <[email protected]>
Date:   Thu Feb 8 08:48:05 2024 -0700

    add missing

commit 9c5a053
Author: Weston Ortiz <[email protected]>
Date:   Mon Apr 8 09:44:34 2024 -0600

    tmp

commit 7959d5c
Author: Weston Ortiz <[email protected]>
Date:   Thu Mar 21 13:45:08 2024 -0600

    tmp

commit 8d1f2ea
Author: Weston Ortiz <[email protected]>
Date:   Tue Mar 12 09:51:47 2024 -0600

    basic backtracking appears to work

commit 1fd075f
Author: Weston Ortiz <[email protected]>
Date:   Fri Feb 16 11:06:10 2024 -0700

    fix echo flag print 3d bc dup (goma#452)

commit 94051f6
Author: Weston Ortiz <[email protected]>
Date:   Fri Feb 9 14:36:51 2024 -0700

    3d bc dup (goma#451)

    * Add flag for 3D BC duplication printing

    * add doc file

    * try to fix docs

commit dd2c7ac
Author: Weston Ortiz <[email protected]>
Date:   Tue Feb 6 13:49:36 2024 -0700

    White metzner (goma#450)

    * Start on White-Metzner readdition

    * WM bugfix

commit e33cc79
Author: Weston Ortiz <[email protected]>
Date:   Tue Mar 12 09:51:47 2024 -0600

    basic backtracking appears to work

commit f13cf11
Author: Weston Ortiz <[email protected]>
Date:   Thu Mar 7 17:06:01 2024 -0700

    backtrack print

commit 7c3f8b3
Author: Weston Ortiz <[email protected]>
Date:   Thu Mar 7 17:06:01 2024 -0700

    backtrack print

commit 34f5cdc
Author: Weston Ortiz <[email protected]>
Date:   Thu Mar 7 16:55:24 2024 -0700

    backtrace_start

commit de2532f
Author: Weston Ortiz <[email protected]>
Date:   Thu Mar 7 16:55:24 2024 -0700

    backtrace_start

commit f106535
Author: Weston Ortiz <[email protected]>
Date:   Thu Feb 22 09:41:02 2024 -0700

    semi working stabilization for sqrt_Conf

commit d69730d
Author: Weston Ortiz <[email protected]>
Date:   Mon Feb 19 12:06:42 2024 -0700

    not working for sharkskin

commit aeaadab
Author: Weston Ortiz <[email protected]>
Date:   Fri Feb 9 15:50:17 2024 -0700

    tmp

commit d3ea2f0
Author: Weston Ortiz <[email protected]>
Date:   Fri Feb 9 13:54:53 2024 -0700

    tmp update

commit db70339
Author: Weston Ortiz <[email protected]>
Date:   Thu Feb 8 08:48:05 2024 -0700

    add missing

commit 5fb2817
Author: Weston Ortiz <[email protected]>
Date:   Thu Jan 25 11:55:20 2024 -0700

    tmp
  • Loading branch information
@wortiz
wortiz committed Aug 8, 2024
1 parent a08cb0f commit 9f98025
Show file tree
Hide file tree
Showing 50 changed files with 7,824 additions and 222 deletions.
16 changes: 16 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,16 @@ if(${stratimikos_package_index} GREATER_EQUAL 0)
endif()
endif()

list(FIND Trilinos_PACKAGE_LIST Sacado sacado_package_index)
if(${sacado_package_index} GREATER_EQUAL 0)
option(ENABLE_SACADO "ENABLE_SACADO" ON)
if(ENABLE_SACADO)
message(STATUS "TRILINOS: Sacado found, enabling in Goma")
list(APPEND GOMA_COMPILE_DEFINITIONS GOMA_ENABLE_SACADO)
endif()
endif()


if(${Trilinos_VERSION} VERSION_LESS 14.0.0)
message(WARNING "Trilinos version less than 14.0.0, Tpetra not supported")
else()
Expand Down Expand Up @@ -467,6 +477,9 @@ set(GOMA_INCLUDES
include/ac_stability.h
include/ac_stability_util.h
include/ac_update_parameter.h
include/ad_turbulence.h
include/ad_momentum.h
include/ad_stress.h
include/bc_colloc.h
include/bc_contact.h
include/bc_curve.h
Expand Down Expand Up @@ -625,6 +638,9 @@ set(GOMA_SOURCES
src/ac_stability.c
src/ac_stability_util.c
src/ac_update_parameter.c
src/ad_turbulence.cpp
src/ad_momentum.cpp
src/ad_stress.cpp
src/bc_colloc.c
src/bc_contact.c
src/bc_curve.c
Expand Down
3 changes: 1 addition & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,7 @@ See licenses at https://gitlab.com/libeigen/eigen
FindMETIS.cmake

* @copyright (c) 2009-2014 The University of Tennessee and The University
* of Tennessee Research Foundation.
* All rights reserved.
of Tennessee Research Foundation. All rights reserved.
* @copyright (c) 2012-2014 Inria. All rights reserved.
* @copyright (c) 2012-2014 Bordeaux INP, CNRS (LaBRI UMR 5800), Inria, Univ. Bordeaux. All rights reserved.

Expand Down
38 changes: 38 additions & 0 deletions include/ad_momentum.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#include "ad_turbulence.h"

#ifdef __cplusplus
void ad_ve_polymer_stress(ADType gamma[DIM][DIM], ADType stress[DIM][DIM]);
void ad_fluid_stress(ADType Pi[DIM][DIM]);
int ad_momentum_source_term(ADType f[DIM], /* Body force. */
dbl time);
ADType ad_viscosity(struct Generalized_Newtonian *gn_local, ADType gamma_dot[DIM][DIM]);
#endif

#ifdef __cplusplus
extern "C" {
#endif

int ad_assemble_momentum(dbl time, /* current time */
dbl tt, /* parameter to vary time integration from
explicit (tt = 1) to implicit (tt = 0) */
dbl dt, /* current time step size */
dbl h_elem_avg, /* average global element size for PSPG*/
const PG_DATA *pg_data,
double xi[DIM], /* Local stu coordinates */
const Exo_DB *exo);

int ad_assemble_continuity(dbl time_value, /* current time */
dbl tt, /* parameter to vary time integration from
explicit (tt = 1) to implicit (tt = 0) */
dbl dt, /* current time step size */
const PG_DATA *pg_data);
int ad_assemble_stress_sqrt_conf(dbl tt, /* parameter to vary time integration from
* explicit (tt = 1) to implicit (tt = 0) */
dbl dt, /* current time step size */
PG_DATA *pg_data);

dbl ad_viscosity_wrap(struct Generalized_Newtonian *gn_local);

#ifdef __cplusplus
}
#endif
Empty file added include/ad_stress.h
View file
Empty file.
130 changes: 130 additions & 0 deletions include/ad_turbulence.h
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
#ifndef GOMA_AD_TURBULENCE_H
#define GOMA_AD_TURBULENCE_H

#ifdef GOMA_ENABLE_SACADO

#ifdef __cplusplus
#include <Sacado.hpp>
extern "C" {
#include "el_elm.h"
#include "mm_mp_const.h"
#include "std.h"
}
using ADType = Sacado::Fad::DFad<double>;
void ad_supg_tau_shakib(ADType &supg_tau, int dim, dbl dt, ADType diffusivity, int interp_eqn);
struct AD_Basis {
ADType d_phi[MDE][DIM]; /* d_phi[i][a] = d(phi_i)/d(q_a) */
ADType grad_phi[MDE][DIM]; /* grad_phi[i][a] = e_a . grad(phi_i) */
ADType grad_phi_e[MDE][DIM][DIM][DIM]; /* grad_phi_e[i][a][p][q] */
/* = (e_p e_q): grad(phi_i e_a) */
ADType curl_phi_e[MDE][DIM][DIM];
};
struct AD_Field_Variables {
AD_Field_Variables() = default;
std::vector<AD_Basis> basis;
ADType detJ;
ADType J[DIM][DIM];
ADType B[DIM][DIM];
ADType v[DIM];
ADType v_dot[DIM];
ADType x[DIM];
ADType d[DIM];
ADType x_dot[DIM];
ADType grad_v[DIM][DIM];
ADType G[DIM][DIM];
ADType grad_G[DIM][DIM][DIM];
ADType div_G[DIM];
ADType S[MAX_MODES][DIM][DIM];
ADType S_dot[MAX_MODES][DIM][DIM];
ADType grad_S[MAX_MODES][DIM][DIM][DIM];
ADType div_S[MAX_MODES][DIM];
ADType grad_SH[DIM];
ADType P;
ADType SH;
ADType grad_P[DIM];
ADType eddy_nu;
ADType eddy_nu_dot;
ADType grad_eddy_nu[DIM];
ADType turb_k;
ADType turb_k_dot;
ADType grad_turb_k[DIM];
ADType turb_omega;
ADType turb_omega_dot;
ADType grad_turb_omega[DIM];
int total_ad_variables;
int ielem;
int offset[V_LAST];
};

extern AD_Field_Variables *ad_fv;
int ad_calc_shearrate(ADType &gammadot, /* strain rate invariant */
ADType gamma_dot[DIM][DIM]); /* strain rate tensor */

void ad_only_tau_momentum_shakib(ADType &tau, int dim, dbl dt, int pspg_scale);
ADType ad_sa_viscosity(struct Generalized_Newtonian *gn_local);
ADType ad_only_turb_k_omega_viscosity(void);
void compute_sst_blending(ADType &F1, ADType &F2);
ADType sst_viscosity(const ADType &Omega, const ADType &F2);
extern "C" {
#endif

#include "mm_as_structs.h"
#include "mm_fill_stabilization.h"
#include "mm_mp_structs.h"
#include "std.h"

void ad_tau_momentum_shakib(momentum_tau_terms *tau_terms, int dim, dbl dt, int pspg_scale);

int ad_assemble_turb_k(dbl time_value, /* current time */
dbl tt, /* parameter to vary time integration from
explicit (tt = 1) to implicit (tt = 0) */
dbl dt, /* current time step size */
const PG_DATA *pg_data);

void ad_sa_wall_func(double func[DIM], double d_func[DIM][MAX_VARIABLE_TYPES + MAX_CONC][MDE]);
dbl ad_turb_k_omega_sst_viscosity(VISCOSITY_DEPENDENCE_STRUCT *d_mu);

int ad_assemble_turb_omega(dbl time_value, /* current time */
dbl tt, /* parameter to vary time integration from
explicit (tt = 1) to implicit (tt = 0) */
dbl dt, /* current time step size */
const PG_DATA *pg_data);
dbl ad_sa_viscosity(struct Generalized_Newtonian *gn_local, VISCOSITY_DEPENDENCE_STRUCT *d_mu);
void fill_ad_field_variables();
int ad_assemble_spalart_allmaras(dbl time_value, /* current time */
dbl tt, /* parameter to vary time integration from
explicit (tt = 1) to implicit (tt = 0) */
dbl dt, /* current time step size */
const PG_DATA *pg_data);
int ad_assemble_turb_k_modified(dbl time_value, /* current time */
dbl tt, /* parameter to vary time integration from
explicit (tt = 1) to implicit (tt = 0) */
dbl dt, /* current time step size */
const PG_DATA *pg_data);
int ad_assemble_turb_omega_modified(dbl time_value, /* current time */
dbl tt, /* parameter to vary time integration from
explicit (tt = 1) to implicit (tt = 0) */
dbl dt, /* current time step size */
const PG_DATA *pg_data);
int ad_assemble_turb_k_omega_modified(dbl time_value, /* current time */
dbl tt, /* parameter to vary time integration from
explicit (tt = 1) to implicit (tt = 0) */
dbl dt, /* current time step size */
const PG_DATA *pg_data);
int ad_assemble_k_omega_sst_modified(dbl time_value, /* current time */
dbl tt, /* parameter to vary time integration from
explicit (tt = 1) to implicit (tt = 0) */
dbl dt, /* current time step size */
const PG_DATA *pg_data);
int ad_assemble_invariant(double tt, /* parameter to vary time integration from
* explicit (tt = 1) to implicit (tt = 0) */
double dt); /* time step size */
void ad_omega_wall_func(double func[DIM], double d_func[DIM][MAX_VARIABLE_TYPES + MAX_CONC][MDE]);

#ifdef __cplusplus
}
#endif

#endif

#endif // GOMA_AD_TURBULENCE_H
59 changes: 41 additions & 18 deletions include/mm_as_structs.h
100755 → 100644
View file
Original file line number Diff line number Diff line change
Expand Up @@ -570,7 +570,9 @@ struct Element_Variable_Pointers {
dbl *sh_sat_2[MDE]; /* Porous shell saturation layer 2 */
dbl *sh_sat_3[MDE]; /* Porous shell saturation layer 3 */

dbl *eddy_nu[MDE]; /* Eddy viscosity for turbulent flow */
dbl *eddy_nu[MDE]; /* Eddy viscosity for turbulent flow */
dbl *turb_k[MDE]; /* Eddy viscosity for turbulent flow */
dbl *turb_omega[MDE]; /* Eddy viscosity for turbulent flow */
};

/*___________________________________________________________________________*/
Expand Down Expand Up @@ -697,7 +699,9 @@ struct Element_Stiffness_Pointers {
dbl **sh_sat_2; /* Porous shell saturation layer 2 */
dbl **sh_sat_3; /* Porous shell saturation layer 3 */

dbl **eddy_nu; /* Eddy viscosity for turbulent flow */
dbl **eddy_nu; /* Eddy viscosity for turbulent flow */
dbl **turb_k; /* Eddy viscosity for turbulent flow */
dbl **turb_omega; /* Eddy viscosity for turbulent flow */

/*
* These are for debugging purposes...
Expand Down Expand Up @@ -815,6 +819,8 @@ typedef struct turbulent_information {
int num_side_sets;
int num_node_sets;
int use_internal_wall_distance;
double omega_inf;
double k_inf;
} turbulent_information;

/*
Expand Down Expand Up @@ -1107,20 +1113,21 @@ struct Transient_Information {
int step;
int MaxSteadyStateSteps;
int MaxTimeSteps;
int Fill_Weight_Fcn; /* Weight function to use on the transient fill equation
*/
int Fill_Equation; /* Equation for fill-level set */
dbl Delta_t0; /* initial time step */
dbl Delta_t_min; /* minimum time step size */
dbl Delta_t_max; /* maximum time step size */
dbl time_step_decelerator; /* factor used to make time step smaller when a
time step fails to converge */
dbl resolved_delta_t_min; /* if dt < resolved_delta_t_min, accept any
converged soln regardless of time step error */
dbl TimeMax; /* time at which to end integration */
dbl theta; /* time step parameter: theta = 0. => Backward Euler
theta = 1. => Forward Euler
theta = .5 => Crack-Nicholson */
int Fill_Weight_Fcn; /* Weight function to use on the transient fill equation
*/
int Fill_Equation; /* Equation for fill-level set */
dbl Delta_t0; /* initial time step */
dbl Delta_t_min; /* minimum time step size */
dbl Delta_t_max; /* maximum time step size */
dbl time_step_decelerator; /* factor used to make time step smaller when a
time step fails to converge */
dbl resolved_delta_t_min; /* if dt < resolved_delta_t_min, accept any
converged soln regardless of time step error */
dbl TimeMax; /* time at which to end integration */
dbl theta; /* time step parameter: theta = 0. => Backward Euler
theta = 1. => Forward Euler
theta = .5 => Crack-Nicholson */
dbl current_theta;
dbl eps; /* time step error */
int use_var_norm[MAX_VARIABLE_TYPES]; /* Booleans used for time step
truncation error control */
Expand Down Expand Up @@ -1733,6 +1740,8 @@ struct Field_Variables {
dbl sh_sat_3; /* Porous shell saturation layer 3 */

dbl eddy_nu; /* Eddy viscosity for turbulent flow */
dbl turb_k; /* Eddy viscosity for turbulent flow */
dbl turb_omega; /* Eddy viscosity for turbulent flow */
dbl wall_distance; /* Distance to nearest wall */
dbl multi_contact_line_distance; /* Distance to multi contact line points */

Expand Down Expand Up @@ -1784,6 +1793,8 @@ struct Field_Variables {
dbl grad_sh_sat_3[DIM]; /* Gradient of porous shell saturation layer 3 */

dbl grad_eddy_nu[DIM]; /* Gradient of Eddy viscosity */
dbl grad_turb_k[DIM]; /* Gradient of Eddy viscosity */
dbl grad_turb_omega[DIM]; /* Gradient of Eddy viscosity */
dbl grad_wall_distance[DIM]; /* Distance to nearest wall */

/*
Expand Down Expand Up @@ -1969,6 +1980,8 @@ struct Field_Variables {
dbl d_max_strain_dmesh[DIM][MDE];
dbl d_cur_strain_dmesh[DIM][MDE];
dbl d_grad_eddy_nu_dmesh[DIM][DIM][MDE];
dbl d_grad_turb_k_dmesh[DIM][DIM][MDE];
dbl d_grad_turb_omega_dmesh[DIM][DIM][MDE];
dbl d_grad_restime_dmesh[DIM][DIM][MDE];
/*
* Values at surfaces for integrated boundary conditions
Expand Down Expand Up @@ -2121,7 +2134,9 @@ struct Diet_Field_Variables {
dbl sh_sat_2; /* Porous shell saturation layer 2 */
dbl sh_sat_3; /* Porous shell saturation layer 3 */

dbl eddy_nu; /* Eddy viscosity for turbulent flow */
dbl eddy_nu; /* Eddy viscosity for turbulent flow */
dbl turb_k; /* Eddy viscosity for turbulent flow */
dbl turb_omega; /* Eddy viscosity for turbulent flow */

dbl grad_em_er[DIM][DIM]; /* EM wave Fields */
dbl grad_em_ei[DIM][DIM]; /* EM wave Fields */
Expand Down Expand Up @@ -2150,7 +2165,9 @@ struct Diet_Field_Variables {
dbl grad_tfmp_sat[DIM]; /* Gradient of the thin-film multi-phase lubrication saturation */

dbl grad_n[DIM][DIM]; /* Normal to level set function OR shell normal */
dbl div_n; /* Divergence of LS normal field */
dbl grad_turb_omega[DIM];
dbl grad_turb_k[DIM];
dbl div_n; /* Divergence of LS normal field */

/* Material tensors used at old time values */
dbl strain[DIM][DIM]; /* Strain tensor */
Expand Down Expand Up @@ -3032,6 +3049,8 @@ struct stress_dependence {
double pf[DIM][DIM][MAX_PHASE_FUNC][MDE];
double degrade[DIM][DIM][MDE];
double eddy_nu[DIM][DIM][MDE];
double turb_k[DIM][DIM][MDE];
double turb_omega[DIM][DIM][MDE];
};
typedef struct stress_dependence STRESS_DEPENDENCE_STRUCT;

Expand Down Expand Up @@ -3081,6 +3100,8 @@ struct viscosity_dependence {
double pf[MAX_PHASE_FUNC][MDE]; /* phase function */
double degrade[MDE]; /* amount of degradation */
double eddy_nu[MDE]; /* Turbulent viscosity */
double turb_k[MDE]; /* Turbulent k */
double turb_omega[MDE]; /* Turbulent omega */
double sh_t[MDE]; /* shell temperature */
};
typedef struct viscosity_dependence VISCOSITY_DEPENDENCE_STRUCT;
Expand Down Expand Up @@ -3150,6 +3171,8 @@ struct pspg_dependence {
double v[DIM][DIM][MDE]; /* velocity dependence. */
double T[DIM][MDE]; /* temperature dependence. */
double eddy_nu[DIM][MDE];
double turb_k[DIM][MDE];
double turb_omega[DIM][MDE];
double P[DIM][MDE]; /* pressure dependence. */
double C[DIM][MAX_CONC][MDE]; /* conc dependence. */
double X[DIM][DIM][MDE]; /* mesh dependence. */
Expand Down
3 changes: 3 additions & 0 deletions include/mm_fill_stabilization.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ typedef struct {
dbl d_tau_dF[MDE]; /* FILL dependence. */
dbl d_tau_dnn[MDE]; /* bond concentration dependence */
dbl d_tau_dEDDY_NU[MDE]; /* Turbulent viscosity */
dbl d_tau_dturb_k[MDE]; /* Turbulent viscosity */
dbl d_tau_dturb_omega[MDE]; /* Turbulent viscosity */
} momentum_tau_terms;

void supg_tau_shakib(SUPG_terms *supg_terms, int dim, dbl dt, dbl diffusivity, int interp_eqn);
Expand Down Expand Up @@ -83,4 +85,5 @@ int calc_cont_gls /* mm_fill_terms.c */
dbl, /* current time */
const PG_DATA *);

bool is_evss_f_model(int model);
#endif // GOMA_MM_FILL_STABILIZATION_H
9 changes: 9 additions & 0 deletions include/mm_fill_turbulent.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,4 +21,13 @@ EXTERN int assemble_spalart_allmaras(dbl time_value, /* current time */
dbl dt, /* current time step size */
const PG_DATA *pg_data);

EXTERN int assemble_k_omega_sst_modified(dbl time_value, /* current time */
dbl tt, /* parameter to vary time integration from
explicit (tt = 1) to implicit (tt = 0) */
dbl dt, /* current time step size */
const PG_DATA *pg_data);

void compute_sst_blending(dbl *F1, dbl *F2);
dbl sst_viscosity(const dbl Omega_old, const dbl F2);

#endif
1 change: 1 addition & 0 deletions include/mm_mp_const.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -335,6 +335,7 @@ extern int Num_Var_Init_Mat[MAX_NUMBER_MATLS]; /* number of variables to overwri
/* Turbulent viscosity models for Reynolds Averaged NS */
#define TURBULENT_SA 52 /* Spallart Allmaras */
#define TURBULENT_SA_DYNAMIC 53 /* Spallart Allmaras */
#define TURBULENT_K_OMEGA 54

/*
* Heat source modeling
Expand Down
Loading

0 comments on commit 9f98025

Please sign in to comment.