Skip to content

Dev to main #216

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 55 commits into from
Apr 21, 2026
Merged

Dev to main #216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
55 commits
Select commit Hold shift + click to select a range
887c803
Redefined 1st parameter from actual grid number to internal grid number
victorkemp Apr 3, 2026
014ec1b
Merge branch 'MYSTRANsolver:main' into redefine-GET_GRID_NUM_COMPS
victorkemp Apr 3, 2026
e94d188
Remove testing GRID array is sorted
victorkemp Apr 3, 2026
c35c2e0
converted internal grid number to sequence number
victorkemp Apr 4, 2026
c6d8ade
Merge branch 'MYSTRANsolver:main' into fix-grav-grid-order-bug
victorkemp Apr 4, 2026
a27d13c
CONM2 grid odering fix
victorkemp Apr 5, 2026
ac8fb00
Merge pull request #200 from victorkemp/fix-grav-grid-order-bug
victorkemp Apr 5, 2026
724c9b0
Merge pull request #201 from victorkemp/redefine-GET_GRID_NUM_COMPS
victorkemp Apr 5, 2026
a24eb77
gated writes to F06
victorkemp Apr 6, 2026
6eb82a8
Merge pull request #203 from victorkemp/bar-stress-summary-f06
victorkemp Apr 6, 2026
6a724b9
removed most ANS file writing
victorkemp Apr 6, 2026
6974de5
removed ANS related variables and PARAMs
victorkemp Apr 6, 2026
4d5470e
removed now-unused format strings
victorkemp Apr 6, 2026
6401eff
Use reverse lookup instead of nested loop
Copper280z Apr 6, 2026
63ac946
clean up now-redundant IF statements
victorkemp Apr 6, 2026
d9c4168
Merge pull request #205 from victorkemp/remove-ans
victorkemp Apr 7, 2026
df87550
Merge pull request #204 from Copper280z/dev
victorkemp Apr 7, 2026
7ca2527
limit counter writes and add a way to force-finish
Bruno02468 Apr 7, 2026
54a43bd
Merge pull request #207 from Bruno02468/counter_performance
Bruno02468 Apr 7, 2026
9c87723
change UNIX_TIME to use libc's time() instead of previous mess
Bruno02468 Apr 7, 2026
6728ef8
Merge pull request #208 from Bruno02468/unix_time
Bruno02468 Apr 8, 2026
eea97f7
made common subroutine and used in Link 1
victorkemp Apr 15, 2026
541b100
converted link0-4, formats 1092,3092,4092
victorkemp Apr 16, 2026
5c42d65
converted link5-9
victorkemp Apr 16, 2026
2114e9e
added LINK_MESSAGE_I and corrected some formats 3093,5093,9093
victorkemp Apr 16, 2026
39c71e9
Merge pull request #209 from victorkemp/LINK_MESSAGE
zchlrnr Apr 16, 2026
648153c
basic implementation
victorkemp Apr 16, 2026
dc44cd2
cleaned up old code, and removed DEBUG(81)
victorkemp Apr 16, 2026
d59fcb7
Merge pull request #210 from victorkemp/optimize_MATADD_SSS
victorkemp Apr 17, 2026
12eca79
removed redundant loop
victorkemp Apr 18, 2026
e77e204
Merge pull request #212 from victorkemp/link9_speedup_init_loop
zchlrnr Apr 18, 2026
8a011a3
search&replace common BEGN and END blocks
victorkemp Apr 18, 2026
69047ac
manual search and remove BEGN
victorkemp Apr 18, 2026
19a9eb6
fix fort.4 (F04) tempfile due to CSHIFT being called by IS_THIS_A_RES…
Bruno02468 Apr 18, 2026
b539699
manual search and remove remaining BEGN and BEGIN
victorkemp Apr 18, 2026
c49a52e
manual search and remove END
victorkemp Apr 18, 2026
0623263
removed remaing writes to F04, including BLAS
victorkemp Apr 18, 2026
a08686d
Merge branch 'MystranSolver:main' into remove_f04
victorkemp Apr 18, 2026
0ec3151
Revert "Merge branch 'MystranSolver:main' into remove_f04"
victorkemp Apr 18, 2026
d67ad66
removed f04 file opening and closing
victorkemp Apr 18, 2026
6634daf
regex deleted SUBR_BEGEND declarations and WRITE_MEM_SUM_TO_F04
victorkemp Apr 18, 2026
1fcc570
Deleted SUBR_BEGEND_LEVELS and SUBR_BEGEND
victorkemp Apr 18, 2026
2f67685
Removed WRT_LOG
victorkemp Apr 19, 2026
1b8f1b6
removed F04 step 1
victorkemp Apr 19, 2026
2a515fa
removed F04 step 2
victorkemp Apr 19, 2026
b978b08
removed some F04 related variables and parameters
victorkemp Apr 19, 2026
fd65f9a
Removed F04 flag param from FILE_OPEN and FILE_CLOSE
victorkemp Apr 19, 2026
9623d36
Merge branch 'dev' into remove_f04
victorkemp Apr 19, 2026
2ff93ce
Merge pull request #213 from victorkemp/remove_f04
victorkemp Apr 19, 2026
9e4c7aa
Removed SUBR_BEGEND_LEVELS from BLAS files
victorkemp Apr 19, 2026
d020e66
Merge pull request #214 from victorkemp/remove_f04
victorkemp Apr 19, 2026
9cbafd4
added dev branch to build action
victorkemp Apr 19, 2026
a766704
Merge pull request #215 from victorkemp/build_for_dev
Bruno02468 Apr 19, 2026
8c4ca09
add tiny lil flag to the Profiling build
Bruno02468 Apr 21, 2026
cf75fe2
fix large LSUB causing 105 decks to run slow
Bruno02468 Apr 21, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions .github/workflows/cmake.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ name: CMake

on:
push:
branches: [ "main" ]
branches: [ "main", "dev" ]
pull_request:
branches: [ "main" ]
branches: [ "main", "dev" ]

env:
# Customize the CMake build type here (Release, Debug, RelWithDebInfo, etc.)
Expand Down
3 changes: 1 addition & 2 deletions BLAS/DGEMM.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
SUBROUTINE DGEMM ( TRANSA, TRANSB, M, N, K, ALPHA, A, LDA, B, LDB,
$ BETA, C, LDC )
USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : ERR, F04, F06, SC1, WRT_LOG
USE IOUNT1, ONLY : ERR, F06, SC1
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR
USE TIMDAT, ONLY : HOUR, MINUTE, SEC,
& SFRAC, TSEC
USE SUBR_BEGEND_LEVELS, ONLY : LAPACK_BEGEND

USE OUTA_HERE_Interface

Expand Down
3 changes: 1 addition & 2 deletions BLAS/DGEMV.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ SUBROUTINE DGEMV ( TRANS, M, N, ALPHA, A, LDA, X, INCX,
$ BETA, Y, INCY )

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : ERR, F04, F06, SC1, WRT_LOG
USE IOUNT1, ONLY : ERR, F06, SC1
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR
USE TIMDAT, ONLY : HOUR, MINUTE, SEC,
& SFRAC, TSEC
USE SUBR_BEGEND_LEVELS, ONLY : LAPACK_BEGEND

USE OUTA_HERE_Interface

Expand Down
3 changes: 1 addition & 2 deletions BLAS/DLAMCH.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
DOUBLE PRECISION FUNCTION DLAMCH( CMACH )

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : ERR, F04, F06, SC1, WRT_LOG
USE IOUNT1, ONLY : ERR, F06, SC1
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR
USE TIMDAT, ONLY : HOUR, MINUTE, SEC,
& SFRAC, TSEC
USE SUBR_BEGEND_LEVELS, ONLY : LAPACK_BEGEND
USE LAPACK_BLAS_AUX

USE OUTA_HERE_Interface
Expand Down
3 changes: 1 addition & 2 deletions BLAS/DLANST.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
DOUBLE PRECISION FUNCTION DLANST( NORM, N, D, E )

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : ERR, F04, F06, SC1, WRT_LOG
USE IOUNT1, ONLY : ERR, F06, SC1
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR
USE TIMDAT, ONLY : HOUR, MINUTE, SEC,
& SFRAC, TSEC
USE SUBR_BEGEND_LEVELS, ONLY : LAPACK_BEGEND
USE LAPACK_BLAS_AUX

