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

upgrade OPAC aerosol with more advanced MERRA2 aerosol #254

Merged
merged 13 commits into from
Mar 26, 2021

Conversation

AnningCheng-NOAA
Copy link
Contributor

@AnningCheng-NOAA AnningCheng-NOAA commented Mar 5, 2021

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?
Replace the 5 degree by 5 degree OPAC aerosol with 0.5 degree and 0.625 degree MERRA2 climatological aerosol. The data has been changed and the memory usage by the interpolation code has been decreased.

Is a change of answers expected from this PR?
yes. Expecting improvements on aerosol interactions with radiation and microphysics

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!)

Testing

How were these changes tested? regression tests
What compilers / HPCs was it tested with? default used by UFS
Are the changes covered by regression tests? (If not, why? Do new tests need to be added?) yes. no new tests needed
Have the ufs-weather-model regression test been run? On what platform? has been tested in orion, DELL, and Hera

  • Will the code updates change regression test baseline? If yes, why? Please show the baseline directory below. yes. Because New forcing from aerosol is used.
  • 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? yes
If so add the "waiting for other repos" label and list the upstream PRs

@AnningCheng-NOAA AnningCheng-NOAA changed the title changed .gitmodules to point to merra2 ccpp/physics upgrade OPAC aerosol with more advanced MERRA2 aerosol Mar 12, 2021
@@ -0,0 +1,23 @@
module aerclm_def
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please remove this file, IPD is gone.

Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This PR is behind the authoritative repositories and needs to be updated. I see submodule pointer updates that shouldn't be there (GFDL_atmos_cubed_sphere and ccpp-framework).

