Skip to content

Commit 9b189a9

Browse files
joseeromanbalay
joseeroman
authored and
balay
committed
Remove no longer needed custom Fortran stubs
1 parent fc1a986 commit 9b189a9

File tree

49 files changed

+75
-2445
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+75
-2445
lines changed

‎src/eps/f90-mod/slepceps.h90

Lines changed: 0 additions & 262 deletions
Original file line numberDiff line numberDiff line change
@@ -7,265 +7,3 @@
77
! SLEPc is distributed under a 2-clause BSD license (see LICENSE).
88
! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
99
!
10-
interface EPSGetDimensions
11-
subroutine EPSGetDimensions000(a,b,c,d,z)
12-
import tEPS
13-
EPS a
14-
PetscInt b
15-
PetscInt c
16-
PetscInt d
17-
PetscErrorCode z
18-
end subroutine
19-
subroutine EPSGetDimensions100(a,b,c,d,z)
20-
import tEPS
21-
EPS a
22-
PetscInt b(*)
23-
PetscInt c
24-
PetscInt d
25-
PetscErrorCode z
26-
end subroutine
27-
subroutine EPSGetDimensions010(a,b,c,d,z)
28-
import tEPS
29-
EPS a
30-
PetscInt b
31-
PetscInt c(*)
32-
PetscInt d
33-
PetscErrorCode z
34-
end subroutine
35-
subroutine EPSGetDimensions001(a,b,c,d,z)
36-
import tEPS
37-
EPS a
38-
PetscInt b
39-
PetscInt c
40-
PetscInt d(*)
41-
PetscErrorCode z
42-
end subroutine
43-
subroutine EPSGetDimensions110(a,b,c,d,z)
44-
import tEPS
45-
EPS a
46-
PetscInt b(*)
47-
PetscInt c(*)
48-
PetscInt d
49-
PetscErrorCode z
50-
end subroutine
51-
subroutine EPSGetDimensions011(a,b,c,d,z)
52-
import tEPS
53-
EPS a
54-
PetscInt b
55-
PetscInt c(*)
56-
PetscInt d(*)
57-
PetscErrorCode z
58-
end subroutine
59-
subroutine EPSGetDimensions101(a,b,c,d,z)
60-
import tEPS
61-
EPS a
62-
PetscInt b(*)
63-
PetscInt c
64-
PetscInt d(*)
65-
PetscErrorCode z
66-
end subroutine
67-
end interface EPSGetDimensions
68-
69-
interface EPSGetEigenpair
70-
subroutine EPSGetEigenpair00(a,b,c,d,e,f,z)
71-
import tEPS,tVec
72-
EPS a
73-
PetscInt b
74-
PetscScalar c
75-
PetscScalar d
76-
Vec e
77-
Vec f
78-
PetscErrorCode z
79-
end subroutine
80-
subroutine EPSGetEigenpair10(a,b,c,d,e,f,z)
81-
import tEPS,tVec
82-
EPS a
83-
PetscInt b
84-
PetscScalar c(*)
85-
PetscScalar d
86-
Vec e
87-
Vec f
88-
PetscErrorCode z
89-
end subroutine
90-
subroutine EPSGetEigenpair01(a,b,c,d,e,f,z)
91-
import tEPS,tVec
92-
EPS a
93-
PetscInt b
94-
PetscScalar c
95-
PetscScalar d(*)
96-
Vec e
97-
Vec f
98-
PetscErrorCode z
99-
end subroutine
100-
subroutine EPSGetEigenpair11(a,b,c,d,e,f,z)
101-
import tEPS,tVec
102-
EPS a
103-
PetscInt b
104-
PetscScalar c(*)
105-
PetscScalar d(*)
106-
Vec e
107-
Vec f
108-
PetscErrorCode z
109-
end subroutine
110-
end interface EPSGetEigenpair
111-
112-
interface EPSGetEigenvalue
113-
subroutine EPSGetEigenvalue00(a,b,c,d,z)
114-
import tEPS
115-
EPS a
116-
PetscInt b
117-
PetscScalar c
118-
PetscScalar d
119-
PetscErrorCode z
120-
end subroutine
121-
subroutine EPSGetEigenvalue10(a,b,c,d,z)
122-
import tEPS
123-
EPS a
124-
PetscInt b
125-
PetscScalar c(*)
126-
PetscScalar d
127-
PetscErrorCode z
128-
end subroutine
129-
subroutine EPSGetEigenvalue01(a,b,c,d,z)
130-
import tEPS
131-
EPS a
132-
PetscInt b
133-
PetscScalar c
134-
PetscScalar d(*)
135-
PetscErrorCode z
136-
end subroutine
137-
end interface EPSGetEigenvalue
138-
139-
interface EPSGetTolerances
140-
subroutine EPSGetTolerances00(a,b,c,z)
141-
import tEPS
142-
EPS a
143-
PetscReal b
144-
PetscInt c
145-
PetscErrorCode z
146-
end subroutine
147-
subroutine EPSGetTolerances10(a,b,c,z)
148-
import tEPS
149-
EPS a
150-
PetscReal b(*)
151-
PetscInt c
152-
PetscErrorCode z
153-
end subroutine
154-
subroutine EPSGetTolerances01(a,b,c,z)
155-
import tEPS
156-
EPS a
157-
PetscReal b
158-
PetscInt c(*)
159-
PetscErrorCode z
160-
end subroutine
161-
end interface EPSGetTolerances
162-
163-
interface EPSGetBalance
164-
subroutine EPSGetBalance000(a,b,c,d,z)
165-
import tEPS
166-
EPS a
167-
EPSBalance b
168-
PetscInt c
169-
PetscReal d
170-
PetscErrorCode z
171-
end subroutine
172-
subroutine EPSGetBalance100(a,b,c,d,z)
173-
import tEPS
174-
EPS a
175-
EPSBalance b(*)
176-
PetscInt c
177-
PetscReal d
178-
PetscErrorCode z
179-
end subroutine
180-
subroutine EPSGetBalance010(a,b,c,d,z)
181-
import tEPS
182-
EPS a
183-
EPSBalance b
184-
PetscInt c(*)
185-
PetscReal d
186-
PetscErrorCode z
187-
end subroutine
188-
subroutine EPSGetBalance001(a,b,c,d,z)
189-
import tEPS
190-
EPS a
191-
EPSBalance b
192-
PetscInt c
193-
PetscReal d(*)
194-
PetscErrorCode z
195-
end subroutine
196-
subroutine EPSGetBalance110(a,b,c,d,z)
197-
import tEPS
198-
EPS a
199-
EPSBalance b(*)
200-
PetscInt c(*)
201-
PetscReal d
202-
PetscErrorCode z
203-
end subroutine
204-
subroutine EPSGetBalance011(a,b,c,d,z)
205-
import tEPS
206-
EPS a
207-
EPSBalance b
208-
PetscInt c(*)
209-
PetscReal d(*)
210-
PetscErrorCode z
211-
end subroutine
212-
subroutine EPSGetBalance101(a,b,c,d,z)
213-
import tEPS
214-
EPS a
215-
EPSBalance b(*)
216-
PetscInt c
217-
PetscReal d(*)
218-
PetscErrorCode z
219-
end subroutine
220-
end interface EPSGetBalance
221-
222-
interface EPSSetDeflationSpace
223-
subroutine EPSSetDeflationSpace0(a,b,c,z)
224-
import tEPS,tVec
225-
EPS a
226-
PetscInt b
227-
Vec c
228-
PetscErrorCode z
229-
end subroutine
230-
subroutine EPSSetDeflationSpace1(a,b,c,z)
231-
import tEPS,tVec
232-
EPS a
233-
PetscInt b
234-
Vec c(*)
235-
PetscErrorCode z
236-
end subroutine
237-
end interface EPSSetDeflationSpace
238-
239-
interface EPSSetInitialSpace
240-
subroutine EPSSetInitialSpace0(a,b,c,z)
241-
import tEPS,tVec
242-
EPS a
243-
PetscInt b
244-
Vec c
245-
PetscErrorCode z
246-
end subroutine
247-
subroutine EPSSetInitialSpace1(a,b,c,z)
248-
import tEPS,tVec
249-
EPS a
250-
PetscInt b
251-
Vec c(*)
252-
PetscErrorCode z
253-
end subroutine
254-
end interface EPSSetInitialSpace
255-
256-
interface EPSSetLeftInitialSpace
257-
subroutine EPSSetLeftInitialSpace0(a,b,c,z)
258-
import tEPS,tVec
259-
EPS a
260-
PetscInt b
261-
Vec c
262-
PetscErrorCode z
263-
end subroutine
264-
subroutine EPSSetLeftInitialSpace1(a,b,c,z)
265-
import tEPS,tVec
266-
EPS a
267-
PetscInt b
268-
Vec c(*)
269-
PetscErrorCode z
270-
end subroutine
271-
end interface EPSSetLeftInitialSpace

