Moving displacement dynamic poro to LHS

Author: rwalkerlewis

libsrc/pylith/fekernels/Poroelasticity.hh

@@ -582,42 +582,38 @@ public:
 
     } // addPoroelasticContextBodyForceSourceDensity
 
-/** f0 function for displacement equation: f0u = \dot{u}.
+    /** f0 function for displacement equation: f0u = \dot{u}.
      *
      * Solution fields: [disp(dim), vel(dim)]
      */
     static inline
     void f0u_explicit(const PylithInt dim,
-             const PylithInt numS,
-             const PylithInt numA,
-             const PylithInt sOff[],
-             const PylithInt sOff_x[],
-             const PylithScalar s[],
-             const PylithScalar s_t[],
-             const PylithScalar s_x[],
-             const PylithInt aOff[],
-             const PylithInt aOff_x[],
-             const PylithScalar a[],
-             const PylithScalar a_t[],
-             const PylithScalar a_x[],
-             const PylithReal t,
-             const PylithScalar x[],
-             const PylithInt numConstants,
-             const PylithScalar constants[],
-             PylithScalar f0[]) {
-        assert(sOff);
-        assert(s);
-        assert(s_t);
-        assert(f0);
-        printf("f0u_explicit \n");
-        const PylithInt _numS = 3;
-        assert(_numS == numS);
+                      const PylithInt numS,
+                      const PylithInt numA,
+                      const PylithInt sOff[],
+                      const PylithInt sOff_x[],
+                      const PylithScalar s[],
+                      const PylithScalar s_t[],
+                      const PylithScalar s_x[],
+                      const PylithInt aOff[],
+                      const PylithInt aOff_x[],
+                      const PylithScalar a[],
+                      const PylithScalar a_t[],
+                      const PylithScalar a_x[],
+                      const PylithReal t,
+                      const PylithScalar x[],
+                      const PylithInt numConstants,
+                      const PylithScalar constants[],
+                      PylithScalar f0[]) {
+        pylith::fekernels::Poroelasticity::PoroelasticContext poroelasticContext;
+        pylith::fekernels::Poroelasticity::setPoroelasticContextDynamic(
+            &poroelasticContext, dim, numS, sOff, sOff_x, s, s_t, s_x, aOff, aOff_x, a, a_t, a_x, t, x);
 
-        const PylithInt i_disp = 0;
-        const PylithScalar* disp_t = &s_t[sOff[i_disp]];
+        const PylithScalar *displacement_t = poroelasticContext.displacement_t;
+        const PylithScalar *velocity = poroelasticContext.velocity;
 
         for (PylithInt i = 0; i < dim; ++i) {
-            f0[i] += disp_t[i];
+            f0[i] += displacement_t[i] - velocity[i];
         } // for
     } // f0u_explicit
 
@@ -657,35 +653,34 @@ public:
 
 #endif
 
-    //Calculate bulk density
+    // Calculate bulk density
     static inline
     void bulkDensity_asScalar(const PylithInt dim,
-                            const PylithInt numS,
-                            const PylithInt numA,
-                            const PylithInt sOff[],
-                            const PylithInt sOff_x[],
-                            const PylithScalar s[],
-                            const PylithScalar s_t[],
-                            const PylithScalar s_x[],
-                            const PylithInt aOff[],
-                            const PylithInt aOff_x[],
-                            const PylithScalar a[],
-                            const PylithScalar a_t[],
-                            const PylithScalar a_x[],
-                            const PylithReal t,
-                            const PylithScalar x[],
-                            const PylithInt numConstants,
-                            const PylithScalar constants[],
-                            PylithReal* bulkDensity) {
-
+                              const PylithInt numS,
+                              const PylithInt numA,
+                              const PylithInt sOff[],
+                              const PylithInt sOff_x[],
+                              const PylithScalar s[],
+                              const PylithScalar s_t[],
+                              const PylithScalar s_x[],
+                              const PylithInt aOff[],
+                              const PylithInt aOff_x[],
+                              const PylithScalar a[],
+                              const PylithScalar a_t[],
+                              const PylithScalar a_x[],
+                              const PylithReal t,
+                              const PylithScalar x[],
+                              const PylithInt numConstants,
+                              const PylithScalar constants[],
+                              PylithReal* bulkDensity) {
         // Poroelastic Context
         pylith::fekernels::Poroelasticity::PoroelasticContext poroelasticContext;
         pylith::fekernels::Poroelasticity::setPoroelasticContextQS(
             &poroelasticContext, dim, numS, sOff, sOff_x, s, s_t, s_x, aOff, aOff_x, a, a_t, a_x, t, x);
 
         bulkDensity = &(poroelasticContext.bulkDensity);
 
-    } //bulkDensity_asScalar
+    } // bulkDensity_asScalar
 
     // =============================================================================
     // Velocity

libsrc/pylith/materials/Poroelasticity.cc

@@ -457,7 +457,7 @@ pylith::materials::Poroelasticity::_setKernelsResidual(pylith::feassemble::Integ
         // Displacement
         const PetscPointFunc f0u = pylith::fekernels::Poroelasticity::f0u_explicit;
         const PetscPointFunc f1u = NULL;
-        const PetscPointFunc g0u = pylith::fekernels::Poroelasticity::g0u;
+        const PetscPointFunc g0u = NULL; // pylith::fekernels::Poroelasticity::g0u;
         const PetscPointFunc g1u = NULL;
 
         // Pressure
@@ -913,7 +913,7 @@ pylith::materials::Poroelasticity::_setKernelsDerivedField(pylith::feassemble::I
     kernels[1] = ProjectKernels("cauchy_strain", strainKernel);
 
     const PetscPointFunc bulkDensity = pylith::fekernels::Poroelasticity::bulkDensity_asScalar;
-    
+
     kernels[2] = ProjectKernels("bulk_density", bulkDensity);
 
     assert(integrator);