Skip to content

Commit 15f51d9

Browse files
authored
Merge pull request #41 from Bruno02468/main
MYSTRAN 15.1.6 Update
2 parents bf79abf + d8703c2 commit 15f51d9

6 files changed

Lines changed: 28 additions & 8 deletions

File tree

Source/LK1/L1A-BD/BD_EIGR.f90

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,13 @@ SUBROUTINE BD_EIGR ( CARD, LARGE_FLD_INP, EIGFND )
219219
EIG_NCVFACL = 0
220220

221221
! to ensure SCNUM is alloc'd right. #subcases = #eigenvecs
222-
LSUB = EIG_N2
222+
IF (EIG_N2 > LSUB) THEN
223+
LSUB = EIG_N2
224+
ELSE
225+
! no idea what the # of eigenvectors should be for now, let's keep
226+
! it large for now. this ought to be fixed someday
227+
LSUB = 1000
228+
END IF
223229

224230
NUM_FAIL_CRIT = 0 ! Following have not been determined yet but write values to L1M anyway
225231
MAXMIJ = ZERO

Source/LK1/L1A-BD/BD_EIGRL.f90

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,13 @@ SUBROUTINE BD_EIGRL ( CARD, LARGE_FLD_INP, EIGFND )
246246
MIJ_COL = 0
247247

248248
! ensure a proper size for SCNUM
249-
LSUB = EIG_N2
249+
IF (EIG_N2 > LSUB) THEN
250+
LSUB = EIG_N2
251+
ELSE
252+
! no idea what the # of eigenvectors should be for now, let's keep
253+
! it large for now. this ought to be fixed someday
254+
LSUB = 1000
255+
END IF
250256

251257
CALL WRITE_L1M
252258

Source/LK2/LINK2.f90

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -569,8 +569,8 @@ SUBROUTINE DEALLOCATE_LINK2_ARRAYS ( WHICH )
569569
IF (WHICH == 1) THEN
570570
IF (SOL_NAME(1:8) /= 'BUCKLING') THEN
571571
CALL DEALLOCATE_SPARSE_MAT ( 'KLL' )
572+
CALL DEALLOCATE_SPARSE_MAT ( 'MLL' )
572573
ENDIF
573-
CALL DEALLOCATE_SPARSE_MAT ( 'MLL' )
574574
CALL DEALLOCATE_SPARSE_MAT ( 'PL' )
575575
ELSE IF (WHICH == 2) THEN
576576
CALL DEALLOCATE_SPARSE_MAT ( 'GMN' )

Source/LK9/LINK9/LINK9.f90

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1230,7 +1230,13 @@ SUBROUTINE LINK9 ( LK9_PROC_NUM )
12301230
WRITE(SC1,12345,ADVANCE='NO') ' Deallocate GMNt', CR13 ; CALL DEALLOCATE_SPARSE_MAT ( 'GMNt' )
12311231
WRITE(SC1,12345,ADVANCE='NO') ' Deallocate HMN ', CR13 ; CALL DEALLOCATE_SPARSE_MAT ( 'HMN' )
12321232
WRITE(SC1,12345,ADVANCE='NO') ' Deallocate MSF ', CR13 ; CALL DEALLOCATE_SPARSE_MAT ( 'MSF' )
1233-
WRITE(SC1,12345,ADVANCE='NO') ' Deallocate MLL ', CR13 ; CALL DEALLOCATE_SPARSE_MAT ( 'MLL' )
1233+
1234+
! save MLL from deallocation in case we need to use it for eigenvalue
1235+
! estimation in a next step of the eigen solution
1236+
IF ((SOL_NAME(1:8) /= 'BUCKLING') .OR. (LOAD_ISTEP == 2)) THEN
1237+
WRITE(SC1,12345,ADVANCE='NO') ' Deallocate MLL ', CR13 ; CALL DEALLOCATE_SPARSE_MAT ( 'MLL' )
1238+
END IF
1239+
12341240
WRITE(SC1,12345,ADVANCE='NO') ' Deallocate LMN ', CR13 ; CALL DEALLOCATE_SPARSE_MAT ( 'LMN' )
12351241
WRITE(SC1,12345,ADVANCE='NO') ' Deallocate QSYS', CR13 ; CALL DEALLOCATE_COL_VEC ( 'QSYS_COL' )
12361242

Source/Modules/MYSTRAN_Version.f90

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,9 @@ MODULE MYSTRAN_Version
3535
SAVE
3636

3737
CHARACTER(256*BYTE) :: MYSTRAN_COMMENT = '*** Please report any problems to mystransolver@gmail.com ***'
38-
CHARACTER( 8*BYTE), PARAMETER :: MYSTRAN_VER_NUM = '15.1.5'
39-
CHARACTER( 3*BYTE), PARAMETER :: MYSTRAN_VER_MONTH= 'Feb'
40-
CHARACTER( 2*BYTE), PARAMETER :: MYSTRAN_VER_DAY = '12'
38+
CHARACTER( 8*BYTE), PARAMETER :: MYSTRAN_VER_NUM = '15.1.6'
39+
CHARACTER( 3*BYTE), PARAMETER :: MYSTRAN_VER_MONTH= 'Mar'
40+
CHARACTER( 2*BYTE), PARAMETER :: MYSTRAN_VER_DAY = '14'
4141
CHARACTER( 4*BYTE), PARAMETER :: MYSTRAN_VER_YEAR = '2024'
4242
CHARACTER( 33*BYTE), PARAMETER :: MYSTRAN_AUTHOR = 'MYSTRAN developed by Dr Bill Case'
4343

Source/UTIL/OUTPUT2_WRITE_TABLE.f90

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,9 @@ SUBROUTINE WRITE_OUG3(ITABLE, ISUBCASE, FORMAT_CODE, DEVICE_CODE, ANALYSIS_CODE,
170170

171171
! do nothing statement
172172
APPROACH_CODE = 0
173+
174+
! TODO gotta figure out the appropriate value
175+
FIELD7 = 0.0
173176
ELSE
174177
WRITE(ERR,100) ANALYSIS_CODE
175178
STOP
@@ -204,4 +207,3 @@ SUBROUTINE WRITE_OUG3(ITABLE, ISUBCASE, FORMAT_CODE, DEVICE_CODE, ANALYSIS_CODE,
204207

205208
100 FORMAT(" analysis_code=", i4, " is not supported...stopping")
206209
END SUBROUTINE WRITE_OUG3
207-

0 commit comments

Comments
 (0)