Pre-v19 fixes

CMakeLists.txt

@@ -546,7 +546,7 @@ endif()
 # SYSTEM:   we statically link a system BLAS+LAPACK. We try to detect
 # the vendor (OpenBLAS, MKL, BLIS, ATLAS, Apple Accelerate,
 # Arm Performance Libraries) from BLAS_LIBRARIES/LAPACK_LIBRARIES
-# so the corresponding license text from extra_licenses/ can
+# so the corresponding license text from dependencies_licenses/ can
 # be embedded in the binary. If detection fails OR the license
 # file is missing, we WARN the user that the resulting binary
 # may not be legally redistributable.
@@ -568,28 +568,28 @@ else()
     set(_SYS_BLAS_TAG "OPENBLAS")
     set(_SYS_BLAS_LIBNAME "OpenBLAS")
     set(_SYS_BLAS_DESC "system BLAS+LAPACK")
-    set(_SYS_BLAS_LICENSE_PATH "extra_licenses/openblas.txt")
+    set(_SYS_BLAS_LICENSE_PATH "dependencies_licenses/openblas.txt")
   elseif(_SYS_BLAS_SIG MATCHES "mkl")
     set(_SYS_BLAS_TAG "MKL")
     set(_SYS_BLAS_LIBNAME "Intel MKL")
     set(_SYS_BLAS_DESC "system BLAS+LAPACK")
-    set(_SYS_BLAS_LICENSE_PATH "extra_licenses/mkl.txt")
+    set(_SYS_BLAS_LICENSE_PATH "dependencies_licenses/mkl.txt")
   elseif(_SYS_BLAS_SIG MATCHES "blis")
     set(_SYS_BLAS_TAG "BLIS")
     set(_SYS_BLAS_LIBNAME "BLIS")
     set(_SYS_BLAS_DESC "system BLAS")
-    set(_SYS_BLAS_LICENSE_PATH "extra_licenses/blis.txt")
+    set(_SYS_BLAS_LICENSE_PATH "dependencies_licenses/blis.txt")
   elseif(_SYS_BLAS_SIG MATCHES "atlas")
     set(_SYS_BLAS_TAG "ATLAS")
     set(_SYS_BLAS_LIBNAME "ATLAS")
     set(_SYS_BLAS_DESC "system BLAS+LAPACK")
-    set(_SYS_BLAS_LICENSE_PATH "extra_licenses/atlas.txt")
+    set(_SYS_BLAS_LICENSE_PATH "dependencies_licenses/atlas.txt")
   elseif(_SYS_BLAS_SIG MATCHES "blas")
     # Generic Reference-BLAS / netlib install on the system.
     set(_SYS_BLAS_TAG "REFBLAS")
-    set(_SYS_BLAS_LIBNAME "Reference BLAS/LAPACK")
-    set(_SYS_BLAS_DESC "system BLAS+LAPACK (Reference-LAPACK / netlib)")
-    set(_SYS_BLAS_LICENSE_PATH "extra_licenses/netlib-blas-lapack.txt")
+    set(_SYS_BLAS_LIBNAME "Netlib LAPACK")
+    set(_SYS_BLAS_DESC "system BLAS+LAPACK")
+    set(_SYS_BLAS_LICENSE_PATH "dependencies_licenses/netlib-blas-lapack.txt")
   endif()
 
   if(_SYS_BLAS_TAG STREQUAL "")
@@ -599,7 +599,7 @@ else()
       "  No license text will be embedded for the BLAS/LAPACK provider, "
       "which may make the resulting binary legally undistributable.\n"
       "  Add a matching entry to the system-BLAS detection block in "
-      "CMakeLists.txt and drop the license file under extra_licenses/.")
+      "CMakeLists.txt and drop the license file under dependencies_licenses/.")
   else()
     list(APPEND _MYSTRAN_STATIC_DEFS "_STATIC_${_SYS_BLAS_TAG}")
     list(APPEND _MYSTRAN_STATIC_NAMES "${_SYS_BLAS_LIBNAME}")
