Bezier Field Solution Transfer #321

avinmoharana · 2020-08-24T16:56:00Z

This pull request adds the transfer of bezier solution fields.

Note that blending is used internally in Bezier Shapes. More specifically when a BezierCurver object is set with a non-zero third argument, Bezier shapes for tets and triangles might behave differently. Therefore, we needed to make sure the blending orders are set to zero at the beginning of the convertInterpolationgFieldsToBezier routine and then reverted back to the original values at the end. There still seems to be necessary to construct a new BezierCurver object with last argument 0 for the bezier fields to work properly.

…ier_fields Conflicts: crv/crvBezierFields.cc

…ndBezierFields

…r logSizeField

cwsmith · 2020-08-24T17:01:36Z

Would you please rebase this branch on develop?

mortezah · 2020-08-31T15:55:37Z

crv/CMakeLists.txt

@@ -20,6 +22,7 @@ set(SOURCES
  crvTables.cc
  crvQuality.cc
  crvVtk.cc
+  crvBezierFields.cc


@avinmoharana

crvBezierFields.cc seems to have been added twice!

mortezah · 2020-08-31T15:58:04Z

crv/crv.h

@@ -37,6 +41,13 @@ int getBlendingOrder(const int type);
 /** \brief count invalid elements of the mesh */
 int countNumberInvalidElements(apf::Mesh2* m);

+/** \ brief converts field f to Bezier entity wise */
+void convertInterpolationFieldPoints(apf::MeshEntity* e,


@avinmoharana
Is this used by outside users or only internally?

@mortezah
The converInterpolationFieldPoints is not currently used outside, but it would be nice to have an entity-specific convert routine.

@avinmoharana

What do you mean by entity-specific?

@mortezah
I meant while testing an operator we construct a toy example where this routine can get the control points/ interpolation points for a specific edge or a face.
The routine convertInterpolationFieldPoints is defined in crvBezierFields.cc and is used in crvBezierSolutionTransfer.cc and we don't have a header file defined for crvBezierFields.

mortezah · 2020-08-31T15:58:28Z

crv/crv.h

+    apf::Field* f, int n, int ne, apf::NewArray<double> &c);
+
+/** \brief converts field f, which is interpolating to Bezier */
+void convertInterpolatingFieldToBezier(apf::Mesh2* m_mesh, apf::Field* f);


@avinmoharana
Is this used by outside users or only internally?

@mortezah
This can be used outside as well. If we have an interpolating field defined outside then we can convert to Bezier from outside.

@avinmoharana if it is not used outside, it should not be here. If they are design issues that prevent this we should discuss and resolve those appropriately.

@mortezah
We want this to be accessible from outside. Can we not keep the current design?

mortezah · 2020-08-31T15:58:45Z

crv/crv.h

@@ -203,6 +214,10 @@ void writeInterpolationPointVtuFiles(apf::Mesh* m, const char* prefix);
 int getTriNodeIndex(int P, int i, int j);
 int getTetNodeIndex(int P, int i, int j, int k);

+/** \brief adds bezier solution transfers */
+ma::SolutionTransfer* setBezierSolutionTransfers(


@avinmoharana

Is this used by outside users or only internally?

@mortezah
No this not used outside.

@avinmoharana

then it should be made static. It also seems that this file is not a correct location for this. In that case, it has to be moved to the file it is defined. Where is the implementation (the actual code)? Can you just remove this declaration make the implementation static in the file it is defined?

@mortezah
The setBezierSolutionTransfers() is defined in crvBezierSolutionTransfer.cc and is called inside the adapt routine of crvAdapt.cc.
The current implementation uses the createBezierSolutionTransfer() (defined static in crvBezierSolutionTransfer.cc) to access the bezier fields and the setBezierSolutionTransfers adds those to solutionTransfer.

I can make the createBezierSolutionTransfer() accessible and define the setBezierSolutionTransfers routine in crvAdapt.cc, or define both only in crvAdapt.

mortezah · 2020-08-31T16:00:51Z

crv/crvAdapt.cc

@@ -194,6 +195,16 @@ static void flagCleaner(crv::Adapt* a)
  }
 }

+void getAllBezierFields(ma::Mesh* m, std::vector<apf::Field*>& fields)


@avinmoharana

if this is used only in this file, it should be made static.

mortezah · 2020-08-31T16:12:49Z

ma/CMakeLists.txt

