Skip to content

Buckling MPC fixes #195

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
zchlrnr merged 4 commits into from
Feb 11, 2026
Merged

Buckling MPC fixes #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
56e08e3
add deterministic build type
Bruno02468 Feb 11, 2026
98136ec
fix MPCs causing crashes on SOL 105
Bruno02468 Feb 11, 2026
236f7c0
prevent LINK9 from closing L2A (breaks SOL 105 w/ MPCs)
Bruno02468 Feb 11, 2026
54f6f53
also keep L2R
Bruno02468 Feb 11, 2026
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
35 changes: 25 additions & 10 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,14 @@ include_directories("${CMAKE_SOURCE_DIR}/INCLUDE")
# uncomment this to debug
# set(CMAKE_VERBOSE_MAKEFILE true)

# a new build type for profiling
set(CMAKE_PROFILING_FLAGS "-O2 -g -fno-omit-frame-pointer -fno-inline-functions")

set(CMAKE_C_FLAGS_PROFILING "${CMAKE_PROFILING_FLAGS}")
set(CMAKE_CXX_FLAGS_PROFILING "${CMAKE_PROFILING_FLAGS}")
set(CMAKE_Fortran_FLAGS_PROFILING "${CMAKE_PROFILING_FLAGS}")

set(CMAKE_EXE_LINKER_FLAGS_PROFILING "")
set(CMAKE_SHARED_LINKER_FLAGS_PROFILING "")

# register the Profile build type, just in case
set(CMAKE_CONFIGURATION_TYPES
Debug
Release
RelWithDebInfo
MinSizeRel
Profiling
Deterministic
CACHE STRING "" FORCE
)

Expand Down Expand Up @@ -346,6 +337,30 @@ if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_Fortran_FLAGS_DEBUG
"-g -O0 -fcheck=all -fbacktrace -fbounds-check \
-fno-inline -fno-ipa-sra -fno-ipa-cp -fno-optimize-sibling-calls")
set(CMAKE_Fortran_FLAGS_DETERMINISTIC
"-O0 -g \
-fno-fast-math \
-ffp-contract=off \
-fno-unsafe-math-optimizations \
-fno-associative-math \
-fno-reciprocal-math \
-frounding-math"
)
set(CMAKE_C_FLAGS_DETERMINISTIC
"-O0 -g \
-fno-fast-math \
-ffp-contract=off \
-frounding-math"
)
set(CMAKE_CXX_FLAGS_DETERMINISTIC
"${CMAKE_C_FLAGS_DETERMINISTIC}"
)
set(CMAKE_PROFILING_FLAGS "-O2 -g -fno-omit-frame-pointer -fno-inline-functions")
set(CMAKE_C_FLAGS_PROFILING "${CMAKE_PROFILING_FLAGS}")
set(CMAKE_CXX_FLAGS_PROFILING "${CMAKE_PROFILING_FLAGS}")
set(CMAKE_Fortran_FLAGS_PROFILING "${CMAKE_PROFILING_FLAGS}")
set(CMAKE_EXE_LINKER_FLAGS_PROFILING "")
set(CMAKE_SHARED_LINKER_FLAGS_PROFILING "")
endif()

# issue a couple messages about compilation
Expand Down
50 changes: 25 additions & 25 deletions Source/Interfaces/MPC_PROC_Interface.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,53 @@
! ###############################################################################################################################
! Begin MIT license text.
! Begin MIT license text.
! _______________________________________________________________________________________________________
! Copyright 2022 Dr William R Case, Jr (mystransolver@gmail.com)
! Permission is hereby granted, free of charge, to any person obtaining a copy of this software and

! Copyright 2022 Dr William R Case, Jr (mystransolver@gmail.com)

! Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
! associated documentation files (the "Software"), to deal in the Software without restriction, including
! without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
! copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to
! the following conditions:
! The above copyright notice and this permission notice shall be included in all copies or substantial
! portions of the Software and documentation.
! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
! AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
! LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
! THE SOFTWARE.
! copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to
! the following conditions:

! The above copyright notice and this permission notice shall be included in all copies or substantial
! portions of the Software and documentation.

! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
! AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
! LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
! THE SOFTWARE.
! _______________________________________________________________________________________________________
! End MIT license text.

! End MIT license text.

MODULE MPC_PROC_Interface

INTERFACE

SUBROUTINE MPC_PROC


USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : WRT_ERR, WRT_LOG, ERR, F04, F06, L1J, L1S, LINK1S, L1S_MSG
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR, LMPCADDC, NGRID, NMPC, NMPCADD, NUM_MPCSIDS
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR, LMPCADDC, NGRID, NMPC, NMPCADD, NUM_MPCSIDS, SOL_NAME
USE TIMDAT, ONLY : TSEC
USE SUBR_BEGEND_LEVELS, ONLY : MPC_PROC_BEGEND
USE MODEL_STUF, ONLY : GRID_ID, MPCSET, MPCSIDS
USE DOF_TABLES, ONLY : TDOF, TDOF_ROW_START
USE NONLINEAR_PARAMS, ONLY : LOAD_ISTEP

IMPLICIT NONE

CHARACTER( 1*BYTE) :: MPC_SET_USED ! 'Y'/'N' indicator if an MPC set in B.D. is used

INTEGER(LONG), PARAMETER :: SUBR_BEGEND = MPC_PROC_BEGEND

END SUBROUTINE MPC_PROC

END INTERFACE

END MODULE MPC_PROC_Interface

49 changes: 24 additions & 25 deletions Source/Interfaces/REDUCE_KGGD_TO_KNND_Interface.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
! ###############################################################################################################################
! Begin MIT license text.
! Begin MIT license text.
! _______________________________________________________________________________________________________
! Copyright 2022 Dr William R Case, Jr (mystransolver@gmail.com)
! Permission is hereby granted, free of charge, to any person obtaining a copy of this software and

! Copyright 2022 Dr William R Case, Jr (mystransolver@gmail.com)

! Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
! associated documentation files (the "Software"), to deal in the Software without restriction, including
! without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
! copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to
! the following conditions:
! The above copyright notice and this permission notice shall be included in all copies or substantial
! portions of the Software and documentation.
! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
! AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
! LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
! THE SOFTWARE.
! copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to
! the following conditions:

! The above copyright notice and this permission notice shall be included in all copies or substantial
! portions of the Software and documentation.

! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
! AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
! LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
! THE SOFTWARE.
! _______________________________________________________________________________________________________
! End MIT license text.

! End MIT license text.

MODULE REDUCE_KGGD_TO_KNND_Interface

INTERFACE

SUBROUTINE REDUCE_KGGD_TO_KNND ( PART_VEC_G_NM )


USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : ERR, F04, F06, L2J, LINK2J, L2J_MSG, SC1, WRT_ERR, WRT_LOG
USE IOUNT1, ONLY : ERR, F04, F06, LINK2A, L2A, L2ASTAT, L2A_MSG, L2J, LINK2J, L2J_MSG, SC1, WRT_ERR, WRT_LOG
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR, NDOFG, NDOFN, NDOFM, NTERM_HMN, NTERM_KGGD, NTERM_KNND, &
NTERM_KNMD, NTERM_KMMD, NTERM_GMN
USE PARAMS, ONLY : EPSIL, SPARSTOR
USE TIMDAT, ONLY : TSEC
USE SUBR_BEGEND_LEVELS, ONLY : REDUCE_KGGD_TO_KNND_BEGEND
USE CONSTANTS_1, ONLY : ONE
USE CONSTANTS_1, ONLY : ONE
USE SPARSE_MATRICES, ONLY : I_HMN, J_HMN, HMN, I_KGGD, J_KGGD, KGGD, I_KNND, J_KNND, KNND, I_KNMD, J_KNMD, KNMD, &
I_KMMD, J_KMMD, KMMD, I_KMND, J_KMND, KMND, I_GMN, J_GMN, GMN, I_GMNt, J_GMNt, GMNt
USE SPARSE_MATRICES, ONLY : SYM_GMN, SYM_HMN, SYM_KGGD, SYM_KNND, SYM_KNMD, SYM_KMMD, SYM_KMND
Expand All @@ -47,7 +47,7 @@ SUBROUTINE REDUCE_KGGD_TO_KNND ( PART_VEC_G_NM )
IMPLICIT NONE

CHARACTER, PARAMETER :: CR13 = CHAR(13) ! This causes a carriage return simulating the "+" action in a FORMAT
INTEGER(LONG), INTENT(IN) :: PART_VEC_G_NM(NDOFG)! Partitioning vector (G set into N and M sets)
INTEGER(LONG), INTENT(IN) :: PART_VEC_G_NM(NDOFG)! Partitioning vector (G set into N and M sets)
INTEGER(LONG), PARAMETER :: NUM1 = 1 ! Used in subr's that partition matrices
INTEGER(LONG), PARAMETER :: NUM2 = 2 ! Used in subr's that partition matrices
INTEGER(LONG), PARAMETER :: SUBR_BEGEND = REDUCE_KGGD_TO_KNND_BEGEND
Expand All @@ -57,4 +57,3 @@ END SUBROUTINE REDUCE_KGGD_TO_KNND
END INTERFACE

END MODULE REDUCE_KGGD_TO_KNND_Interface

Loading