Merge pull request #39 from anshgupta1234/fix_13

MFlowCode · Jan 1, 2023 · 83528f1 · 83528f1
2 parents ba86586 + 9afd287
commit 83528f1
Show file tree

Hide file tree

Showing 13 changed files with 624 additions and 1,285 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -168,11 +168,16 @@ macro(HANDLE_FYPP target)
 
         set(f90_filepath "${f90_dirpath}/autogen/${f90_filename}")
 
+        set(depends_on "${fpp_filepath}")
+        if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/src/${target}/case.fpp")
+            list(APPEND depends_on "${CMAKE_CURRENT_SOURCE_DIR}/src/${target}/case.fpp")
+        endif()
+
         add_custom_command(
             OUTPUT   "${f90_filepath}"
             COMMAND  "${FYPP_EXE}" "${fpp_filepath}" "${f90_filepath}"
-            DEPENDS  "${fpp_filepath}" "${CMAKE_CURRENT_SOURCE_DIR}/src/${target}/case.fpp"
-            COMMENT  "Preprocessing ${fpp_filename}"
+            DEPENDS  "${depends_on}"
+            COMMENT  "Preprocessing (Fypp) ${fpp_filename}"
             VERBATIM
         )
 

diff --git a/src/simulation/m_variables_conversion.f90 → src/common/m_variables_conversion.fpp b/src/simulation/m_variables_conversion.f90 → src/common/m_variables_conversion.fpp
diff --git a/src/post_process/m_global_parameters.f90 b/src/post_process/m_global_parameters.f90
@@ -235,6 +235,16 @@ module m_global_parameters
     real(kind(0d0)) :: poly_sigma
     !> @}
 
+    !> @name Index variables used for m_variables_conversion
+    !> @{
+    integer :: momxb, momxe
+    integer :: advxb, advxe
+    integer :: contxb, contxe
+    integer :: intxb, intxe
+    integer :: bubxb, bubxe
+    integer :: strxb, strxe
+    !> @}
+
     ! Mathematical and Physical Constants ======================================
     real(kind(0d0)), parameter :: pi = 3.141592653589793d0
     ! ==========================================================================
@@ -516,6 +526,19 @@ subroutine s_initialize_global_parameters_module() ! ----------------------
                 end if
             end if
         end if
+
+        momxb = mom_idx%beg
+        momxe = mom_idx%end
+        advxb = adv_idx%beg
+        advxe = adv_idx%end
+        contxb = cont_idx%beg
+        contxe = cont_idx%end
+        bubxb = bub_idx%beg
+        bubxe = bub_idx%end
+        strxb = stress_idx%beg
+        strxe = stress_idx%end
+        intxb = internalEnergies_idx%beg
+        intxe = internalEnergies_idx%end
         ! ==================================================================
 
 #ifdef MFC_MPI