Skip to content

Fix setting of land mask in sfcsub.F#304

Merged
grantfirl merged 3 commits into
ufs-community:ufs/devfrom
GeorgeGayno-NOAA:sfcsub_maskfix
Aug 13, 2025
Merged

Fix setting of land mask in sfcsub.F#304
grantfirl merged 3 commits into
ufs-community:ufs/devfrom
GeorgeGayno-NOAA:sfcsub_maskfix

Conversation

@GeorgeGayno-NOAA
Copy link
Copy Markdown

Description of Changes:

Fix the setting of the land mask used in interpolating GLDAS soil data to the model grid. For a complete description, see #300,

Tests Conducted:

All regression tests were run on WCOSS2 and passed.

Tests were conducted in a GFS v17 parallel: NOAA-EMC/GFS#16 (comment)

Dependencies:

None.

Documentation:

N/A

Issue (optional):

Fixes #300.

@GeorgeGayno-NOAA
Copy link
Copy Markdown
Author

Here is a portion of regression test log on WCOSS2:

====START OF WCOSS2 REGRESSION TESTING LOG====

UFSWM hash used in testing:
e1e5d2a118c85f47296f3ba1dc03ca1d7594aad8

Submodule hashes used in testing:
 0a8a9a40b112262865491b6d7d25908863b17231 AQM (v0.2.0-39-g0a8a9a4)
 642e81395472d5887b54f601b60ee607ed39bf09 AQM/src/model/CMAQ (CMAQv5.2.1_07Feb2018-6194-g642e81395)
 132fa6963ba2f7103f711eb567e4fe97ed0804a8 CDEPS-interface/CDEPS (cdeps0.4.17-406-g132fa69)
 4411a158cc4839157e3087d7fe8e399f9685eb35 CICE-interface/CICE (CICE6.0.0-399-g4411a15)
 43ead56380bf11ecad66f165dcd736ed0c278763 CICE-interface/CICE/icepack (Icepack1.1.0-200-g43ead56)
 ae6db2120e7a97429a2b2d3287e13feebe25d530 CMEPS-interface/CMEPS (cmeps_v0.4.1-2318-gae6db21)
 9b7652c75b40d9cbb40e52b824f8c0a423922757 CMakeModules (v1.0.0-33-g9b7652c)
 9aff946a6a662c89133accee5458e2f5e99f93bd FV3 (heads/develop-1-g9aff946)
 11359cb04a420fc87e4cf0f035f4d1215ab24488 FV3/ccpp/framework (2025-01-06-dev-5-g11359cb)
 ae59e39fa55fb39657041c54512c2a448063615e FV3/ccpp/physics (EP4-1788-gae59e39f)
 c62efd27caa26f660edf24232f33f154e608b77a FV3/ccpp/physics/physics/MP/TEMPO/TEMPO (c62efd2)
 74a0e098b2163425e4b5466c2dfcf8ae26d560a5 FV3/ccpp/physics/physics/Radiation/RRTMGP/rte-rrtmgp (v1.6)
 4f1a5ef4b83461a79a62c8d965ebc2b26cf5eba8 FV3/fv3/atmos_cubed_sphere (201912_public_release-416-g4f1a5ef)
 e5f9fcb5d4607e3576c7d507da594a9d3b516adc FV3/upp (upp_v10.2.0-272-ge5f9fcb5)
