Added Spring2019 news. Refs idaholab#174.

doc/content/news/2019-03.md

@@ -5,9 +5,15 @@
 !row!
 
 !col! small=12 medium=6 large=6
+<<<<<<< HEAD
 Made progress in implementing an explicit solver that will significantly reduce runtime. The explicit solver is benchmarked by comparing results of simple problems with the corresponding implicit, Newmark-Beta solution. The explicit solver is expected to be merged into the MOOSE framework in Summer, 2019 after thorough testing and will include both consistent and lumped-mass matrix options.
 
 The implementation comprises changes to the MOOSE framework and includes a new, `CentralDifference` TimeIntegrator. The implementation includes several other changes that make the usage of the explicit solver extremely easy to use. The user is simply required to change the TimeIntegrator in the Executioner and add the input statement, `implicit = false`, in the strain kernels. Sample results for a single solid element problem are presented in [image001].
+=======
+Made progress in implementing an explicit solver that will significantly reduce runtime. The explicit solver is benchmarked by comparing results of simple problems with the corresponding implcit, Newmark-Beta solution. The explicit solver is expected to be merged into the MOOSE framework in summer 2019 after thorough testing and will include both consistent and lumped-mass matrix options.
+
+The implementation comprises changes to the MOOSE framework and includes a new, `CentralDifference` TimeIntegrator. The implementation includes several other changes that make the usage of the explicit solver extremely easy to use. The user is simply required to change the TimeIntegrator in the Executioner and add the input 'implicit = false' in the strain kernels. Sample results for a single solid element problem are presented in [image001].
+>>>>>>> b328d7d... Added Spring2019 news. Refs #174.
 !col-end!
 
 !col! small=12 medium=6 large=6
@@ -23,7 +29,11 @@ The implementation comprises changes to the MOOSE framework and includes a new,
 
 !col! small=12 medium=6 large=6
 A beam mesh generator has been created and is currently under testing. The mesh generator will input nodal co-ordinates and beam connectivity information through csv files and will create a mesh automatically. This circumvents the usage of a meshing software and provides a much easier way to import meshes from traditional structural engineering software like SAP2000 or GTStrudl.
+<<<<<<< HEAD
 [image002] shows an L-shaped mesh and the corresponding input csv files created for testing. More tests and examples will follow. This will be merged with MASTODON in Summer, 2019.
+=======
+[image002] shows an L-shaped mesh and the corresponding input csv files created for testing. More tests and examples will follow. This will be implemented in summer 2019.
+>>>>>>> b328d7d... Added Spring2019 news. Refs #174.
 !col-end!
 
 !col! small=12 medium=6 large=6
@@ -38,12 +48,20 @@ A beam mesh generator has been created and is currently under testing. The mesh
 !row!
 
 !col! small=12 medium=6 large=6
+<<<<<<< HEAD
 A 4-noded shell element is being implemented in MOOSE based on the [citet:dvorkin1984continuum] formulation. This shell element can be used for problems that involve small or finite rotations. An initial tested version of this element would be available in MASTODON by end of Summer, 2019.
+=======
+Implementing strain calculator for shell implements that computes the strain tensor in the shell local coordinate system. Modified the strain calculator so that the strains are calculated in the element local coordinate system. This will enable use of the shell element with the existing material models in the long run, through the use of the weak plane stress kernel. Added the stress calculators and linear elastic isotropic elasticity tensor class for shell elements that has weak plane stress assumption built in it. Also, added stress divergence kernel for shell elements using the stresses and test function gradients calculated in the shell local coordinate system. Began testing it on bending of a 4 element cantilever beam bending problem from Dvorkin and Bathe paper. The residual is diverging, mostly likely due to a bug in the linear elastic isotropic elasticity tensor for the shell.
+>>>>>>> b328d7d... Added Spring2019 news. Refs #174.
 !col-end!
 
 !col! small=12 medium=6 large=6
 !media news/mar2019/Picture3.png style=width:300px;margin-left:50px id=image003
+<<<<<<< HEAD
        caption=Illustration of the [citet:dvorkin1984continuum] 4-noded shell element.
+=======
+       caption=???
+>>>>>>> b328d7d... Added Spring2019 news. Refs #174.
 !col-end!
 
 !row-end!
@@ -53,7 +71,11 @@ A 4-noded shell element is being implemented in MOOSE based on the [citet:dvorki
 !row!
 
 !col! small=12 medium=6 large=6
+<<<<<<< HEAD
 Extended the `ResponseHistoryBuilder`, `ResponseSpectraCalculator` and `HSICalculator` vectorpostprocessors to accept sets of nodes, or boundaries at input. Users do not have to create an individual VPP block for history, or spectrum at each node anymore. This makes these VPPs more user friendly. Illustrations and examples of the updated VPPs are provided in the corresponding documentation pages.
+=======
+Extended the Response History Builder, Response Spectra Calculator and HSI Calculator vector post processors to accept sets of nodes, or boundaries at input. Users do not have to create an individual VPP block for history, or spectrum at each node anymore. This makes the MASTODON `ResponseHistoryBuilder`, `ResponseSpectraCalculator`, and the `HSICalculator` more user friendly. Illustrations and examples are provided in the corresponding documentation pages.
+>>>>>>> b328d7d... Added Spring2019 news. Refs #174.
 !col-end!
 
 !col! small=12 medium=6 large=6
@@ -62,5 +84,8 @@ Extended the `ResponseHistoryBuilder`, `ResponseSpectraCalculator` and `HSICalcu
 !col-end!
 
 !row-end!
+<<<<<<< HEAD
 
 !bibtex bibliography
+=======
+>>>>>>> b328d7d... Added Spring2019 news. Refs #174.