← Back to branch summary

~fluidity-core/fluidity/MultiFluids_reordering

« back to all changes in this revision

Viewing changes to legacy_reservoir_prototype/src/cv-adv-dif.F90

  • Committer: James Robert Percival
  • Date: 2014-02-27 17:33:43 UTC
  • mfrom: (4334.1.3 MultiFluids_Dev)
  • Revision ID: j.percival@imperial.ac.uk-20140227173343-sm6peei6xccg2ove
 fixing a raft of sizing bugs

Show diffs side-by-side

added added

removed removed

Lines of Context:
legacy_reservoir_prototype/src/cv-adv-dif.F90
1114
1114
            IF( (SELE /= 0) .AND. (INCOME(iphase) > 0.5) ) BCZERO=0.0
1115
1115
         
1116
1116
 
1117
 
            do icomp=1,nphase
 
1117
            do icomp=1,ncomp
1118
1118
 
1119
1119
               rhs_NODI_IPHA=icomp+(iphase-1)*ncomp+(CV_NODI-1)*NPHASE*NCOMP
1120
1120
 
1231
1231
 
1232
1232
 
1233
1233
                  CV_RHS( rhs_NODI_IPHA ) = CV_RHS( rhs_NODI_IPHA ) &
1234
 
                       + (CV_BETA * DENOLD(ICOMP,IPHASE,CV_NODI) * T2OLD(1,IPHASE,CV_NODI_IPHA) &
1235
 
                       + (1.-CV_BETA) * DEN(ICOMP,IPHASE,CV_NODI) * T2(1,IPHASE,CV_NODI_IPHA))  &
 
1234
                       + (CV_BETA * DENOLD(ICOMP,IPHASE,CV_NODI) * T2OLD(1,IPHASE,CV_NODI) &
 
1235
                       + (1.-CV_BETA) * DEN(ICOMP,IPHASE,CV_NODI) * T2(1,IPHASE,CV_NODI))  &
1236
1236
                       * MEAN_PORE_CV(CV_NODI) * MASS_CV(CV_NODI) * TOLD(ICOMP,IPHASE,CV_NODI) / DT
1237
1237
               ELSE
1238
1238
 
1245
1245
                  CSR_ACV( IMID_IPHA ) =  CSR_ACV( IMID_IPHA ) &
1246
1246
                    !+ (CV_BETA * DENOLD(CV_NODI_IPHA) + (1.-CV_BETA) * DEN(CV_NODI_IPHA))  &
1247
1247
                       + (CV_BETA * DEN(ICOMP,IPHASE,CV_NODI) &
1248
 
                       + (1.-CV_BETA) * DEN(ICOMP,IPHASe,CV_NODI))  &
 
1248
                       + (1.-CV_BETA) * DEN(ICOMP,IPHASE,CV_NODI))  &
1249
1249
                       * MEAN_PORE_CV(CV_NODI) * MASS_CV(CV_NODI) / DT
1250
1250
 
1251
1251
                  CV_RHS( rhs_NODI_IPHA ) = CV_RHS( rhs_NODI_IPHA ) &
1252
 
                       + (CV_BETA * DENOLD(ICOMP,IPHASE,CV_NODI_IPHA) &
1253
 
                       + (1.-CV_BETA) * DEN(ICOMP,IPHASE,CV_NODI_IPHA)) &
 
1252
                       + (CV_BETA * DENOLD(ICOMP,IPHASE,CV_NODI) &
 
1253
                       + (1.-CV_BETA) * DEN(ICOMP,IPHASE,CV_NODI)) &
1254
1254
                       * MEAN_PORE_CV(CV_NODI) * MASS_CV(CV_NODI) * TOLD(ICOMP,IPHASE,CV_NODI) / DT
 
1255
 
1255
1256
               ENDIF
1256
1257
                  
1257
1258