Resolve Merge Issues

Author: Dimitrios Adam

src/simulation/m_rhs.fpp

@@ -1523,8 +1523,8 @@ contains
                             do i = momxb, E_idx
                                 rhs_vf(i)%sf(j, k, l) = &
                                     rhs_vf(i)%sf(j, k, l) + 1._wp/dx(j)* &
-                                    (flux_src_n(i)%sf(j - 1, k, l) &
-                                     - flux_src_n(i)%sf(j, k, l))
+                                    (flux_src_n_in(i)%sf(j - 1, k, l) &
+                                     - flux_src_n_in(i)%sf(j, k, l))
                             end do
                         end do
                     end do
@@ -1540,15 +1540,15 @@ contains
                             do i = chemxb, chemxe
                                 rhs_vf(i)%sf(j, k, l) = &
                                     rhs_vf(i)%sf(j, k, l) + 1._wp/dx(j)* &
-                                    (flux_src_n(i)%sf(j - 1, k, l) &
-                                     - flux_src_n(i)%sf(j, k, l))
+                                    (flux_src_n_in(i)%sf(j - 1, k, l) &
+                                     - flux_src_n_in(i)%sf(j, k, l))
                             end do
 
                             if (.not. viscous) then
                                 rhs_vf(E_idx)%sf(j, k, l) = &
                                     rhs_vf(E_idx)%sf(j, k, l) + 1._wp/dx(j)* &
-                                    (flux_src_n(E_idx)%sf(j - 1, k, l) &
-                                     - flux_src_n(E_idx)%sf(j, k, l))
+                                    (flux_src_n_in(E_idx)%sf(j - 1, k, l) &
+                                     - flux_src_n_in(E_idx)%sf(j, k, l))
                             end if
                         end do
                     end do
@@ -1631,8 +1631,8 @@ contains
                                 do i = momxb, E_idx
                                     rhs_vf(i)%sf(j, k, l) = &
                                         rhs_vf(i)%sf(j, k, l) + 1._wp/dy(k)* &
-                                        (flux_src_n(i)%sf(j, k - 1, l) &
-                                         - flux_src_n(i)%sf(j, k, l))
+                                        (flux_src_n_in(i)%sf(j, k - 1, l) &
+                                         - flux_src_n_in(i)%sf(j, k, l))
                                 end do
                             end do
                         end do
@@ -1648,14 +1648,14 @@ contains
                                 do i = chemxb, chemxe
                                     rhs_vf(i)%sf(j, k, l) = &
                                         rhs_vf(i)%sf(j, k, l) + 1._wp/dy(k)* &
-                                        (flux_src_n(i)%sf(j, k - 1, l) &
-                                         - flux_src_n(i)%sf(j, k, l))
+                                        (flux_src_n_in(i)%sf(j, k - 1, l) &
+                                         - flux_src_n_in(i)%sf(j, k, l))
                                 end do
                                 if (.not. viscous) then
                                     rhs_vf(E_idx)%sf(j, k, l) = &
                                         rhs_vf(E_idx)%sf(j, k, l) + 1._wp/dy(k)* &
-                                        (flux_src_n(E_idx)%sf(j, k - 1, l) &
-                                         - flux_src_n(E_idx)%sf(j, k, l))
+                                        (flux_src_n_in(E_idx)%sf(j, k - 1, l) &
+                                         - flux_src_n_in(E_idx)%sf(j, k, l))
                                 end if
                             end do
                         end do
@@ -1742,8 +1742,8 @@ contains
                             do i = momxb, E_idx
                                 rhs_vf(i)%sf(j, k, l) = &
                                     rhs_vf(i)%sf(j, k, l) + 1._wp/dz(l)* &
-                                    (flux_src_n(i)%sf(j, k, l - 1) &
-                                     - flux_src_n(i)%sf(j, k, l))
+                                    (flux_src_n_in(i)%sf(j, k, l - 1) &
+                                     - flux_src_n_in(i)%sf(j, k, l))
                             end do
                         end do
                     end do
@@ -1759,14 +1759,14 @@ contains
                             do i = chemxb, chemxe
                                 rhs_vf(i)%sf(j, k, l) = &
                                     rhs_vf(i)%sf(j, k, l) + 1._wp/dz(l)* &
-                                    (flux_src_n(i)%sf(j, k, l - 1) &
-                                     - flux_src_n(i)%sf(j, k, l))
+                                    (flux_src_n_in(i)%sf(j, k, l - 1) &
+                                     - flux_src_n_in(i)%sf(j, k, l))
                             end do
                             if (.not. viscous) then
                                 rhs_vf(E_idx)%sf(j, k, l) = &
                                     rhs_vf(E_idx)%sf(j, k, l) + 1._wp/dz(l)* &
-                                    (flux_src_n(E_idx)%sf(j, k, l - 1) &
-                                     - flux_src_n(E_idx)%sf(j, k, l))
+                                    (flux_src_n_in(E_idx)%sf(j, k, l - 1) &
+                                     - flux_src_n_in(E_idx)%sf(j, k, l))
                             end if
                         end do
                     end do

toolchain/pyproject.toml

@@ -38,8 +38,8 @@ dependencies = [
 
     # Chemistry
     "cantera==3.1.0",
-    "pyrometheus=1.0.3",
-
+    "pyrometheus == 1.0.3",
+    
     # Frontier Profiling
     "astunparse==1.6.2",
     "colorlover",