Skip to content

Commit d28fd05

Browse files
Merge pull request #59 from maserlib/develop
Adding Wave propagation mode (LO or RX) option
2 parents 37e38cb + 5a4ccac commit d28fd05

12 files changed

Lines changed: 199 additions & 805 deletions

File tree

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "schema"]
2+
path = schema
3+
url = http://gitlab.obspm.fr/voparis-ns/maser/expres

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Exoplanetary and Planetary Radio Emission Simulator (ExPRES) V1.2.0
1+
# Exoplanetary and Planetary Radio Emission Simulator (ExPRES) V1.3.0
22

33
<a href="http://ascl.net/1902.009"><img src="https://img.shields.io/badge/ascl-1902.009-blue.svg?colorB=262255" alt="ascl:1902.009" /></a>
44
[![DOI](https://zenodo.org/badge/DOI/10.5281/zenodo.4280546.svg)](https://doi.org/10.5281/zenodo.4280546)
@@ -49,5 +49,5 @@ This compiles all the necessary routines in advance. Then the simulation can be
4949
```
5050
IDL> main,'file.json'
5151
```
52-
where `file.json` is the input parameter file. This file must comply with the [ExPRES-v1.2 JSON-shema](https://voparis-ns.obspm.fr/maser/expres/v1.2/schema#)
52+
where `file.json` is the input parameter file. This file must comply with the [ExPRES-v1.3 JSON-shema](https://voparis-ns.obspm.fr/maser/expres/v1.3/schema#)
5353

docs/usage/advanced.rst

Lines changed: 48 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ Simulation Setup
8080
----------------
8181

8282
The simulation setup is configured via an ExPRES configuration file (in *JSON* format), following the `ExPRES
83-
JSON-Schema v1.2 <https://voparis-ns.pages.obspm.fr/maser/expres/v1.2/schema#>`_.
83+
JSON-Schema v1.3 <https://voparis-ns.pages.obspm.fr/maser/expres/v1.3/schema#>`_.
8484

8585

8686

@@ -488,6 +488,8 @@ Radio Source Configuration
488488
- ``CURRENT``: The type of electron distribution in the source (see documentation). Allowed values:
489489
``Transient (Alfvenic)``, ``Constant``, ``Steady-State``, ``Shell``
490490
- ``CONSTANT``: The value of beaming pattern half-cone opening angle (if ``Constant`` is selected), in degrees
491+
- ``MODE``: The type of the wave mode. Allowed values:
492+
``RX``, ``LO`` (default is ``RX``)
491493
- ``ACCEL``: The value of resonant electron beam energy in keV (not used when ``Constant`` is selected)
492494
- ``TEMP``: The value of the cold electron distribution temperature (in keV)
493495
- ``TEMPH``: The value of the halo electron distribution temperature (in keV)
@@ -504,53 +506,56 @@ energy of 3 keV (``"ACCEL": 3``) and the distribution function is of the loss co
504506
505507
"SOURCE": [
506508
{
507-
"ON": true,
508-
"NAME": "Source1",
509-
"PARENT": "Jupiter",
510-
"TYPE": "attached to a satellite",
511-
"LG_MIN": 0,
512-
"LG_MAX": 0,
513-
"LG_NBR": 1,
514-
"LAT": 0,
515-
"LAG_MODEL":"hinton2019" ,
516-
"SUB": 0,
517-
"AURORA_ALT": 0.009091926738619804,
518-
"SAT": "Io",
519-
"NORTH": true,
520-
"SOUTH": false,
521-
"WIDTH": 1,
522-
"CURRENT": "Transient (Alfvenic)",
523-
"CONSTANT": 0.0,
524-
"ACCEL": 3,
525-
"TEMP": 0,
526-
"TEMPH": 0,
527-
"REFRACTION": false
509+
510+
"ON": true,
511+
"NAME": "Source1",
512+
"PARENT": "Jupiter",
513+
"TYPE": "attached to a satellite",
514+
"LG_MIN": 0,
515+
"LG_MAX": 0,
516+
"LG_NBR": 1,
517+
"LAT": 0,
518+
"LAG_MODEL":"hinton2019" ,
519+
"SUB": 0,
520+
"AURORA_ALT": 0.009091926738619804,
521+
"SAT": "Io",
522+
"NORTH": true,
523+
"SOUTH": false,
524+
"WIDTH": 1,
525+
"CURRENT": "Transient (Alfvenic)",
526+
"CONSTANT": 0.0,
527+
"MODE": "",
528+
"ACCEL": 3,
529+
"TEMP": 0,
530+
"TEMPH": 0,
531+
"REFRACTION": false
528532
},
529533
{
530-
"ON": true,
531-
"NAME": "Source2",
532-
"PARENT": "Jupiter",
533-
"TYPE": "attached to a satellite",
534-
"LG_MIN": 0,
535-
"LG_MAX": 0,
536-
"LG_NBR": 1,
537-
"LAG_MODEL":"hinton2019",
538-
"LAT": 0,
539-
"SUB": 0,
540-
"AURORA_ALT": 0.009091926738619804,
541-
"SAT": "Io",
542-
"NORTH": false,
543-
"SOUTH": true,
544-
"WIDTH": 1,
545-
"CURRENT": "Transient (Alfvenic)",
546-
"CONSTANT": 0.0,
547-
"ACCEL": 3, "TEMP": 0,
548-
"TEMPH": 0,
549-
"REFRACTION": false
534+
"ON": true,
535+
"NAME": "Source2",
536+
"PARENT": "Jupiter",
537+
"TYPE": "attached to a satellite",
538+
"LG_MIN": 0,
539+
"LG_MAX": 0,
540+
"LG_NBR": 1,
541+
"LAG_MODEL":"hinton2019",
542+
"LAT": 0,
543+
"SUB": 0,
544+
"AURORA_ALT": 0.009091926738619804,
545+
"SAT": "Io",
546+
"NORTH": false,
547+
"SOUTH": true,
548+
"WIDTH": 1,
549+
"CURRENT": "Transient (Alfvenic)",
550+
"CONSTANT": 0.0,
551+
"MODE": "",
552+
"ACCEL": 3,
553+
"TEMP": 0,
554+
"TEMPH": 0,
555+
"REFRACTION": false
550556
}
551557
]
552558
553-
554559
Output Configuration
555560
+++++++++++++++++++++
556561

schema

Submodule schema added at 620fe2a

0 commit comments

Comments
 (0)