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

gsd/develop: update from NOAA-EMC develop #28

Merged

Conversation

climbfuji
Copy link

@climbfuji climbfuji commented May 15, 2020

This PR updates the NOAA-GSD gsd/develop branch of fv3atm with the latest version from NOAA-EMC develop.

Associated PRs:

NOAA-GSL/GFDL_atmos_cubed_sphere#2
NOAA-GSL/ccpp-framework#3
NOAA-GSL/ccpp-physics#28
#28
NOAA-GSL/ufs-weather-model#22

See NOAA-GSL/ufs-weather-model#22 for regression testing information.

jswhit2 and others added 19 commits February 4, 2020 13:45
* netcdf parallel writing and lon/lat in netcdf file

* some changes to get it to (almost) run on hera

* lat should be in degrees - remove conversion to radians.

* import updates from jswhit/fv3atm

* more bug fixes - now works on hera

* specify collective access if compression turned on.

* use classic model

* bug fixes for parallel IO with compression

* fix calculation of max compression error

* turn off shuffle filter

* code simplification

* remove debug print

* don't use parallel IO for 2d file (since it seems to increase run time)

* allow multiple values of output_file, as long as they all start with 'netcdf'

* use default chunksize for 2d vars

* delete commented out macro ESMF_ERR_ABORT

* delete rad2dg

* add module_write_netcdf_parallel.F90

* add option to build without parallel netcdf (-DNO_PARALLEL_NETCDF)

* fix typo

* stub file for building without parallel netcdf lib

* allow chunksizes for 2d arrays to be set in model_configure (ichunk2d,jchunk2d)
Default is size of array on each write task.

* add ichunk3d,jchunk3d,kchunk3d to specify 3d chunksizes.
Default is now ichunk3d,jchunk3d same as array size on each PE, kchunk3d=nlevs
This results in the fastest writes on hera.

* fix typo

* put ifdefs in module_write_netcdf_parallel.F90 so no stub file needed

* don't need this file anymore

* remove module_write_netcdf_parallel_stub.o target

* use specified chunksizes for serial IO. If chunksize parameter negative, let netcdf library choose defaults.

* update comments

* get output_file without esmf call error

* syntax fix

* fix stub interface in module_write_netcdf_parallel.F90 for cmake build

