merge develop #13
Merged
merge develop #13
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
* github version of latest branch * some fixes to physics driver * adding import field of z0 surface roughness length and cplwav2atm flag for coupling wave to atm * removing 271.2 near line 1884 * minor update of atmos_model.F90 * updating GFS_typedef for includeing ras in ccpp, plus minor mod in physics driver * after merging with Jessica's wave update in fv3 * coupling with ww3 * after merging with fv3atm develop branch and updating for ras * FV3 updates for RAS MG3 SHOC so that IPD and CCPP reproduce in REPRO mode * updating mg driver, physics driver and typedef * updating gcm_shoc.f90 to turn on commented code in assumed pdf * constraing imported ice fraction in atmos_model.F90 * after merging with NOAA-EMC/fv3atm/develop * minor fix to atmos_model.F90 and IPD physics driver * updating .gitmodules * adding two couplrd suites * a bug fix in atmos_model.F90, added a logical frac_grid_off to enable reading fractional grid orography file and run as no fractional grid, and minor bug fix in physics driver related to the fractional grid - FV3GFS_io.F90 is modified to use lake fraction if it exists to distinguish lake from ocean * adding con_csol to GFS_typedefs.F90 and GFS_typedefs.meta for CCPP * Update long names of hydrometeors to match the ccpp-physics change * reverting white space changes in .gitmodules * adding ignore_lake flag to GFS_typedefs.F90 andFV3GFS_io.F90 to preserve the option used in current s2s benchmarks * settng the momentum, sensible and latent heat fluxes over land exported to the mediator set to large values and over 100% sea ice set to values imported from icemodel. The mask identifying the ocean points to the mediator is correted based on ocean fraction. Updates also include name changes for the ice fields as changed by Denise Worthen. Also added an ignore_lake option to the namelist * changing variable puny to epsln in atmos_model.F90 on Denise's recommendation * added a new namelist parameter, min_lake_height, with default value of 250m, changeable by user to give more generality * update gcycle * point atmos_cubed_sphere to NOAA-EMC repo and ccpp/physics to SMoorthi-EMC SM_Jan102020 branch * reverting definition of do_cnvgwd in GFS_typedefs.F90 * removed 3 lines from gcycle.F90, which I previously forgot to delete * fixing a bug in gcycle update * removing updating tsfco in gcycle when nsstr is on * updating .gitmodules to point to NCAR/ccpp-physics master branch Co-authored-by: Jessica.Meixner <Jessica.Meixner@noaa.gov> Co-authored-by: Dom Heinzeller <climbfuji@ymail.com> Co-authored-by: Jun.Wang <Jun.Wang@noaa.gov>
* fix omp error in dycore and atmos_model.F90 * Update atmos_cubed_sphere submodule
fv3atm:
fractional landmask changes (from @shansun6)
ccpp-framework:
bugfixes for handling optional arguments (no impact on current setup)
bugfix for debug messages (no impact on current setup)
ccpp-physics:
GFSv16 physics updates
add moninedmf_hafs
scientific documentation for NoahMP and satmedmfvdifq
bugfix for threading (avoid dead lock) when calculating Thompson MP lookup tables
addition of radar reflectivity reset switch for Thompson MP, bugfix for non-aerosol Thompson runs (from @ericaligo-NOAA)
fractional landmask changes (from @shansun6)
CCPP version of RAS, updates to shoc and MG (from @SMoorthi-emc)
bugfixes when levr < levs (from @SMoorthi-emc)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.