test merge and add nv_uvm_out_of_core back

Author: wilfonba

src/simulation/m_global_parameters.fpp

@@ -163,6 +163,7 @@ module m_global_parameters
                                        ! 1 => jac on GPU, jac_rhs and jac_old on CPU
                                        ! 2 => jac and jac_rhs on GPU, jac_old on CPU
                                        ! 3 => jac, jac_rhs, and jac_old on GPU (default)
+    logical :: nv_uvm_out_of_core ! Enable out-or-core storage of q_cons_ts(2) in timestepping
     logical :: nv_uvm_pref_gpu ! Enable explicit gpu memory hints (default TRUE)
     !> @}
 
@@ -584,6 +585,7 @@ contains
 
         ! NVIDIA UVM options
         nv_uvm_igr_temps_on_gpu = 3 ! => jac, jac_rhs, and jac_old on GPU (default)
+        nv_uvm_out_of_core = .false.
         nv_uvm_pref_gpu = .true.
 
         ! Simulation algorithm parameters

src/simulation/m_mpi_proxy.fpp

@@ -239,6 +239,7 @@ contains
 
         ! NVIDIA UVM variables
         call MPI_BCAST(nv_uvm_igr_temps_on_gpu, 1, MPI_INTEGER, 0, MPI_COMM_WORLD, ierr)
+        call MPI_BCAST(nv_uvm_out_of_core, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
         call MPI_BCAST(nv_uvm_pref_gpu, 1, MPI_LOGICAL, 0, MPI_COMM_WORLD, ierr)
 
 #endif

src/simulation/m_time_steppers.fpp

@@ -574,7 +574,6 @@ contains
         real(wp), intent(inout) :: time_avg
 
         integer :: i, j, k, l, q!< Generic loop iterator
-        integer :: dest
         real(wp) :: start, finish
         integer :: dest
 
@@ -810,9 +809,8 @@ contains
         real(wp), intent(INOUT) :: time_avg
 
         integer :: i, j, k, l, q !< Generic loop iterator
-        integer :: dest
-
         real(wp) :: start, finish
+        integer :: dest
 
         ! Stage 1 of 3
 
@@ -1385,7 +1383,11 @@ contains
         do j = 1, sys_size
             @:DEALLOCATE(q_cons_ts(1)%vf(j)%sf)
             if (num_ts == 2) then
-                nullify(q_cons_ts(2)%vf(j)%sf)
+                if (nv_uvm_out_of_core) then
+                    nullify(q_cons_ts(2)%vf(j)%sf)
+                else
+                    @:DEALLOCATE(q_cons_ts(2)%vf(j)%sf)
+                end if
             end if
         end do
         deallocate(q_cons_ts_pool_host)

toolchain/mfc/run/case_dicts.py

@@ -314,6 +314,7 @@ def analytic(self):
     'ic_eps': ParamType.REAL,
     'ic_beta': ParamType.REAL,
     'nv_uvm_igr_temps_on_gpu': ParamType.INT,
+    'nv_uvm_igr_out_of_core': ParamType.LOG,
     'nv_uvm_pref_gpu': ParamType.LOG,
 })