Commits

Glenn Hammond  committed 0c983e5

Removed unneeded #ifdefs from stochastic as it only works with the legacy code.

  • Participants
  • Parent commits 691f00b

Comments (0)

Files changed (2)

File src/pflotran/stochastic.F90

 ! ************************************************************************** !
 subroutine StochasticInit(stochastic,option)
 
-#ifdef PROCESS_MODEL
-  use Simulation_Base_class
-  use Communicator_Base_module  
-#else
   use Simulation_module
-#endif
   use Option_module
   use Input_module
   
     stochastic%num_realizations = 1
   endif
   
-#if PROCESS_MODEL
-  call CommCreateProcessorGroups(option,stochastic%num_groups)
-#else
   call OptionCreateProcessorGroups(option,stochastic%num_groups)
-#endif
   
   ! divvy up the realizations
   stochastic%num_local_realizations = stochastic%num_realizations / &
 ! ************************************************************************** !
 subroutine StochasticRun(stochastic,option)
 
-#ifdef PROCESS_MODEL
-  use Simulation_Base_class
-#else
   use Simulation_module
-#endif
   use Realization_class
   use Timestepper_module
   use Option_module
 
   type(stepper_type), pointer :: master_stepper
   PetscInt :: irealization
-#ifdef PROCESS_MODEL  
-  class(simulation_base_type), pointer :: simulation
-#else
   type(simulation_type), pointer :: simulation
-#endif
   character(len=MAXSTRINGLENGTH) :: string
   PetscInt :: init_status
   PetscErrorCode :: ierr
 
   do irealization = 1, stochastic%num_local_realizations
 
-#ifndef PROCESS_MODEL  
     call OptionInitRealization(option)
 
     ! Set group prefix based on id
 
     call SimulationDestroy(simulation)
 
-#endif    
-
   enddo
   
   call LoggingDestroy()

File src/pflotran/stochastic_aux.F90

 module Stochastic_Aux_module
 
-#ifdef PROCESS_MODEL
-  use Simulation_Base_class
-  use Subsurface_Simulation_class
-#else
   use Simulation_module
-#endif
 
   implicit none
   
     PetscInt :: num_realizations
     PetscInt :: num_local_realizations
     PetscInt, pointer :: realization_ids(:)
-#ifdef PROCESS_MODEL    
-    class(simulation_base_type), pointer :: simulation
-#else
     type(simulation_type), pointer :: simulation
-#endif
   end type stochastic_type
   
   public :: StochasticCreate, &
   if (.not.associated(stochastic)) return
   
   if (associated(stochastic%simulation)) then
-#ifndef PROCESS_MODEL    
     call SimulationDestroy(stochastic%simulation)
-#endif    
     nullify(stochastic%simulation)
   endif