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.

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

sync with develop #26

Open
wants to merge 618 commits into
base: noahlsm_snowfix
Choose a base branch
from

Conversation

HelinWei-NOAA
Copy link
Owner

Description

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:

  • AQM
  • CDEPS
  • CICE
  • CMEPS
  • CMakeModules
  • FV3
  • GOCART
  • HYCOM
  • MOM6
  • NOAHMP
  • WW3
  • stochastic_physics
  • none

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

RatkoVasic-NOAA and others added 30 commits October 4, 2022 08:33
* Add RRFS-A to weekly tests
* Update input-data and hpc-stack containers

* Update Dockerfile and opnReqTest

* Update Jenkinsfile to handle PRs properly

Co-authored-by: JONG KIM <[email protected]>
* .gitmodules updates and hash to rmontuoro/bugfix/aqm-build-system for AQM

Co-authored-by: jkbk2004 <[email protected]>
…he P8 physics suite) (#1451)

* This is equivalent to PR66 in NCAR/ufs-weather-model: Bugfix and optimization of prognostic closure for the P8 physics suite

Co-authored-by: JONG KIM <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
#1437)

* fixes for rrfs debug tests (uninitialized memory in fv_regional_bc and module_bl_mynn)

* rrfs 13km debug tests

* smoke bug fixes for restart

* RRFS tests, but smoke takes too long due to 2hr wallclock limit, needed for restart test

* remove smoke test variants

* remove workarounds and fix remaining known bugs in ps_reg

* a few more surface pressure bug fixes; now the test case runs in debug mode

* update conus13km test list

* workarounds and bug fixes from gnu compiler testing

* atmos_cubed_sphere fixes&tweaks; ccpp/physics fix for precision issue that fails gfortran -DDEBUG=ON

* 120s timestep for conus13km tests

* atmos_cubed_sphere: simplify comments and explain snan

* move task calculations to compute_petbounds_and_tasks in rt_utils.sh; call it from rt.sh

* disable conus13km decomp and restart tests that are known to not match the control

* hera.gnu tests pass, except conus13km decomp and restart which are expected to fail

* move sanity checks to lsm_ruc and add "snow on ice" check

* use i-1 & j-1 for two-point averages, when available

* hera.gnu tests pass against new baseline after atmos_cubed_sphere i-j change

* Replace many changes with atmos_cubed_sphere PR #220

* update stochastic_physics url

Co-authored-by: JONG KIM <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
* update FV3 submodule pointer and .gitmodules for RTs

* small cloud tuning from Greg Thompson (#1410)

* Simplify Jenkins pipeline

Co-authored-by: Grant Firl <[email protected]>
Co-authored-by: Jesse McFarland <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: JONG KIM <[email protected]>
* Sync WW3 develop with dev/ufs-weather-model, Oct 12th 2022

* fix needed for cheyenne lmod update

* Update fv3_qsub.IN_cheyenne

* acorn intel lua cray-mpich update

* acorn intel debug lua cray mpich update

Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: jkbk2004 <[email protected]>
* update components and add external land component support

* use cubed_sphere_grid as output grid

* point updated CMEPS fork

* switch to another fix for inconsistent land sea mask issue

* make grid file configurable for external land

Co-authored-by: Ufuk Turuncoglu <[email protected]>
Co-authored-by: JONG KIM <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
* Add a new RT for SDF FV3_WoFS_v0

* Update delta_srw210 branch in ccpp/physics and minor bug fix in CCPP_typedefs

Co-authored-by: JONG KIM <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
…clouds, ESMF 8.4 support for AQM, Update WW3. (#1456)

* Bring in AQM PR #24 changes

* Update WW3 hash to DeniseWorthen/feature/updatewm

* Update AQM hash, bringing in EXMF 8.4 support for AQM

* remove bio from aqm.rc

Co-authored-by: jkbk2004 <[email protected]>
* Improve radiative fluxes and cloud cover in FV3 for HR1

Co-authored-by: JONG KIM <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
* Replace low resolution regression tests with high resolution.

* Rename ICs and result directory

* Remove "calendar" variable from namelists.

* Remove unused scripts: gfdlmp_run.IN & gsd_run.IN

* Add '--cpus-per-task=@[THRD]' to fv3_conf/fv3_slurm.IN_jet

* add omplace to cheyenne qsub script

Co-authored-by: JONG KIM <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: Dusan Jovic <[email protected]>
… 550nm (#1475)

* Adjust GFS diagnostic ADO output to the exact 550nm in ccpp/physics

* Modify a few lines of code in FV3/ccpp/physics/physics/radiation_aerosols.f to make them properly indented

Co-authored-by: JONG KIM <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
…reading for cpld_bmark control and restart (was #1483); Software module updates in hpc-stack for Hera (intel, gnu) (was #1468) (#1486)

* update CMEPS submodule

* bmark cpld tests use esmf-managed threading by default
* remove version w/o esmf-managed threading

* update hera hpc stack locations: intel/gnu

Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: jkbk2004 <[email protected]>
Co-authored-by: zach1221 <[email protected]>
…a 3D diagnostic tracer in UFSWM (#1494)

* Adding extra tracer (PM2.5) from AQM

* correct units on aqm_pm25 tracer

* Bring in production and fengsha section, but only enable prod

* Keep PM2.5 name consistent with production.

Co-authored-by: jkbk2004 <[email protected]>
…#1492)

* modify mom6_files.cmake to add 3 new files

* specify KVML in MOM_input but the follow three will use new default values (by following MOM6-examples)
KAPPA_SHEAR_VERTEX_PSURF_BUG
BAROTROPIC_TIDAL_SAL_BUG
LAYER_Z_INIT_IC_EXTRAP_BUG

* add STORE_CORIOLIS_ACCEL = False in MOM_input

Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: jkbk2004 <[email protected]>
* Couple convective clouds to radiation (#1496)

Co-authored-by: Grant Firl <[email protected]>
Co-authored-by: JONG KIM <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
* update CICE

* remove files from cice_files.cmake

* remove modules for features which have been removed (cesm ponds and
therm_0layer)

* remove compiles of drivers not used in ufs

Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: jkbk2004 <[email protected]>
* noahmp bugfix/noahmp_hr1

* Add a new varible 'ztmax' in NOAHMP-interface/noahmp

* Change DT_ATMOS from 720s to 600s for RT merra2_thompson due to the instability issue

Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: jkbk2004 <[email protected]>
… WCOSS2 MAPL Enable Tests (#1507) (#1505)

* Inline post is now compiled by default on all supported platforms

* Create Debug RT for AQM, Bring in fixes from debug testing and @rmontuoro small updates to AQM

* update wcoss2 module files with esmf/mapl and turn on gocart in coupled runs

* disable regional_atmaq_debug on jet: time out issue

Co-authored-by: Dusan Jovic <[email protected]>
Co-authored-by: Jun Wang <[email protected]>
Co-authored-by: jkbk2004 <[email protected]>
* Change fv3atm branch to bugfix/noahmp_tq2m

Co-authored-by: jkbk2004 <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
…ototype 8, and turn on prognostic closure. (#1480)

* Generation of gfsv17 tests for RT's beyond P8, updates in FV3 and ccpp submodules

* Added DNATS=0 flag to not exclude any tracers from advection

* update TKE contribution from cu for progsigma in deep and shallow cu

* Correct noareo tests to set DNATS=0 to ensure advection of all tracers

* Address review comments - clean out P7 and P8 labels in GFSv17 tests

* update rt.conf removing old control tests, adding a cpld gfsv17 test

* add outerloop wave coupling to a gfsv17 test

* remove duplicate test

Co-authored-by: Jessica Meixner <[email protected]>
Co-authored-by: jkbk2004 <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
* adding hr_ave_chem_v1

* aqm diag_table changes

Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: JONG KIM <[email protected]>
* removed control_2dwrtdecomp, control_fhzero, control_2threads_debug
* Update Jenkinsfile

* Update ci.test

* add a mixed-mode test

Co-authored-by: zach1221 <[email protected]>
Co-authored-by: JONG KIM <[email protected]>
Co-authored-by: Rahul Mahajan <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: jkbk2004 <[email protected]>
* Performance optimization of moving nest.

* Turn on HAFS RTs on WCOSS2 and switch to use the netcdf (instead of
netcdf_parallel) write_grid_component option for HAFS RTs.

* Update submodule FV3, which points to latest UPP develop branch.

* Update submodule FV3, which will only call atmosphere_fill_nest_cpl at the cap
driver time steps (coupling time steps)

* Adding upoff as a namelist parameter

* Update submodule HYCOM after the momentum flux fix for HAFS FV3ATM-HYCOM
coupling.

* Update submodule FV3 and rename HAFS_V0 CCPP physics suites into HAFS_V1.

* Cleanup of CMakefile for moving nest, and added fv_timers namelist option

Co-authored-by: William Ramstrom <[email protected]>
Co-authored-by: Biju Thomas <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: jkbk2004 <[email protected]>
… indices. (#1497)

* fv3 surface restart io: turn some calls into loops

* turn many loops into subroutine calls, and remove nt_save

* Refactor surface restart logic in FV3GFS_io.F90 to not use hard-coded indices

Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: jkbk2004 <[email protected]>
* Enhanced stability of drag_suite module and added diagnostics

* Added new UGWP diagnostic variables to parm/diag_table/diag_table_rap

* Bug fixes to rap, hrrr and rrfs test description files and tests/parm/rap.nml.IN

* Updated standard_names for do_gsl_drag_ls_bl, do_gsl_drag_ss, do_gsl_drag_tofd and ugwp_seq_update

* Incorporated dustinswales suggestions in ccpp-physics PR#22

* Assumed-shape in gwdps.f

* Added logical flag 'ugwp_seq_update' to gfs_physics_nml namelist

* Modified calculation of dtfac in drag_suite.F90 and revised various long_name's of diagnostic variables

* Removed passage of variables 'ak' and 'bk' to drag_suite -- these are no longer used

* Removed unused variables from GFS_typedefs.F90 and added clarifying comments in ccpp-physics

Co-authored-by: JONG KIM <[email protected]>
* Convert all regression tests to use esmf-managed threading

* update CMakeLists.txt

* update rt.conf

* Comment out unneeded steps in workflows/aux.yml

* turn off control_c384 on cheyenne: all others passed

Co-authored-by: Bin.Li <[email protected]>
Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: jkbk2004 <[email protected]>
* allow option no updated sub-components

* Run control_c384 and control_c384gdas tests on Gaea using TPN=18

Co-authored-by: Brian Curtis <[email protected]>
Co-authored-by: jkbk2004 <[email protected]>
DeniseWorthen and others added 30 commits August 6, 2024 10:40
…omponents (#2370)

* UFSWM - 
  * CICE - initialize scalar field when created
  * MOM6 - initialize scalar field when created
  * WW3 - initialize scalar field when created
…s arrays (#2183)

* UFSWM - In fv3atm and submodules, convert internal GFS DDTs from blocked data structures to contiguous arrays. This excludes the (external) `GFS_extdiag` and `GFS_restart` DDTs.
  * AQM - 
  * CDEPS - 
  * CICE - 
  * CMEPS - 
  * CMakeModules - 
  * FV3 - Convert GFS DDTs from blocked data structures to contiguous arrays (not including GFS_restart and GFS_extdiag DDTs)
    * ccpp-physics - Convert GFS DDTs from blocked data structures to contiguous arrays (affects `GFS_debug.{F90,meta} only`)
    * atmos_cubed_sphere - Convert GFS DDTs from blocked data structures to contiguous arrays and remove IPD_Data super DDT
  * GOCART - 
  * HYCOM - 
  * MOM6 - 
  * NOAHMP - 
  * WW3 - 
  * stochastic_physics -
… FV3 diag table documentation #2277 + SKEB fix with d_con = zero #2374 (#2278)

* UFSWM - python scripts for yaml and rocoto-xml conversion, experiment setup, and test log output  
* Add python superlint option
* Documentation update: doc/UsersGuide/source/tables/fv3_diag_table.rst
    * FV3 - 
    * atmos_cubed_sphere - bugfix: allocates heat_source when skeb is True and d_con is zero
* using MOM6 test branch
      add MOM_dynamics_split_RK2b.F90 and MOM_EOS_base_type.F90 in cmake list
      add extra 8PE for cpld_debug_pdlib job
      set DEFAULT_ANSWER_DATE=20231231 in 5x5 case
      add USE_HUYNH_STENCIL_BUG = True in MOM_input
      using MOM6 restart file as BL for sfs and hafs_mom jobs

* remove USE_HUYNH_STENCIL_BUG = True in MOM_input
  switch FIX_USTAR_GUSTLESS_BUG=F to USTAR_GUSTLESS_BUG=T

* switch FIX_USTAR_GUSTLESS_BUG to USTAR_GUSTLESS_BUG for MOM_input_hafs

* set USE_HUYNH_STENCIL_BUG = True
)

* UFSWM - Update the MOM_input templates and RT scripts to allow use of downscaled MOM6 and CICE6 warmstarts.

* update script variables and sfs test
* UFSWM - update g2tmpl library, g2 library, UPP hash. Sync parm files with new UPP version.
  * FV3 - update inline post for UPP, point UPP submodule to head of develop, revise spack.yaml
…ng in rt.sh (2388) + Add ability to read increment files on native cubed sphere grid (2304) (#2389)

* UFSWM -  Unify CDEPS gfs, cfsr, and gefs datm datamodes. Add ability to read increment files on native cubed sphere grid.  Update rt scripts to fix checking the job exit status from Slurm and PBS schedulers.
  * FV3 - Add namelist parameter for cubed sphere increment read and update atmos_cubed_sphere hash for GFDL 
    Atmospheric Cubed Sphere PR #[342](NOAA-GFDL/GFDL_atmos_cubed_sphere#342)
     * atmos_cubed_sphere - Add ability to read increments from files on native cubed sphere grid
  * CDEPS - Unify CDEPS gfs, cfsr, and gefs datm datamodes. Rename CDEPS-related FILENAME_BASE to FILEBASE_DATM in 
     tests. Sunset gfs_hafs datamode.
…3/SAS/MYNN fix) (#2408)

* UFSWM - Refactor NRL h2o photochemical scheme; add "tendency_of_vertically_diffused_tracer_concentration" as output 
     from the MYNN PBL scheme
  * FV3 - Refactor NRL h2o photochemical scheme; add "tendency_of_vertically_diffused_tracer_concentration" as output from 
     the MYNN PBL scheme
      * ccpp-physics - Refactor NRL h2o photochemical scheme; add "tendency_of_vertically_diffused_tracer_concentration" as 
         output from the MYNN PBL scheme
…Switch to using Aux history files in atm_ds2s_docn_dice test; Remove IFI tests (was #2417) (#2395)

* UFSWM - 
  * CMEPS - fix aux history functionality; sync with ESCOMP
  * UFSWM - use auxiliary history files as input for atm_ds2s_docn_dice; remove the IFI tests
 *MOM6 - update MOM6 to its main repo. 20240824 updating (GFDL's FMA PR)
* UFSWM - Update default parameter values for damping based off of work done for GW
* UFSWM - The fire_behavior component has been added and a new application created 'ATMF'. This work also includes a new regression test 'cpld_regional_atm_fbh' for testing two-way coupling of the atm component (fv3atm) and fbh component (fire_behavior)
  * CMEPS - CMEPS required modifications to be aligned with the changes to the ccpp physics package
  * FV3 - the fv3 cap has been modified to export atmosphere forcing data to the fire component when 'cpl_fire' is set to true. It will also import new fields for physics.
    * ccpp-physics - the ccpp physics package has been modified to add heat fluxes, upward specific humidity flux, and a smoke tracer from the fire component.
…#2430)

* UFSWM - Use EMC/CICE:develop branch from CICE-Consortium:main
  * CICE - Use EMC/CICE:develop branch from CICE-Consortium:main
…to fms/2024.01 (#2431)

* UFSWM - Bump libraries on WCOSS2 to ip/4.0.0 w3emc/2.12.0 and fms/2024.01

* Adjust FMS location and bump ufs_common.lua

* Acorn lua update for fms bump, remove ifi library load
* UFSWM -  Add support for Intel LLVM compiler
  * CICE -  Add support for Intel LLVM compiler
  * FV3 -  Add support for Intel LLVM compiler
    * ccpp-physics -  Add support for Intel LLVM compiler
    * atmos_cubed_sphere -  Add support for Intel LLVM compiler 
    * upp -  Add support for Intel LLVM compiler 
  * WW3 - Add support for Intel LLVM compiler
* UFSWM - Add forecast day output for CICE via timestep stream
* UFSWM - Adds GFDL Land Model version 4 (LM4) as a component model, functional in Data Atmosphere mode
  * CMEPS - Small modifications for coupling of LM4
 * LM4-NUOPC driver - new model component hosted at github.com/NOAA-GFDL/LM4-NUOPC-driver. NUOPC Cap for LM4
   * LM4.0 - submodule of LM4 NUOPC driver, hosted at https://github.com/NOAA-GFDL/LM4/
* UFSWM - physics updates for RRFS.v1 code freeze
  * FV3 - physics updates for RRFS.v1 code freeze
    * ccpp-physics - physics updates for RRFS.v1 code freeze
* apply gaea job card fix for MPI issue: FI_VERBS_PREFER_XRC
…ccpp-framework) for ccpp-framework PR 600 (bug fix for unit conversion error in ccpp_prebuild.py ) #2464 + Update chunksizes for cubed sphere grid #2465 (#2463)

* UFSWM - 
  Update LND I/O docs
  Add fd_ufs.yaml docs
  Add tests-dev docs
* UFSWM - Change the default chunking for the cubed sphere history files to use only the horizontal grid size of each of the tiles.
   * FV3 - Change the default chunking for the cubed sphere history files to use only the horizontal grid size of each of the tiles.
   * FV3 - Submodule pointer update for ccpp-framework PR 600 (bug fix for unit conversion error in ccpp_prebuild.py)

---------

Co-authored-by: Dusan Jovic <[email protected]>
Co-authored-by:  Dom Heinzeller <[email protected]>
* UFSWM - Modify global_control.nml to add compatibility with Global Workflow
* UFSWM - Updates cpld_control_sfs to use the most up-to-date configuration specs
* UFSWM - Update units attributes in netCDF output to be machine-readable
  * FV3 - Update units attributes in netCDF output to be machine-readable
    * atmos_cubed_sphere - Update units attributes in netCDF output to be machine-readable
…n PR from production/RRFS.v1 #2481 (#2458)

* UFSWM - Enable some of the intel llvm tests in rt conf
* UFSWM - Second reconciliation PR from production/RRFS.v1 related to FV3 unused and optional variables 
  * FV3 - Second reconciliation PR from production/RRFS.v1 related to FV3 unused and optional variables
    * ccpp-physics - Second reconciliation PR from production/RRFS.v1 related to FV3 unused and optional variables

---------

Co-authored-by: Grant Firl <[email protected]>
… CAPE cases + #2459 (#2461)

* UFSWM - Add tests-dev ATM-only idealized dry baroclinic wave test and a 2020 July CAPE case
* UFSWM - Update modulefile to support Rocky 8 on CSPs, with ParallelWorks

---------

Co-authored-by: Wei Huang <[email protected]>
Co-authored-by: Jong Kim <[email protected]>
* UFSWM - add PIO settings to WAV attributes in ufs.configure templates
* UFSWM - update ww3_shel.nml to allow for the ice field to be written to the restart file when required (i.e, waves in the slow loop)
* UFSWM - add WW3 restart files to comparison lists
  * WW3 - Add netCDF PIO capability for restarts and run-time history
* UFSWM 
  * FV3
    * ccpp-physics - Add Incremental Analysis Update (IAU) capability to update soil temperature and moisture for CCPP's NoahMP land model
… (#2489)

* UFSWM - Documentation for HSD cases 
  * FV3 - 
    * upp - update upp hash to ce258fca with update inline post interface. 

---------

Co-authored-by: gspetro-NOAA <[email protected]>
Co-authored-by: cameronbook <[email protected]>
* UFSWM - Thompson-Eidhammer microphysics code formatting
  * FV3 - Thompson-Eidhammer microphysics code formatting
    * ccpp-physics - Thompson-Eidhammer microphysics code formatting
* UFSWM - Update CICE to Consortium/main (2024-11). Expose hist_suffix for CICE ice_in
  * CICE - Update CICE to Consortium/main (2024-11)
…WW3 to avoid build errors #2512 (#2483)

* UFSWM - MYNN PBL, Smoke and subgrid cloud fraction.
  * FV3 - MYNN PBL, Smoke and subgrid cloud fraction.
    * ccpp-physics - MYNN PBL, Smoke and subgrid cloud fraction.
    * atmos_cubed_sphere - hail diagnostics, and average of smoke/dust.
  * WW3 -  Updated to add PIO switch to avoid build error
* UFSWM - Flexible restart write times (restart_fh) for med, ocn, ice, wav
  * CICE - Flexible restart write times (restart_fh)
  * CMEPS - Flexible restart write times (restart_fh)
  * MOM6 - Flexible restart write times (restart_fh)
  * WW3 - Flexible restart write times (restart_fh)
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.