Skip to content
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

Jump to bottom

Merging upstream updates #1

Merged
merged 8 commits into from
Jul 27, 2023
Merged

Merging upstream updates #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
86cfd2b
fixing device code, which made "large" op2 tables not work
SteveDoyle2 Nov 14, 2022
da48ec6
found a few missed op2 flags
SteveDoyle2 Nov 14, 2022
6c02a03
Update WRITE_GRD_OP2_OUTPUTS.f90
zchlrnr May 25, 2023
d338889
Merge pull request #7 from MYSTRANsolver/op2_record_length
zchlrnr May 25, 2023
26d35ed
Update
MYSTRANsolver Jul 17, 2023
e54b437
Update
MYSTRANsolver Jul 17, 2023
2a938dc
Update
MYSTRANsolver Jul 19, 2023
7d92f4f
Update
MYSTRANsolver Jul 19, 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
2 changes: 1 addition & 1 deletion BUILD.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ If your build environment is already set up, building MYSTRAN is quite straightf
3. Fetch the source code if you haven't already. If you're using Git, you can clone the repo with **`git clone https://github.com/MYSTRANsolver/MYSTRAN.git`**.
4. Move the terminal to the MYSTRAN folder. If you've just run `git clone`, just do a **`cd MYSTRAN`**.
5. Generate the build scripts by running **`cmake -G "MinGW Makefiles" .`**.
6. Compile with **`make`**. If you have an N-core processor, running **`make -jN`** will probably me much faster. A good choice of N is printed in the previous step, right before the end.
6. Compile with **`mingw32-make`**. If you have an N-core processor, running **`mingw32-make -jN`** will probably be much faster. A good choice of N is printed in the previous step, right before the end.
7. The executable will reside at **`Binaries/mystran.exe`**.

### Steps for Linux (any)
Expand Down
3 changes: 2 additions & 1 deletion Source/Interfaces/WRITE_ROD_Interface.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ MODULE WRITE_ROD_Interface
INTERFACE

SUBROUTINE WRITE_ROD ( ISUBCASE, NUM, FILL_F06, FILL_ANS, ITABLE, TITLE, SUBTITLE, LABEL, &
FIELD5_INT_MODE, FIELD6_EIGENVALUE )
FIELD5_INT_MODE, FIELD6_EIGENVALUE, WRITE_OP2 )


USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
Expand All @@ -49,6 +49,7 @@ SUBROUTINE WRITE_ROD ( ISUBCASE, NUM, FILL_F06, FILL_ANS, ITABLE, TITLE, SUBTITL
CHARACTER(LEN=128), INTENT(IN) :: TITLE ! the model TITLE
CHARACTER(LEN=128), INTENT(IN) :: SUBTITLE ! the subcase SUBTITLE
CHARACTER(LEN=128), INTENT(IN) :: LABEL ! the subcase LABEL
LOGICAL, INTENT(IN) :: WRITE_OP2 ! writes the op2

INTEGER(LONG), INTENT(IN) :: NUM ! The number of rows of OGEL to write out
INTEGER(LONG), INTENT(IN) :: ITABLE ! the current op2 subtable, should be -3, -5, ...
Expand Down
96 changes: 53 additions & 43 deletions Source/LK9/L91/WRITE_ELEM_STRAINS.f90
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,20 +390,23 @@ SUBROUTINE WRITE_ELEM_STRAINS ( JSUB, NUM, IHDR, NUM_PTS, ITABLE )
!IF (TYPE == 'BAR ') THEN
!CALL WRITE_BAR ( NUM, FILL(1:1), FILL(1:16) )
IF (TYPE(1:4) == 'ELAS') THEN
CALL GET_SPRING_OP2_ELEMENT_TYPE(ELEMENT_TYPE)

NUM_WIDE = 2 ! eid, spring_strain
NVALUES = NUM_WIDE * NUM

DEVICE_CODE = 1 ! PLOT

!CALL GET_STRESS_CODE(STRESS_CODE, IS_VON_MISES, IS_STRAIN, IS_FIBER_DISTANCE)
CALL GET_STRESS_CODE( STRESS_CODE, 1, 1, 0)
CALL WRITE_OES3_STATIC(ITABLE, ISUBCASE, DEVICE_CODE, ELEMENT_TYPE, NUM_WIDE, STRESS_CODE, &
TITLEI, STITLEI, LABELI, FIELD5_INT_MODE, FIELD6_EIGENVALUE)
IF (WRITE_OP2) THEN
CALL GET_SPRING_OP2_ELEMENT_TYPE(ELEMENT_TYPE)

NUM_WIDE = 2 ! eid, spring_strain
NVALUES = NUM_WIDE * NUM

DEVICE_CODE = 1 ! PLOT

WRITE(OP2) NVALUES
WRITE(OP2) (EID_OUT_ARRAY(I,1)*10+DEVICE_CODE, REAL(OGEL(I,1), 4), I=1,NUM)
!CALL GET_STRESS_CODE(STRESS_CODE, IS_VON_MISES, IS_STRAIN, IS_FIBER_DISTANCE)
CALL GET_STRESS_CODE( STRESS_CODE, 1, 1, 0)
CALL WRITE_OES3_STATIC(ITABLE, ISUBCASE, DEVICE_CODE, ELEMENT_TYPE, NUM_WIDE, STRESS_CODE, &
TITLEI, STITLEI, LABELI, FIELD5_INT_MODE, FIELD6_EIGENVALUE)

WRITE(OP2) NVALUES
WRITE(OP2) (EID_OUT_ARRAY(I,1)*10+DEVICE_CODE, REAL(OGEL(I,1), 4), I=1,NUM)
ENDIF

WRITE(F06,1103) (FILL(1:1), EID_OUT_ARRAY(I,1), OGEL(I,1),I=1,NUM)

Expand All @@ -428,7 +431,7 @@ SUBROUTINE WRITE_ELEM_STRAINS ( JSUB, NUM, IHDR, NUM_PTS, ITABLE )
NNODES = 7
ENDIF

!IF (WRITE_OP2) THEN
IF (WRITE_OP2) THEN
NUM_WIDE = 4 + 21 * NNODES
NVALUES = NUM_WIDE * NUM

Expand Down Expand Up @@ -472,6 +475,7 @@ SUBROUTINE WRITE_ELEM_STRAINS ( JSUB, NUM, IHDR, NUM_PTS, ITABLE )
! szz txz s3 c1 c2 c3
REAL(OGEL(I,3),4), REAL(OGEL(I,6),4), REAL(OGEL(I,11),4), 0., 0., 0., &
J=1,NNODES), I=1,NUM)
ENDIF

IF (STRN_OPT == 'VONMISES') THEN
NCOLS = 7
Expand Down Expand Up @@ -499,12 +503,12 @@ SUBROUTINE WRITE_ELEM_STRAINS ( JSUB, NUM, IHDR, NUM_PTS, ITABLE )
ENDIF

ELSE IF (TYPE(1:5) == 'QUAD4') THEN
!CALL WRITE_OST_CQUAD4 ( NUM, FILL, ISUBCASE, ITABLE, TITLEI, STITLEI, LABELI )

!CALL GET_STRESS_CODE(STRESS_CODE, IS_VON_MISES, IS_STRAIN, IS_FIBER_DISTANCE)
CALL GET_STRESS_CODE( STRESS_CODE, 1, 1, 1)
IF (WRITE_OP2) THEN
!CALL WRITE_OST_CQUAD4 ( NUM, FILL, ISUBCASE, ITABLE, TITLEI, STITLEI, LABELI )