@@ -56,6 +56,8 @@ set(HEADERS
  ma.h
  maInput.h
  maMesh.h
+  maMap.h


@avinmoharana

Are these two need to be here, or is this done for debugging? If this is done for debugging, please revert this back.

ma/maRefine.cc

ma/maShape.cc

ma/maSize.cc

avinmoharana · 2020-09-02T05:47:36Z

crv/crv.h

@@ -37,6 +41,13 @@ int getBlendingOrder(const int type);
 /** \brief count invalid elements of the mesh */
 int countNumberInvalidElements(apf::Mesh2* m);

+/** \ brief converts field f to Bezier entity wise */
+void convertInterpolationFieldPoints(apf::MeshEntity* e,


@mortezah
The converInterpolationFieldPoints is not currently used outside, but it would be nice to have an entity-specific convert routine.

avinmoharana · 2020-09-02T05:51:37Z

crv/crv.h

+    apf::Field* f, int n, int ne, apf::NewArray<double> &c);
+
+/** \brief converts field f, which is interpolating to Bezier */
+void convertInterpolatingFieldToBezier(apf::Mesh2* m_mesh, apf::Field* f);


@mortezah
This can be used outside as well. If we have an interpolating field defined outside then we can convert to Bezier from outside.

avinmoharana · 2020-09-02T05:54:17Z

crv/crv.h

@@ -203,6 +214,10 @@ void writeInterpolationPointVtuFiles(apf::Mesh* m, const char* prefix);
 int getTriNodeIndex(int P, int i, int j);
 int getTetNodeIndex(int P, int i, int j, int k);

+/** \brief adds bezier solution transfers */
+ma::SolutionTransfer* setBezierSolutionTransfers(


@mortezah
No this not used outside.

avinmoharana · 2020-09-02T06:32:39Z

crv/crvBezierFields.cc

+
+void convertInterpolatingFieldToBezier(apf::Mesh2* m_mesh, apf::Field* f)
+{
+  // TODO: to be completed


@mortezah
There is no assumption that the blending order of the entities is 0, i.e. the convert to Bezier Field should work with a non-zero blending order, as is implemented for the coordinate field. Should I remove the TODO from here?

crv/crvShapeHandler.cc

avinmoharana · 2020-09-02T06:43:52Z

ma/maSolutionTransfer.cc

-    apf::NewArray<double> value;
-};
+  return 0;
+}


@mortezah

we added this routine to print the field name that undergoes solution transfer onto the output console.

@avinmoharana

things that are added for debugging should be reverted back to their original state.

@mortezah
Removed getTransferFieldName().

avinmoharana · 2020-09-02T06:47:23Z

ma/maSolutionTransfer.cc

-    int minDim;
-};
+  }
+}


@mortezah

From line 216 to 245, it was a fix to account for piecewise constant energy field, where we conserve the total energy of the cavity on mesh adapt. This was a specific fix to the problem and should not be generalized. Should I remove this part?

avinmoharana · 2020-09-02T06:49:18Z

ma/maSolutionTransfer.h

+	EntityArray& oldElements,
+	EntityArray& newEntities);
+  private:
+    int minDim;
 };


@mortezah
We modified the structure of the code to make the routines usable outside maSolutionTransfer.

crv/crvAdapt.cc

mortezah · 2020-09-08T19:12:43Z

crv/crvBezierSolutionTransfer.cc

+		  val[k] = 0.;
+		apf::setComponents(f, newEntities[i], j, &(val[0]));
+	      }
+	      repositionInteriorFieldWithBlended(mesh,f,newEntities[i]);


@avinmoharana
why are we getting involved with blending here?

mortezah · 2020-09-08T19:13:41Z

