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

generalization of number of soil layers #31

Open
wants to merge 94 commits into
base: nsoil9
Choose a base branch
from
Open

Conversation

HelinWei-NOAA
Copy link
Owner

Description

(Instructions: this, and all subsequent sections of text should be removed and filled in as appropriate.)
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?

Issue(s) addressed

Link the issues to be closed with this PR, whether in this repository, or in another repository.
(Remember, issues should always be created before starting work on a PR branch!)

  • fixes #<issue_number>
  • fixes noaa-emc/fv3atm/issues/<issue_number>

Testing

How were these changes tested?
What compilers / HPCs was it tested with?
Are the changes covered by regression tests? (If not, why? Do new tests need to be added?)
Have the ufs-weather-model regression test been run? On what platform?

  • Will the code updates change regression test baseline? If yes, why? Please show the baseline directory below.
  • Please commit the regression test log files in your ufs-weather-model branch

Dependencies

If testing this branch requires non-default branches in other repositories, list them.
Those branches should have matching names (ideally)

Do PRs in upstream repositories need to be merged first?
If so add the "waiting for other repos" label and list the upstream PRs

  • waiting on noaa-emc/nems/pull/<pr_number>
  • waiting on noaa-emc/fv3atm/pull/<pr_number>

grantfirl and others added 12 commits July 24, 2023 12:48
…MC#674)

* optimized the code and decrease the stratosphere warm bias for mraerosol=T
---------
Co-authored-by: anning.cheng <[email protected]>
* Add initialization for some local variables.

* Change undefined value of aextc55 as 0

* Read soill to level 9 for RUC LSM

* Correct tke reading and update upp revision.

* Update upp revision to baa7751
* If the output bundle has no fields do not attempt to get a grid
* Comment out return status check after recover_fields
* Add option to output top parent history file on cubed sphere grid

* Rename module_configure parameter, history_file_on_native_grid
* switch sign on mean momentum fluxes

* send mean momentum fluxes to mediator w/ correct sign for coupling
* fix variable alignment in module_block_data

* change sign of exported sensible heat flux

* add evap fields for atm export

* change sign for exported latent heat flux
* point to Greg's bugfix branch: few small fixes to Thompson MP
@HelinWei-NOAA HelinWei-NOAA changed the title clarify lsoil and lsoil_lsm generalization of number of soil layers Aug 21, 2023
SamuelTrahanNOAA and others added 16 commits August 22, 2023 09:42
…#681)

* Changes to logging and initialization of the CLM Lake Model.

1. Use ice thickness hice(i) to find the level in the lake where ice is
   zero.
2. Do not allow lake temperature to be below freezing point if there is
   no ice.
3. If there is no snow or ice, do not allow surface lake temperature to
   be below freezing point.
   These changes fixed the problem with large errors in the energy budget
   at the beginning of the cold-start run with lakes.
4. Added flag to turn on debug print statements in the CLM lake model.

* merge ccpp-physics NOAA-EMC#91 (UFS-SRW v3.0.0 SciDoc updates)
… & FV3_HRRR_gf (NOAA-EMC#692)

* fix fortran coding error in dynamical core
* use clm lake in fv3_hrrr_c3
* initialize arrays after allocation
* ressurect FV3_HRRR_gf suite and give it the clm lake model
* bug fix from Dusan to use the correct type kind when reading lan & lon in quilt server
…A-EMC#595)

* Change the format of domain restart files to netcdf4 and set chunksizes

* Remove nc_format="netcdf4" argument when opening restart files

* Set chunksize of zaxis and time axis to 1

* Update clm_lake and rrfs_sd modules to support chunksizes

* Make quilting restart files identical to fms files
* 2D advection of cellular automata
* update missing value

* adding timing information

* add write_runtimelog option

* update upp and not include dycore updates that change results
* add SPP support to G-F deep convection
* MYNN SFC OpenACC directives
…nd used for data variables. (NOAA-EMC#697)

* Write netcdf axis variables using the same real kind as data variables
…sics, and string length mismatch in dycore plus PR NOAA-EMC#705 and NOAA-EMC#699 (NOAA-EMC#695)

* GFDL_atmos_cubed_sphere: consistent string lengths in array

* stop FV3_HRRR_c3 from crashing with gnu debug

* in dycore, initialize srf_wnd_var2 and tracers_var3 arrays

* Write netcdf axis variables using the same real kind as data variables

* "GF radar reflectivity, dust bug fix, C3 updates, more fluxes output"

* Fix race condition in GFS_phys_time_vary.fv3.F90 error detection

* More bug fixes to GFS_phys_time_vary.fv3.F90:
1. detect empty errmsg from subroutines
2. Initialize err variables in set_soilveg.f, which is called from GFS_phys_time_vary.fv3.F90

* initialize errmsg & errflg in noahmp_tables.f90

* only read h2odata, ozdata and noahmp table when they are needed

* remove all constant 3D variables from clm lake

* calculate clm lake constants only once per i loop

---------

Co-authored-by: Dusan Jovic <[email protected]>
Co-authored-by: Haiqin.Li <[email protected]>
* change mean->inst for fields going to ATM
* switch 'mean' prec fields to be inst
* bug fixed for mraerosol

* update upp revision
* allow cpllnd to use inst lw and sw down

* change print statements to use ufs, not nems

* update active attributes in GFS_typedefs.meta

* add flag_for_land_coupling to active value for both
dlwsfci_cpl and dswsfci_cpl

* update ccpp and revert gitmodules
* Added 'ugwpv1' suite definition files and fixed ccpp UGWP OGWD stability issues in upper atmosphere

* Corrected new 'ugwpv1' SDF's

* Updated ccpp-physics to incorporate PR#115 -- 'hr3_land_upgrades'
climbfuji and others added 30 commits February 23, 2024 13:54
…mpile error on macOS (NOAA-EMC#747)

* Make ozone physics CCPP compliant by removing 'optional' and 'pointer' attributes: ccpp/physics  PRs  NOAA-EMC#168 NOAA-EMC#169 NOAA-EMC#150

* Bug fix in io/module_wrt_grid_comp.F90 to compile on macOS with apple-clang

* Update ccpp-framework
* ice model to determine the ice temperature over both sea ice and lake ice
…OAA-EMC#792)

* Bug fix in ccpp/driver/GFS_diagnostics.F90: only output sfcprop(nb)%wetness for RUC LSM

* Update ccpp-framework for bug fix to provide backward compatibility with blocked data structure
* CSAW-MG update: fix convective_updraft_area_fraction_at_model_interfaces metadata and actual dimension in CCPP_typedefs.F90
…ure/capgen into main/20240308) (NOAA-EMC#796)

* Update ccpp-framework and ccpp-physics for the prep of capgen transition

* In ccpp/data/GFS_typedefs.meta: change units 'flashes 5 min-1' to 'flashes min-1' and update long name to make clear this is per 5 minutes

* In ccpp/driver/GFS_diagnostics.F90, scale lightning threat from flashes per minute to flashes per 5 minutes to match diagnostic units

* Fix wrong long names for lightning threat indices in ccpp/data/GFS_typedefs.meta
…allow-argument-mismatch' flag (NOAA-EMC#770)

* Resolve argument mismatch errors when using gfortran

* Switch from 'use mpi' to 'use mpi_f08'

* More argument mismatch fixes

* Merge Dom's ccpp-framework and ccpp-physics feature/depend_on_mpi braches

* Check output_grid type and inline post compatibility

* If output grid is 'cubed_sphere_grid' AND inline post is turned on
print error and terminate the model.

* Use type(MPI_Comm) in io/module_wrt_grid_comp.F90
…onvective cloud condensate should be included in cloud fraction and optical depth calculation in radiation in the GFS suite. (NOAA-EMC#799)

* Update ccpp/physics for namelist flag xr_cnvcld
* Split add_dim into two routines

* Add NF90_NODIMSCALE_ATTACH constant

* Test classic netcdf file formats
* add cpl_scalars for atm

* add field cpl_scalars to export state of fv3atm when coupled.
cpl_scalars contain the dimensions of the fv3atm domain and are
used by cmeps to write mediator history files as a single 2d
grid for regional and 6 2d grids for CSG.

* remove unused NUOPC use statement
* Update cubed_sphere@f060e85 hash: a bug fix in the HAILCAST diagnostic code (units issue)
…m wrong for nests (NOAA-EMC#806)

* nesting fixes
1. Initialize hailwat index in dynamical core.
2. Use the correct tile number for nests in atmos_model.F90.

* remove unneeded write statements

* Fix kchunk3d in io/module_write_netcdf.F90

---------

Co-authored-by: Dusan Jovic <[email protected]>
* Update atmos_cubed_sphere and add compile definition BYPASS_BREED_SLP_INLINE to dycore

* Pass correct mpi communicator type to post_alctvars routine in inline post
* Update github workflow. Update gcc to 12 and mpi to openmpi

* Add 'spack clean' to reduce the size of the cache files

* Split GCC.yml workflow into two jobs, build_spack and build_fv3atm

* Update github workflow. Add mpich

* Update github actions to v4

* Use action/cache/restore in build_fv3atm job

* update upp revision to 5faac75

* Update GCC.yml

---------

Co-authored-by: Dusan Jovic <[email protected]>
…AA-EMC#816)

* update ccpp/framework

* fixed excessive evaporation when both innerloop=T and mraerosol=T

---------

Co-authored-by: Grant Firl <[email protected]>
…OAA-EMC#826)

* Add model_configure option to specify history file output directory (fv3atm_output_dir)

* Update workflows/GCC.yml

* Move reading of 'fv3atm_output_dir' config option to module_wrt_grid_comp

* Update upp
* Remove -DUSE_COND and -DMOIST_CAPPA compiling flags for hydrostatic runs; Fix the issue to write out omga and geopotential height for inline post

* Add the conditions to calculate omega in post

* Update CMakeLists.txt

* revise conditions to calculate zint
…gfixes, sfcsub.F landmask bugfix, and canopy resistance output (NOAA-EMC#831)

* add rca when NOAH_MP is active

* fix type in GFS_typedefs.F90 for use_lake2m
…AA-EMC#807)

* In ccpp/data/GFS_typedefs.meta: change units 'flashes 5 min-1' to 'flashes min-1' and update long name to make clear this is per 5 minutes

* In ccpp/driver/GFS_diagnostics.F90, scale lightning threat from flashes per minute to flashes per 5 minutes to match diagnostic units

* Fix wrong long names for lightning threat indices in ccpp/data/GFS_typedefs.meta

* Remove invalid active attributes in ccpp/data/GFS_typedefs.meta

* Bug fix for GFDL-MP in CCPP: use correct allocation of variables but internally bend everything back to where it's expected (affects some, but not all variables in CCPP_typedefs.{F90,meta})

* Bug fix in ccpp/data/GFS_typedefs.meta: sncovr_ice is always allocated, remove active attribute

* Bug fix in ccpp/data/CCPP_typedefs.meta small-scale gravity wave drag variables are active for options 2,3,22,33 of gwd, not just 3,33

* Bug fix in ccpp/data/GFS_typedefs.meta: three variables are always allocated, remove active attribute

* More bug fixes for active attributes in ccpp/data/GFS_typedefs.meta

* More bug fixes for allocation dimensions in ccpp/data/CCPP_typedefs.*; optional arguments in stochastic_physics/stochastic_physics_wrapper.F90

* Set ccpp_data's thrd_cnt in ccpp/driver/CCPP_driver.F90

* No default in OMP pragmas in ccpp/driver/CCPP_driver.F90
* set up fhour with multiple values

* updates for diag time

* add fixes for two bucket

* Update fhzero global attribute at runtime

* Update to speed uo writing restart files

* allow fhzero to be non-integer

* Move ESMF_InfoBroadcast call outside ESMF_VMEpochEnter/ESMF_VMEpochExit section to avoid hanging

---------

Co-authored-by: Jun.Wang <[email protected]>
Co-authored-by: Dusan Javic <[email protected]>
* Perturbation/increment file for cold starts: move the call to read_da_inc outside the if external_ic/restart logic.
…ut the nest grid corner locations (NOAA-EMC#847)

*  typo/bug in fv_grid_tools.F90 when print out the grid SW, NW, NE, SE CORNER indexes and lat/lon locations.
…similar to hydrostatic method (NOAA-EMC#849)

* Added new parameter, pass_full_omega_to_physics_in_non_hydrostatic_mode
* HR4 GWD update for files GFS_typedefs.F90 GFS_typedefs.meta

* update files GFS_typedefs.F90 GFS_typedefs.meta

* remove psl_ from files GFS_typedefs.F90 GFS_typedefs.meta

* HR4 Gravity Wave Drag Update

* update code GFS_typedefs.F90 for GWD and Noahmp HR4

* point to PR#549 of ccpp-framework

* retract the changes from the Noahmp model

---------

Co-authored-by: Grant Firl <[email protected]>
Co-authored-by: Dustin Swales <[email protected]>
* atmos_cubed_sphere - bug fix to address debug mode crashes caused by floating-point exception in subroutine a2b_ord2 in model/a2b_edge.F90
… in the GFS physics suite (NOAA-EMC#851)

* Output updraft value of convective cloud condensate in CCPP

* update xkinv1 to 0.15

* add check if progsigma is true

* address seg fault if progsigma=F

---------

Co-authored-by: Grant Firl <[email protected]>
* Land surface upgrades for HR4
* Update diagnose_cplFields routine to use FieldBundleWrite. Needs esmf v8.6.0

* Fixed bug in aux2d dimensions for GFS meta file.

* Pass return code from diagnose_cplFields back to caller

* Skip 'cpl_scalars' field when dumping export state

* fix fhzero for GEFS

* fix cpl_scalars (#6)

* fix issues w/ cplscalars

* error out of all 3 spatial indices are not present

* add check for scalar_id = 0

* modify for timeslices and times (#7)
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.