1. Richard Mills
  2. pflotran-dev

Commits

Gautam Bisht  committed 80f6210

Removed comments from TH-mode

  • Participants
  • Parent commits 239ac55
  • Branches default

Comments (0)

Files changed (1)

File src/pflotran/th.F90

View file
 #endif
 
   J(1,2) = global_aux_var%sat(1)*TH_aux_var%dden_dt*porXvol !*TH_aux_var%xmol(1)
-!GB  J(1,3) = 0.d0 !-global_aux_var%sat(1)*global_aux_var%den(1)*porXvol
-!GB  J(2,1) = (global_aux_var%sat(1)*TH_aux_var%dden_dp + &
-!GB           TH_aux_var%dsat_dp*global_aux_var%den(1))*porXvol*TH_aux_var%xmol(2)
-!GB  J(2,2) = global_aux_var%sat(1)*TH_aux_var%dden_dt*porXvol*TH_aux_var%xmol(2)
-!GB  J(2,3) = global_aux_var%sat(1)*global_aux_var%den(1)*porXvol
   J(2,1) = (TH_aux_var%dsat_dp*global_aux_var%den(1)*TH_aux_var%u + &
             global_aux_var%sat(1)*TH_aux_var%dden_dp*TH_aux_var%u + &
             global_aux_var%sat(1)*global_aux_var%den(1)*TH_aux_var%du_dp)*porXvol
            (TH_aux_var%dden_dt*TH_aux_var%u + &  ! pull %sat outside
             global_aux_var%den(1)*TH_aux_var%du_dt)*porXvol +  &
            (1.d0 - por)*vol*rock_dencpr 
-!GB  J(3,3) = 0.d0
 
 #ifdef ICE 
   ! SK, 11/17/11
                     dsatg_dt*den_g*mol_g + sat_g*ddeng_dt*mol_g + &
                     sat_g*den_g*dmolg_dt + dsati_dt*den_i + sat_i*ddeni_dt)* &
                     porXvol
-!GB  J(2,2) = J(2,2) + TH_aux_var%dsat_dt*global_aux_var%den(1)* &
-!GB                    TH_aux_var%xmol(2)*porXvol
   J(2,1) = J(2,1) + (dsatg_dp*den_g*u_g + dsati_dp*den_i*u_i + &
                     sat_i*ddeni_dp*u_i)*porXvol
   J(2,2) = J(2,2) + (TH_aux_var%dsat_dt*global_aux_var%den(1)*TH_aux_var%u + &
                     sat_g*den_g*dug_dt + dsati_dt*den_i*u_i + &
                     sat_i*ddeni_dt*u_i + sat_i*den_i*dui_dt)*porXvol
                     
-#ifdef REMOVE_SATURATION
-!GB  J(2,1) = TH_aux_var%dden_dp*porXvol*TH_aux_var%xmol(2)
-!GB  J(2,2) = TH_aux_var%dden_dt*porXvol*TH_aux_var%xmol(2)
-!GB  J(2,3) = global_aux_var%den(1)*porXvol
-#endif                    
 #endif
 
   J = J/option%flow_dt
 
     x(1) = global_aux_var%pres(1)
     x(2) = global_aux_var%temp(1)
-!GB    x(3) = TH_aux_var%xmol(2)
     
     call THAccumulation(TH_aux_var,global_aux_var, &
                          por,vol,rock_dencpr,option, &
         endif
           x_pert(ideriv) = x_pert(ideriv) + pert
       endif
-!GB      if (ideriv == 3) then
-!GB        x_pert(ideriv) = x_pert(ideriv) + pert
-!GB      endif
 #else
       x_pert(ideriv) = x_pert(ideriv) + pert
 #endif
       Jdn(1,1) = (dq_dp_dn*density_ave+q*dden_ave_dp_dn)
       Jdn(1,2) = (dq_dt_dn*density_ave+q*dden_ave_dt_dn)
 
-!GB      Jup(2,1) = (dq_dp_up*density_ave+q*dden_ave_dp_up)*uxmol(2)
-!GB      Jup(2,2) = (dq_dt_up*density_ave+q*dden_ave_dt_up)*uxmol(2)
-!GB      Jup(2,3) = q*density_ave*duxmol_dxmol_up
-
-!GB      Jdn(2,1) = (dq_dp_dn*density_ave+q*dden_ave_dp_dn)*uxmol(2)
-!GB      Jdn(2,2) = (dq_dt_dn*density_ave+q*dden_ave_dt_dn)*uxmol(2)
-!GB      Jdn(2,3) = q*density_ave*duxmol_dxmol_dn
-     
       ! based on flux = q*density_ave*uh
       Jup(option%nflowdof,1) = (dq_dp_up*density_ave+q*dden_ave_dp_up)*uh+q*density_ave*duh_dp_up
       Jup(option%nflowdof,2) = (dq_dt_up*density_ave+q*dden_ave_dt_up)*uh+q*density_ave*duh_dt_up
                   (global_aux_var_up%sat(1) + global_aux_var_dn%sat(1))*aux_var_dn%dden_dp)
     ddifff_dt_dn = diffdp*0.25D0*(global_aux_var_up%sat(1) + global_aux_var_dn%sat(1))*aux_var_dn%dden_dt
                                     
