Commits

Anonymous committed 1c8b3b6 Merge

merge

Comments (0)

Files changed (5)

src/pflotran/init.F90

   call readRegionFiles(realization)
   ! clip regions and set up boundary connectivity, distance  
   call RealizationLocalizeRegions(realization)
-  call RealizatonPassPtrsToPatches(realization)
+  call RealizationPassPtrsToPatches(realization)
   ! link conditions with regions through couplers and generate connectivity
   call RealProcessMatPropAndSatFunc(realization)
   call RealizationProcessCouplers(realization)
                                  LIQUID_SATURATION)
       call GlobalSetAuxVarScalar(realization,option%reference_water_density, &
                                  LIQUID_DENSITY)
+    else
+      call GlobalUpdateAuxVars(realization,TIME_T,0.d0)
     endif
 
     ! initial concentrations must be assigned after densities are set !!!

src/pflotran/makefile

                 option.o output_aux.o patch.o pflotran_constants.o reaction.o \
                 reaction_aux.o reactive_transport_aux.o realization_base.o \
                 region.o saturation_function.o strata.o string.o \
-                structured_grid.o time_storage.o uniform_velocity.o \
-                unstructured_cell.o unstructured_grid.o \
+                structured_communicator.o structured_grid.o time_storage.o \
+                uniform_velocity.o unstructured_cell.o \
+                unstructured_communicator.o unstructured_grid.o \
                 unstructured_grid_aux.o variables.o waypoint.o
 realization_base.o : communicator_base.o debug.o discretization.o field.o \
                      input_aux.o mass_transfer.o option.o output_aux.o patch.o \

src/pflotran/pm_rt.F90

   ! set up communicator
   select case(this%realization%discretization%itype)
     case(STRUCTURED_GRID, STRUCTURED_GRID_MIMETIC)
-      this%comm1 => StructuredCommunicatorCreate()
       this%commN => StructuredCommunicatorCreate()
     case(UNSTRUCTURED_GRID)
-      this%comm1 => UnstructuredCommunicatorCreate()
       this%commN => UnstructuredCommunicatorCreate()
   end select
-  call this%comm1%SetDM(this%realization%discretization%dm_1dof)
   call this%commN%SetDM(this%realization%discretization%dm_ntrandof)
 #endif
 
   ! set the communicator
-  this%realization%comm1 => this%comm1
+  this%comm1 => this%realization%comm1
   
 end subroutine PMRTInit
 

src/pflotran/pm_subsurface.F90

   
   PetscErrorCode :: ierr
 
-  ! set up communicator
-  select case(this%realization%discretization%itype)
-    case(STRUCTURED_GRID, STRUCTURED_GRID_MIMETIC)
-      this%comm1 => StructuredCommunicatorCreate()
-    case(UNSTRUCTURED_GRID)
-      this%comm1 => UnstructuredCommunicatorCreate()
-  end select
-  call this%comm1%SetDM(this%realization%discretization%dm_1dof)
-
   ! set the communicator
-  this%realization%comm1 => this%comm1
+  this%comm1 => this%realization%comm1
   
 end subroutine PMSubsurfaceInit
 

src/pflotran/realization.F90

             RealizationCountCells, &
             RealizationPrintGridStatistics, &
             RealizationSetUpBC4Faces, &
-            RealizatonPassPtrsToPatches, &
+            RealizationPassPtrsToPatches, &
             RealLocalToLocalWithArray, &
             RealizationCalculateCFL1Timestep, &
             RealizationNonInitializedData, &
   use Unstructured_Cell_module
   use DM_Kludge_module
   use Variables_module, only : VOLUME
+  use Structured_Communicator_class, only : StructuredCommunicatorCreate
+  use Unstructured_Communicator_class, only : UnstructuredCommunicatorCreate
   
   implicit none
   
     call VecSet(field%flowrate_aveg,0.d0,ierr)
   endif
 
+  select case(realization%discretization%itype)
+    case(STRUCTURED_GRID, STRUCTURED_GRID_MIMETIC)
+      realization%comm1 => StructuredCommunicatorCreate()
+    case(UNSTRUCTURED_GRID)
+      realization%comm1 => UnstructuredCommunicatorCreate()
+  end select
+  call realization%comm1%SetDM(discretization%dm_1dof)
+
 end subroutine RealizationCreateDiscretization
 
 ! ************************************************************************** !
 
 ! ************************************************************************** !
 
-subroutine RealizatonPassPtrsToPatches(realization)
+subroutine RealizationPassPtrsToPatches(realization)
   ! 
   ! Sets patch%field => realization%field
   ! 
   realization%patch%datasets => realization%datasets
   realization%patch%reaction => realization%reaction
   
-end subroutine RealizatonPassPtrsToPatches
+end subroutine RealizationPassPtrsToPatches
 
 ! ************************************************************************** !