asdf

wilfonba · Feb 18, 2025 · f48b6db · f48b6db
1 parent 9983669
commit f48b6db
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 29 deletions.
diff --git a/examples/2D_igr/case.py b/examples/2D_igr/case.py
@@ -41,8 +41,8 @@
     # "t_save": 2.5/100,
     "dt": dt,
     "t_step_start": 0,
-    "t_step_stop": 5000,
-    "t_step_save": 50,
+    "t_step_stop": 1,
+    "t_step_save": 1,
     # Simulation Algorithm
     "model_eqns": 2,
     "alt_soundspeed": "F",
@@ -65,6 +65,9 @@
     "num_patches": 2,
     "num_fluids": 1,
     "igr": "T",
+    "alf_factor": 10,
+    "elliptic_smoothing": "T",
+    "elliptic_smoothing_iters": 15,
     # Database Structure Parameters
     "format": 1,
     "precision": 2,
@@ -89,16 +92,10 @@
     "patch_icpp(1)%alpha(1)": 1,
     # High pressure
     "patch_icpp(2)%alter_patch(1)": "T",
-    "patch_icpp(2)%smoothen": "T",
-    "patch_icpp(2)%smooth_patch_id": 1,
-    "patch_icpp(2)%smooth_coeff": 0.5,
     "patch_icpp(2)%geometry": 2,
-    # "patch_icpp(2)%geometry": 5,
     "patch_icpp(2)%x_centroid": 0,
     "patch_icpp(2)%y_centroid": 0,
     "patch_icpp(2)%radius": r0,
-    # "patch_icpp(2)%radii(1)": r0,
-    # "patch_icpp(2)%radii(2)": 2*r0/3,
     "patch_icpp(2)%vel(1)": 0.0,
     "patch_icpp(2)%vel(2)": 0.0,
     "patch_icpp(2)%pres": 9.518,

diff --git a/src/pre_process/m_perturbation.fpp b/src/pre_process/m_perturbation.fpp
@@ -616,7 +616,7 @@ contains
         type(scalar_field), dimension(sys_size) :: q_prim_vf
         real(wp), dimension(0:m, 0:n, 0:p, 1:sys_size) :: q_prim_temp
         integer :: i, j, k, l, q
-
+        print*, proc_rank, bcxb, bcxe
         do q = 1, elliptic_smoothing_iters
             if(bcxb >= -12) then
                 if(bcxb >= 0) then

diff --git a/src/simulation/m_igr.fpp b/src/simulation/m_igr.fpp
@@ -239,8 +239,10 @@ contains
         real(wp) :: resid
         integer :: num_iters, t_step
 
-        if (t_step == 0) then
-            num_iters = 500
+        print*, proc_rank, bcxb, bcxe
+
+        if (t_step <= 10) then
+            num_iters = 500 - 50*t_step
         else
             num_iters = num_igr_iters
         end if
@@ -278,12 +280,6 @@ contains
                 end do
             end do
 
-            !$acc kernels
-            resid = maxval(jac - jac_old)
-            !$acc end kernels
-
-            print*, t_step, resid
-
             if(bcxb >= -12) then
                 if(bcxb >= 0) then
                     call s_mpi_sendrecv_F_igr(jac, 1, -1)
@@ -1356,12 +1352,12 @@ contains
                 do l = 0, p
                     do k = 0, n
                         do j = 0, m
-                            rhs_vf(i)%sf(j, k, l) = rhs_vf(i)%sf(j, k, l) + &
-                                q_prim_vf(i)%sf(j,k,l) * dux(j,k,l)
                             !rhs_vf(i)%sf(j, k, l) = rhs_vf(i)%sf(j, k, l) + &
-                                !q_prim_vf(i)%sf(j,k,l) * (1._wp/(2._wp*dx(j))) * &
-                                !(qL_rs_vf(j+1,k,l,momxb) + qR_rs_vf(j,k,l,momxb) - &
-                                !qL_rs_vf(j,k,l,momxb) - qR_rs_vf(j-1,k,l,momxb))
+                                !q_prim_vf(i)%sf(j,k,l) * dux(j,k,l)
+                            rhs_vf(i)%sf(j, k, l) = rhs_vf(i)%sf(j, k, l) + &
+                                q_prim_vf(i)%sf(j,k,l) * (1._wp/(2._wp*dx(j))) * &
+                                (qL_rs_vf(j+1,k,l,momxb) + qR_rs_vf(j,k,l,momxb) - &
+                                qL_rs_vf(j,k,l,momxb) - qR_rs_vf(j-1,k,l,momxb))
                         end do
                     end do
                 end do
@@ -1386,12 +1382,12 @@ contains
                 do l = 0, p
                     do k = 0, n
                         do j = 0, m
-                            rhs_vf(i)%sf(j, k, l) = rhs_vf(i)%sf(j, k, l) + &
-                                q_prim_vf(i)%sf(j,k,l) * dvy(j,k,l)
                             !rhs_vf(i)%sf(j, k, l) = rhs_vf(i)%sf(j, k, l) + &
-                                !q_prim_vf(i)%sf(j,k,l) * (1._wp/(2._wp*dy(k))) * &
-                                !(qL_rs_vf(j,k+1,l,momxb+1) + qR_rs_vf(j,k,l,momxb+1) - &
-                                !qL_rs_vf(j,k,l,momxb+1) - qR_rs_vf(j,k-1,l,momxb+1))
+                                !q_prim_vf(i)%sf(j,k,l) * dvy(j,k,l)
+                            rhs_vf(i)%sf(j, k, l) = rhs_vf(i)%sf(j, k, l) + &
+                                q_prim_vf(i)%sf(j,k,l) * (1._wp/(2._wp*dy(k))) * &
+                                (qL_rs_vf(j,k+1,l,momxb+1) + qR_rs_vf(j,k,l,momxb+1) - &
+                                qL_rs_vf(j,k,l,momxb+1) - qR_rs_vf(j,k-1,l,momxb+1))
                         end do
                     end do
                 end do
@@ -1416,8 +1412,8 @@ contains
                 do l = 0, p
                     do k = 0, n
                         do j = 0, m
-                            rhs_vf(i)%sf(j, k, l) = rhs_vf(i)%sf(j, k, l) + &
-                                q_prim_vf(i)%sf(j,k,l) * dwz(j,k,l)
+                            !rhs_vf(i)%sf(j, k, l) = rhs_vf(i)%sf(j, k, l) + &
+                                !q_prim_vf(i)%sf(j,k,l) * dwz(j,k,l)
                             !rhs_vf(i)%sf(j, k, l) = rhs_vf(i)%sf(j, k, l) + &
                                 !q_prim_vf(i)%sf(j,k,l) * (1._wp/(2._wp*dz(l))) * &
                                 !(qL_rs_vf(j,k,l+1,momxe) + qR_rs_vf(j,k,l,momxe) - &