-! SK   
-
-!GB    Jup(2,1) = Jup(2,1) + ddifff_dp_up*0.5d0*(Diff_up + Diff_dn)* &
-!GB                         (aux_var_up%xmol(2) - aux_var_dn%xmol(2))
-!GB    Jup(2,2) = Jup(2,2) + ddifff_dt_up*0.5d0*(Diff_up + Diff_dn)* &
-!GB                         (aux_var_up%xmol(2) - aux_var_dn%xmol(2))
-!GB    Jup(2,3) = Jup(2,3) + difff*0.5d0*(Diff_up + Diff_dn)
-!GB
-!GB    Jdn(2,1) = Jdn(2,1) + ddifff_dp_dn*0.5d0*(Diff_up + Diff_dn)* &
-!GB                         (aux_var_up%xmol(2) - aux_var_dn%xmol(2))
-!GB    Jdn(2,2) = Jdn(2,2) + ddifff_dt_dn*0.5d0*(Diff_up + Diff_dn)* &
-!GB                         (aux_var_up%xmol(2) - aux_var_dn%xmol(2))
-!GB    Jdn(2,3) = Jdn(2,3) + difff*0.5d0*(Diff_up + Diff_dn)*(-1.d0)
-
-
 #ifdef ICE
   ! Added by Satish Karra, updated 11/11/11
   satg_up = aux_var_up%sat_gas
   ddifff_dt_up = diffdp * 0.5d0 * aux_var_up%dden_dt
   ddifff_dt_dn = diffdp * 0.5d0 * aux_var_dn%dden_dt
   
-!GB  Jup(2,1) = Jup(2,1) + ddifff_dp_up*0.5d0*(Diff_up + Diff_dn)* &
-!GB                         (aux_var_up%xmol(2) - aux_var_dn%xmol(2))
-!GB  Jup(2,2) = Jup(2,2) + ddifff_dt_up*0.5d0*(Diff_up + Diff_dn)* &
-!GB                         (aux_var_up%xmol(2) - aux_var_dn%xmol(2))
-!GB  Jup(2,3) = Jup(2,3) + difff*0.5d0*(Diff_up + Diff_dn)
-
-!GB  Jdn(2,1) = Jdn(2,1) + ddifff_dp_dn*0.5d0*(Diff_up + Diff_dn)* &
-!GB                         (aux_var_up%xmol(2) - aux_var_dn%xmol(2))
-!GB  Jdn(2,2) = Jdn(2,2) + ddifff_dt_dn*0.5d0*(Diff_up + Diff_dn)* &
-!GB                         (aux_var_up%xmol(2) - aux_var_dn%xmol(2))
-!GB  Jdn(2,3) = Jdn(2,3) + difff*0.5d0*(Diff_up + Diff_dn)*(-1.d0)
-
-#endif                         
+#endif
 #endif 
 
         
     call GlobalAuxVarCopy(global_aux_var_dn,global_aux_var_pert_dn,option)
     x_up(1) = global_aux_var_up%pres(1)
     x_up(2) = global_aux_var_up%temp(1)
-!GB    x_up(3) = aux_var_up%xmol(2)
     x_dn(1) = global_aux_var_dn%pres(1)
     x_dn(2) = global_aux_var_dn%temp(1)
