Merge pull request #285 from gafusion/update_imas

Update to use IMAS 3.40.0

README.md

@@ -1,5 +1,5 @@
 ![OMAS version](https://img.shields.io/github/tag-date/gafusion/omas.svg?label=OMAS&color=blue)
-![IMAS version](https://img.shields.io/badge/IMAS-3.39.0-yellow)
+![IMAS version](https://img.shields.io/badge/IMAS-3.40.0-yellow)
 
 ![GitHub repo size](https://img.shields.io/github/repo-size/gafusion/omas.svg?color=blue)
 

omas/examples/connect_gkdb.py

@@ -15,8 +15,8 @@
 # load a sample GKDB sample json file
 sample_filename = omas_dir + 'samples/gkdb_linear_eigenvalue.json'
 ods = ODS()
-# warn about `gyrokinetics.fluxes_integrated_norm = []` and drop it
-ods['gyrokinetics'].load(sample_filename, consistency_check='warn_drop')
+# warn about `gyrokinetics_local.fluxes_integrated_norm = []` and drop it
+ods['gyrokinetics_local'].load(sample_filename, consistency_check='warn_drop')
 
 # show content
 pprint(ods.pretty_paths())
@@ -29,11 +29,11 @@
 
     __file__ = inspect.getfile(lambda: None)
 filename = omas_testdir(__file__) + '/gkdb_linear_initialvalue.json'
-ods['gyrokinetics'].save(filename)
+ods['gyrokinetics_local'].save(filename)
 
 # load the newly saved copy
 ods1 = ODS()
-ods1['gyrokinetics'].load(filename)
+ods1['gyrokinetics_local'].load(filename)
 
 # look for differences between original GKDB json and OMAS json
 differences = ods.diff(ods1, ignore_type=True)

omas/examples/omas_mongo_example.py

@@ -44,8 +44,8 @@
 print('load a sample GKDB sample json file')
 sample_filename = omas_dir + 'samples/gkdb_linear_eigenvalue.json'
 ods = ODS()
-# warn about `gyrokinetics.fluxes_integrated_norm = []` and drop it
-ods['gyrokinetics'].load(sample_filename, consistency_check='warn_drop')
+# warn about `gyrokinetics_local.fluxes_integrated_norm = []` and drop it
+ods['gyrokinetics_local'].load(sample_filename, consistency_check='warn_drop')
 
 print('write GKDB entry to the database')
 _id = ods.save('mongo', collection='gkdb', database='test')

omas/imas_structures/3_40_0/_global_quantities.json

@@ -0,0 +1,132 @@
+[
+ "core_profiles.global_quantities.beta_pol",
+ "core_profiles.global_quantities.beta_tor",
+ "core_profiles.global_quantities.beta_tor_norm",
+ "core_profiles.global_quantities.current_bootstrap",
+ "core_profiles.global_quantities.current_non_inductive",
+ "core_profiles.global_quantities.ejima",
+ "core_profiles.global_quantities.energy_diamagnetic",
+ "core_profiles.global_quantities.ion",
+ "core_profiles.global_quantities.ion_time_slice",
+ "core_profiles.global_quantities.ip",
+ "core_profiles.global_quantities.li",
+ "core_profiles.global_quantities.li_3",
+ "core_profiles.global_quantities.n_e_volume_average",
+ "core_profiles.global_quantities.resistive_psi_losses",
+ "core_profiles.global_quantities.t_e_peaking",
+ "core_profiles.global_quantities.t_e_volume_average",
+ "core_profiles.global_quantities.t_i_average_peaking",
+ "core_profiles.global_quantities.v_loop",
+ "core_profiles.global_quantities.z_eff_resistive",
+ "disruption.global_quantities.current_halo_pol",
+ "disruption.global_quantities.current_halo_tor",
+ "disruption.global_quantities.energy_ohm",
+ "disruption.global_quantities.energy_ohm_halo",
+ "disruption.global_quantities.energy_parallel_halo",
+ "disruption.global_quantities.energy_radiated_electrons_impurities",
+ "disruption.global_quantities.energy_radiated_electrons_impurities_halo",
+ "disruption.global_quantities.power_ohm",
+ "disruption.global_quantities.power_ohm_halo",
+ "disruption.global_quantities.power_parallel_halo",
+ "disruption.global_quantities.power_radiated_electrons_impurities",
+ "disruption.global_quantities.power_radiated_electrons_impurities_halo",
+ "disruption.global_quantities.psi_halo_boundary",
+ "equilibrium.time_slice[:].global_quantities.area",
+ "equilibrium.time_slice[:].global_quantities.beta_normal",
+ "equilibrium.time_slice[:].global_quantities.beta_pol",
+ "equilibrium.time_slice[:].global_quantities.beta_tor",
+ "equilibrium.time_slice[:].global_quantities.current_centre",
+ "equilibrium.time_slice[:].global_quantities.energy_mhd",
+ "equilibrium.time_slice[:].global_quantities.ip",
+ "equilibrium.time_slice[:].global_quantities.length_pol",
+ "equilibrium.time_slice[:].global_quantities.li_3",
+ "equilibrium.time_slice[:].global_quantities.magnetic_axis",
+ "equilibrium.time_slice[:].global_quantities.plasma_inductance",
+ "equilibrium.time_slice[:].global_quantities.plasma_resistance",
+ "equilibrium.time_slice[:].global_quantities.psi_axis",
+ "equilibrium.time_slice[:].global_quantities.psi_boundary",
+ "equilibrium.time_slice[:].global_quantities.psi_external_average",
+ "equilibrium.time_slice[:].global_quantities.q_95",
+ "equilibrium.time_slice[:].global_quantities.q_axis",
+ "equilibrium.time_slice[:].global_quantities.q_min",
+ "equilibrium.time_slice[:].global_quantities.rho_tor_boundary",
+ "equilibrium.time_slice[:].global_quantities.surface",
+ "equilibrium.time_slice[:].global_quantities.v_external",
+ "equilibrium.time_slice[:].global_quantities.volume",
+ "equilibrium.time_slice[:].global_quantities.w_mhd",
+ "plasma_initiation.global_quantities.b_field_perpendicular",
+ "plasma_initiation.global_quantities.b_field_stray",
+ "plasma_initiation.global_quantities.connection_length",
+ "plasma_initiation.global_quantities.coulomb_logarithm",
+ "runaway_electrons.global_quantities.current_tor",
+ "runaway_electrons.global_quantities.energy_kinetic",
+ "runaway_electrons.global_quantities.volume_average",
+ "summary.global_quantities.b0",
+ "summary.global_quantities.beta_pol",
+ "summary.global_quantities.beta_pol_mhd",
+ "summary.global_quantities.beta_tor",
+ "summary.global_quantities.beta_tor_mhd",
+ "summary.global_quantities.beta_tor_norm",
+ "summary.global_quantities.beta_tor_norm_mhd",
+ "summary.global_quantities.beta_tor_thermal_norm",
+ "summary.global_quantities.current_alignment",
+ "summary.global_quantities.current_bootstrap",
+ "summary.global_quantities.current_non_inductive",
+ "summary.global_quantities.current_ohm",
+ "summary.global_quantities.denergy_diamagnetic_dt",
+ "summary.global_quantities.denergy_thermal_dt",
+ "summary.global_quantities.energy_b_field_pol",
+ "summary.global_quantities.energy_diamagnetic",
+ "summary.global_quantities.energy_electrons_thermal",
+ "summary.global_quantities.energy_fast_parallel",
+ "summary.global_quantities.energy_fast_perpendicular",
+ "summary.global_quantities.energy_ion_total_thermal",
+ "summary.global_quantities.energy_mhd",
+ "summary.global_quantities.energy_thermal",
+ "summary.global_quantities.energy_total",
+ "summary.global_quantities.fusion_fluence",
+ "summary.global_quantities.fusion_gain",
+ "summary.global_quantities.greenwald_fraction",
+ "summary.global_quantities.h_98",
+ "summary.global_quantities.h_mode",
+ "summary.global_quantities.ip",
+ "summary.global_quantities.li",
+ "summary.global_quantities.li_mhd",
+ "summary.global_quantities.power_bremsstrahlung",
+ "summary.global_quantities.power_line",
+ "summary.global_quantities.power_loss",
+ "summary.global_quantities.power_ohm",
+ "summary.global_quantities.power_radiated",
+ "summary.global_quantities.power_radiated_inside_lcfs",
+ "summary.global_quantities.power_radiated_outside_lcfs",
+ "summary.global_quantities.power_steady",
+ "summary.global_quantities.power_synchrotron",
+ "summary.global_quantities.psi_external_average",
+ "summary.global_quantities.q_95",
+ "summary.global_quantities.r0",
+ "summary.global_quantities.ratio_tau_helium_fuel",
+ "summary.global_quantities.resistance",
+ "summary.global_quantities.tau_energy",
+ "summary.global_quantities.tau_energy_98",
+ "summary.global_quantities.tau_helium",
+ "summary.global_quantities.tau_resistive",
+ "summary.global_quantities.v_loop",
+ "summary.global_quantities.volume",
+ "wall.global_quantities.current_tor",
+ "wall.global_quantities.electrons",
+ "wall.global_quantities.neutral",
+ "wall.global_quantities.power_black_body",
+ "wall.global_quantities.power_conducted",
+ "wall.global_quantities.power_convected",
+ "wall.global_quantities.power_currents",
+ "wall.global_quantities.power_density_inner_target_max",
+ "wall.global_quantities.power_density_outer_target_max",
+ "wall.global_quantities.power_incident",
+ "wall.global_quantities.power_inner_target_ion_total",
+ "wall.global_quantities.power_neutrals",
+ "wall.global_quantities.power_radiated",
+ "wall.global_quantities.power_recombination_neutrals",
+ "wall.global_quantities.power_recombination_plasma",
+ "wall.global_quantities.power_to_cooling",
+ "wall.global_quantities.temperature"
+]