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.

Sign up for GitHub

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

Jump to bottom

Add hydrometeors #422

Open
wants to merge 7 commits into
base: develop
Choose a base branch
from
+25 −10
Open

Add hydrometeors #422

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5e7ebbc
add qr/qs
rtodling Sep 12, 2024
365ac55
w/o this code defaults to GFDL settings
rtodling Sep 13, 2024
71bcc0b
Merge branch 'develop' into feature/add_hydrometeors
rtodling Sep 25, 2024
82080b1
Merge branch 'develop' into feature/add_hydrometeors
rtodling Oct 21, 2024
92a88c9
a bit more more hydrometeors
rtodling Oct 21, 2024
60151ee
no reason for these to be exec files
rtodling Oct 22, 2024
ec72d72
Merge branch 'develop' into feature/add_hydrometeors
rtodling Oct 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified src/swell/configuration/jedi/interfaces/geos_atmosphere/model/background.yaml
100755 → 100644
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

permission issue

Empty file.
Empty file modified src/swell/configuration/jedi/interfaces/geos_atmosphere/model/background_ensemble.yaml
100755 → 100644
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you accidentally changed the file permissions here?

Empty file.
1 change: 1 addition & 0 deletions src/swell/configuration/jedi/interfaces/geos_atmosphere/model/background_error.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ saber outer blocks:
- saber block name: gsi interpolation to model grid
state variables to inverse: &bvars [eastward_wind,northward_wind,air_temperature,surface_pressure,
specific_humidity,cloud_liquid_ice,cloud_liquid_water,
rain_water,snow_water,
mole_fraction_of_ozone_in_air,
fraction_of_ocean,fraction_of_lake,fraction_of_ice,
sfc_geopotential_height_times_grav]
Expand Down
Empty file modified src/swell/configuration/jedi/interfaces/geos_atmosphere/model/geometry.yaml
100755 → 100644
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you accidentally changed the file permissions here?

Copy link
Contributor Author

@rtodling rtodling Oct 25, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ok - 1st to the file permissions: not accidental - I don't see any reason for yaml files to be executable files, unless I am missing something, am I?

Empty file.
Empty file modified src/swell/configuration/jedi/interfaces/geos_atmosphere/model/geometry_inner.yaml
100755 → 100644
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

permission

Empty file.
1 change: 1 addition & 0 deletions src/swell/configuration/jedi/interfaces/geos_atmosphere/model/getvalues.yaml
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
variable change:
variable change name: Model2GeoVaLs
hydrometeor effective radii method: gsi
Empty file modified src/swell/configuration/jedi/interfaces/geos_atmosphere/model/pseudo-model.yaml
100755 → 100644
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

permission

Empty file.
Empty file modified src/swell/configuration/jedi/interfaces/geos_atmosphere/model/r2d2.yaml
100755 → 100644
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

permission

Empty file.
Empty file modified src/swell/configuration/jedi/interfaces/geos_atmosphere/model/stage.yaml
100755 → 100644
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

permission

Empty file.
Empty file modified src/swell/configuration/jedi/interfaces/geos_atmosphere/model/stage_cycle.yaml
100755 → 100644
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

permission

Empty file.
4 changes: 2 additions & 2 deletions src/swell/configuration/jedi/interfaces/geos_atmosphere/observations/amsr2_gcom-w1.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ obs operator:

linear obs operator:
Absorbers: [H2O,O3]
Clouds: [Water]
Surfaces: [Water_Temperature]
Clouds: [Water,Ice,Rain,Snow]
Surfaces: [Water_Temperature,Land_Temperature,Ice_Temperature,Snow_Temperature]

obs bias:
input file: '{{cycle_dir}}/amsr2_gcom-w1.{{background_time}}.satbias.nc4'
Expand Down
4 changes: 2 additions & 2 deletions src/swell/configuration/jedi/interfaces/geos_atmosphere/observations/gmi_gpm.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ obs operator:
CoefficientPath: '{{crtm_coeff_dir}}/'
linear obs operator:
Absorbers: [H2O,O3]
Clouds: [Water]
Surfaces: [Water_Temperature]
Clouds: [Water,Ice,Rain,Snow]
Surfaces: [Water_Temperature,Land_Temperature,Ice_Temperature,Snow_Temperature]

obs bias:
input file: '{{cycle_dir}}/gmi_gpm.{{background_time}}.satbias.nc4'
Expand Down
4 changes: 2 additions & 2 deletions src/swell/configuration/jedi/interfaces/geos_atmosphere/observations/mhs_metop-b.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ obs operator:
CoefficientPath: '{{crtm_coeff_dir}}/'
linear obs operator:
Absorbers: [H2O,O3]
Clouds: [Water]
Surfaces: [Water_Temperature]
Clouds: [Water, Ice, Rain, Snow]
Surfaces: [Water_Temperature,Land_Temperature,Ice_Temperature,Snow_Temperature]

