Skip to content

Commit d6f830a

Browse files
committed
Read total energy using dycore formula from fixed CAM snapshots
- read ncdata variables te_ini_phys, te_ini_dyn, te_cur_phys, te_cur_dyn - update to standard names per discussion in ESCOMP/CAM#1141
1 parent 8d71300 commit d6f830a

File tree

2 files changed

+40
-12
lines changed

2 files changed

+40
-12
lines changed

src/data/registry.xml

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -202,21 +202,37 @@
202202
<dimensions>horizontal_dimension vertical_interface_dimension</dimensions>
203203
<ic_file_input_names>zi state_zi</ic_file_input_names>
204204
</variable>
205-
<variable local_name="te_ini"
206-
standard_name="vertically_integrated_energies_of_initial_state_in_cam"
205+
<variable local_name="te_ini_phys"
206+
standard_name="vertically_integrated_total_energy_of_initial_state_using_physics_energy_formula"
207207
units="J m-2"
208208
type="real" kind="kind_phys"
209209
allocatable="pointer">
210210
<dimensions>horizontal_dimension</dimensions>
211-
<ic_file_input_names>te_ini state_te_ini</ic_file_input_names>
211+
<ic_file_input_names>te_ini_phys state_te_ini_phys</ic_file_input_names>
212212
</variable>
213-
<variable local_name="te_cur"
214-
standard_name="vertically_integrated_energies_of_current_state_in_cam"
213+
<variable local_name="te_cur_phys"
214+
standard_name="vertically_integrated_total_energy_of_current_state_using_physics_energy_formula"
215215
units="J m-2"
216216
type="real" kind="kind_phys"
217217
allocatable="pointer">
218218
<dimensions>horizontal_dimension</dimensions>
219-
<ic_file_input_names>te_cur state_te_cur</ic_file_input_names>
219+
<ic_file_input_names>te_cur_phys state_te_cur_phys</ic_file_input_names>
220+
</variable>
221+
<variable local_name="te_ini_dyn"
222+
standard_name="vertically_integrated_total_energy_of_initial_state_using_dycore_energy_formula"
223+
units="J m-2"
224+
type="real" kind="kind_phys"
225+
allocatable="pointer">
226+
<dimensions>horizontal_dimension</dimensions>
227+
<ic_file_input_names>te_ini_dyn state_te_ini_dyn</ic_file_input_names>
228+
</variable>
229+
<variable local_name="te_cur_dyn"
230+
standard_name="vertically_integrated_total_energy_of_current_state_using_dycore_energy_formula"
231+
units="J m-2"
232+
type="real" kind="kind_phys"
233+
allocatable="pointer">
234+
<dimensions>horizontal_dimension</dimensions>
235+
<ic_file_input_names>te_cur_dyn state_te_cur_dyn</ic_file_input_names>
220236
</variable>
221237
<variable local_name="tw_ini"
222238
standard_name="vertically_integrated_total_water_of_initial_state"

tools/stdnames_to_inputnames_dictionary.xml

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -160,16 +160,28 @@
160160
<ic_file_input_name>state_zi</ic_file_input_name>
161161
</ic_file_input_names>
162162
</entry>
163-
<entry stdname="vertically_integrated_energies_of_initial_state_in_cam">
163+
<entry stdname="vertically_integrated_total_energy_of_initial_state_using_physics_energy_formula">
164164
<ic_file_input_names>
165-
<ic_file_input_name>te_ini</ic_file_input_name>
166-
<ic_file_input_name>state_te_ini</ic_file_input_name>
165+
<ic_file_input_name>te_ini_phys</ic_file_input_name>
166+
<ic_file_input_name>state_te_ini_phys</ic_file_input_name>
167167
</ic_file_input_names>
168168
</entry>
169-
<entry stdname="vertically_integrated_energies_of_current_state_in_cam">
169+
<entry stdname="vertically_integrated_total_energy_of_current_state_using_physics_energy_formula">
170170
<ic_file_input_names>
171-
<ic_file_input_name>te_cur</ic_file_input_name>
172-
<ic_file_input_name>state_te_cur</ic_file_input_name>
171+
<ic_file_input_name>te_cur_phys</ic_file_input_name>
172+
<ic_file_input_name>state_te_cur_phys</ic_file_input_name>
173+
</ic_file_input_names>
174+
</entry>
175+
<entry stdname="vertically_integrated_total_energy_of_initial_state_using_dycore_energy_formula">
176+
<ic_file_input_names>
177+
<ic_file_input_name>te_ini_dyn</ic_file_input_name>
178+
<ic_file_input_name>state_te_ini_dyn</ic_file_input_name>
179+
</ic_file_input_names>
180+
</entry>
181+
<entry stdname="vertically_integrated_total_energy_of_current_state_using_dycore_energy_formula">
182+
<ic_file_input_names>
183+
<ic_file_input_name>te_cur_dyn</ic_file_input_name>
184+
<ic_file_input_name>state_te_cur_dyn</ic_file_input_name>
173185
</ic_file_input_names>
174186
</entry>
175187
<entry stdname="vertically_integrated_total_water_of_initial_state">

0 commit comments

Comments
 (0)