Skip to content

Add tx2_3v3, following tx2_3v2#318

Merged
alperaltuntas merged 6 commits intoESCOMP:mainfrom
gustavo-marques:tx2_3v3
Apr 23, 2026
Merged

Add tx2_3v3, following tx2_3v2#318
alperaltuntas merged 6 commits intoESCOMP:mainfrom
gustavo-marques:tx2_3v3

Conversation

@gustavo-marques
Copy link
Copy Markdown
Collaborator

Add tx2_3v3, following tx2_3v2. New parameter settings for tx2_3v3 will be included in an upcoming PR.

@gustavo-marques gustavo-marques marked this pull request as draft April 2, 2026 16:27
@gustavo-marques
Copy link
Copy Markdown
Collaborator Author

Converting it to a draft until files are imported and PR is tested.

@gustavo-marques gustavo-marques marked this pull request as ready for review April 22, 2026 04:12
@gustavo-marques
Copy link
Copy Markdown
Collaborator Author

@mnlevy1981, did you have a chance to add the files here to the input data? @alperaltuntas, once Mike confirms that the files have been imported, this PR will be ready for review.

Copy link
Copy Markdown
Collaborator

@mnlevy1981 mnlevy1981 left a comment

Choose a reason for hiding this comment

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

I see 8 files that are added to both input_data_list.yaml and MOM_input.yaml:

ocn/mom/tx2_3v3/channels_tx2_3v3_260304.txt
ocn/mom/tx2_3v3/geothermal_davies2013_tx2_3v3_260305.nc
ocn/mom/tx2_3v3/mle_cr_labsea_mask_tx2_3v3_260306.nc
ocn/mom/tx2_3v3/ocean_hgrid_250930.nc
ocn/mom/tx2_3v3/ocean_topo_tx2_3v3_260305.nc
ocn/mom/tx2_3v3/seawifs-clim-1997-2010-tx2_3v3_260305.nc
ocn/mom/tx2_3v3/state_restore_tx2_3v3_260305.nc
ocn/mom/tx2_3v3/tidal_energy_tx2_3v3_conserve_260306.nc

I have added those files to the inputdata repository. However, these two are in MOM_input.yaml but not input_data_list.yaml (and also don't exist in the inputdata directory on derecho):

ocn/mom/tx2_3v3/lev-2025-09-12.nc
ocn/mom/tx2_3v3/dz_max-2025-09-12.nc

I don't think the tx2_3v2 versions have been added to the inputdata repository and we haven't caught that because they are not in input_data_list.yaml either. I suggest we import the tx2_3v2 versions and also add them to input_data_list.yaml; we can decide if we want separate tx2_3v3 copies or not separately.

Comment thread param_templates/MOM_input.yaml Outdated
Comment on lines +989 to +990
$MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID in ["tx2_3v3"]: |
'"FILE:${DIN_LOC_ROOT}/ocn/mom/tx2_3v3/lev-2025-09-12.nc,Z"'
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

This file does not exist in campaign; should we just use the tx2_3v2 version? If so, you should modify the two lines above these:

-            $MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID in ["tx2_3v2"]: |
+            $MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID in ["tx2_3v2", "tx2_3v3"]: |
                   '"FILE:${DIN_LOC_ROOT}/ocn/mom/tx2_3v2/lev-2025-09-12.nc,Z"'

Comment thread param_templates/MOM_input.yaml Outdated
Comment on lines +1008 to +1009
$MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID in ["tx2_3v3"]: |
'"FILE:${DIN_LOC_ROOT}/ocn/mom/tx2_3v3/dz_max-2025-09-12.nc,dz"'
Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Same as previous comment, this file doesn't exist on campaign. If you want to use the tx2_3v2 version of this file, then update the logic around tx2_3v2 default to be $MOM6_VERTICAL_GRID == "hycom1" and $OCN_GRID in ["tx2_3v2", "tx2_3v3"]

@gustavo-marques
Copy link
Copy Markdown
Collaborator Author

gustavo-marques commented Apr 23, 2026

Thanks, @mnlevy1981. Both lev-2025-09-12.nc and dz_max-2025-09-12.nc, have been copied to ocn/mom/grid_indpt. I modified MAXIMUM_INT_DEPTH_CONFIG and MAX_LAYER_THICKNESS_CONFIG in MOM_input.yaml to use ocn/mom/grid_indpt instead of the grid-specific paths.

I see 8 files that are added to both input_data_list.yaml and MOM_input.yaml:

ocn/mom/tx2_3v3/channels_tx2_3v3_260304.txt
ocn/mom/tx2_3v3/geothermal_davies2013_tx2_3v3_260305.nc
ocn/mom/tx2_3v3/mle_cr_labsea_mask_tx2_3v3_260306.nc
ocn/mom/tx2_3v3/ocean_hgrid_250930.nc
ocn/mom/tx2_3v3/ocean_topo_tx2_3v3_260305.nc
ocn/mom/tx2_3v3/seawifs-clim-1997-2010-tx2_3v3_260305.nc
ocn/mom/tx2_3v3/state_restore_tx2_3v3_260305.nc
ocn/mom/tx2_3v3/tidal_energy_tx2_3v3_conserve_260306.nc

I have added those files to the inputdata repository. However, these two are in MOM_input.yaml but not input_data_list.yaml (and also don't exist in the inputdata directory on derecho):

ocn/mom/tx2_3v3/lev-2025-09-12.nc
ocn/mom/tx2_3v3/dz_max-2025-09-12.nc

I don't think the tx2_3v2 versions have been added to the inputdata repository and we haven't caught that because they are not in input_data_list.yaml either. I suggest we import the tx2_3v2 versions and also add them to input_data_list.yaml; we can decide if we want separate tx2_3v3 copies or not separately.

I see the two files in input_data_list.yaml (see here). I am not sure if adding the following is what we need here:
$OCN_GRID in ["tx2_3v2", ]"tx2_3v3": "${INPUTDIR}/lev-2025-09-12.nc"

Comment thread param_templates/input_data_list.yaml Outdated
Comment thread param_templates/input_data_list.yaml Outdated
@alperaltuntas
Copy link
Copy Markdown
Member

Running the yaml_to_json.py script should fix the CI failure. Otherwise, LGTM.

@mnlevy1981
Copy link
Copy Markdown
Collaborator

2bde1c4 updated the YAML file but not the JSON file, resulting in

AssertionError: input_data_list.yaml and .json files appear to have different information. If you have updated yaml file but not json file, update it by running param_templates/yaml_to_json.py and then push the updated json file.

I imported the two grid_indpt files, so running yaml_to_json.py and pushing the JSON file should be sufficient to pass all the tests

Copy link
Copy Markdown
Collaborator

@mnlevy1981 mnlevy1981 left a comment

Choose a reason for hiding this comment

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

Looks good to me!

@alperaltuntas alperaltuntas merged commit 3497642 into ESCOMP:main Apr 23, 2026
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants