Data override: ext weights #1534
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…external weights from file Added components ext_weights_file_name and ext_weights_source to the derived type data_type
…ttempting to read the 'type' key value
abrooks1085
requested review from
rem1776,
thomas-robinson and
bensonr
as code owners
abrooks1085
changed the title
bensonr
requested changes
May 22, 2024
data_override/README.MD
Outdated
| ``` | ||
| Which corresponds to the following model code: | ||
| ```F90 | ||
| call data_override('ICE', 'sic_obs', icec, Spec_Time) | ||
| ``` | ||
| where: | ||
| - `ICE` corresponds to the gridname in the data_table | ||
| - `sic_obs` corresponds to the fieldname_code in the data_table | ||
| - `ICE` corresponds to the grid_name in the data_table |
There was a problem hiding this comment.
I think it's the component domain for which the variable is being interpolated
data_override/README.MD
Outdated
| - `ICE` corresponds to the gridname in the data_table | ||
| - `sic_obs` corresponds to the fieldname_code in the data_table | ||
| - `ICE` corresponds to the grid_name in the data_table | ||
| - `sic_obs` corresponds to the fieldname_in_model in the data_table | ||
| - `icec` is the variable to write the data to |
There was a problem hiding this comment.
Isn't that the storage array that holds the interpolated data?
data_override/README.MD
Outdated
Comment on lines
101
to
104
| - `ICE` corresponds to the grid_name in the data_table | ||
| - `sit_obs` corresponds to the fieldname_in_model in the data_table | ||
| - `icec` is the variable to write the data to | ||
| - `Spec_Time` is the time to interpolate the data to. |
data_override/README.MD
Outdated
Comment on lines
136
to
139
| - `OCN` corresponds to the grid_name in the data_table | ||
| - `runoff` corresponds to the fieldname_in_model in the data_table | ||
| - `runoff_data` is the variable to write the data to | ||
| - `Spec_Time` is the time to interpolate the data to. |
3 tasks
…S into Data_Override_Ext_Weights
uramirez8707
requested changes
Jun 24, 2024
| call check_for_valid_gridname(data_table(i)%gridname) | ||
| call get_value_from_key(file_id, entry_id(i), "fieldname_code", data_table(i)%fieldname_code) | ||
| call get_value_from_key(file_id, entry_id(i), "fieldname_in_model", data_table(i)%fieldname_code) | ||
|
|
There was a problem hiding this comment.
You should move the call that gets the factor here
| call get_value_from_key(file_id, entry_id(i), "fieldname_code", data_table(i)%fieldname_code) | ||
| call get_value_from_key(file_id, entry_id(i), "fieldname_in_model", data_table(i)%fieldname_code) | ||
|
|
||
| mentries = get_num_blocks(file_id, "override_file", parent_block_id=entry_id(i)) |
There was a problem hiding this comment.
I think you should add something like
! initialize the data_override type
data_table(i)%file_name = ""
data_table(i)%fieldname_file = ""
data_table(i)%interpol_method = "none"
data_table(i)%multifile = .false.
data_table(i)%ext_weights = .false.
data_table(i)%region_type = NO_REGION
! If there is no override_file block, then not overriding from file, so move on to the next entry
if (mentries .eq. 0) cycleThere was a problem hiding this comment.
and remove in the lines below
Comment on lines
+597
to
+598
| call get_value_from_key(file_id, sub_block_id(1), "file_name", data_table(i)%file_name, & | ||
| & is_optional=.true.) |
There was a problem hiding this comment.
is_optional should be removed now, because you are overriding from a file so the file_name is required
Comment on lines
+601
to
+602
| call get_value_from_key(file_id, sub_block_id(1), "fieldname_in_file", data_table(i)%fieldname_file, & | ||
| & is_optional=.true.) |
There was a problem hiding this comment.
is_optional should be removed now, because you are overriding from a file so the fieldname_in_file is required
Comment on lines
+605
to
+606
| call get_value_from_key(file_id, sub_block_id(1), "interp_method", data_table(i)%interpol_method, & | ||
| & is_optional=.true.) |
There was a problem hiding this comment.
is_optional should be removed now, because you are overriding from a file so the interpol_method is required
| - **file_name:** Name of the file where the variable is located, including the directory | ||
| - **fieldname_in_file:** Name of the field as it is writen in the file | ||
| - **interp_method:** Method used to interpolate the field. The acceptable values are "bilinear", "bicubic", and "none". "none" implies that the field in the file is already in the model grid. The LIMA format is no longer supported | ||
| - **multi_file:** The multifile parent key. **Required** only if it is desired to use multiple(3) input netcdf files instead of 1. Note that **file_name** must be the second file in the set when using multiple input netcdf files |
There was a problem hiding this comment.
Can you add an example using that uses multi_file and external_weights?
8 tasks
|
closing since these commits will be included in the PR above |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Subroutine to read new data table yaml format has been updated. Data override test scripts have been updated for new yaml format as well as the data override documentation.
Fixes #1521
How Has This Been Tested?
built on amd box using autotools with gcc/13.2.0, netcdf/4.9.2, mpich/4.1.2, libyaml/0.2.5
Checklist:
make distcheckpasses