USE OUTA_HERE_Interface
Expand Down
3 changes: 1 addition & 2 deletions BLAS/DSCAL.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
SUBROUTINE DSCAL(N,DA,DX,INCX)

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : ERR, F04, F06, SC1, WRT_LOG
USE IOUNT1, ONLY : ERR, F06, SC1
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR
USE TIMDAT, ONLY : HOUR, MINUTE, SEC,
& SFRAC, TSEC
USE SUBR_BEGEND_LEVELS, ONLY : LAPACK_BEGEND

USE OUTA_HERE_Interface

Expand Down
26 changes: 2 additions & 24 deletions BLAS/DSTEQR.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,18 +3,12 @@
SUBROUTINE DSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : ERR, F04, F06, SC1, WRT_LOG
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR
USE TIMDAT, ONLY : HOUR, MINUTE, SEC,
& SFRAC, TSEC
USE SUBR_BEGEND_LEVELS, ONLY : LAPACK_BEGEND
USE IOUNT1, ONLY : ERR, F06, SC1
USE SCONTR, ONLY : FATAL_ERR
USE LAPACK_BLAS_AUX

USE OUTA_HERE_Interface

INTEGER(LONG), PARAMETER :: SUBR_BEGEND = LAPACK_BEGEND

CHARACTER(LEN=LEN(BLNK_SUB_NAM)):: subr_name = 'DSTEQR'
*
* -- LAPACK routine (version 2.0) --
* Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
Expand Down Expand Up @@ -121,14 +115,6 @@ SUBROUTINE DSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
* ..
* .. Executable Statements ..

! **********************************************************************************************************************************
IF (WRT_LOG >= SUBR_BEGEND+1) THEN
CALL OURTIM
WRITE(F04,9001) SUBR_NAME,TSEC
9001 FORMAT(1X,A,' BEGN ',F10.3)
ENDIF

! **********************************************************************************************************************************
*
* Test the input parameters.
*
Expand Down Expand Up @@ -522,14 +508,6 @@ SUBROUTINE DSTEQR( COMPZ, N, D, E, Z, LDZ, WORK, INFO )
*
190 CONTINUE

! **********************************************************************************************************************************
9000 IF (WRT_LOG >= SUBR_BEGEND+1) THEN
CALL OURTIM
WRITE(F04,9002) SUBR_NAME,TSEC
9002 FORMAT(1X,A,' END ',F10.3)
ENDIF

! **********************************************************************************************************************************
RETURN
*
* End of DSTEQR
Expand Down
26 changes: 0 additions & 26 deletions BLAS/DSTERF.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,10 @@
SUBROUTINE DSTERF( N, D, E, INFO )

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : F04, WRT_LOG
USE SCONTR, ONLY : BLNK_SUB_NAM
USE TIMDAT, ONLY : HOUR, MINUTE, SEC,
& TSEC
USE SUBR_BEGEND_LEVELS, ONLY : LAPACK_BEGEND

USE LAPACK_BLAS_AUX
USE LAPACK_LIN_EQN_DPB

USE OURTIM_Interface

INTEGER(LONG), PARAMETER :: SUBR_BEGEND = LAPACK_BEGEND

CHARACTER(LEN=LEN(BLNK_SUB_NAM)):: subr_name = 'DSTERF'
*
* -- LAPACK routine (version 3.0) --
* Univ. of Tennessee, Univ. of California Berkeley, NAG Ltd.,
Expand Down Expand Up @@ -86,14 +76,6 @@ SUBROUTINE DSTERF( N, D, E, INFO )
* ..
* .. Executable Statements ..

! **********************************************************************************************************************************
IF (WRT_LOG >= SUBR_BEGEND) THEN
CALL OURTIM
WRITE(F04,9001) SUBR_NAME,TSEC
9001 FORMAT(1X,A,' BEGN ',F10.3)
ENDIF

! **********************************************************************************************************************************
*
* Test the input parameters.
*
Expand Down Expand Up @@ -386,14 +368,6 @@ SUBROUTINE DSTERF( N, D, E, INFO )
*
180 CONTINUE

