diff --git a/src/sys/examples/tutorials/ex10f90.F90 b/src/sys/examples/tutorials/ex10f90.F90 index 6df5a06555..1d5b9867aa 100644 --- a/src/sys/examples/tutorials/ex10f90.F90 +++ b/src/sys/examples/tutorials/ex10f90.F90 @@ -7,6 +7,7 @@ PetscErrorCode :: ierr Character(len=256) :: filename PetscBool :: flg + PetscInt :: n call PetscInitialize(PETSC_NULL_CHARACTER,ierr) if (ierr .ne. 0) then @@ -18,6 +19,7 @@ call PetscOptionsInsertFileYAML(PETSC_COMM_WORLD,filename,PETSC_TRUE,ierr);CHKERRA(ierr) end if call PetscOptionsView(PETSC_NULL_OPTIONS,PETSC_VIEWER_STDOUT_WORLD,ierr);CHKERRA(ierr) + call PetscOptionsGetUnused(PETSC_NULL_OPTIONS,n,ierr);CHKERRQ(ierr); Call PetscFinalize(ierr) end program ex10f90 diff --git a/src/sys/examples/tutorials/ex3f.F b/src/sys/examples/tutorials/ex3f.F index b2e848ac73..df4494d967 100644 --- a/src/sys/examples/tutorials/ex3f.F +++ b/src/sys/examples/tutorials/ex3f.F @@ -33,6 +33,7 @@ parameter (onefp = 1.0d0) PetscReal onereal,tenreal parameter (onereal = 1.0, tenreal = 10.0) + PetscInt n ! ! - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ! Beginning of program @@ -115,6 +116,7 @@ call PetscLogEventEnd(USER_EVENT1,ierr) call PetscInfo('PETSc info message\n'//'Another line\n',ierr) + call PetscOptionsAllUsed(PETSC_NULL_OPTIONS,n,ierr); call PetscFinalize(ierr) end diff --git a/src/sys/objects/ftn-custom/zoptionsf.c b/src/sys/objects/ftn-custom/zoptionsf.c index 7e4d1daf8d..31216cdf7c 100644 --- a/src/sys/objects/ftn-custom/zoptionsf.c +++ b/src/sys/objects/ftn-custom/zoptionsf.c @@ -8,6 +8,7 @@ #include #if defined(PETSC_HAVE_FORTRAN_CAPS) +#define petscoptionsallused_ PETSCOPTIONSALLUSED #define petscoptionsgetenumprivate_ PETSCOPTIONSGETENUMPRIVATE #define petscoptionsgetbool_ PETSCOPTIONSGETBOOL #define petscoptionsgetintarray_ PETSCOPTIONSGETINTARRAY @@ -27,6 +28,7 @@ #define petscoptionsleft_ PETSCOPTIONSLEFT #define petscobjectviewfromoptions_ PETSCOBJECTVIEWFROMOPTIONS #elif !defined(PETSC_HAVE_FORTRAN_UNDERSCORE) +#define petscoptionsallused_ petscoptionsallused #define petscoptionsgetenumprivate_ petscoptionsgetenumprivate #define petscoptionsgetbool_ petscoptionsgetbool #define petscoptionssetvalue_ petscoptionssetvalue @@ -111,6 +113,12 @@ PETSC_EXTERN void PETSC_STDCALL petscoptionshasname_(PetscOptions *options,char* FREECHAR(name,c2); } +PETSC_EXTERN void PETSC_STDCALL petscoptionsallused_(PetscOptions *opt,PetscInt *n,PetscErrorCode *ierr) +{ + CHKFORTRANNULLOBJECTDEREFERENCE(opt); + *ierr = PetscOptionsAllUsed(*opt,n); +} + PETSC_EXTERN void PETSC_STDCALL petscoptionsgetint_(PetscOptions *opt,char* pre PETSC_MIXED_LEN(len1),char* name PETSC_MIXED_LEN(len2), PetscInt *ivalue,PetscBool *flg,PetscErrorCode *ierr PETSC_END_LEN(len1) PETSC_END_LEN(len2)) {