branching of master with addition from old newmaster branch. superloa… by jguterl · Pull Request #5 · llnl/INGRID

jguterl · 2020-10-21T22:11:49Z

superload and supersave methods to reload an entire set of patches and associated grids. Corresponding workflow is: create a grid with INGRID -> run UEDGE -> identify an issue with a cell -> remake grid only in the patch where it occurs if possible (e.g. poloidal point distribution modification) or in patches of same topological region (e.g. radial point distribution modification)
add new format capabilities to add simag and sigbndry values to the header of the generated grid file. This is turned off by default.
Adding a distribution function parser (new fille added DistribFunc.py) where distribution functions of grid point can be defined through a string converted into a lambda function (old system) or through a function defined in python or through a predefined function in DistribFunc.py
some other minor modifications

I would suggest to push these additions one by one through a new commit each time.

…d and supersave methods to reload an entire set of patches and associated grids. Corresponding workflow is: create a grid with INGRID -> run UEDGE -> identify an issue with a cell -> remake grid only in the patch where it occurs if possible (e.g. poloidal point distribution modification) or in patches of same topological region (e.g. radial point distribution modification)

bryan-garcia · 2020-10-23T21:28:59Z

INGRID/ingrid.py

        return fpath
+
+
+    def StoreSettings(self, fname: str = '', settings: dict = {}) -> 'Path':


Maybe SaveSettings for consistency with SavePatches

bryan-garcia

Comments before testing pull request in GUI workflow.

bryan-garcia · 2020-10-23T21:33:56Z

INGRID/ingrid.py

-        if self.settings['patch_data']['preferences']['new_file']:
-            self.SavePatches(self.settings['patch_data']['preferences']['new_fname'])
+        self.CurrentTopology.SetBoundarySplines()
+        #not practical in a workflow


So the thought is to separate patch saving from patch construction?

This commented out if statement can be moved to the gui code in master with ease (if that's your thought)

It was about the new_file variable. Probably easier to have a single filename system with a prompt to replace existing file or an option to overwrite automatically.

bryan-garcia · 2020-10-23T23:28:14Z

INGRID/utils.py

+        if type(PatchName)==str:
+            if len(PatchName)<1 or len(PatchName)>2:
+                raise IOError('PatchName must be a string of one or two characters')
+            L=''
+            N=None


len(PatchName) should be 2 by our convention. Is there a new feature for Patch with 1 char name?

Yes. This is to generate a list of patches based on one letter. For instance, I can redo A1/A2 and B1/B2 by simply putting in the list ['A','B']. similary, I can redo all the core with ['1'].

bryan-garcia · 2020-10-24T00:11:08Z

INGRID/ingrid.py

+
+    def SuperSavePatches(self, fname: str = '') -> None:
+        """
+        Save patches as '.npy' file for later reconstruction in Ingrid.
+
+        This file contains the information required to reconstruct patches
+        at a later time and bypass the line_tracing.
+
+        Parameters
+        ----------
+        fname : str, optional
+            Name of file/location for patch data.
+        """
+        if fname in ['', None]:
+            fname = self.CurrentTopology.config + '_patches_' + str(int(time()))
+        self.CurrentTopology.ResetHeavyAttr()
+
+        Data={'patches':self.CurrentTopology.patches,
+              'config':self.CurrentTopology.config,
+              'xpt_data':self.CurrentTopology.LineTracer.NSEW_lookup
+              }
+        np.save(fname, Data)
+
+        if Path(fname).suffix == '.npy':
+            tail = ''
+        else:
+            tail = '.npy'
+        print(f"# Saved patch data for file {Path(fname).name + tail}")


Does SuperSavePatches only differ from SavePatches by saving the data in npy format as dict all at once without spline data?

yes and the grids as well.

bryan-garcia · 2020-10-24T20:08:27Z

INGRID/utils.py

+    def SetPatchesOrientation(self):
+
+
+        # set radial orientation negative if patch is in PFR
+        for name, patch in self.patches.items():
+            if  patch.plate_patch and self.GetPatchLetterNumber(patch.get_tag())[1]=='1':
+                patch.RadOrientation=-1
+            else:
+                patch.RadOrientation=1
+
+        #set poloidal orientation negative if patches in high field side region (must be checked for other config)
+        Letters=list(dict.fromkeys([L for L,N in  self.GetPatchLetterNumber(self.GetListAllPatches())]))
+        Nhalf=int(len(Letters)/2)
+        ListLFS=Letters[0:Nhalf]
+        for name, patch in self.patches.items():
+            if self.GetPatchLetterNumber(patch.get_tag())[0] in ListLFS:
+                patch.PolOrientation=-1
+            else:
+                patch.PolOrientation=1
+


SetPatchesOrientation should be added strictly to the SNL class first since all other topologies inherit from TopologyUtils.

This will allow us to implement topology specific patch orientations (we see some SF configs have number-tag == 1 in the core)

bryan-garcia · 2020-10-28T03:06:02Z

More comments:

LoadPatches error occurs with merging due to differing patch-data file contents (added grid data expectation)
Patch map labeling with SNL keywords will not carry to other topologies (move labeling to SNL class itself?)

jguterl · 2020-11-13T18:23:11Z

It would be probably a good idea to reorganize the patch loading structure into a dictionary so the saving is straightforward.
Loading a dictionary rather than structured data prevent future compatibility issues.

bryan-garcia reviewed Oct 23, 2020

View reviewed changes

bryan-garcia reviewed Oct 24, 2020

View reviewed changes

bryan-garcia added a commit that referenced this pull request Oct 28, 2020

Testing pull-request #5

0537a70

bryan-garcia force-pushed the master branch from 4d8b487 to ac04a95 Compare February 16, 2022 06:01

bryan-garcia force-pushed the GA_develop branch from fb6b493 to 872c143 Compare February 16, 2022 06:05

		return fpath


		def StoreSettings(self, fname: str = '', settings: dict = {}) -> 'Path':

Conversation

jguterl commented Oct 21, 2020

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bryan-garcia left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

bryan-garcia commented Oct 28, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jguterl commented Nov 13, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

bryan-garcia commented Oct 28, 2020 •

edited

Loading