Merge remote-tracking branch 'refs/remotes/origin/main'

Author: hctorres

swm_AMReX_Fkernels/inputs

@@ -1,6 +1,6 @@
 # Number of cells on each direction
-nx = 64 
-ny = 64 
+nx = 3
+ny = 3
 
 # Cell size in each direction
 dx = 100000
@@ -10,11 +10,11 @@ dy = 100000
 max_chunk_size = 100000
 
 # Number of time steps to take
-n_time_steps = 4000
+n_time_steps = 1
 
 # Size of time step
 dt = 90
 
 # How often to write a plotfile
 # Optional. If left out no plot files will be written.
-plot_interval = 100
+plot_interval = 100

swm_AMReX_Fkernels/swm_fortran_amrex_kernels.F90

@@ -31,6 +31,7 @@ subroutine UpdateNewVariablesAmrexKernel(i,j,k,tdtsdx,tdtsdy,tdts8,pold,uold,vol
     real, dimension(:,:,:), intent(in) :: cu, cv, z, h
     real, dimension(:,:,:), pointer :: pold, uold, vold, pnew, unew, vnew
 
+    print *,'i,j,k: ',i,j,k
     unew(i+1,j,k) = uold(i+1,j,k) + &
                   tdts8 * (z(i+1,j+1,k) + z(i+1,j,k)) * (cv(i+1,j+1,k) + cv(i,j+1,k) + cv(i,j,k) + cv(i+1,j,k)) - &
                   tdtsdx * (h(i+1,j,k) - h(i,j,k))
@@ -58,4 +59,4 @@ subroutine UpdateOldVariablesAmrexKernel(i,j,k,alpha,pnew,unew,vnew,p,u,v,pold,u
 
   end subroutine UpdateOldVariablesAmrexKernel
 
-end module SWM_Fortran_Amrex_Kernels
+end module SWM_Fortran_Amrex_Kernels

swm_AMReX_Fkernels/swm_mini_app_utils.cpp

@@ -376,6 +376,7 @@ void UpdateNewVariables(const double dx, const double dy, const double tdt, cons
     const double tdtsdy = tdt / dy;
     const double tdts8  = tdt / 8.0;
 
+    amrex::Print() << tdtsdx << " " << tdtsdy << " " << tdts8 << std::endl;
     for (amrex::MFIter mfi(p_old); mfi.isValid(); ++mfi)
     {
         const amrex::Box& bx = mfi.validbox();
@@ -403,6 +404,26 @@ void UpdateNewVariables(const double dx, const double dy, const double tdt, cons
                                      p_new_array, u_new_array, v_new_array);
 
         });
+	amrex::Print() << "p_old: " << std::endl;
+        amrex::Print() << p_old[mfi] << std::endl;
+	amrex::Print() << "u_old: " << std::endl;
+        amrex::Print() << u_old[mfi] << std::endl;
+	amrex::Print() << "v_old: " << std::endl;
+        amrex::Print() << v_old[mfi] << std::endl;
+	amrex::Print() << "cu: " << std::endl;
+        amrex::Print() << cu[mfi] << std::endl;
+	amrex::Print() << "cv: " << std::endl;
+        amrex::Print() << cv[mfi] << std::endl;
+	amrex::Print() << "h: " << std::endl;
+        amrex::Print() << h[mfi] << std::endl;
+	amrex::Print() << "z: " << std::endl;
+        amrex::Print() << z[mfi] << std::endl;
+	amrex::Print() << "p_new: " << std::endl;
+        amrex::Print() << p_new[mfi] << std::endl;
+	amrex::Print() << "u_new: " << std::endl;
+        amrex::Print() << u_new[mfi] << std::endl;
+	amrex::Print() << "v_new: " << std::endl;
+        amrex::Print() << v_new[mfi] << std::endl;
     }
 
     u_new.FillBoundary(geom.periodicity());