Merge latest RUC LSM into community develop #1646

tanyasmirnova · 2023-03-08T22:48:07Z

Description

This PR merges changes from RRFS_dev to UFS community develop related to:

Introducing new variables for fractional vegetation and soil data and and read this data in FV3GFS_io.F90.
Updated snow model in RUC LSM
Changes in the output related to LSM-produced variables.<!--

Provide a detailed description of what this PR does. What bug does it fix, or what feature does it add? Is a change of answers expected from this PR? Are any library updates included in this PR (modulefiles etc.)?
-->

Top of commit queue on: TBD

Input data additions/changes

No changes are expected to input data.
There will be new input data.
Input data will be updated.

Anticipated changes to regression tests:

No changes are expected to any regression test.
Changes are expected to the following tests:

Subcomponents involved:

Combined with PR's (If Applicable):

Commit Queue Checklist:

Link PR's from all sub-components involved
Confirm reviews completed in sub-component PR's
Add all appropriate labels to this PR.
Run full RT suite on either Hera/Cheyenne with both Intel/GNU compilers
Add list of any failed regression tests to "Anticipated changes to regression tests" section.

Linked PR's and Issues:

Testing Day Checklist:

This PR is up-to-date with the top of all sub-component repositories except for those sub-components which are the subject of this PR.
Move new/updated input data on RDHPCS Hera and propagate input data changes to all supported systems.