crv/crvShapeHandler.cc

              getBezierTransformationMatrix(parentType,childType,P,A,vp);
              mth::multiply(Ai[apf::Mesh::typeDimension[childType]],A,B);
              for (int j = 0; j < ni; ++j){
                apf::Vector3 point(0,0,0);
-                for (int k = 0; k < np; ++k)
+                for (int k = 0; k < np; ++k) {


@avinmoharana

can you remove the extra bracket for this for loop?

@mortezah
Removed the extra bracket.

mortezah · 2020-09-08T19:16:03Z

ma/maSolutionTransfer.h

@@ -100,7 +164,7 @@ class SolutionTransfers : public SolutionTransfer
    virtual void onCavity(
        EntityArray& oldElements,
        EntityArray& newEntities);
-  private:
+  //private


@avinmoharana

Why is the private commented here?

@mortezah
We accessed the field names for solution transfer from transfers which was earlier defined private. Reverted it back to private.

Nightly Bot and others added 30 commits August 29, 2019 00:13

Merging develop into master

d9eeb2b

Merging develop into master

b384d6c

Merge branch 'develop'

d245e92

Merging develop into master

c33f4c4

Merging develop into master

ab96992

Merging develop into master

f7b1884

Merging develop into master

00bbb32

Merging develop into master

73e0dfb

Merging develop into master

c52aa74

Merging develop into master

f66ef98

Merging develop into master

7903280

Merging develop into master

d18ce6c

Merging develop into master

307f983

Merging develop into master

e8c5374

Merging develop into master

2cdb8ef

Merging develop into master

2b41420

Merging develop into master

89aee2b

Merging develop into master

bc34e3f

Merging develop into master

7037417

Merge branch 'develop'

7f8f777

Adds required functionality for Bezier Fields

0627108

handle fields through Bezier shapes

61ae04b

bezier representation of solution fields

775b743

testing bezier field solution transfer.

2982d4e

Merge branch 'bezier_fields' of github.com:avinmoharana/core into bez…

76badb6

…ier_fields Conflicts: crv/crvBezierFields.cc

Renames files FieldTransfer to SolutionTransfer

47fb3b6

Adds setBezierSolutionTransfers for clients

2228cfc

bezier field representation after Refine.

f71dfee

Separates implementation of maSolutionTransfer

9a09525

mortezah and others added 19 commits April 20, 2020 10:24

Forward declares the crv::Adapt class in crv.h

50dfbcc

Removes an unnecessary header file

06b74c7

Merge branch 'develop' of github.com:SCOREC/core into bezier_fields

5b76fa9

removes commented header file.

dfe6876

fixed solution transfer onCavity and onRefine.

2c083b7

Merge branch 'bezier_fields' of github.com:avinmoharana/core into STa…

1a8336c

…ndBezierFields

Merge branch 'develop' of github.com:SCOREC/core into STandBezierFields

515bf06

Merge branch 'develop' of github.com:SCOREC/core into bezier_fields

dd2ec78

Appends the crv Solution transfers to the existing ones.

fb2b3ed

Merge branch 'bezier_fields' of github.com:avinmoharana/core into STa…

097d33d

…ndBezierFields

removed print statements.

613983d

getFieldTransferName added.

ffbffcc

constant field transfer in a cavity, weighted by old to new values.

e273e25

bezier fields + st.

aa75b6a

constant Field cavity transfer.

44b059c

index fixed in ST OnRefine.

0b352bf

changes specific to Laghos problem.

b77a821

debugging field values after solutionTransfer + commented second orde…

251213b

…r logSizeField

clean code.

1db8724

Code cleanup.

58be87e

mortezah requested changes Aug 31, 2020

View reviewed changes

avinmoharana added 2 commits September 2, 2020 01:26

cleanup

721999b

cleanup.

3caaeb2

avinmoharana commented Sep 7, 2020

View reviewed changes

removed print blending order.

03cd0a2

mortezah requested changes Sep 8, 2020

View reviewed changes

avinmoharana added 3 commits September 13, 2020 22:21

cleanup.

83f850b

regression test for bezier field.

cfe92b4

convert interpolating to bezier fix for blended entities.

e73749b

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Bezier Field Solution Transfer #321

Bezier Field Solution Transfer #321

avinmoharana commented Aug 24, 2020

cwsmith commented Aug 24, 2020

mortezah Aug 31, 2020

mortezah Aug 31, 2020

avinmoharana Sep 2, 2020

mortezah Sep 9, 2020

avinmoharana Sep 13, 2020

mortezah Aug 31, 2020

avinmoharana Sep 2, 2020

mortezah Sep 8, 2020

avinmoharana Sep 13, 2020

mortezah Aug 31, 2020

avinmoharana Sep 2, 2020

mortezah Sep 8, 2020

avinmoharana Sep 14, 2020

mortezah Aug 31, 2020

mortezah Aug 31, 2020

avinmoharana Sep 2, 2020

avinmoharana Sep 2, 2020

avinmoharana Sep 2, 2020

avinmoharana Sep 2, 2020

avinmoharana Sep 2, 2020

mortezah Sep 8, 2020

avinmoharana Sep 14, 2020

avinmoharana Sep 2, 2020

avinmoharana Sep 2, 2020

mortezah Sep 8, 2020

mortezah Sep 8, 2020

avinmoharana Sep 13, 2020

mortezah Sep 8, 2020

avinmoharana Sep 14, 2020

Bezier Field Solution Transfer #321

Are you sure you want to change the base?

Bezier Field Solution Transfer #321

Conversation

avinmoharana commented Aug 24, 2020

cwsmith commented Aug 24, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment