Commits

Anonymous committed d768a17

Fixed saturation function name; added trim() to stage name.

Comments (0)

Files changed (2)

src/pflotran/logging.F90

   PetscErrorCode :: ierr
   
   logging%stage_count = logging%stage_count + 1
-  full_stage_name = stage_name // ' Stage'
+  full_stage_name = trim(stage_name) // ' Stage'
   call PetscLogStageRegister(full_stage_name,stage_id,ierr)
   stage_id = logging%stage_count
   

src/pflotran/unittests/test_saturation_function.pf

 
     ! liquid relative permeability = f(saturation)
     saturation = 0.5d0
-    call SatFuncGetRelPermFromSat(saturation,relative_perm,dkr_Se, &
-                                  this%sf_Brooks_Corey_Burdine,1, &
+    call SatFuncGetLiqRelPermFromSat(saturation,relative_perm,dkr_Se, &
+                                     this%sf_Brooks_Corey_Burdine,1, &
                                   PETSC_TRUE,this%option)
     string = 'Brooks-Corey-Burdine liquid relative permeability as a ' // &
              'function of liquid saturation'
 
     ! liquid relative permeability = f(saturation)
     saturation = 0.5d0
-    call SatFuncGetRelPermFromSat(saturation,relative_perm,dkr_Se, &
-                                  this%sf_van_Genuchten_Mualem,1, &
-                                  PETSC_TRUE,this%option)
+    call SatFuncGetLiqRelPermFromSat(saturation,relative_perm,dkr_Se, &
+                                     this%sf_van_Genuchten_Mualem,1, &
+                                     PETSC_TRUE,this%option)
     string = 'van Genuchten-Mualem liquid relative permeability as a ' // &
              'function of liquid saturation'
     value = 7.1160141309814171d-3