Skip to content

Commit a477083

Browse files
zchlrnrzchlrnr
authored
Merge pull request #183 from Bruno02468/eigrl_fixes
Remove EIGRL continuation card and LANCMETH parameter
2 parents 11507f6 + cb2dde4 commit a477083

11 files changed

Lines changed: 898 additions & 970 deletions

File tree

‎Source/Interfaces/BD_PARAM_Interface.f90‎

Lines changed: 26 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,36 +1,36 @@
11
! ###############################################################################################################################
2-
! Begin MIT license text.
2+
! Begin MIT license text.
33
! _______________________________________________________________________________________________________
4-
5-
! Copyright 2022 Dr William R Case, Jr (mystransolver@gmail.com)
6-
7-
! Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
4+
5+
! Copyright 2022 Dr William R Case, Jr (mystransolver@gmail.com)
6+
7+
! Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
88
! associated documentation files (the "Software"), to deal in the Software without restriction, including
99
! without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10-
! copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to
11-
! the following conditions:
12-
13-
! The above copyright notice and this permission notice shall be included in all copies or substantial
14-
! portions of the Software and documentation.
15-
16-
! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
17-
! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18-
! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19-
! AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20-
! LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21-
! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22-
! THE SOFTWARE.
10+
! copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to
11+
! the following conditions:
12+
13+
! The above copyright notice and this permission notice shall be included in all copies or substantial
14+
! portions of the Software and documentation.
15+
16+
! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
17+
! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
! AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
! LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
! THE SOFTWARE.
2323
! _______________________________________________________________________________________________________
24-
25-
! End MIT license text.
24+
25+
! End MIT license text.
2626

2727
MODULE BD_PARAM_Interface
2828

2929
INTERFACE
3030

3131
SUBROUTINE BD_PARAM ( CARD )
3232

33-
33+
3434
USE PENTIUM_II_KIND, ONLY : BYTE, LONG, DOUBLE
3535
USE IOUNT1, ONLY : WRT_ERR, WRT_LOG, ERR, F04, F06
3636

@@ -53,7 +53,7 @@ SUBROUTINE BD_PARAM ( CARD )
5353
EPSIL , EMP0_PAUSE , ESP0_PAUSE , F06_COL_START , &
5454
GRDPNT , GRIDSEQ , HEXAXIS , &
5555
IORQ1M , IORQ1S , IORQ1B , IORQ2B , IORQ2T , &
56-
ITMAX , KLLRAT , KOORAT , LANCMETH , MATSPARS , &
56+
ITMAX , KLLRAT , KOORAT , MATSPARS , &
5757
MEMAFAC , MIN4TRED , MXALLOCA , MAXRATIO , &
5858
MEFMCORD , MEFMLOC , MEFMGRID , &
5959
MPFOUT , MXITERI , MXITERL , OTMSKIP , POST , &
@@ -73,19 +73,18 @@ SUBROUTINE BD_PARAM ( CARD )
7373
THRESHK , THRESHK_LAP , TINY , &
7474
TSTM_DEF , USR_JCT , USR_LTERM_KGG , USR_LTERM_MGG , WINAMEM , &
7575
WTMASS
76-
76+
7777
IMPLICIT NONE
78-
78+
7979
CHARACTER(LEN=*), INTENT(IN) :: CARD ! A Bulk Data card
8080
CHARACTER(15*BYTE) :: PARNAM ! The name of a parameter
81-
81+
8282
INTEGER(LONG) :: LOWER ! Lower allowable value for an integer parameter
8383
INTEGER(LONG) :: UPPER ! Upper allowable value for an integer parameter
8484
INTEGER(LONG), PARAMETER :: SUBR_BEGEND = BD_PARAM_BEGEND
85-
85+
8686
END SUBROUTINE BD_PARAM
8787

8888
END INTERFACE
8989

9090
END MODULE BD_PARAM_Interface
91-

‎Source/Interfaces/LINK4_Interface.f90‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,28 @@
11
! ###############################################################################################################################
2-
! Begin MIT license text.
2+
! Begin MIT license text.
33
! _______________________________________________________________________________________________________
4-
5-
! Copyright 2022 Dr William R Case, Jr (mystransolver@gmail.com)
6-
7-
! Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
4+
5+
! Copyright 2022 Dr William R Case, Jr (mystransolver@gmail.com)
6+
7+
! Permission is hereby granted, free of charge, to any person obtaining a copy of this software and
88
! associated documentation files (the "Software"), to deal in the Software without restriction, including
99
! without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
10-
! copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to
11-
! the following conditions:
12-
13-
! The above copyright notice and this permission notice shall be included in all copies or substantial
14-
! portions of the Software and documentation.
15-
16-
! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
17-
! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18-
! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19-
! AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20-
! LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21-
! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22-
! THE SOFTWARE.
10+
! copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to
11+
! the following conditions:
12+
13+
! The above copyright notice and this permission notice shall be included in all copies or substantial
14+
! portions of the Software and documentation.
15+
16+
! THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
17+
! OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
18+
! FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
19+
! AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
20+
! LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
21+
! OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
22+
! THE SOFTWARE.
2323
! _______________________________________________________________________________________________________
24-
25-
! End MIT license text.
24+
25+
! End MIT license text.
2626

2727
MODULE LINK4_Interface
2828

@@ -40,7 +40,7 @@ SUBROUTINE LINK4
4040
NVEC, NUM_EIGENS, NUM_KLLD_DIAG_ZEROS, NUM_MLL_DIAG_ZEROS, SOL_NAME, WARN_ERR
4141
USE TIMDAT, ONLY : YEAR, MONTH, DAY, HOUR, MINUTE, SEC, SFRAC, STIME, TSEC
4242
USE CONSTANTS_1, ONLY : ZERO, ONE
43-
USE PARAMS, ONLY : EPSIL, LANCMETH, SPARSTOR, SUPINFO
43+
USE PARAMS, ONLY : EPSIL, SOLLIB, SPARSTOR, SUPINFO
4444
USE MODEL_STUF, ONLY : EIG_COMP, EIG_CRIT, EIG_FRQ1, EIG_FRQ2, EIG_GRID, EIG_METH, EIG_MSGLVL, EIG_LAP_MAT_TYPE, &
4545
EIG_MODE, EIG_N1, EIG_N2, EIG_NCVFACL, EIG_NORM, EIG_SID, EIG_SIGMA, EIG_VECS, MAXMIJ, &
4646
MIJ_COL, MIJ_ROW, NUM_FAIL_CRIT
@@ -52,7 +52,7 @@ SUBROUTINE LINK4
5252
USE LAPACK_DPB_MATRICES, ONLY : ABAND, BBAND
5353
USE DEBUG_PARAMETERS, ONLY : DEBUG
5454

55-
IMPLICIT NONE
55+
IMPLICIT NONE
5656

5757
CHARACTER, PARAMETER :: CR13 = CHAR(13) ! This causes a carriage return simulating the "+" action in a FORMAT
5858

@@ -63,4 +63,3 @@ END SUBROUTINE LINK4
6363
END INTERFACE
6464

6565
END MODULE LINK4_Interface
66-

0 commit comments

Comments
 (0)