Skip to content

Commit c553b78

Browse files
committed
Fix nv_uvm_out_of_core inconsistency and add to case file
1 parent 51d7e90 commit c553b78

File tree

5 files changed

+7
-6
lines changed

5 files changed

+7
-6
lines changed

examples/3D_IGR_TaylorGreenVortex_nvidia/case.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
"fluid_pp(1)%pi_inf": 0,
9898
"fluid_pp(1)%Re(1)": 1 / mu,
9999
# NVIDIA UVM Options
100+
"nv_uvm_out_of_core": "T",
100101
"nv_uvm_igr_temps_on_gpu": 3,
101102
"nv_uvm_pref_gpu": "T",
102103
}

src/simulation/m_global_parameters.fpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -159,11 +159,11 @@ module m_global_parameters
159159

160160
!> @name Variables for our of core IGR computation on NVIDIA
161161
!> @{
162+
logical :: nv_uvm_out_of_core ! Enable out-or-core storage of q_cons_ts(2) in timestepping
162163
integer :: nv_uvm_igr_temps_on_gpu ! 0 => jac, jac_rhs, and jac_old on CPU
163164
! 1 => jac on GPU, jac_rhs and jac_old on CPU
164165
! 2 => jac and jac_rhs on GPU, jac_old on CPU
165166
! 3 => jac, jac_rhs, and jac_old on GPU (default)
166-
logical :: nv_uvm_out_of_core ! Enable out-or-core storage of q_cons_ts(2) in timestepping
167167
logical :: nv_uvm_pref_gpu ! Enable explicit gpu memory hints (default TRUE)
168168
!> @}
169169

@@ -584,8 +584,8 @@ contains
584584
t_save = dflt_real
585585
586586
! NVIDIA UVM options
587-
nv_uvm_igr_temps_on_gpu = 3 ! => jac, jac_rhs, and jac_old on GPU (default)
588587
nv_uvm_out_of_core = .false.
588+
nv_uvm_igr_temps_on_gpu = 3 ! => jac, jac_rhs, and jac_old on GPU (default)
589589
nv_uvm_pref_gpu = .true.
590590
591591
! Simulation algorithm parameters

src/simulation/m_mpi_proxy.fpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ contains
238238
end do
239239
240240
! NVIDIA UVM variables
241-
call MPI_BCAST(nv_uvm_igr_temps_on_gpu, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
242241
call MPI_BCAST(nv_uvm_out_of_core, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
242+
call MPI_BCAST(nv_uvm_igr_temps_on_gpu, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
243243
call MPI_BCAST(nv_uvm_pref_gpu, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
244244
245245
#endif

src/simulation/m_start_up.fpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -188,8 +188,8 @@ contains
188188
hyperelasticity, R0ref, num_bc_patches, Bx0, powell, &
189189
cont_damage, tau_star, cont_damage_s, alpha_bar, &
190190
alf_factor, num_igr_iters, num_igr_warm_start_iters, &
191-
int_comp, ic_eps, ic_beta, nv_uvm_igr_temps_on_gpu, &
192-
nv_uvm_pref_gpu, down_sample
191+
int_comp, ic_eps, ic_beta, nv_uvm_out_of_core, &
192+
nv_uvm_igr_temps_on_gpu, nv_uvm_pref_gpu, down_sample
193193

194194
! Checking that an input file has been provided by the user. If it
195195
! has, then the input file is read in, otherwise, simulation exits.

toolchain/mfc/run/case_dicts.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -313,8 +313,8 @@ def analytic(self):
313313
'int_comp': ParamType.LOG,
314314
'ic_eps': ParamType.REAL,
315315
'ic_beta': ParamType.REAL,
316+
'nv_uvm_out_of_core': ParamType.LOG,
316317
'nv_uvm_igr_temps_on_gpu': ParamType.INT,
317-
'nv_uvm_igr_out_of_core': ParamType.LOG,
318318
'nv_uvm_pref_gpu': ParamType.LOG,
319319
})
320320

0 commit comments

Comments
 (0)