IF (.TRUE.) THEN
!CALL GET_STRESS_CODE(STRESS_CODE, IS_VON_MISES, IS_STRAIN, IS_FIBER_DISTANCE)
CALL GET_STRESS_CODE( STRESS_CODE, 1, 1, 1)
IF (STRN_LOC == 'CENTER ') THEN
! CQUAD4-33
!(eid_device,
Expand Down Expand Up @@ -676,7 +680,7 @@ SUBROUTINE WRITE_ELEM_STRAINS ( JSUB, NUM, IHDR, NUM_PTS, ITABLE )

ELSE IF (TYPE == 'ROD ') THEN
CALL WRITE_ROD (ISUBCASE, NUM, FILL(1:1), FILL(1:16), ITABLE, TITLEI, STITLEI, LABELI, &
FIELD5_INT_MODE, FIELD6_EIGENVALUE )
FIELD5_INT_MODE, FIELD6_EIGENVALUE, WRITE_OP2 )

ELSE IF (TYPE(1:5) == 'SHEAR') THEN
CALL WRITE_OST_CSHEAR (NUM, FILL, ISUBCASE, ITABLE, TITLEI, STITLEI, LABELI, &
Expand All @@ -689,18 +693,20 @@ SUBROUTINE WRITE_ELEM_STRAINS ( JSUB, NUM, IHDR, NUM_PTS, ITABLE )
WRITE_F06, WRITE_OP2, WRITE_ANS)

ELSE IF (TYPE == 'BUSH ') THEN
ELEMENT_TYPE = 102 ! CBUSH
NUM_WIDE = 7 ! eid, tx, ty, tz, rx, ry, rz
STRESS_CODE = 1 ! dunno
!CALL GET_STRESS_CODE(STRESS_CODE, IS_VON_MISES, IS_STRAIN, IS_FIBER_DISTANCE)
CALL GET_STRESS_CODE( STRESS_CODE, 0, 1, 0)
NVALUES = NUM * NUM_WIDE

CALL WRITE_OES3_STATIC(ITABLE, ISUBCASE, DEVICE_CODE, ELEMENT_TYPE, NUM_WIDE, STRESS_CODE, &
TITLEI, STITLEI, LABELI, FIELD5_INT_MODE, FIELD6_EIGENVALUE)

WRITE(OP2) NVALUES
WRITE(OP2) (EID_OUT_ARRAY(I,1)*10+DEVICE_CODE,(REAL(OGEL(I,J),4), J=1,6), I=1,NUM)
IF (WRITE_OP2) THEN
ELEMENT_TYPE = 102 ! CBUSH
NUM_WIDE = 7 ! eid, tx, ty, tz, rx, ry, rz
STRESS_CODE = 1 ! dunno
!CALL GET_STRESS_CODE(STRESS_CODE, IS_VON_MISES, IS_STRAIN, IS_FIBER_DISTANCE)
CALL GET_STRESS_CODE( STRESS_CODE, 0, 1, 0)
NVALUES = NUM * NUM_WIDE

CALL WRITE_OES3_STATIC(ITABLE, ISUBCASE, DEVICE_CODE, ELEMENT_TYPE, NUM_WIDE, STRESS_CODE, &
TITLEI, STITLEI, LABELI, FIELD5_INT_MODE, FIELD6_EIGENVALUE)

WRITE(OP2) NVALUES
WRITE(OP2) (EID_OUT_ARRAY(I,1)*10+DEVICE_CODE,(REAL(OGEL(I,J),4), J=1,6), I=1,NUM)
ENDIF