obs bias:
input file: '{{cycle_dir}}/mhs_metop-b.{{background_time}}.satbias.nc4'
Expand Down
4 changes: 2 additions & 2 deletions src/swell/configuration/jedi/interfaces/geos_atmosphere/observations/mhs_metop-c.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ obs operator:
CoefficientPath: '{{crtm_coeff_dir}}/'
linear obs operator:
Absorbers: [H2O,O3]
Clouds: [Water]
Surfaces: [Water_Temperature]
Clouds: [Water, Ice, Rain, Snow]
Surfaces: [Water_Temperature,Land_Temperature,Ice_Temperature,Snow_Temperature]

obs bias:
input file: '{{cycle_dir}}/mhs_metop-c.{{background_time}}.satbias.nc4'
Expand Down
4 changes: 2 additions & 2 deletions src/swell/configuration/jedi/interfaces/geos_atmosphere/observations/mhs_n19.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ obs operator:
CoefficientPath: '{{crtm_coeff_dir}}/'
linear obs operator:
Absorbers: [H2O,O3]
Clouds: [Water]
Surfaces: [Water_Temperature]
Clouds: [Water, Ice, Rain, Snow]
Surfaces: [Water_Temperature,Land_Temperature,Ice_Temperature,Snow_Temperature]

obs bias:
input file: '{{cycle_dir}}/mhs_n19.{{background_time}}.satbias.nc4'
Expand Down
4 changes: 4 additions & 0 deletions src/swell/configuration/jedi/interfaces/geos_atmosphere/task_questions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@ analysis_variables:
- ps
- qi
- ql
- qr
- qs
- o3ppmv
- phis
- frocean
Expand All @@ -25,6 +27,8 @@ analysis_variables:
- ps
- qi
- ql
- qr
- qs
- o3ppmv
- phis
- frocean
Expand Down
3 changes: 3 additions & 0 deletions src/swell/configuration/jedi/oops/LocalEnsembleDA.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@ background:
TASKFILLbackground_ensemble

observations:
get values:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When you put anything in the OOPS part of SWELL this will impact the marine side as well if it's a generic application. So for this, we don't have a corresponding get_values.yaml on the geos_ocean side and 3dvar is complaining. One option is that I can create an dummy get_values.yaml which is fine.

However when I searched for this get values key in the SWELL source code I see sections that modifies that behavior, see below, so we have to be careful with this:

swell/src/swell/tasks/run_jedi_ufo_tests_executable.py

Lines 87 to 93 in 2b0f03b

# Remove the LinObsOperator and Insert the GeoVaLs section
# ---------------------------------------------------------
# Loop over the observations
for index in range(len(observations)):
# Remove GetValues if present
if 'get values' in jedi_config_dict['observations'][index]:
del jedi_config_dict['observations'][index]['get values']

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As I say below, I personally see no reason why an entry that's used in the Var should not be present in the UFO test; that makes the UFO test inconsistent w/ the Var ... but also, as I say below, I don't particularly care too much about what's being done in these tests. What I care about is for the Var opts/settings to come out correctly - and believe they do .... as look at the final yaml file in my Var runs.

TASKFILLgetvalues

observers:
SPECIALobservations

Expand Down
2 changes: 2 additions & 0 deletions src/swell/configuration/jedi/oops/hofx3D.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,7 @@ state:
TASKFILLbackground

observations:
get values:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same above^

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the correct way of handling this? I am completely surprised and puzzled as to why the UFO tasks are removing the "get values" entries ... but then again, I don't care too much about those tests.

So the important thing for me is to have "get values" properly appear in the Var cases ... which as far as I know they do. Now, I didn't think of that upsetting the marine apps ... so I agree that something else would need to be done to avoid that - perhaps as you say, implementing an empty "get values"

TASKFILLgetvalues
observers:
SPECIALobservations
2 changes: 2 additions & 0 deletions src/swell/configuration/jedi/oops/variational3D.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,8 @@ cost function:
background error:
TASKFILLbackground_error
observations:
get values:
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same above^

TASKFILLgetvalues
observers:
SPECIALobservations
variational:
Expand Down
2 changes: 2 additions & 0 deletions src/swell/configuration/jedi/oops/variational4D.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ cost function:
background error:
TASKFILLbackground_error
observations:
get values:
rtodling marked this conversation as resolved.
Show resolved Hide resolved
TASKFILLgetvalues
observers:
SPECIALobservations
variational:
Expand Down
Loading