! **********************************************************************************************************************************
IF (WRT_LOG >= SUBR_BEGEND) THEN
CALL OURTIM
WRITE(F04,9002) SUBR_NAME,TSEC
9002 FORMAT(1X,A,' END ',F10.3)
ENDIF

! **********************************************************************************************************************************
RETURN
*
* End of DSTERF
Expand Down
3 changes: 1 addition & 2 deletions BLAS/DSWAP.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
SUBROUTINE DSWAP (N,DX,INCX,DY,INCY)

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : ERR, F04, F06, SC1, WRT_LOG
USE IOUNT1, ONLY : ERR, F06, SC1
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR
USE TIMDAT, ONLY : HOUR, MINUTE, SEC,
& SFRAC, TSEC
USE SUBR_BEGEND_LEVELS, ONLY : LAPACK_BEGEND

USE OUTA_HERE_Interface

Expand Down
3 changes: 1 addition & 2 deletions BLAS/DTRSM.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ SUBROUTINE DTRSM ( SIDE, UPLO, TRANSA, DIAG, M, N, ALPHA, A, LDA,
$ B, LDB )

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : ERR, F04, F06, SC1, WRT_LOG
USE IOUNT1, ONLY : ERR, F06, SC1
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR
USE TIMDAT, ONLY : HOUR, MINUTE, SEC,
& SFRAC, TSEC
USE SUBR_BEGEND_LEVELS, ONLY : LAPACK_BEGEND

USE OUTA_HERE_Interface

Expand Down
3 changes: 0 additions & 3 deletions BLAS/DTRTRI.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,17 +3,14 @@
SUBROUTINE DTRTRI( UPLO, DIAG, N, A, LDA, INFO )

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : F04, WRT_LOG
USE SCONTR, ONLY : BLNK_SUB_NAM
USE TIMDAT, ONLY : HOUR, MINUTE, SEC,
& TSEC
USE SUBR_BEGEND_LEVELS, ONLY : LAPACK_BEGEND
USE LAPACK_BLAS_AUX
USE LAPACK_SYM_MAT_INV

USE OURTIM_Interface

INTEGER(LONG), PARAMETER :: SUBR_BEGEND = LAPACK_BEGEND

*
* -- LAPACK routine (version 3.0) --
Expand Down
3 changes: 1 addition & 2 deletions BLAS/ILAENV.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,10 @@ INTEGER FUNCTION ILAENV( ISPEC, NAME, OPTS, N1, N2, N3,
$ N4 )

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : ERR, F04, F06, SC1, WRT_LOG
USE IOUNT1, ONLY : ERR, F06, SC1
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR
USE TIMDAT, ONLY : HOUR, MINUTE, SEC,
& SFRAC, TSEC
USE SUBR_BEGEND_LEVELS, ONLY : LAPACK_BEGEND

USE OUTA_HERE_Interface

Expand Down
3 changes: 1 addition & 2 deletions BLAS/XERBLA.f
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,10 @@
SUBROUTINE XERBLA( SRNAME, arg_num )

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : ERR, F04, F06, SC1, WRT_LOG
USE IOUNT1, ONLY : ERR, F06, SC1
USE SCONTR, ONLY : BLNK_SUB_NAM, FATAL_ERR
USE TIMDAT, ONLY : HOUR, MINUTE, SEC,
& SFRAC, TSEC
USE SUBR_BEGEND_LEVELS, ONLY : LAPACK_BEGEND

USE OUTA_HERE_Interface

Expand Down
8 changes: 5 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,11 +233,13 @@ endif()
# collect all fortran source files
file(GLOB_RECURSE ALL_FORTRAN_FILES
"${CMAKE_SOURCE_DIR}/*.f"
"${CMAKE_SOURCE_DIR}/*.F"
"${CMAKE_SOURCE_DIR}/*.f90"
"${CMAKE_SOURCE_DIR}/*.F90"
"${CMAKE_SOURCE_DIR}/*.F"
"${CMAKE_SOURCE_DIR}/*.F95"
"${CMAKE_SOURCE_DIR}/*.f95"
"${CMAKE_SOURCE_DIR}/*.F95"
"${CMAKE_SOURCE_DIR}/*.f03"
"${CMAKE_SOURCE_DIR}/*.F03"
)

