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

Dev/emc #6

Merged
merged 130 commits into from
Apr 9, 2022
Merged

Dev/emc #6

merged 130 commits into from
Apr 9, 2022

Conversation

JiliDong-NOAA
Copy link
Owner

Description

Include a summary of the change and which issue is fixed. Please also include
relevant motivation and context. List any dependencies that are required for
this change.

Fixes # (issue)

How Has This Been Tested?

Please describe the tests that you ran to verify your changes. Please also note
any relevant details for your test configuration (e.g. compiler, OS). Include
enough information so someone can reproduce your tests.

Checklist:

Please check all whether they apply or not

  • My code follows the style guidelines of this project
  • I have performed a self-review of my own code
  • I have commented my code, particularly in hard-to-understand areas
  • I have made corresponding changes to the documentation
  • My changes generate no new warnings
  • Any dependent changes have been merged and published in downstream modules

akubaryk and others added 30 commits October 2, 2019 16:39
resolve conflicts.
Conflicts:
	driver/fvGFS/atmosphere.F90
	model/dyn_core.F90
	model/fv_arrays.F90
	model/fv_control.F90
	model/fv_dynamics.F90
	model/fv_mapz.F90
	model/nh_utils.F90
	model/sw_core.F90
	model/tp_core.F90
	tools/fv_diagnostics.F90
…cing the necessary functions with fms2_io_mod functions
…name when needed and removing unneccessary code in fv_io_mod
remove trailiing spaces
fixes missing argument in store_data for case where GFS_PHYS macro no…
add in test for do_cube_transform in fv_grid_tool::init_grid
fixes bug in regional bc time calculation in fv_tracer2d.F90
laurenchilutti and others added 29 commits October 6, 2021 10:22
…ud_amount

Bug fix fv_regional_bc.F90: initialize cloud amount boundary conditions only if cloud amount is a valid tracer
#147)

* Initializing tracers to fix the FP issue for some tracers in debug mode triggered in remap_scalar

* remove duplicate code and fix lstatus on all grids depending on gfs_data and gfs_data.tile1

Co-authored-by: Joseph Mouallen <j3mouall@uwaterloo.ca>
* update in fv_nudge to fix 666 label logic
* Remove namelist #ifdef, keeping the #if block and removing #else block
…n be fixed by using -O0 instead of -O2 to compile fv_diagnostics.F90
* Updates to allow for JEDI to specify input.nml
* fix for 4diau with iau_filter_increments=T

* fix time interval for 3DIAU

* fix typo in comment

* fix bug found in review by @MingjingTong-NOAA

* change tnext to integer variable itnext

Co-authored-by: jswhit2 <Jeffrey.S.Whitaker@noaa.gov>
* Incorporated Tim Supinie's updates to handle a hail category (nwat=7)

* Added print for hail max/min (non-debug section)

* Add hallwat to !OMP shared variables in main loop

Addresses compile failure when OMP is turned on (e.g., on Hera)

* Update to states as used in SFE2021
(Removed SFE code for now)

* Cleanup after rebase

* Redo removal of alt. namelist read

* Removed tools/module_diag_hailcast.F90

* Fixes from Jili Dong

* Add hailwat to tools/external_ic.F90

* Set logic in fv_regional_bc.F90 to match current code; Change logic in external_ic.F90 to check value of nwat

* Recommended changes

* Check actual index (hailwat) instead of assuming a positive value based on 'nwat' value

* Split nwat=7 bits into separate loops (see if it affects nwat=6)

Co-authored-by: Larissa Reames <52886575+LarissaReames-NOAA@users.noreply.github.com>
Co-authored-by: LarissaReames-NOAA <larissa.reames@noaa.gov>
@JiliDong-NOAA JiliDong-NOAA merged commit 8264d5f into JiliDong-NOAA:dev/emc Apr 9, 2022
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.