Skip to content

Commit 514b771

Browse files
author
mohdsaid497566
committed
added sys_size under eqn_idx
1 parent bd3269a commit 514b771

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+727
-722
lines changed

src/common/m_boundary_common.fpp

Lines changed: 55 additions & 54 deletions
Large diffs are not rendered by default.

src/common/m_chemistry.fpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ contains
2525
! conservative variables.
2626

2727
type(scalar_field), intent(inout) :: q_T_sf
28-
type(scalar_field), dimension(sys_size), intent(in) :: q_cons_vf
28+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: q_cons_vf
2929
type(int_bounds_info), dimension(1:3), intent(in) :: bounds
3030

3131
integer :: x, y, z, eqn
@@ -62,7 +62,7 @@ contains
6262
subroutine s_compute_T_from_primitives(q_T_sf, q_prim_vf, bounds)
6363

6464
type(scalar_field), intent(inout) :: q_T_sf
65-
type(scalar_field), dimension(sys_size), intent(in) :: q_prim_vf
65+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: q_prim_vf
6666
type(int_bounds_info), dimension(1:3), intent(in) :: bounds
6767

6868
integer :: x, y, z, i
@@ -87,9 +87,9 @@ contains
8787

8888
subroutine s_compute_chemistry_reaction_flux(rhs_vf, q_cons_qp, q_T_sf, q_prim_qp, bounds)
8989

90-
type(scalar_field), dimension(sys_size), intent(inout) :: rhs_vf
90+
type(scalar_field), dimension(eqn_idx%sys_size), intent(inout) :: rhs_vf
9191
type(scalar_field), intent(inout) :: q_T_sf
92-
type(scalar_field), dimension(sys_size), intent(inout) :: q_cons_qp, q_prim_qp
92+
type(scalar_field), dimension(eqn_idx%sys_size), intent(inout) :: q_cons_qp, q_prim_qp
9393
type(int_bounds_info), dimension(1:3), intent(in) :: bounds
9494

9595
integer :: x, y, z