‎src/eps/impls/krylov/krylovschur/ftn-custom/zkrylovschurf.c

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -12,25 +12,13 @@
1212
#include <slepceps.h>
1313

1414
#if defined(PETSC_HAVE_FORTRAN_CAPS)
15-
#define epskrylovschursetsubintervals_ EPSKRYLOVSCHURSETSUBINTERVALS
1615
#define epskrylovschurgetsubintervals_ EPSKRYLOVSCHURGETSUBINTERVALS
1716
#define epskrylovschurgetinertias_ EPSKRYLOVSCHURGETINERTIAS
18-
#define epskrylovschurgetsubcomminfo_ EPSKRYLOVSCHURGETSUBCOMMINFO
19-
#define epskrylovschurgetsubcommmats_ EPSKRYLOVSCHURGETSUBCOMMMATS
2017
#elif !defined(PETSC_HAVE_FORTRAN_UNDERSCORE)
21-
#define epskrylovschursetsubintervals_ epskrylovschursetsubintervals
2218
#define epskrylovschurgetsubintervals_ epskrylovschurgetsubintervals
2319
#define epskrylovschurgetinertias_ epskrylovschurgetinertias
24-
#define epskrylovschurgetsubcomminfo_ epskrylovschurgetsubcomminfo
25-
#define epskrylovschurgetsubcommmats_ epskrylovschurgetsubcommmats
2620
#endif
2721

