From 8fb1f3fb1459607d8e81154d0c9ba0130dd94cfa Mon Sep 17 00:00:00 2001 From: Bryan Herman Date: Thu, 4 Oct 2012 13:00:23 -0700 Subject: [PATCH] added PETSC compiler flag so code works when not compiling with PETSC --- src/cmfd_execute.F90 | 10 ++++++++++ src/cmfd_input.F90 | 4 ++++ src/cmfd_jacobian_operator.F90 | 4 ++++ src/cmfd_loss_operator.F90 | 4 ++++ src/cmfd_message_passing.F90 | 3 +++ src/cmfd_output.F90 | 4 ++++ src/cmfd_power_solver.F90 | 4 ++++ src/cmfd_prod_operator.F90 | 4 ++++ src/cmfd_snes_solver.F90 | 4 ++++ src/finalize.F90 | 4 ++++ src/input_xml.F90 | 2 +- 11 files changed, 46 insertions(+), 1 deletion(-) diff --git a/src/cmfd_execute.F90 b/src/cmfd_execute.F90 index 098ad9701d..a0ce3bba17 100644 --- a/src/cmfd_execute.F90 +++ b/src/cmfd_execute.F90 @@ -7,7 +7,9 @@ module cmfd_execute private public :: execute_cmfd, cmfd_init_batch +# ifdef PETSC # include +# endif contains @@ -17,6 +19,8 @@ contains subroutine execute_cmfd() +# ifdef PETSC + use cmfd_data, only: set_up_cmfd use cmfd_message_passing, only: petsc_init_mpi, cmfd_bcast use cmfd_output, only: write_hdf5_output @@ -124,6 +128,8 @@ contains ! wait here for all procs call MPI_Barrier(MPI_COMM_WORLD,mpi_err) +# endif + end subroutine execute_cmfd !============================================================================== @@ -166,6 +172,8 @@ contains end subroutine cmfd_init_batch +# ifdef PETSC + !============================================================================== ! PROCESS_CMFD_OPTIONS !============================================================================== @@ -433,6 +441,8 @@ contains end function get_matrix_idx +# endif + !=============================================================================== ! CMFD_TALLY_RESET !=============================================================================== diff --git a/src/cmfd_input.F90 b/src/cmfd_input.F90 index 0b4dd07f1b..6bba522800 100644 --- a/src/cmfd_input.F90 +++ b/src/cmfd_input.F90 @@ -12,7 +12,9 @@ contains subroutine configure_cmfd() +# ifdef PETSC use cmfd_message_passing, only: petsc_init_mpi +# endif use global, only: cmfd, cmfd_write_hdf5, master #ifdef HDF5 @@ -27,7 +29,9 @@ contains ! call write_cmfd_input_summary(cmfd_tally_size) ! initialize petsc on mpi +# ifdef PETSC call petsc_init_mpi() +# endif ! Create a new file using default properties. # ifdef HDF5 diff --git a/src/cmfd_jacobian_operator.F90 b/src/cmfd_jacobian_operator.F90 index bb8bfe3bd3..bbda97fa73 100644 --- a/src/cmfd_jacobian_operator.F90 +++ b/src/cmfd_jacobian_operator.F90 @@ -1,5 +1,7 @@ module cmfd_jacobian_operator +# ifdef PETSC + use cmfd_loss_operator, only: loss_operator,init_M_operator, & build_loss_matrix,destroy_M_operator use cmfd_prod_operator, only: prod_operator,init_F_operator, & @@ -345,4 +347,6 @@ contains end subroutine destroy_J_operator +# endif + end module cmfd_jacobian_operator diff --git a/src/cmfd_loss_operator.F90 b/src/cmfd_loss_operator.F90 index b6c7c80769..3b261a235b 100644 --- a/src/cmfd_loss_operator.F90 +++ b/src/cmfd_loss_operator.F90 @@ -1,5 +1,7 @@ module cmfd_loss_operator +# ifdef PETSC + implicit none private public :: init_M_operator,build_loss_matrix,destroy_M_operator @@ -533,4 +535,6 @@ contains end subroutine destroy_M_operator +# endif + end module cmfd_loss_operator diff --git a/src/cmfd_message_passing.F90 b/src/cmfd_message_passing.F90 index b4b0b9caab..c6430f3aa9 100644 --- a/src/cmfd_message_passing.F90 +++ b/src/cmfd_message_passing.F90 @@ -1,5 +1,6 @@ module cmfd_message_passing +# ifdef PETSC ! This module contains MPI routines related to the CMFD calculation @@ -93,4 +94,6 @@ contains end subroutine cmfd_bcast +# endif + end module cmfd_message_passing diff --git a/src/cmfd_output.F90 b/src/cmfd_output.F90 index 614cb9ef60..1943439c08 100644 --- a/src/cmfd_output.F90 +++ b/src/cmfd_output.F90 @@ -1,5 +1,7 @@ module cmfd_output +# ifdef PETSC + ! This modules cleans up cmfd objects and echos the results implicit none @@ -164,4 +166,6 @@ contains end subroutine write_hdf5_output +# endif + end module cmfd_output diff --git a/src/cmfd_power_solver.F90 b/src/cmfd_power_solver.F90 index 71d31d00e0..995e5acef5 100644 --- a/src/cmfd_power_solver.F90 +++ b/src/cmfd_power_solver.F90 @@ -1,5 +1,7 @@ module cmfd_power_solver +# ifdef PETSC + ! This module contains routines to execute the power iteration solver use cmfd_loss_operator, only: loss_operator,init_M_operator, & @@ -428,4 +430,6 @@ contains end subroutine finalize +# endif + end module cmfd_power_solver diff --git a/src/cmfd_prod_operator.F90 b/src/cmfd_prod_operator.F90 index b847fde4b8..741a63c22a 100644 --- a/src/cmfd_prod_operator.F90 +++ b/src/cmfd_prod_operator.F90 @@ -1,5 +1,7 @@ module cmfd_prod_operator +# ifdef PETSC + implicit none private public :: init_F_operator,build_prod_matrix,destroy_F_operator @@ -356,4 +358,6 @@ contains end subroutine destroy_F_operator +# endif + end module cmfd_prod_operator diff --git a/src/cmfd_snes_solver.F90 b/src/cmfd_snes_solver.F90 index 218e6bb399..d62b152422 100644 --- a/src/cmfd_snes_solver.F90 +++ b/src/cmfd_snes_solver.F90 @@ -1,5 +1,7 @@ module cmfd_snes_solver +# ifdef PETSC + use cmfd_loss_operator, only: loss_operator,init_M_operator, & & build_loss_matrix,destroy_M_operator use cmfd_prod_operator, only: prod_operator,init_F_operator, & @@ -452,4 +454,6 @@ contains end subroutine finalize +# endif + end module cmfd_snes_solver diff --git a/src/finalize.F90 b/src/finalize.F90 index 96172c8cc1..005e71c54b 100644 --- a/src/finalize.F90 +++ b/src/finalize.F90 @@ -1,6 +1,8 @@ module finalize +# ifdef PETSC use cmfd_output, only: finalize_cmfd +# endif use global use output, only: print_runtime use tally, only: write_tallies, tally_statistics @@ -36,8 +38,10 @@ contains end if end if +# ifdef PETSC ! finalize cmfd if (cmfd_run) call finalize_cmfd() +# endif ! stop timers and show timing statistics call timer_stop(time_finalize) diff --git a/src/input_xml.F90 b/src/input_xml.F90 index af45731a6c..eb178be64d 100644 --- a/src/input_xml.F90 +++ b/src/input_xml.F90 @@ -1,6 +1,6 @@ module input_xml - use cmfd_input, only: configure_cmfd + use cmfd_input, only: configure_cmfd use constants use datatypes, only: dict_add_key, dict_has_key, dict_get_key use error, only: fatal_error, warning