* upstream/develop:
  Add missing OpenMP dependency to ccpp/data/CMakeLists.txt and ccpp/driver/CMakeLists.txt (NOAA-EMC#258)
  Regional inlinepost (NOAA-EMC#229)
@AnningCheng-NOAA
Copy link
Contributor Author

AnningCheng-NOAA commented Mar 16, 2021 via email

@climbfuji
Copy link
Collaborator

HI, Dom: I have just brought my branch up to the latest trunk, but I get a message as "No submodule mapping found in .gitmodules for path 'atmos_cubed_sphere' ", when run "git clone --recursive --branch merra2 https://github.com/AnningCheng-NOAA/fv3atm". Do I need to run "git rm atmos_cubed_sphere"? Anning

No, all you need to do is make sure that after pulling in the updates for fv3atm develop, you update the submodule pointer (check out the correct/updated hash) for GFDL_atmos_cubed_sphere:

cd FV3
git remote update
git pull noaa-emc develop # or origin, depending on how you call the remote with url noaa-emc
git status
# if you see sth like "atmos_cubed_sphere (new commits)" then
git submodule update atmos_cubed_sphere

Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good except for the whitespace/tab changes in .gitmodules, but that can be fixed after ccpp-physics is merged. No need to do now.

.gitmodules Outdated
path = atmos_cubed_sphere
url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere
branch = dev/emc
path = atmos_cubed_sphere
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert all whitespace/tab changes in .gitmodules

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

done. Extra space and comment lines are removed.

Copy link
Collaborator

@climbfuji climbfuji left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Approved pending correct update of the submodule pointer and reversal of .gitmodules change.

@junwang-noaa junwang-noaa merged commit 597fe91 into NOAA-EMC:develop Mar 26, 2021
@yangfanglin
Copy link
Collaborator

yangfanglin commented Mar 26, 2021 via email

christinaholtNOAA added a commit to NOAA-GSL/fv3atm that referenced this pull request Jun 15, 2021
* Add NSSL 2-Moment Microphysics

* Update data structures to handle the additional tracer species in NSSL microphysics
* Add the code files for NSSL microphysics to the CCPP prebuild config

* Add suite for NSSL microphysics

* Add a CCPP suite to test NSSL microphysics

* Initialize ice fluxes and add "tiice" array (#119)

(1) Introducing a separate array "tiice" to store internal ice temperature. "tiice" will be added to phyf*nc output only when frac_grid=T.
(2) When cplflx=T, initializing ice fluxes by PBL calculated values when fluxes from CICE are unavailable.
(3) Adding frac_grid to namelist and no longer modifying it inside FV3GFS_io.F90. frac_grid=F by default.

* Remove cheyenne.pgi from CCPP config (#117)

remove cheyenne.pgi from CCPP config (ccpp/set_compilers.sh, ccpp/build_ccpp.sh)

* develop: merge HWRF version of saSAS with GFS version (#93)

* Merge branch 'man_hafs_sas_without_updates_of_dtc_develop_49b73a8f4149ca88f071dbaae81f1769b120f1e0' into HEAD
* gfsphysics/physics/GFS_debug.F90: add capability to debug 1-d logical arrays
* Clean up error messages in gfsphysics/GFS_layer/GFS_typedefs.F90

Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>

* Merge GFDL FV3 dynamic core new (201912) version (#65)

* Change 'mytile' to 'mygrid' corresponding to the change in atmos_cubed_sphere

* GFS.v16.0.4 physics update (#128)

* physics update from GFS.v16.0.4
* GFS.v16.0.4 physics udpate
* remove whitespaces in sfc_diff.f
* keep z0 unchanged in coupled mode in sfc_diff.f
* fix IPD run
* point to NCAR ccpp-physics branch

Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>

* Update for GFDL_atmos_cubed_sphere (dycore GNU bugfix) (#131)

* Bugfix for regional runs when dycore is compiled in double precision (#133)

* Update .gitmodules and submodule pointer for fv3atm for code review and testing

* Revert change to .gitmodules and update submodule pointer for GFDL_atmos_cubed_sphere

* Update develop from gsd/develop 2020/06/30 (#134)

- output of auxiliary arrays (2d, 3d) from CCPP to assist developers debugging their physics
- correctly output 3-dim tendencies for t, u, v, qv, ozone from CCPP physics
- mandatory changes for the CCPP framework updates to handle blocked data structures correctly: fix inconsistent use of `horizontal_dimension` (ix) versus `horizontal_loop_extent` (im) and other metadata corrections
- remove old pset logic from `ccpp_prebuild_config.py` (was required for CCPP dynamic build)
- updates to all suite definition files: change the order of interstitial schemes get_phi_fv3+GFS_suite_interstitial_3 and GFS_DCNV_generic_pre to match the logical flow (does not change the answer)
- move CCPP physics initialization calls in `atmos_model.F90` so that the physics can see the data from the restart files at initialization time
- add capability to read large-scale and small-scale orographic data when using GSL drag suite
- add additional fields to restart files as required for GSL physics updates
- new suite definition files for RAP and HRRR configurations
- capability to call radiation for the first `nhfrad` physics time steps for cold starts, afterwards on the cycle defined by the radiation time step

* Add regression tests with MULTI_GASES (#108)

* Update suite_FV3_GFS_2017_fv3wam.xml

* Remove unnecessary file from the CCPP prebuild configuration

* Add TACC frontera configuration

* Update to RAS in CCPP, update submodule pointer for ccpp-framework (CI tests) (NOAA-EMC#252)

* Reactivate mass flux arrays
* fix the argument list in inline_post_getattr and remove prints and post_gfs_stub.F90
* ccpp/data/GFS_typedefs.F90: correct initialization of Model%fscav
* Add FV3_GFS_v16_ras

* Cld perts (NOAA-EMC#233)

Addition of stochastic physics restarts in netCDF format that will be written at the restart interval, and at end of run.  
Also, addition of stochastic cloud perturbation and microphyiscs perturbations for SPPT.

* upgrade OPAC aerosol with more advanced MERRA2 aerosol (NOAA-EMC#254)

* changed .gitmodules to point to merra2 ccpp/physics
* revert .gitmodule

* update to Larissa version

* add atmos_cube_sphere and ccpp/physics as submodules

* add submodules of emc-2021-cloud

* update ccpp/physics: remove CAPS version mp_nssl_2mom

* ccpp/physics update: fix nssl mp reproducibility issue

* Updating pointer to ccpp/physics.

* Pointing to Christin's branch

* Adding new suite for NSSL physics.

* Updating suites to match HWT.

* Updating gitmodules

* Updating pointer to atmos_cubed_sphere.

Co-authored-by: Tim Supinie <tsupinie@ou.edu>
Co-authored-by: shansun6 <48043606+shansun6@users.noreply.github.com>
Co-authored-by: Dom Heinzeller <dom.heinzeller@icloud.com>
Co-authored-by: Dusan Jovic <dusan.jovic@noaa.gov>
Co-authored-by: XiaqiongZhou-NOAA <48254930+XiaqiongZhou-NOAA@users.noreply.github.com>
Co-authored-by: Jun Wang <37633869+junwang-noaa@users.noreply.github.com>
Co-authored-by: Jun Wang <junwang-noaa@users.noreply.github.com>
Co-authored-by: Phil Pegion <38869668+pjpegion@users.noreply.github.com>
Co-authored-by: AnningCheng-NOAA <48297505+AnningCheng-NOAA@users.noreply.github.com>
Co-authored-by: Jili Dong <jili.dong@noaa.gov>
SamuelTrahanNOAA pushed a commit to SamuelTrahanNOAA/fv3atm that referenced this pull request Jun 13, 2022
…led model (NOAA-EMC#254)

* Implements a bugfix for the mapping of ifrac for both nems_orig and nems_frac in CMEPS: issue (NCAR#17)[NOAA-EMC/CMEPS#17]
* Adds field-packing for performance improvements in CMEPS: issue (NCAR#23)[NOAA-EMC/CMEPS#23]
* Uses module file fv3_debug when DEBUG=Y is specified and fv3_debug is available
* Shortens the nems.configure file name used with the coupled model
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.

upgrade OPAC aerosol with more advanced MERRA2 aerosol
4 participants