Merge pull request #41 from Bruno02468/main

MYSTRAN 15.1.6 Update
MYSTRANsolver · Mar 14, 2024 · 15f51d9 · 15f51d9
2 parents bf79abf + d8703c2
commit 15f51d9
Show file tree

Hide file tree

Showing 6 changed files with 28 additions and 8 deletions.
diff --git a/Source/LK1/L1A-BD/BD_EIGR.f90 b/Source/LK1/L1A-BD/BD_EIGR.f90
@@ -219,7 +219,13 @@ SUBROUTINE BD_EIGR ( CARD, LARGE_FLD_INP, EIGFND )
          EIG_NCVFACL      = 0
 
          ! to ensure SCNUM is alloc'd right. #subcases = #eigenvecs
-         LSUB             = EIG_N2
+         IF (EIG_N2 > LSUB) THEN
+            LSUB             = EIG_N2
+         ELSE
+            ! no idea what the # of eigenvectors should be for now, let's keep
+            ! it large for now. this ought to be fixed someday
+            LSUB = 1000
+         END IF
 
          NUM_FAIL_CRIT    = 0                              ! Following have not been determined yet but write values to L1M anyway
          MAXMIJ           = ZERO

diff --git a/Source/LK1/L1A-BD/BD_EIGRL.f90 b/Source/LK1/L1A-BD/BD_EIGRL.f90
@@ -246,7 +246,13 @@ SUBROUTINE BD_EIGRL ( CARD, LARGE_FLD_INP, EIGFND )
          MIJ_COL       = 0
 
          ! ensure a proper size for SCNUM
-         LSUB          = EIG_N2
+         IF (EIG_N2 > LSUB) THEN
+            LSUB          = EIG_N2
+         ELSE
+            ! no idea what the # of eigenvectors should be for now, let's keep
+            ! it large for now. this ought to be fixed someday
+            LSUB = 1000
+         END IF
 
          CALL WRITE_L1M
 

diff --git a/Source/LK2/LINK2.f90 b/Source/LK2/LINK2.f90
@@ -569,8 +569,8 @@ SUBROUTINE DEALLOCATE_LINK2_ARRAYS ( WHICH )
       IF (WHICH  == 1) THEN
          IF (SOL_NAME(1:8) /= 'BUCKLING') THEN
             CALL DEALLOCATE_SPARSE_MAT ( 'KLL'     )
+            CALL DEALLOCATE_SPARSE_MAT ( 'MLL'     )
          ENDIF
-         CALL DEALLOCATE_SPARSE_MAT ( 'MLL'     )
          CALL DEALLOCATE_SPARSE_MAT ( 'PL'      )
       ELSE IF (WHICH == 2) THEN
          CALL DEALLOCATE_SPARSE_MAT ( 'GMN'     )

diff --git a/Source/LK9/LINK9/LINK9.f90 b/Source/LK9/LINK9/LINK9.f90
@@ -1230,7 +1230,13 @@ SUBROUTINE LINK9 ( LK9_PROC_NUM )
       WRITE(SC1,12345,ADVANCE='NO') '       Deallocate GMNt', CR13  ;   CALL DEALLOCATE_SPARSE_MAT ( 'GMNt' )
       WRITE(SC1,12345,ADVANCE='NO') '       Deallocate HMN ', CR13  ;   CALL DEALLOCATE_SPARSE_MAT ( 'HMN' )
       WRITE(SC1,12345,ADVANCE='NO') '       Deallocate MSF ', CR13  ;   CALL DEALLOCATE_SPARSE_MAT ( 'MSF' )
-      WRITE(SC1,12345,ADVANCE='NO') '       Deallocate MLL ', CR13  ;   CALL DEALLOCATE_SPARSE_MAT ( 'MLL' )
+
+      ! save MLL from deallocation in case we need to use it for eigenvalue
+      ! estimation in a next step of the eigen solution
+      IF ((SOL_NAME(1:8) /= 'BUCKLING') .OR. (LOAD_ISTEP == 2)) THEN
+         WRITE(SC1,12345,ADVANCE='NO') '       Deallocate MLL ', CR13  ;   CALL DEALLOCATE_SPARSE_MAT ( 'MLL' )
+      END IF
+
       WRITE(SC1,12345,ADVANCE='NO') '       Deallocate LMN ', CR13  ;   CALL DEALLOCATE_SPARSE_MAT ( 'LMN' )
       WRITE(SC1,12345,ADVANCE='NO') '       Deallocate QSYS', CR13  ;   CALL DEALLOCATE_COL_VEC    ( 'QSYS_COL' )
 

diff --git a/Source/Modules/MYSTRAN_Version.f90 b/Source/Modules/MYSTRAN_Version.f90
@@ -35,9 +35,9 @@ MODULE MYSTRAN_Version
       SAVE
 
       CHARACTER(256*BYTE)            :: MYSTRAN_COMMENT  = '*** Please report any problems to [email protected] ***'
-      CHARACTER(  8*BYTE), PARAMETER :: MYSTRAN_VER_NUM  = '15.1.5'
-      CHARACTER(  3*BYTE), PARAMETER :: MYSTRAN_VER_MONTH= 'Feb'
-      CHARACTER(  2*BYTE), PARAMETER :: MYSTRAN_VER_DAY  = '12'
+      CHARACTER(  8*BYTE), PARAMETER :: MYSTRAN_VER_NUM  = '15.1.6'
+      CHARACTER(  3*BYTE), PARAMETER :: MYSTRAN_VER_MONTH= 'Mar'
+      CHARACTER(  2*BYTE), PARAMETER :: MYSTRAN_VER_DAY  = '14'
       CHARACTER(  4*BYTE), PARAMETER :: MYSTRAN_VER_YEAR = '2024'
       CHARACTER( 33*BYTE), PARAMETER :: MYSTRAN_AUTHOR   = 'MYSTRAN developed by Dr Bill Case'
 

diff --git a/Source/UTIL/OUTPUT2_WRITE_TABLE.f90 b/Source/UTIL/OUTPUT2_WRITE_TABLE.f90
@@ -170,6 +170,9 @@ SUBROUTINE WRITE_OUG3(ITABLE, ISUBCASE, FORMAT_CODE, DEVICE_CODE, ANALYSIS_CODE,
 
         ! do nothing statement
         APPROACH_CODE = 0
+
+        ! TODO gotta figure out the appropriate value
+        FIELD7 = 0.0
       ELSE
         WRITE(ERR,100) ANALYSIS_CODE
         STOP
@@ -204,4 +207,3 @@ SUBROUTINE WRITE_OUG3(ITABLE, ISUBCASE, FORMAT_CODE, DEVICE_CODE, ANALYSIS_CODE,
 
  100  FORMAT(" analysis_code=", i4, " is not supported...stopping")
       END SUBROUTINE WRITE_OUG3
-