@@ -658,13 +658,13 @@ set(_MYSTRAN_LICENSE_MAP
   "SUPERLU_MT:submodules/superlu_mt/License.txt:SuperLU_MT:multi-threaded sparse solver"
   "METIS:submodules/metis/LICENSE:METIS:graph partitioner for SuperLU"
   "GKLIB:submodules/GKlib/LICENSE.txt:GKlib:utility library for METIS"
-  "ARPACK:extra_licenses/arpack.txt:ARPACK:Lanczos eigensolver implementation"
-  "GOMP:extra_licenses/gpl-3.0-with-gcc-exception.txt:libgomp:GNU OpenMP runtime"
-  "GFORTRAN:extra_licenses/gpl-3.0-with-gcc-exception.txt:libgfortran:GNU Fortran runtime"
-  "GCC:extra_licenses/gpl-3.0-with-gcc-exception.txt:libgcc:GNU C runtime"
-  "WINPTHREAD:extra_licenses/libwinpthread.txt:libwinpthread:Windows POSIX threads, used by SuperLU_MT"
-  "PTHREAD:extra_licenses/lgpl-2.1.txt:libpthread:POSIX threads, used by SuperLU_MT"
-  "REGEX:extra_licenses/lgpl-2.1.txt:libregex:POSIX regexes, used by GKlib"
+  "ARPACK:dependencies_licenses/arpack.txt:ARPACK:Lanczos eigensolver"
+  "GOMP:dependencies_licenses/gpl-3.0-with-gcc-exception.txt:libgomp:GNU OpenMP runtime"
+  "GFORTRAN:dependencies_licenses/gpl-3.0-with-gcc-exception.txt:libgfortran:GNU Fortran runtime"
+  "GCC:dependencies_licenses/gpl-3.0-with-gcc-exception.txt:libgcc:GNU C runtime"
+  "WINPTHREAD:dependencies_licenses/libwinpthread.txt:libwinpthread:Windows POSIX threads, used by SuperLU_MT"
+  "PTHREAD:dependencies_licenses/lgpl-2.1.txt:libpthread:POSIX threads, used by SuperLU_MT"
+  "REGEX:dependencies_licenses/lgpl-2.1.txt:libregex:POSIX regexes, used by GKlib"
 )
 
 # BLAS/LAPACK license entry depends on which provider was selected.

README.md

@@ -45,7 +45,7 @@ NASTRAN. It is an independent program written in modern Fortran 95.
 - Linear Elastic Buckling Analysis
 - Full Suite of 1D, 2D, and 3D elements
 - Support for Classical Laminated Plate Theory
-- OP2 Support
+- OP2 Supports
 
 # Get EXE or Make Binary
 