src/common/m_derived_types.fpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@ module m_derived_types
140140
!! size and the configuration of the system of equations to which they belong
141141
!> @{
142142
type system_of_equations
143+
integer :: sys_size !< Size of the system of equations
143144
type(int_bounds_info) :: cont !< Indexes of first & last continuity eqns.
144145
type(int_bounds_info) :: mom !< Indexes of first & last momentum eqns.
145146
integer :: E !< Index of energy equation

src/common/m_mpi_common.fpp

Lines changed: 56 additions & 53 deletions
Large diffs are not rendered by default.

src/common/m_phase_change.fpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ contains
4848
!! some parameter. It replaces the procedure pointer, which CCE
4949
!! is breaking on.
5050
impure subroutine s_relaxation_solver(q_cons_vf)
51-
type(scalar_field), dimension(sys_size), intent(inout) :: q_cons_vf
51+
type(scalar_field), dimension(eqn_idx%sys_size), intent(inout) :: q_cons_vf
5252
! This is empty because in current master the procedure pointer
5353
! was never assigned
5454
@:ASSERT(.false., "s_relaxation_solver called but it currently does nothing")
@@ -80,7 +80,7 @@ contains
8080
!! @param q_cons_vf Cell-average conservative variables
8181
pure subroutine s_infinite_relaxation_k(q_cons_vf)
8282

83-
type(scalar_field), dimension(sys_size), intent(inout) :: q_cons_vf
83+
type(scalar_field), dimension(eqn_idx%sys_size), intent(inout) :: q_cons_vf
8484
real(wp) :: pS, pSOV, pSSL !< equilibrium pressure for mixture, overheated vapor, and subcooled liquid
8585
real(wp) :: TS, TSOV, TSSL, TSatOV, TSatSL !< equilibrium temperature for mixture, overheated vapor, and subcooled liquid. Saturation Temperatures at overheated vapor and subcooled liquid
8686
real(wp) :: rhoe, dynE, rhos !< total internal energy, kinetic energy, and total entropy
@@ -293,7 +293,7 @@ contains
293293
integer, intent(in) :: j, k, l, MFL
294294
real(wp), intent(out) :: pS
295295
real(wp), dimension(num_fluids), intent(out) :: p_infpT
296-
type(scalar_field), dimension(sys_size), intent(in) :: q_cons_vf
296+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: q_cons_vf
297297
real(wp), intent(in) :: rhoe
298298
real(wp), intent(out) :: TS
299299
real(wp) :: gp, gpp, hp, pO, mCP, mQ !< variables for the Newton Solver
@@ -397,7 +397,7 @@ contains
397397
real(wp), intent(inout) :: pS
398398
real(wp), dimension(num_fluids), intent(in) :: p_infpT
399399
real(wp), intent(in) :: rhoe
400-
type(scalar_field), dimension(sys_size), intent(inout) :: q_cons_vf
400+
type(scalar_field), dimension(eqn_idx%sys_size), intent(inout) :: q_cons_vf
401401
real(wp), intent(inout) :: TS
402402

403403
real(wp), dimension(num_fluids) :: p_infpTg !< stiffness for the participating fluids for pTg-equilibrium
@@ -521,7 +521,7 @@ contains
521521
!> @name variables for the correction of the reacting partial densities
522522
!> @{
523523
real(wp), intent(out) :: MCT
524-
type(scalar_field), dimension(sys_size), intent(inout) :: q_cons_vf
524+
type(scalar_field), dimension(eqn_idx%sys_size), intent(inout) :: q_cons_vf
525525
real(wp), intent(inout) :: rM
526526
integer, intent(in) :: j, k, l
527527
!> @}
@@ -586,7 +586,7 @@ contains
586586
real(wp), dimension(2, 2), intent(out) :: Jac
587587
integer, intent(in) :: k, l
588588
real(wp), intent(in) :: mCPD, mCVGP, mCVGP2, pS
589-
type(scalar_field), dimension(sys_size), intent(in) :: q_cons_vf
589+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: q_cons_vf
590590
real(wp), dimension(2, 2), intent(out) :: TJac
591591
592592
real(wp) :: ml, mT, TS, dFdT, dTdm, dTdp ! mass of the reacting fluid, total reacting mass, and auxiliary variables
@@ -690,7 +690,7 @@ contains
690690
691691
integer, intent(in) :: j, k, l
692692
real(wp), intent(in) :: mCPD, mCVGP, mQD
693-
type(scalar_field), dimension(sys_size), intent(in) :: q_cons_vf
693+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: q_cons_vf
694694
real(wp), intent(in) :: pS, rhoe
695695
real(wp), dimension(2), intent(out) :: R2D
696696

src/common/m_variables_conversion.fpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ contains
8282
subroutine s_convert_to_mixture_variables(q_vf, i, j, k, &
8383
rho, gamma, pi_inf, qv, Re_K, G_K, G)
8484

85-
type(scalar_field), dimension(sys_size), intent(in) :: q_vf
85+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: q_vf
8686
integer, intent(in) :: i, j, k
8787
real(wp), intent(out), target :: rho, gamma, pi_inf, qv
8888
real(wp), optional, dimension(2), intent(out) :: Re_K
@@ -208,7 +208,7 @@ contains
208208
subroutine s_convert_mixture_to_mixture_variables(q_vf, i, j, k, &
209209
rho, gamma, pi_inf, qv)
210210

211-
type(scalar_field), dimension(sys_size), intent(in) :: q_vf
211+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: q_vf
212212
integer, intent(in) :: i, j, k
213213

214214
real(wp), intent(out), target :: rho
@@ -250,7 +250,7 @@ contains
250250
subroutine s_convert_species_to_mixture_variables_bubbles(q_vf, j, k, l, &
251251
rho, gamma, pi_inf, qv, Re_K)
252252

253-
type(scalar_field), dimension(sys_size), intent(in) :: q_vf
253+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: q_vf
254254

255255
integer, intent(in) :: j, k, l
256256

@@ -372,7 +372,7 @@ contains
372372
subroutine s_convert_species_to_mixture_variables(q_vf, k, l, r, rho, &
373373
gamma, pi_inf, qv, Re_K, G_K, G)
374374

375-
type(scalar_field), dimension(sys_size), intent(in) :: q_vf
375+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: q_vf
376376

377377
integer, intent(in) :: k, l, r
378378

@@ -735,7 +735,7 @@ contains
735735
!Initialize mv at the quadrature nodes based on the initialized moments and sigma
736736
pure subroutine s_initialize_mv(qK_cons_vf, mv)
737737

738-
type(scalar_field), dimension(sys_size), intent(in) :: qK_cons_vf
738+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: qK_cons_vf
739739

740740
real(wp), dimension(idwint(1)%beg:, idwint(2)%beg:, idwint(3)%beg:, 1:, 1:), intent(inout) :: mv
741741

@@ -767,7 +767,7 @@ contains
767767

768768
!Initialize pb at the quadrature nodes using isothermal relations (Preston model)
769769
pure subroutine s_initialize_pb(qK_cons_vf, mv, pb)
770-
type(scalar_field), dimension(sys_size), intent(in) :: qK_cons_vf
770+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: qK_cons_vf
771771

772772
real(wp), dimension(idwint(1)%beg:, idwint(2)%beg:, idwint(3)%beg:, 1:, 1:), intent(in) :: mv
773773
real(wp), dimension(idwint(1)%beg:, idwint(2)%beg:, idwint(3)%beg:, 1:, 1:), intent(inout) :: pb
@@ -811,9 +811,9 @@ contains
811811
qK_prim_vf, &
812812
ibounds)
813813

814-
type(scalar_field), dimension(sys_size), intent(in) :: qK_cons_vf
814+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: qK_cons_vf
815815
type(scalar_field), intent(inout) :: q_T_sf
816-
type(scalar_field), dimension(sys_size), intent(inout) :: qK_prim_vf
816+
type(scalar_field), dimension(eqn_idx%sys_size), intent(inout) :: qK_prim_vf
817817
type(int_bounds_info), dimension(1:3), intent(in) :: ibounds
818818

819819
real(wp), dimension(num_fluids) :: alpha_K, alpha_rho_K
@@ -1156,8 +1156,8 @@ contains
11561156
impure subroutine s_convert_primitive_to_conservative_variables(q_prim_vf, &
11571157
q_cons_vf)
11581158

1159-
type(scalar_field), dimension(sys_size), intent(in) :: q_prim_vf
1160-
type(scalar_field), dimension(sys_size), intent(inout) :: q_cons_vf
1159+
type(scalar_field), dimension(eqn_idx%sys_size), intent(in) :: q_prim_vf
1160+
type(scalar_field), dimension(eqn_idx%sys_size), intent(inout) :: q_cons_vf
11611161

11621162
! Density, specific heat ratio function, liquid stiffness function
11631163
! and dynamic pressure, as defined in the incompressible flow sense,

0 commit comments

Comments
 (0)