# same BLAS-finding subroutine as SuperLU
Expand Down Expand Up @@ -355,7 +357,7 @@ if(CMAKE_COMPILER_IS_GNUCC)
set(CMAKE_CXX_FLAGS_DETERMINISTIC
"${CMAKE_C_FLAGS_DETERMINISTIC}"
)
set(CMAKE_PROFILING_FLAGS "-O2 -g -fno-omit-frame-pointer -fno-inline-functions")
set(CMAKE_PROFILING_FLAGS "-O2 -g -fno-inline -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}")
Expand Down
2 changes: 1 addition & 1 deletion Source/ARPACK/ARPACK_INFO_MSG.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ SUBROUTINE ARPACK_INFO_MSG ( SUBNAME, INFO, IPARAM, LWORKL, NEV, NCV )

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE SCONTR, ONLY : PROG_NAME, FATAL_ERR, NDOFL, WARN_ERR
USE IOUNT1, ONLY : WRT_ERR, WRT_LOG, ERR, F04, F06
USE IOUNT1, ONLY : WRT_ERR, ERR, F06
USE PARAMS, ONLY : DARPACK, SUPWARN
USE MODEL_STUF, ONLY : EIG_N2

Expand Down
23 changes: 6 additions & 17 deletions Source/EMG/EMG1/ELMDAT1.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ SUBROUTINE ELMDAT1 ( INT_ELEM_ID, WRITE_WARN )
! OFFSETS : offsets for some elems

USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
USE IOUNT1, ONLY : WRT_ERR, WRT_LOG, ERR, F04, F06
USE IOUNT1, ONLY : WRT_ERR, ERR, F06
USE SCONTR, ONLY : FATAL_ERR, MEDAT0_CUSERIN, MELGP, MEMATC, MEMATR, MEPROP, METYPE, MOFFSET, MRMATLC, &
MRPBAR, MRPBEAM, MRPBUSH, MRPELAS, MRPROD, MRPSHEAR, MRPUSER1, MPSOLID, BLNK_SUB_NAM, &
NCORD, NGRID, SOL_NAME
Expand All @@ -46,7 +46,6 @@ SUBROUTINE ELMDAT1 ( INT_ELEM_ID, WRITE_WARN )
DEDAT_Q8_THICK_KEY, DEDAT_Q8_POFFS_KEY
USE PARAMS, ONLY : EPSIL, TSTM_DEF
USE TIMDAT, ONLY : TSEC
USE SUBR_BEGEND_LEVELS, ONLY : ELMDAT_BEGEND
USE CONSTANTS_1, ONLY : ZERO, ONEPM4, ONE, TWO
USE DEBUG_PARAMETERS, ONLY : DEBUG
USE MODEL_STUF, ONLY : AGRID, BAROFF, BUSH_CID, BUSH_OCID, BUSH_VVEC, BUSH_VVEC_OR_CID, BUSHOFF, BGRID, &
Expand Down Expand Up @@ -93,7 +92,7 @@ SUBROUTINE ELMDAT1 ( INT_ELEM_ID, WRITE_WARN )
INTEGER(LONG) :: NFLAG ! Row number in array DOFPIN
INTEGER(LONG) :: NUM_COMPS ! No. displ components (1 for SPOINT, 6 for actual grid)
INTEGER(LONG) :: NUMMAT ! No. matl properties for an element type
INTEGER(LONG), PARAMETER :: SUBR_BEGEND = ELMDAT_BEGEND


REAL(DOUBLE) :: DXI ! An offset distance in direction 1
REAL(DOUBLE) :: DYI ! An offset distance in direction 2
Expand All @@ -107,12 +106,7 @@ SUBROUTINE ELMDAT1 ( INT_ELEM_ID, WRITE_WARN )

INTRINSIC :: MOD, FLOOR

! **********************************************************************************************************************************
IF (WRT_LOG >= SUBR_BEGEND) THEN
CALL OURTIM
WRITE(F04,9001) SUBR_NAME,TSEC
9001 FORMAT(1X,A,' BEGN ',F10.3)
ENDIF


! **********************************************************************************************************************************
EPS1 = EPSIL(1)
Expand Down Expand Up @@ -168,7 +162,7 @@ SUBROUTINE ELMDAT1 ( INT_ELEM_ID, WRITE_WARN )