-!GB    x_dn(3) = aux_var_dn%xmol(2)
 
     call THFlux( &
       aux_var_up,global_aux_var_up,por_up,tor_up,sir_up,dd_up,perm_up,Dk_up, &
           x_pert_dn(ideriv) = x_pert_dn(ideriv) + pert_dn
       endif
       
-!GB      if (ideriv == 3) then
-!GB        x_pert_up(ideriv) = x_pert_up(ideriv) + pert_up
-!GB        x_pert_dn(ideriv) = x_pert_dn(ideriv) + pert_dn
-!GB      endif
 #else
       x_pert_up(ideriv) = x_pert_up(ideriv) + pert_up
       x_pert_dn(ideriv) = x_pert_dn(ideriv) + pert_dn
 
   Jdn(1,1) = (dq_dp_dn*density_ave+q*dden_ave_dp_dn)
   Jdn(1,2) = (dq_dt_dn*density_ave+q*dden_ave_dt_dn)
-!GB  do ispec=2,option%nflowspec
-!GB    ! based on flux = q*density_ave*uxmol
-!GB    Jdn(ispec,1) = (dq_dp_dn*density_ave+q*dden_ave_dp_dn)*uxmol(ispec)
-!GB    Jdn(ispec,2) = (dq_dt_dn*density_ave+q*dden_ave_dt_dn)*uxmol(ispec)
-!GB    Jdn(ispec,ispec+1) = q*density_ave*duxmol_dxmol_dn
-!GB  enddo
       
   ! based on flux = q*density_ave*uh
   Jdn(option%nflowdof,1) =  &
       ddiff_dp_dn = diffdp * (aux_var_dn%dsat_dp*global_aux_var_dn%den(1)+ &
                                 global_aux_var_dn%sat(1)*aux_var_dn%dden_dp)
       ddiff_dt_dn = diffdp * global_aux_var_dn%sat(1)*aux_var_dn%dden_dt
-! SK
-!GB      Jdn(2,1) = Jdn(2,1) + ddiff_dp_dn*Diff_dn* &
-!GB                            (aux_var_up%xmol(2)-aux_var_dn%xmol(2))
-!GB      Jdn(2,2) = Jdn(2,2) + ddiff_dt_dn*Diff_dn* &
-!GB                            (aux_var_up%xmol(2)-aux_var_dn%xmol(2))
-!GB      Jdn(2,3) = Jdn(2,3) + diff*Diff_dn*(-1.d0)
 
 #ifdef ICE
 #ifdef REMOVE_SATURATION
       ddiff_dp_dn = diffdp * aux_var_dn%dden_dp
       ddiff_dt_dn = diffdp * aux_var_dn%dden_dt
 
-!GB      Jdn(2,1) = Jdn(2,1) + ddiff_dp_dn*Diff_dn* &
-!GB                            (aux_var_up%xmol(2)-aux_var_dn%xmol(2))
-!GB      Jdn(2,2) = Jdn(2,2) + ddiff_dt_dn*Diff_dn* &
-!GB                            (aux_var_up%xmol(2)-aux_var_dn%xmol(2))
-!GB      Jdn(2,3) = Jdn(2,3) + diff*Diff_dn*(-1.d0)
-      
 #endif
 #endif
   end select
     
     x_up(1) = global_aux_var_up%pres(1)
     x_up(2) = global_aux_var_up%temp(1)
-!GB    x_up(3) = aux_var_up%xmol(2)
     x_dn(1) = global_aux_var_dn%pres(1)
     x_dn(2) = global_aux_var_dn%temp(1)
-!GB    x_dn(3) = aux_var_dn%xmol(2)
     do ideriv = 1,3
       if (ibndtype(ideriv) == ZERO_GRADIENT_BC) then
         x_up(ideriv) = x_dn(ideriv)
         endif
         x_pert_dn(ideriv) = x_pert_dn(ideriv) + pert_dn
       endif
-!GB      if (ideriv == 3) then
-!GB        x_pert_dn(ideriv) = x_pert_dn(ideriv) + pert_dn
-!GB      endif
 #else
       x_pert_dn(ideriv) = x_pert_dn(ideriv) + pert_dn
 #endif
 !!GB                           (aux_var_up%xmol(2)-aux_var_dn%xmol(2))
 !pcl  endif
 #ifdef ICE
-#ifdef REMOVE_SATURATION
-        diff = diffdp*global_aux_var_dn%den(1)
-!!GB        fluxm(2) = fluxm(2) + diff*Diff_dn* &
-!!GB                           (aux_var_up%xmol(2)-aux_var_dn%xmol(2))
-#endif
+
 #endif
   end select