Co-authored-by: junwang-noaa <37633869+junwang-noaa@users.noreply.github.com>
* add namelist variable iau_drymassfixer and use consistent coupled fields
* dump out coupled fields in native grid for fv3
* add default(none) for openmp in post_gfs.F90
* update fv3 dycore with reproduce option in g_sum
* change fv3 dycore to point to the NOAA-EMC dev/emc branch
* 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)
… model runs (NOAA-EMC#86)

* make rain/snow tendency consistent with accumulated rain/snow

* put drain_cpl and dsnow_cpl in proper container

* Updates of IPD and CCPP code to regain bit-for-bit identical results for coupled model runs

* Update .gitmodules and submodule pointer for ccpp-physics for code review and testing

* gfsphysics/GFS_layer/GFS_physics_driver.F90: need to initialize local variables for bit-for-bit identical results

* Bugfix in gfsphysics/GFS_layer/GFS_typedefs.F90, allocate Tbd%drain_cpl and Tbd%dsnow_cpl when cplchm or cplflx is true

* Remove local/interstitial variables for seaice coupling, add suite definition file for S2S benchmark runs

* Rename S2S suite suite_FV3_GFS_2017_coupled_satmedmf.xml to suite_FV3_GFS_2017_satmedmf_coupled.xml

* Revert change to .gitmodules and update submodule pointer for ccpp-physics

Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com>
Co-authored-by: Philip Pegion <Philip.Pegion@noaa.gov>
* Update .gitmodules and submodule pointers for GFDL_atmos_cubed_sphere, ccpp-framework, ccpp-physics for code review and testing

* Merge NCAR:dtc/develop into NOAA-EMC:develop

- RRTMGP in CCPP
- build system improvement: get CCPP kind and type definitions from CCPP framework, remove libxml2 from static CCPP build
- cleanup radiation tendencies in CCPP
- required cmake version now 3.0
- missing code changes for MG-IN-CCN update (from code review)
* Porting to Orion
* Remove old comments/code related to arguments mismatch (ifdef __GFORTRAN__)
* Remove CCPP dynamic build from framework
* Bug fix in ccpp/driver/CCPP_driver.F90
…owup bugfix (NOAA-EMC#104)

* point to ccpp branch chsp_latlon_post

* add chsp code changes from Jongil

Co-authored-by: Jongil Han <jingil.han@noaa.gov>

* add landsfcmdl variable to model sfc history file meta data

* add global latlon grid on write grid component, code changes from Jeffrey Whitaker

Co-authored-by: Jeffrey Whitaker <Jeffrey.S.Whitaker@noaa.gov>

* add chsp code changes in ccpp-physics

Co-authored-by: Jongil Han <jongil.han@noaa.gov>

* remove support for legacy Intel compilers in CCPP gmake build

Co-authored-by: Dom Heinzeller <dom.heinzeller@noaa.gov>

* update ccpp physics, fix syntax error

* update sflx.f in ccpp physics

* CCN-IN followup bugfix

Co-authored-by: Grant Firl <grantf@ucar.edu>

* Bugfix for GNU compiler in io/module_wrt_grid_comp.F90; bugfix in gfsphysics/physics/sfc_diff.f; updates for CCPP

* merge fv3 dycore ccpp framework and physics to the latest repoes

* cmeps integration changes

Co-authored-by: Denise Worthen <Denise.Worthen@noaa.gov>

* update CCPP with tsfcl change

* fix timestr in module_cap_cpl.F90

* fix syntax error in ugwp_driver_v0.F

* point ccpp/physics back to NCAR master

Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
Co-authored-by: Jeffrey Whitaker <Jeffrey.S.Whitaker@noaa.gov>
Co-authored-by: Jongil Han <jongil.han@noaa.gov>
Co-authored-by: Dom Heinzeller <dom.heinzeller@noaa.gov>
Co-authored-by: Grant Firl <grantf@ucar.edu>
Co-authored-by: Dom Heinzeller <climbfuji@ymail.com>
Co-authored-by: Denise Worthen <Denise.Worthen@noaa.gov>
Updates to cellular automata for deep convection. Some cleaning. Changes goes with updates in stochastic_physics and ccpp/physics repositories.
…c-v4 back to master (NOAA-EMC#113)

* Update CCPP version number from 3 to 4
* gfsphysics/GFS_layer/GFS_physics_driver.F90: update comment on location of code in CCPP
* Add no_nsst CCPP suites from public release
* Bugfixes for CCPP: check for and correct syntax of \htmlinclude lines
…s.F90, ... (NOAA-EMC#115)

* atmos_model.F90: bugfix for GNU compiler
* Update CCPP suite definition files suite_FV3_GFS_2017_gfdlmp_regional.xml and suite_FV3_GFS_2017_gfdlmp_regional_c768.xml
* gfsphysics/CCPP_layer/CCPP_typedefs.F90: set pointers to hydrometeors only if valid
* Remove non-existent include directory namphysics
…, ccpp-framework and ccpp-physics for code review and testing
@climbfuji
Copy link
Author

@joeolson42 @tanyasmirnova @hannahcbarnes @haiqinli please see commit dabf9e6 for the new RAP/HRRR suite definition file

@tanyasmirnova
Copy link
Collaborator

Dom,
The parts I am familiar with (radiation, lsm) look good to me. One comment: I would change the name to suite_FV3_HRRR.xml instead of suite_FV3_RAPHRRR.xml. The RAP model at 13-km resolution does use convective scheme, which is not included into this suite definition.
Thank you,
Tanya

…tmos_cubed_sphere, ccpp-framework, ccpp-physics
@DomHeinzeller DomHeinzeller merged commit c441a8e into NOAA-GSL:gsd/develop May 20, 2020
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.