Edited subroutine names to not conflict with make_cut.f90

src/pressure_cut.f90

@@ -98,19 +98,19 @@ do i=1,nlsf
       if (prod*lsf(k,i).le.0.d0 .and. icut.eq.0) then
         icut=1
         allocate (vol_lsf(nlsf),stat=err) ; if (err.ne.0) call stop_run ('Error alloc vol_lsf in make_cut$')
-        call get_mat_volume(params,nlsf,lsf,vol_lsf,vol_lsf0)
+        call get_mat_volume_pc(params,nlsf,lsf,vol_lsf,vol_lsf0)
         if (vol_lsf0.gt.eps .or. level.gt.0) matrule=0
         if (matrule.eq.1 .or. matrule.eq.2) then                                ! Use majority or minority rule
-          call set_elem_props(params,mat,matrule,nlsf,nnode,icon,level,        &
+          call set_elem_props_pc(params,mat,matrule,nlsf,nnode,icon,level,     &
                              materialn,vol_lsf,vol_lsf0,x,y,z,u,v,w,temp,      &
                              pressure,strain,r0,s0,t0,rst,eviscosity)
         else                                                                    ! Use divFEM
           if (level.eq.levelmax) then
-          call set_elem_props(params,mat,matrule,nlsf,nnode,icon,level,        &
+          call set_elem_props_pc(params,mat,matrule,nlsf,nnode,icon,level,     &
                              materialn,vol_lsf,vol_lsf0,x,y,z,u,v,w,temp,      &
                              pressure,strain,r0,s0,t0,rst,eviscosity)
           else
-            call divide_element(params,mat,level,levelmax,nlsf,nnode,icon,     &
+            call divide_element_pc(params,mat,level,levelmax,nlsf,nnode,icon,  &
                                ileaves,materialn,lsf,r0,s0,t0,rst,x,y,z,u,v,w, &
                                temp,pressure,strain,eviscosity)
           endif
@@ -136,7 +136,7 @@ end subroutine pressure_cut
 
 !-------------------------------------------------------------------------------
 
-subroutine get_mat_volume (params,nlsf,lsf,vol_lsf,vol_lsf0)
+subroutine get_mat_volume_pc (params,nlsf,lsf,vol_lsf,vol_lsf0)
 
 use definitions
 
@@ -177,13 +177,13 @@ do i=1,nlsf
 enddo
 vol_lsf0=1.d0-sum(vol_lsf)
 
-end subroutine get_mat_volume
+end subroutine get_mat_volume_pc
 
 !-------------------------------------------------------------------------------
 
-subroutine set_elem_props (params,mat,matrule,nlsf,nnode,icon,level,materialn, &
-                          vol_lsf,vol_lsf0,x,y,z,u,v,w,temp,pressure,strain,r0,&
-                          s0,t0,rst,eviscosity)
+subroutine set_elem_props_pc (params,mat,matrule,nlsf,nnode,icon,level,        &
+                             materialn,vol_lsf,vol_lsf0,x,y,z,u,v,w,temp,      &
+                             pressure,strain,r0,s0,t0,rst,eviscosity)
 
 use definitions
 
@@ -271,11 +271,11 @@ call make_pressure (params,icon,x,y,z,viscosity,penal,expon,u,v,w,temp,        &
 
 pressure=pressure+pressurep/(8.d0**level)
 
-end subroutine set_elem_props
+end subroutine set_elem_props_pc
 
 !-------------------------------------------------------------------------------
 
-subroutine divide_element(params,mat,level,levelmax,nlsf,nnode,icon,ileaves,   &
+subroutine divide_element_pc(params,mat,level,levelmax,nlsf,nnode,icon,ileaves,&
                          materialn,lsf,r0,s0,t0,rst,x,y,z,u,v,w,temp,pressure, &
                          strain,eviscosity)
 
@@ -363,7 +363,7 @@ enddo
 
 deallocate (lsfp)
 
-end subroutine divide_element
+end subroutine divide_element_pc
 
 !-------------------------------------------------------------------------------
 !-------------------------------------------------------------------------------
\ No newline at end of file