-179cae1dd84401cf25d250bd9102e66560a9d328 FV3/upp/sorc/libIFI.fd
-3d35332fe66e3e63a285cc8d96facdf255a33481 FV3/upp/sorc/ncep_post.fd/post_gtg.fd
 36e2ab48f2ae0cb8c0c5b661768c13897f40e9ac GOCART (sdr_v2.1.2.6-288-g36e2ab4)
 bcf7777bb037ae2feb2a8a8ac51aacb3511b52d9 HYCOM-interface/HYCOM (2.3.00-122-gbcf7777)
 c4d2337d8607ec994b3cd61179eb974e0a237841 LM4-driver (baseline_change_240904-6-gc4d2337)
 c03c4f68816030f726785daf0db6150aa1e9cc6f LM4-driver/LM4 (land_lad2_2021.02)
 f9e6e2e1686458df842a0b92c61ff241a920ed84 MOM6-interface/MOM6 (dev/master/repository_split_2014.10.10-10634-gf9e6e2e16)
 65ef5c73bc7f5663d5688f75c3855d431da4baea MOM6-interface/MOM6/pkg/CVMix-src (65ef5c7)
 29e64d652786e1d076a05128c920f394202bfe10 MOM6-interface/MOM6/pkg/GSW-Fortran (29e64d6)
 1a2d2fcb02da38e975f252ef743af24b68b3cc7f NOAHMP-interface/noahmp (v3.7.1-455-g1a2d2fc)
 6a5814ab52b5035b1710269bed24b30b5e7e772b WW3 (6.07.1-443-g6a5814ab)
 05cad173feeb598431e3ef5f17c2df6562c8d101 fire_behavior (v0.2.0-1-g05cad17)
 97b24f8e40f1de0980388c8326c48b442e5a5e61 stochastic_physics (ufs-v2.0.0-282-g97b24f8)


NOTES:
[Times](Memory) are at the end of each compile/test in format [MM:SS](Size).
The first time is for the full script (prep+run+finalize).
The second time is specifically for the run phase.

SYNOPSIS:
Starting Date/Time: 20250718 18:22:50
Ending Date/Time: 20250718 20:24:09
Total Time: 02h:02m:47s
Compiles Completed: 34/34
Tests Completed: 174/174

NOTES:
A file 'test_changes.list' was generated but is empty.
If you are using this log as a pull request verification, please commit 'test_changes.list'.

Result: SUCCESS

====END OF WCOSS2 REGRESSION TESTING LOG====

The full log is here: /lfs/h2/emc/global/noscrub/George.Gayno/gfsv17.cycle.problem/ufs-weather-model/tests/logs/RegressionTests_wcoss2.log

@GeorgeGayno-NOAA
Copy link
Copy Markdown
Author

This is a small coding change that does not change results. Could it be wrapped in with other small PRs? If not, I am happy to open PRs under FV3 and UFSWM.

@grantfirl
Copy link
Copy Markdown
Collaborator

grantfirl commented Jul 23, 2025

This is a small coding change that does not change results. Could it be wrapped in with other small PRs? If not, I am happy to open PRs under FV3 and UFSWM.

@GeorgeGayno-NOAA Yes. I'll see where I can git it in. Is there a reason that this is listed as a draft PR?

@GeorgeGayno-NOAA GeorgeGayno-NOAA marked this pull request as ready for review July 28, 2025 14:56
@dpsarmie
Copy link
Copy Markdown

Once this is merged, we can try to get it to the front of the UFS queue for GW. (Also, just leaving a message for notifications)

@dpsarmie
Copy link
Copy Markdown

dpsarmie commented Aug 5, 2025

@GeorgeGayno-NOAA Can you sync your branch to get the latest version of ufs-community/ccpp-physics:ufs/dev? Dusan is going to add this to ufs-community/ufs-weather-model#2753 which is scheduled to be tested and merged later this week. Thanks!

@GeorgeGayno-NOAA
Copy link
Copy Markdown
Author

@GeorgeGayno-NOAA Can you sync your branch to get the latest version of ufs-community/ccpp-physics:ufs/dev? Dusan is going to add this to ufs-community/ufs-weather-model#2753 which is scheduled to be tested and merged later this week. Thanks!

Done at b56d2fc.

@jkbk2004
Copy link
Copy Markdown

all tests are done ok at ufs-community/ufs-weather-model#2753. @rhaesung @grantfirl can you merge this spr?

@grantfirl grantfirl merged commit 8292b66 into ufs-community:ufs/dev Aug 13, 2025
3 checks passed
grantfirl added a commit that referenced this pull request Oct 16, 2025
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.

Incorrect setting of land mask in sfcsub.F

6 participants