1. Glenn Hammond
  2. pflotran-dev

Commits

Glenn Hammond  committed 19fb4e8

Changed subroutine name SatFuncGetRelPermFromSat -> SatFuncGetLiqRelPermFromSat.

  • Participants
  • Parent commits 8ac7fc2
  • Branches default

Comments (0)

Files changed (2)

File src/pflotran/general_aux.F90

View file
  • Ignore whitespace
   if (global_auxvar%istate == LIQUID_STATE .or. &
       global_auxvar%istate == TWO_PHASE_STATE) then
     ! this does not need to be calculated for LIQUID_STATE (=1)
-    call SatFuncGetRelPermFromSat(gen_auxvar%sat(lid),krl,dkrl_Se, &
-                                  saturation_function,lid,PETSC_FALSE,option)
+    call SatFuncGetLiqRelPermFromSat(gen_auxvar%sat(lid),krl,dkrl_Se, &
+                                     saturation_function,lid,PETSC_FALSE,option)
     ! use cell_pressure; cell_pressure - psat calculated internally
     call EOSWaterViscosity(gen_auxvar%temp,cell_pressure, &
                            gen_auxvar%pres(spid),visl,ierr)

File src/pflotran/saturation_function.F90

View file
  • Ignore whitespace
             SatFunctionComputePolynomial, &
             PermFunctionComputePolynomial, &
             SaturationFunctionRead, &
-            SatFuncGetRelPermFromSat, &
+            SatFuncGetLiqRelPermFromSat, &
             SatFuncGetGasRelPermFromSat, &
             SatFuncGetCapillaryPressure, &
             SaturationFunctionGetID, &
 
 ! ************************************************************************** !
 
-subroutine SatFuncGetRelPermFromSat(saturation,relative_perm,dkr_Se, &
-                                    saturation_function,iphase, &
-                                    derivative,option)
+subroutine SatFuncGetLiqRelPermFromSat(saturation,relative_perm,dkr_Se, &
+                                       saturation_function,iphase, &
+                                       derivative,option)
   ! 
   ! Calculates relative permeability from
   ! phase saturation
       end select
   end select
   
-end subroutine SatFuncGetRelPermFromSat
+end subroutine SatFuncGetLiqRelPermFromSat
 
 ! ************************************************************************** !