28-
SLEPC_EXTERN void epskrylovschursetsubintervals_(EPS *eps,PetscReal *subint,PetscErrorCode *ierr)
29-
{
30-
CHKFORTRANNULLREAL(subint);
31-
*ierr = EPSKrylovSchurSetSubintervals(*eps,subint);
32-
}
33-
3422
SLEPC_EXTERN void epskrylovschurgetsubintervals_(EPS *eps,PetscReal *subint,PetscErrorCode *ierr)
3523
{
3624
PetscReal *osubint;
@@ -58,16 +46,3 @@ SLEPC_EXTERN void epskrylovschurgetinertias_(EPS *eps,PetscInt *nshift,PetscReal
5846
*ierr = PetscFree(oshifts);if (*ierr) return;
5947
*ierr = PetscFree(oinertias);
6048
}
61-
62-
SLEPC_EXTERN void epskrylovschurgetsubcomminfo_(EPS *eps,PetscInt *k,PetscInt *n,Vec *v,PetscErrorCode *ierr)
63-
{
64-
CHKFORTRANNULLOBJECT(v);
65-
*ierr = EPSKrylovSchurGetSubcommInfo(*eps,k,n,v);
66-
}
67-
68-
SLEPC_EXTERN void epskrylovschurgetsubcommmats_(EPS *eps,Mat *A,Mat *B,PetscErrorCode *ierr)
69-
{
70-
CHKFORTRANNULLOBJECT(A);
71-
CHKFORTRANNULLOBJECT(B);
72-
*ierr = EPSKrylovSchurGetSubcommMats(*eps,A,B);
73-
}

‎src/eps/impls/krylov/krylovschur/krylovschur.c

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -772,7 +772,7 @@ static PetscErrorCode EPSKrylovSchurSetSubintervals_KrylovSchur(EPS eps,PetscRea
772772
PetscFunctionReturn(PETSC_SUCCESS);
773773
}
774774

775-
/*@C
775+
/*@
776776
EPSKrylovSchurSetSubintervals - Sets the points that delimit the
777777
subintervals to be used in spectrum slicing with several partitions.
778778
@@ -796,10 +796,11 @@ static PetscErrorCode EPSKrylovSchurSetSubintervals_KrylovSchur(EPS eps,PetscRea
796796
797797
.seealso: EPSKrylovSchurSetPartitions(), EPSKrylovSchurGetSubintervals(), EPSSetInterval()
798798
@*/
799-
PetscErrorCode EPSKrylovSchurSetSubintervals(EPS eps,PetscReal *subint)
799+
PetscErrorCode EPSKrylovSchurSetSubintervals(EPS eps,PetscReal subint[])
800800
{
801801
PetscFunctionBegin;
802802
PetscValidHeaderSpecific(eps,EPS_CLASSID,1);
803+
PetscAssertPointer(subint,2);
803804
PetscTryMethod(eps,"EPSKrylovSchurSetSubintervals_C",(EPS,PetscReal*),(eps,subint));
804805
PetscFunctionReturn(PETSC_SUCCESS);
805806
}
@@ -943,14 +944,14 @@ static PetscErrorCode EPSKrylovSchurGetInertias_KrylovSchur(EPS eps,PetscInt *n,
943944
The arrays should be at least of length n. The value of n can be determined
944945
by an initial call
945946
.vb
946-
EPSKrylovSchurGetInertias(eps,n,PETSC_NULL_REAL,PETSC_NULL_INTEGER,ierr)
947+
EPSKrylovSchurGetInertias(eps,n,PETSC_NULL_REAL_ARRAY,PETSC_NULL_INTEGER_ARRAY,ierr)
947948
.ve
948949
949950
Level: advanced
950951
951952
.seealso: EPSSetInterval(), EPSKrylovSchurSetSubintervals()
952953
@*/
953-
PetscErrorCode EPSKrylovSchurGetInertias(EPS eps,PetscInt *n,PetscReal **shifts,PetscInt **inertias)
954+
PetscErrorCode EPSKrylovSchurGetInertias(EPS eps,PetscInt *n,PetscReal *shifts[],PetscInt *inertias[])
954955
{
955956
PetscFunctionBegin;
956957
PetscValidHeaderSpecific(eps,EPS_CLASSID,1);
@@ -973,7 +974,7 @@ static PetscErrorCode EPSKrylovSchurGetSubcommInfo_KrylovSchur(EPS eps,PetscInt
973974
PetscFunctionReturn(PETSC_SUCCESS);
974975
}
975976

976-
/*@C
977+
/*@
977978
EPSKrylovSchurGetSubcommInfo - Gets information related to the case of
978979
doing spectrum slicing for a computational interval with multiple
979980
communicators.
@@ -1066,7 +1067,7 @@ static PetscErrorCode EPSKrylovSchurGetSubcommMats_KrylovSchur(EPS eps,Mat *A,Ma
10661067
PetscFunctionReturn(PETSC_SUCCESS);
10671068
}
10681069

1069-
/*@C
1070+
/*@
10701071
EPSKrylovSchurGetSubcommMats - Gets the eigenproblem matrices stored
10711072
internally in the subcommunicator to which the calling process belongs.
10721073

‎src/eps/interface/epsopts.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ PetscErrorCode EPSSetFromOptions(EPS eps)
241241
PetscFunctionReturn(PETSC_SUCCESS);
242242
}
243243

244-
/*@C
244+
/*@
245245
EPSGetTolerances - Gets the tolerance and maximum iteration count used
246246
by the EPS convergence tests.
247247
@@ -315,7 +315,7 @@ PetscErrorCode EPSSetTolerances(EPS eps,PetscReal tol,PetscInt maxits)
315315
PetscFunctionReturn(PETSC_SUCCESS);
316316
}
317317

318-
/*@C
318+
/*@
319319
EPSGetDimensions - Gets the number of eigenvalues to compute
320320
and the dimension of the subspace.
321321
@@ -1101,7 +1101,7 @@ PetscErrorCode EPSSetBalance(EPS eps,EPSBalance bal,PetscInt its,PetscReal cutof
11011101
PetscFunctionReturn(PETSC_SUCCESS);
11021102
}
11031103

1104-
/*@C
1104+
/*@
11051105
EPSGetBalance - Gets the balancing type used by the EPS object, and the
11061106
associated parameters.
11071107

0 commit comments

Comments
 (0)