@@ -60,7 +60,7 @@ straightforward.
 The end user documentation is located the [MYSTRAN_Documentation](https://github.com/MYSTRANsolver/MYSTRAN_Documentation) repository.
 This includes a Quick Setup Guide, User Manual, and Theory Manual.
 
-# Four Repositories
+# Five Repositories
 
 The MYSTRAN project consists of five repositories.
 
@@ -71,8 +71,9 @@ The MYSTRAN project consists of five repositories.
 3 - The [MYSTRAN_Resources](https://github.com/MYSTRANsolver/MYSTRAN_Resources) repository consists of files for MYSTRAN developers.
 It also contains information and files related to pre- and post-processors relevant to MYSTRAN.
 
-4 - The [MYSTRAN_Benchmark](https://github.com/MYSTRANsolver/MYSTRAN_Benchmark) repository contains the test cases and utilities used to verify that a new build produces results consistent with prior builds and models that have been verified.
+4 - The [MYSTRAN_Validation](https://github.com/MystranSolver/MYSTRAN_Validation) repository contains models with verified results and code to automatically check a MYSTRAN binary against the expected results; this keeps track of our validation effort and prevents regressions.
 
+5 - The [MYSTRAN_Benchmark](https://github.com/MYSTRANsolver/MYSTRAN_Benchmark) repository contains the original test cases and some utilities used to verify results before the Validation repository started.
 
 # Developmental Goals
 

Source/LK9/L91/WRITE_ELEM_ENGR_FORCE.f90

@@ -380,6 +380,8 @@ SUBROUTINE WRITE_ELEM_ENGR_FORCE ( JSUB, NUM, IHDR, NUM_PTS, ITABLE )
               ELEMENT_TYPE = 74
           ELSE IF (TYPE == 'QUAD4   ') THEN
               ELEMENT_TYPE = 33  ! todo: verify no ELEMENT_TYPE=144
+          ELSE IF (TYPE == 'QUAD8   ') THEN
+              ELEMENT_TYPE = 64
           !ELSE
           !   error
           ENDIF

Source/LK9/L91/WRITE_ELEM_STRAINS.f90

@@ -487,7 +487,11 @@ SUBROUTINE WRITE_ELEM_STRAINS ( JSUB, NUM, IHDR, NUM_PTS, ITABLE )
                ! fd1, sx1, sy1, txy1, angle1, major1, minor1, vm1,
                ! fd2, sx2, sy2, txy2, angle2, major2, minor2, vm2,) = out; n=17
                NUM_WIDE = 17
-               ELEMENT_TYPE = 33
+               IF (TYPE(1:5) == 'QUAD4') THEN
+                  ELEMENT_TYPE = 33
+               ELSE
+                  ELEMENT_TYPE = 64 ! QUAD8
+               END IF
                NVALUES = NUM_WIDE * NUM
                CALL WRITE_OES3_STATIC(ITABLE, ISUBCASE, DEVICE_CODE, ELEMENT_TYPE, NUM_WIDE, STRESS_CODE, &
                                       TITLEI, STITLEI, LABELI, FIELD5_INT_MODE, FIELD6_EIGENVALUE)

Source/Modules/MYSTRAN_Version.f90

@@ -35,9 +35,9 @@ MODULE MYSTRAN_Version
       SAVE
 
       CHARACTER(256*BYTE)            :: MYSTRAN_COMMENT  = '*** Please report any problems to mystransolver@gmail.com ***'
-      CHARACTER(  8*BYTE), PARAMETER :: MYSTRAN_VER_NUM  = '18.0.0'
-      CHARACTER(  3*BYTE), PARAMETER :: MYSTRAN_VER_MONTH= 'APR'
-      CHARACTER(  2*BYTE), PARAMETER :: MYSTRAN_VER_DAY  = '20'
+      CHARACTER(  8*BYTE), PARAMETER :: MYSTRAN_VER_NUM  = '19.0.0'
+      CHARACTER(  3*BYTE), PARAMETER :: MYSTRAN_VER_MONTH= 'JUN'
+      CHARACTER(  2*BYTE), PARAMETER :: MYSTRAN_VER_DAY  = '28'
       CHARACTER(  4*BYTE), PARAMETER :: MYSTRAN_VER_YEAR = '2026'
       CHARACTER( 33*BYTE), PARAMETER :: MYSTRAN_AUTHOR   = 'MYSTRAN developed by Dr Bill Case'
 

extra_licenses/netlib-blas-lapack.txt → dependencies_licenses/netlib-blas-lapack.txt

@@ -6,12 +6,8 @@ Copyright (c) 2000-2013 The University of California Berkeley. All
 Copyright (c) 2006-2013 The University of Colorado Denver.  All rights
                         reserved.
 
-$COPYRIGHT$
-
 Additional copyrights may follow
 
-$HEADER$
-
 Redistribution and use in source and binary forms, with or without
 modification, are permitted provided that the following conditions are
 met:

mystran.rc

@@ -1,9 +1,9 @@
 #include <winver.h>
 
 1 VERSIONINFO
-FILEVERSION 18,0,0,0
-PRODUCTVERSION 18,0,0,0
-FILEFLAGSMASK 0x3fL
+FILEVERSION 19,0,0,0
+PRODUCTVERSION 19,0,0,0
+FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
 #ifdef _DEBUG
 FILEFLAGS VS_FF_DEBUG
 #else
@@ -19,11 +19,12 @@ BEGIN
     BLOCK "040904E4"
     BEGIN
       VALUE "FileDescription", "MYSTRAN Finite Element Solver"
-      VALUE "FileVersion", "18.0.0"
+      VALUE "FileVersion", "19.0.0"
       VALUE "ProductName", "MYSTRAN"
-      VALUE "ProductVersion", "18.0.0"
-      VALUE "CompanyName", "Open-Source Project"
+      VALUE "ProductVersion", "19.0.0"
+      VALUE "CompanyName", "The MYSTRAN Project"
       VALUE "OriginalFilename", "mystran.exe"
+      VALUE "InternalName", "mystran"
     END
   END