DO I=1,NUM
WRITE(F06,1802) EID_OUT_ARRAY(I,1),(OGEL(I,J),J=1,6)
Expand Down Expand Up @@ -959,6 +965,7 @@ SUBROUTINE WRITE_OST_CSHEAR(NUM, FILL, ISUBCASE, ITABLE, TITLE, SUBTITLE, LABEL,
REAL(REAL32) :: NAN
NAN = IEEE_VALUE(NAN, IEEE_QUIET_NAN)

IF (WRITE_OP2) THEN
DEVICE_CODE = 1 ! PLOT
NVALUES = NUM * NUM_WIDE
NTOTAL = NVALUES * 4
Expand Down Expand Up @@ -996,6 +1003,7 @@ SUBROUTINE WRITE_OST_CSHEAR(NUM, FILL, ISUBCASE, ITABLE, TITLE, SUBTITLE, LABEL,
!Normal-X Normal-Y Shear-XY -> max_shear, avg_shear, margin
WRITE(OP2) (EID_OUT_ARRAY(I,1)*10+DEVICE_CODE, REAL(OGEL(I,3), 4), REAL(OGEL(I,3), 4), &
NAN, I=1,NUM)
ENDIF ! write op2
DO I=1,NUM,2
IF (I+1 <= NUM) THEN
WRITE(F06,1603) FILL(1: 0), EID_OUT_ARRAY(I,1),(OGEL(I,J),J=1,3), EID_OUT_ARRAY(I+1,1),(OGEL(I+1,J),J=1,3)
Expand Down Expand Up @@ -1062,21 +1070,23 @@ SUBROUTINE WRITE_OST_CTRIA3(NUM, FILL, ISUBCASE, ITABLE, TITLE, SUBTITLE, LABEL,
DEVICE_CODE = 1 ! plot
K = 0

100 FORMAT("*DEBUG: WRITE_CTRIA3 ITABLE=",I8, "; NUM=",I8,"; NVALUES=",I8,"; NTOTAL=",I8)
!101 FORMAT("*DEBUG: WRITE_CTRIA3 ITABLE=",I8," (should be -5, -7,...)")
NVALUES = NUM * NUM_WIDE
NTOTAL = NVALUES * 4
WRITE(ERR,100) ITABLE,NUM,NVALUES,NTOTAL

!CALL GET_STRESS_CODE(STRESS_CODE, IS_VON_MISES, IS_STRAIN, IS_FIBER_DISTANCE)
CALL GET_STRESS_CODE( STRESS_CODE, 1, 1, 1)
CALL WRITE_OES3_STATIC(ITABLE, ISUBCASE, DEVICE_CODE, ELEMENT_TYPE, NUM_WIDE, STRESS_CODE, &
TITLE, SUBTITLE, LABEL, FIELD5_INT_MODE, FIELD6_EIGENVALUE)
WRITE(OP2) NVALUES
IF (WRITE_OP2) THEN
100 FORMAT("*DEBUG: WRITE_CTRIA3 ITABLE=",I8, "; NUM=",I8,"; NVALUES=",I8,"; NTOTAL=",I8)
!101 FORMAT("*DEBUG: WRITE_CTRIA3 ITABLE=",I8," (should be -5, -7,...)")
NVALUES = NUM * NUM_WIDE
NTOTAL = NVALUES * 4
WRITE(ERR,100) ITABLE,NUM,NVALUES,NTOTAL

! op2 version of the upper & lower layers all in one call, but without the transverse shear
WRITE(OP2) (EID_OUT_ARRAY(I,1)*10+DEVICE_CODE, (REAL(OGEL(2*I-1,J),4), J=1,8), (REAL(OGEL(2*I,J),4), J=1,8), I=1,NUM)
!CALL GET_STRESS_CODE(STRESS_CODE, IS_VON_MISES, IS_STRAIN, IS_FIBER_DISTANCE)
CALL GET_STRESS_CODE( STRESS_CODE, 1, 1, 1)
CALL WRITE_OES3_STATIC(ITABLE, ISUBCASE, DEVICE_CODE, ELEMENT_TYPE, NUM_WIDE, STRESS_CODE, &
TITLE, SUBTITLE, LABEL, FIELD5_INT_MODE, FIELD6_EIGENVALUE)
WRITE(OP2) NVALUES

! op2 version of the upper & lower layers all in one call, but without the transverse shear
WRITE(OP2) (EID_OUT_ARRAY(I,1)*10+DEVICE_CODE, (REAL(OGEL(2*I-1,J),4), J=1,8), &
(REAL(OGEL(2*I,J),4), J=1,8), I=1,NUM)
ENDIF
1703 FORMAT(1X,I8,4X,'Anywhere',2X,4(1ES13.5),0PF9.3,5(1ES13.5))

1704 FORMAT(13X,'in elem',3X,4(1ES13.5),0PF9.3,5(1ES13.5))
Expand Down
Loading