Capability to Import Models #313

jhmatthews · 2017-11-23T15:30:00Z

This pull request adds the capability to read in models, as documented in issues #309

The user guide is here: https://github.com/agnwinds/python/wiki/Importing-Models-(wind_type-10-) and also in the cookbook.

A few important changes:

wind mode 10 allows one to access the new mode, wind_type IMPORT
if IMPORT, inwind is set by the user and not by wind cones
if IMPORT, where_in_wind queries the grid rather than working out if you are in the wind by geometry alone
if IMPORT, you cannot be partially in the wind
a new inwind variable, W_NOT_ASSIGNED is now initialised. This is overwritten in the case of
import and this ensures flags are not overwritten
volumes are still set in the corresponding volumes routines but based on the "read in" flags
temperatures are not set by the read in file, even though there is a column for that, but they could be.
This has been tested in cylindrical but needs checking more, especially in rtheta

Knox has written routines to convert windsave2table outputs to reading in files, which should be tried out as described on the wiki.

This merge also includes some reorganisation of setup routines.

In addition to creating a new routine import.c to read in models I have moved some of the inputs having to do with winds from python.c into a reanmed routine in setup, to collect the infomrmation about domains. Note that to avoid having to specify the dimensions in advance one needs to actually read in the models, before one allocates wmain.

…odels

Problems still remain concerning which cells are in the wind.

a spherical model. #309

from a file #309.

windsave to table to serve as imput files for a model to be read into python.

cylindrical coordinates. #309

cylidrical grid #309. This still has problems.

with each coordinate system. Began to revise the import_cylindrical to reflect an assumption that one did not need to add buffer cells. #309

immediately falling over. Issues remain, including making sure that rho is being added to plasma ptr correctly everywhere, and deciding what is actually inwind. #309

imports. #309

…mported models and reading in inwind values

and cylindrical models. #309 One needs to assigne zdom ndim, mdim, and mdim2 early assure that the correct number of wind cells are alocated. If this is not done, then defaults of 30 x 30 will be assumed, which is particularly problematic for a 1d model..

center positions of cells to the master.txt file. The current version of the python routines to convert the master.txt file to an import file should still work.

to failed. Added a simple rtheta model to the regression directory.

coordinates. (At this point we can read in the model, but there are still too many sane_checks)

detailed testing should be done. Updted the version number to 82d in prepration for merge into dev. All of this development is relate to issue #309.

kslong and others added 30 commits November 6, 2017 09:52

earrangement of code to facilitate fili import of gneric models #309

26f9618

Steps on the way to importing generic models from a file

1b1f9e9

Continuation of work on imports

3fc0bc8

Continued work on import

1cde2c3

Change to fix issue with setting up a spherical grid when importing m…

9606e08

…odels

Contined work on import

6b6226a

Merge branch 'import' of https://github.com/agnwinds/python into import

de5e5c2

Incremental commit for import

93afd44

Continued work on importing models

f468cf1

First version for imported spherical model that does not crash. See

16c7c38

Problems still remain concerning which cells are in the wind.

Fixed problem with calulating the cells in the wind for importing

e6c914d

a spherical model. #309

Steps toward implementing a capability to reading in a cylindrical model

1364c28

from a file #309.

Steps toward adding a capbility to import cylindrical models. #309

e653b0f

Added to python scripts which convert the master table produced by

b39ae4e

windsave to table to serve as imput files for a model to be read into python.

Merge branch 'import' of https://github.com/agnwinds/python into import

3ace11e

Attempt to include rho in Plasma cells when reading in a modlel in

49bb397

cylindrical coordinates. #309

Alternative attempt to put in the positions and velocities in a

5f5b896

cylidrical grid #309. This still has problems.

Split the import routines into routines separate routines for dealing

94f276a

with each coordinate system. Began to revise the import_cylindrical to reflect an assumption that one did not need to add buffer cells. #309

A version of import_cylindrical that does actually run without

2b4c0f3

immediately falling over. Issues remain, including making sure that rho is being added to plasma ptr correctly everywhere, and deciding what is actually inwind. #309

Merge branch 'dev' of https://github.com/agnwinds/python into import

cc463d6

Began transition of spherical import to current philosophy for all

f665df6

imports. #309

modified where_in_wind, cylind_volumes and define_wind to deal with i…

e6355ef

…mported models and reading in inwind values

added some comments

c3c443f

Coutined work on spherical import

3a7db4b

Merge branch 'import' of https://github.com/agnwinds/python into import

ad9cdee

Update windsave2table to print out both the edge positions and the

b699e8d

center positions of cells to the master.txt file. The current version of the python routines to convert the master.txt file to an import file should still work.

Fixed small error that was causing standard (non-imported) rtheta models

e28b7de

to failed. Added a simple rtheta model to the regression directory.

Initial (incoplete) work on importing and rtheta model

487f8fc

jhmatthews and others added 4 commits November 21, 2017 13:27

added cv_import model to examples/beta/

33974c3

rm Log statements

92911eb

Further steps to implementing the capability to import a model in rtheta

ee002cc

coordinates. (At this point we can read in the model, but there are still too many sane_checks)

First version of rtheta import which appears to work. Much more

e422aa0

detailed testing should be done. Updted the version number to 82d in prepration for merge into dev. All of this development is relate to issue #309.

jhmatthews added enhancement into_dev labels Nov 23, 2017

jhmatthews merged commit fd5b42b into dev Nov 23, 2017

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Capability to Import Models #313

Capability to Import Models #313

jhmatthews commented Nov 23, 2017

Capability to Import Models #313

Capability to Import Models #313

Conversation

jhmatthews commented Nov 23, 2017