Skip to content

Close #13 #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sbryngelson merged 2 commits into from
Jan 1, 2023
Merged

Close #13 #39

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
627bf85
Move m_variables_conversion to src/common
anshgupta1234 Dec 29, 2022
9afd287
removed most #ifndefs
anshgupta1234 Jan 1, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
)

Expand Down
796 changes: 548 additions & 248 deletions src/simulation/m_variables_conversion.f90 → src/common/m_variables_conversion.fpp
View file
Open in desktop

Large diffs are not rendered by default.

23 changes: 23 additions & 0 deletions src/post_process/m_global_parameters.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
! ==========================================================================
Expand Down Expand Up @@ -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
Expand Down
Loading