ELDOF = 0
DO I=1,ELGP
CALL GET_GRID_NUM_COMPS ( AGRID(I), NUM_COMPS, SUBR_NAME )
CALL GET_GRID_NUM_COMPS ( BGRID(I), NUM_COMPS, SUBR_NAME )
ELDOF = ELDOF + NUM_COMPS
ENDDO

Expand Down Expand Up @@ -1006,7 +1000,7 @@ SUBROUTINE ELMDAT1 ( INT_ELEM_ID, WRITE_WARN )
DO I=1,2 ! If displ comps on CELAS1,2 entry were blank or 0, change to 1,2
ELAS_COMP(I) = EDAT(EPNTK+3+I) ! (i.e. ELAS has 2 components of displ)
IF (ELAS_COMP(I) == 0) THEN
CALL GET_GRID_NUM_COMPS ( AGRID(I), NUM_COMPS, SUBR_NAME )
CALL GET_GRID_NUM_COMPS ( BGRID(I), NUM_COMPS, SUBR_NAME )
IF (NUM_COMPS > 1) THEN
NUM_EMG_FATAL_ERRS = NUM_EMG_FATAL_ERRS + 1
FATAL_ERR = FATAL_ERR + 1
Expand Down Expand Up @@ -1058,12 +1052,7 @@ SUBROUTINE ELMDAT1 ( INT_ELEM_ID, WRITE_WARN )

ENDIF

! **********************************************************************************************************************************
IF (WRT_LOG >= SUBR_BEGEND) THEN
CALL OURTIM
WRITE(F04,9002) SUBR_NAME,TSEC
9002 FORMAT(1X,A,' END ',F10.3)
ENDIF


RETURN

Expand Down
19 changes: 4 additions & 15 deletions Source/EMG/EMG1/ELMDAT2.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,9 @@ SUBROUTINE ELMDAT2 ( INT_ELEM_ID, OPT, WRITE_WARN )
! DT (1 elem temperatures) and PRESS (1 element pressure load)

USE PENTIUM_II_KIND, ONLY : BYTE, LONG
USE IOUNT1, ONLY : WRT_ERR, WRT_LOG, F04
USE IOUNT1, ONLY : WRT_ERR
USE SCONTR, ONLY : BLNK_SUB_NAM, LPDAT, MPRESS, MDT, MTDAT_TEMPRB, NSUB, NTSUB
USE TIMDAT, ONLY : TSEC
USE SUBR_BEGEND_LEVELS, ONLY : ELMDAT_BEGEND
USE CONSTANTS_1, ONLY : ZERO, QUARTER, THIRD
USE MODEL_STUF, ONLY : BGRID, DT, ELGP, ETYPE, GTEMP, PDATA, PPNT, PTYPE, PRESS, TDATA, TPNT, TYPE

Expand All @@ -51,14 +50,9 @@ SUBROUTINE ELMDAT2 ( INT_ELEM_ID, OPT, WRITE_WARN )
INTEGER(LONG) :: I,J ! DO loop indices
INTEGER(LONG) :: IPPN ! A pointer into array PPNT
INTEGER(LONG) :: ITPN ! A pointer into array TPNT
INTEGER(LONG), PARAMETER :: SUBR_BEGEND = ELMDAT_BEGEND

! **********************************************************************************************************************************
IF (WRT_LOG >= SUBR_BEGEND) THEN
CALL OURTIM
WRITE(F04,9001) SUBR_NAME,TSEC
9001 FORMAT(1X,A,' BEGN ',F10.3)
ENDIF



! **********************************************************************************************************************************
TYPE = ETYPE(INT_ELEM_ID)
Expand Down Expand Up @@ -189,12 +183,7 @@ SUBROUTINE ELMDAT2 ( INT_ELEM_ID, OPT, WRITE_WARN )

ENDIF

! **********************************************************************************************************************************
IF (WRT_LOG >= SUBR_BEGEND) THEN
CALL OURTIM
WRITE(F04,9002) SUBR_NAME,TSEC
9002 FORMAT(1X,A,' END ',F10.3)
ENDIF


RETURN

Expand Down
Loading
Loading