Testing Log (for CM's):

RDHPCS
- Intel
  - Hera
  - Orion
  - Jet
  - Gaea
  - Cheyenne
- GNU
  - Hera
  - Cheyenne
WCOSS2
- Dogwood/Cactus
- Acorn
CI
- Completed
opnReqTest
- N/A
- Log attached to comment

…nd testing

BrianCurtis-NOAA · 2023-03-09T20:37:03Z

I see you put Draft: into the title. Thank you for that. If you want to make it a draft in GitHub, you can convert it to draft by clicking the link in the Reviewers section on the right side, you should see something like: Still in progress? Convert to draft. Click Convert to draft.

grantfirl · 2023-03-23T15:22:48Z

@tanyasmirnova Have these changes been tested yet? If not, do you need some assistance?

tanyasmirnova · 2023-03-23T16:10:43Z

@grantfirl Thank you for your question. I am still addressing your comments and the code is still changing. However @RatkoVasic-NOAA started performing a regression tests for my PR. We had a show stopper with compiling -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_sfcocn -DCMEPS_AOFLUX=ON. It appears that CMEPS_AOFLUX has its own meta file that needs to be updated. This is where we are right now.

uturuncoglu · 2023-03-23T16:17:39Z

@tanyasmirnova CMEPS is also defined as CCPP host model for calculating atmosphere-ocean fluxes on exchange grid. So, it has own data structures and metadata file. Let me know if you need help.

tanyasmirnova · 2023-03-23T16:37:47Z

@uturuncoglu I am adding some variables to MED_typedefs.meta. I have a questions: what section should I put xlat_d, xlon_d. They are defined under Grid property in GFS_typedefs.meta:
allocate (Grid%xlat_d (IM))
allocate (Grid%xlon_d (IM))

tanyasmirnova · 2023-03-23T16:54:39Z

@uturuncoglu I think I figured it out.

tanyasmirnova · 2023-03-23T18:19:08Z

@grantfirl @uturuncoglu When I added missing variables to CMEPS metadata, I got the following error in compilation with CMEPS:Compiling CMEPS with CCPP support.
Calling CCPP code generator (ccpp_prebuild.py) for suites --suites=FV3_sfc_ocean ...
-- CCPP prebuild step completed successfully
-- Configuring done
CMake Error at MOM6-interface/CMakeLists.txt:28 (add_library):
Cannot find source file:

MOM6/src/equation_of_state/TEOS10/gsw_chem_potential_water_t_exact.f90

Tried extensions .c .C .c++ .cc .cpp .cxx .cu .mpp .m .M .mm .h .hh .h++
.hm .hpp .hxx .in .txx .f .F .for .f77 .f90 .f95 .f03 .ispc

CMake Error at CICE-interface/CMakeLists.txt:71 (add_library):
Cannot find source file:

CICE/icepack/columnphysics/icepack_aerosol.F90

The log file is in /scratch1/BMC/gsd-fv3-dev/smirnova/ccpp_fv3/ufs_community_6mar23/tests/comp_CMEPS.log

Could you suggest us how to fix this error?

uturuncoglu · 2023-03-24T04:42:33Z

@uturuncoglu I suggest to have clean build by changing "${BUILD_JOBS:-4}" parameter in ./build.sh (in the root model directory) and make it run with 1 thread like "${BUILD_JOBS:-1}". So, this will allow you to compile model component sequentially and make the error more apparent. Form your error output, it seems that the problem is on other components. BTW, I could only access to Orion and Cheyenne. So, if you want me to look at we need to compile on those platforms.

RatkoVasic-NOAA · 2023-03-24T15:25:47Z

@uturuncoglu Ufuk, I updated Tanya's branch so you can try to compile on Orion or Cheyenne. Here is the procedure:

git clone -b ufsdev_ruclsm https://github.com/tanyasmirnova/ufs-weather-model.git
cd ufs-weather-model
git submodule update --init --recursive

ls -l CMEPS-interface/CMEPS/ufs/ccpp/data/  <---- changes are here

cd tests
compile.sh @machine.compiler@ "-DAPP=S2S -DCCPP_SUITES=FV3_GFS_v17_coupled_p8_sfcocn -DCMEPS_AOFLUX=ON"

grantfirl · 2023-03-24T15:57:09Z

@tanyasmirnova @RatkoVasic-NOAA @uturuncoglu @DeniseWorthen It was pointed out in the UFS code management meeting that we'll need a PR in CMEPS for the changes there that should be linked to this PR.

ufsdev_ruclsm->emc/develop

tanyasmirnova · 2023-03-24T16:07:11Z

Thank you very much, Everybody, for your help. Ratko, could you please make a PR in CMEPS?

RatkoVasic-NOAA · 2023-03-24T16:34:06Z

Thank you very much, Everybody, for your help. Ratko, could you please make a PR in CMEPS?

I can do the PR, but compilation is still failing.

uturuncoglu · 2023-03-24T16:35:40Z

@tanyasmirnova @RatkoVasic-NOAA I ll look at this today. I am out of office now.

RatkoVasic-NOAA · 2023-03-24T16:39:37Z

@tanyasmirnova @RatkoVasic-NOAA @uturuncoglu @DeniseWorthen It was pointed out in the UFS code management meeting that we'll need a PR in CMEPS for the changes there that should be linked to this PR.

ufsdev_ruclsm->emc/develop

PR NOAA-EMC/CMEPS#84 is in.

tanyasmirnova · 2023-03-24T17:11:20Z

@RatkoVasic-NOAA @uturuncoglu @SamuelTrahanNOAA Sam is on board to help with testing of this PR. The SD with CMEPS is still not compiling.

…ather-model into ufsdev_ruclsm

zach1221 · 2023-03-31T15:48:59Z

Testing on jet/gaea has been quite slow. Pushing to have those finished by 2pm, then we can move forward with merging process.

SamuelTrahanNOAA · 2023-03-31T15:57:01Z

Testing on jet/gaea has been quite slow. Pushing to have those finished by 2pm, then we can move forward with merging process.

I have access to some Jet projects that have a very high priority (FairShare rating) so if you find it impossible to run on Jet, I can do that for you.

zach1221 · 2023-03-31T16:01:00Z

Thanks, @SamuelTrahanNOAA . I think Jet is almost finished, so I dont want to ask you to do that quite yet.

zach1221 · 2023-03-31T18:14:35Z

Ok, tests are done, we should be able to move forward with this PR. I think we need to have reviews/approval completed in the sub-prs linked #49 and #633. I can follow up in those PRs separately.

grantfirl · 2023-03-31T18:56:38Z

Ok, tests are done, we should be able to move forward with this PR. I think we need to have reviews/approval completed in the sub-prs linked #49 and #633. I can follow up in those PRs separately.

#49 has approval and is ready to merge.

zach1221 · 2023-03-31T19:27:45Z

Thanks, @grantfirl . Feel free to merge ccpp

SamuelTrahanNOAA · 2023-03-31T20:29:37Z

The ccpp has been merged and we're waiting on fv3atm

jkbk2004 · 2023-03-31T20:47:40Z

@SamuelTrahanNOAA @tanyasmirnova fv3 pr was merged. Go ahead to update submodule pointer and revert change in gitmodules.

SamuelTrahanNOAA · 2023-03-31T20:58:12Z

The CMEPS PR still needs to be merged.

NOAA-EMC/CMEPS#84

SamuelTrahanNOAA · 2023-03-31T21:07:52Z

I did update the FV3 submodule, but until the CMEPS PR is merged, I cannot update that one.

DeniseWorthen · 2023-03-31T21:17:19Z

Sorry @SamuelTrahanNOAA Someone marked that the subcomponent PRs were approved, but CMEPS has not been. Hopefully Jun or Brian can quickly approve.

DeniseWorthen · 2023-03-31T22:03:06Z

CMEPS is merged hash 91bcb84

SamuelTrahanNOAA · 2023-03-31T22:27:11Z

The .gitmodules is reverted, and the FV3 & CMEPS point to their authoritative branches. You can merge this now.

Update .gitmodules and submodule pointer for fv3atm for code review a…

f3a032d

…nd testing

tanyasmirnova changed the title ~~Draft: Merge latest RUC LSM into community develop~~ Merge latest RUC LSM into community develop Mar 16, 2023

SamuelTrahanNOAA and others added 7 commits March 17, 2023 01:48

bug fix from @tanyasmirnova for rrfs crashes during restart

2ca7df1

hera tests passed (gnu & intel)

498e8aa

new regression test rrfs_conus13km_hrrr_warm_restart_mismatch

bdfe582

My changes to rt.sh

3d33d66

update FV3

06b1127

Sync ccpp

17fccc9

Revert rt.sh

126172a

SamuelTrahanNOAA mentioned this pull request Mar 23, 2023

bug fix from @tanyasmirnova for rrfs crashes during restart #1660

Closed

35 tasks

Update CMEPS with ufsdev_ruclsm

33391ea

point to top of ufsdev_ruclsm for FV3 and FV3/ccpp/physics

bb475ef

RatkoVasic-NOAA mentioned this pull request Mar 24, 2023

Modify CMEPS for ufsdev_ruclsm NOAA-EMC/CMEPS#84

Merged

9 tasks

SamuelTrahanNOAA added 2 commits March 24, 2023 17:13

FV3: incorrect character lengths in two calls

6a656c0

Merge branch 'ufsdev_ruclsm' of ssh://github.com/tanyasmirnova/ufs-we…

abbce04

…ather-model into ufsdev_ruclsm

add hera.gnu RT logs: passed

e0f14fc

zach1221 added 2 commits March 31, 2023 17:23

add jet.intel RT logs: passed

bcfcb7d

add gaea.intel RT logs: passed

6274684

This was referenced Mar 31, 2023

Merge latest RUC LSM into community develop ufs-community/ccpp-physics#49

Merged

Merge latest RUC LSM into community develop and add new soil/veg data NOAA-EMC/fv3atm#633

Merged

zach1221 requested review from jkbk2004, BrianCurtis-NOAA and SadeghTabas-NOAA March 31, 2023 19:45

point to ufs/dev ccpp-physics

3a21c67

point to develop fv3atm

ec1b0bd

point to emc/develop CMEPS

ded7062

BrianCurtis-NOAA approved these changes Mar 31, 2023

View reviewed changes

jkbk2004 approved these changes Mar 31, 2023

View reviewed changes

zach1221 merged commit 20e21f6 into ufs-community:develop Mar 31, 2023

jkbk2004 mentioned this pull request Mar 31, 2023

update CMEPS to allow bilinear ATM<->WAV mapping for global coupled application; utilize custom restart names for WW3 (was #1684) #1685

Closed

37 tasks

grantfirl mentioned this pull request Apr 7, 2023

UFS-dev PR#49 NCAR/ufs-weather-model#94

Merged

MatthewPyle-NOAA mentioned this pull request Jan 4, 2024

Part of surface fields are missing in RESTART files for RRFS cases #1655

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge latest RUC LSM into community develop #1646

Merge latest RUC LSM into community develop #1646

tanyasmirnova commented Mar 8, 2023 •

edited by DeniseWorthen

Loading

BrianCurtis-NOAA commented Mar 9, 2023

grantfirl commented Mar 23, 2023

tanyasmirnova commented Mar 23, 2023

uturuncoglu commented Mar 23, 2023

tanyasmirnova commented Mar 23, 2023

tanyasmirnova commented Mar 23, 2023

tanyasmirnova commented Mar 23, 2023 •

edited

Loading

uturuncoglu commented Mar 24, 2023 •

edited

Loading

RatkoVasic-NOAA commented Mar 24, 2023

grantfirl commented Mar 24, 2023 •

edited

Loading

tanyasmirnova commented Mar 24, 2023

RatkoVasic-NOAA commented Mar 24, 2023

uturuncoglu commented Mar 24, 2023

RatkoVasic-NOAA commented Mar 24, 2023

tanyasmirnova commented Mar 24, 2023

zach1221 commented Mar 31, 2023

SamuelTrahanNOAA commented Mar 31, 2023

zach1221 commented Mar 31, 2023

zach1221 commented Mar 31, 2023

grantfirl commented Mar 31, 2023 •

edited

Loading

zach1221 commented Mar 31, 2023

SamuelTrahanNOAA commented Mar 31, 2023

jkbk2004 commented Mar 31, 2023

SamuelTrahanNOAA commented Mar 31, 2023

SamuelTrahanNOAA commented Mar 31, 2023

DeniseWorthen commented Mar 31, 2023 •

edited

Loading

DeniseWorthen commented Mar 31, 2023

SamuelTrahanNOAA commented Mar 31, 2023

Merge latest RUC LSM into community develop #1646

Merge latest RUC LSM into community develop #1646

Conversation

tanyasmirnova commented Mar 8, 2023 • edited by DeniseWorthen Loading

Description

Top of commit queue on: TBD

Input data additions/changes

Anticipated changes to regression tests:

Subcomponents involved:

Combined with PR's (If Applicable):

Commit Queue Checklist:

Linked PR's and Issues:

Testing Day Checklist:

Testing Log (for CM's):

BrianCurtis-NOAA commented Mar 9, 2023

grantfirl commented Mar 23, 2023

tanyasmirnova commented Mar 23, 2023

uturuncoglu commented Mar 23, 2023

tanyasmirnova commented Mar 23, 2023

tanyasmirnova commented Mar 23, 2023

tanyasmirnova commented Mar 23, 2023 • edited Loading

uturuncoglu commented Mar 24, 2023 • edited Loading

RatkoVasic-NOAA commented Mar 24, 2023

grantfirl commented Mar 24, 2023 • edited Loading

tanyasmirnova commented Mar 24, 2023

RatkoVasic-NOAA commented Mar 24, 2023

uturuncoglu commented Mar 24, 2023

RatkoVasic-NOAA commented Mar 24, 2023

tanyasmirnova commented Mar 24, 2023

zach1221 commented Mar 31, 2023

SamuelTrahanNOAA commented Mar 31, 2023

zach1221 commented Mar 31, 2023

zach1221 commented Mar 31, 2023

grantfirl commented Mar 31, 2023 • edited Loading

zach1221 commented Mar 31, 2023

SamuelTrahanNOAA commented Mar 31, 2023

jkbk2004 commented Mar 31, 2023

SamuelTrahanNOAA commented Mar 31, 2023

SamuelTrahanNOAA commented Mar 31, 2023

DeniseWorthen commented Mar 31, 2023 • edited Loading

DeniseWorthen commented Mar 31, 2023

SamuelTrahanNOAA commented Mar 31, 2023

tanyasmirnova commented Mar 8, 2023 •

edited by DeniseWorthen

Loading

tanyasmirnova commented Mar 23, 2023 •

edited

Loading

uturuncoglu commented Mar 24, 2023 •

edited

Loading

grantfirl commented Mar 24, 2023 •

edited

Loading

grantfirl commented Mar 31, 2023 •

edited

Loading

DeniseWorthen commented Mar 31, 2023 •

edited

Loading