Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add metadata for orbital parameters in cam_control_mod #325

Merged
merged 11 commits into from
Dec 10, 2024
2 changes: 1 addition & 1 deletion .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
[submodule "ncar-physics"]
path = src/physics/ncar_ccpp
url = https://github.com/ESCOMP/atmospheric_physics
fxtag = 0ecfcc155ac0387ef9db3304611c6f3ef055ac1d
fxtag = e7a599f4bb1533f7cdcd8723b1f864e11578e96c
fxrequired = AlwaysRequired
fxDONOTUSEurl = https://github.com/ESCOMP/atmospheric_physics
[submodule "ccs_config"]
Expand Down
4 changes: 3 additions & 1 deletion src/control/cam_control_mod.F90
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,12 @@ module cam_control_mod
logical, protected :: branch_run ! branch from a previous run; requires a restart file
logical, protected :: post_assim ! We are resuming after a pause

logical, protected :: aqua_planet ! Flag to run model in "aqua planet" mode
logical, protected :: brnch_retain_casename ! true => branch run may use same caseid as
! the run being branched from

!> \section arg_table_cam_control_mod Argument Table
!! \htmlinclude arg_table_cam_control_mod.html
logical, protected :: aqua_planet ! Flag to run model in "aqua planet" mode
real(r8), protected :: eccen ! Earth's eccentricity factor (unitless) (typically 0 to 0.1)
real(r8), protected :: obliqr ! Earth's obliquity in radians
real(r8), protected :: lambm0 ! Mean longitude of perihelion at the
Expand Down
33 changes: 33 additions & 0 deletions src/control/cam_control_mod.meta
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
[ccpp-table-properties]
name = cam_control_mod
type = module

[ccpp-arg-table]
name = cam_control_mod
type = module
cacraigucar marked this conversation as resolved.
Show resolved Hide resolved
[ aqua_planet ]
standard_name = is_aqua_planet
units = flag
type = logical
dimensions = ()
[ eccen ]
standard_name = planet_orbital_eccentricity_factor
units = 1
type = real | kind = r8
dimensions = ()
[ obliqr ]
standard_name = planet_obliquity
long_name = planet's axial tilt (obliquity)
units = rad
type = real | kind = r8
dimensions = ()
[ lambm0 ]
standard_name = mean_longitude_of_perihelion_at_vernal_equinox
units = rad
type = real | kind = r8
dimensions = ()
[ mvelpp ]
standard_name = moving_vernal_equinox_longitude_of_perihelion_plus_pi
units = rad
type = real | kind = r8
dimensions = ()
1 change: 1 addition & 0 deletions src/data/registry.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<!-- CAM-SIMA Host model meta files -->
<!-- Meta-files with DDTs must be listed first -->
<metadata_file>$SRCROOT/src/utils/spmd_utils.meta</metadata_file>
<metadata_file>$SRCROOT/src/control/cam_control_mod.meta</metadata_file>
<metadata_file>$SRCROOT/src/control/cam_logfile.meta</metadata_file>
<metadata_file>$SRCROOT/src/control/camsrfexch.meta</metadata_file>
<metadata_file>$SRCROOT/src/control/runtime_obj.meta</metadata_file>
Expand Down
6 changes: 3 additions & 3 deletions src/physics/utils/physics_grid.meta
Original file line number Diff line number Diff line change
Expand Up @@ -38,13 +38,13 @@
protected = True
[ lat_rad ]
standard_name = latitude
units = radians
units = rad
type = real | kind = kind_phys
dimensions = (horizontal_dimension)
protected = True
[ lon_rad ]
standard_name = longitude
units = radians
units = rad
type = real | kind = kind_phys
dimensions = (horizontal_dimension)
protected = True
Expand All @@ -62,7 +62,7 @@
protected = True
[ area ]
standard_name = cell_angular_area
units = steradian
units = sr
type = real | kind = kind_phys
dimensions = (horizontal_dimension)
protected = True
Expand Down
4 changes: 2 additions & 2 deletions test/unit/sample_files/phys_types_dup_section.meta
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,13 @@
protected = True
[ latitude ]
standard_name = latitude
units = radians
units = rad
type = real | kind = kind_phys
dimensions = (horizontal_dimension)
protected = True
[ longitude ]
standard_name = longitude
units = radians
units = rad
type = real | kind = kind_phys
dimensions = (horizontal_dimension)
protected = True
Expand Down
Loading