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

Add bc and pom in the coarse mode of the MAM3/MAM4 chem pkgs #416

Merged
merged 2 commits into from
Dec 9, 2015

Conversation

singhbalwinder
Copy link
Contributor

This commit adds BC and POM in the 3rd mode (coarse) of MAM3 and MAM4
chemistry packages. To run the model is this configuration, user
has to configure the model using "rain_evap_to_coarse_aero" option.
This option will act as a CPP directive where turning this on would
add BC and POM into the coarse mode of MAM3 or MAM4 chemistry
packages.

Another option "mam_amicphys_optaa_out" is added to control the invocation of amicphys codes.

This commit also fixes a bug in the chemistry preprocessor and a bug in RtmMod.F90 file.

Fixes #484

[BFB]
[NML]
[FCC]
AG-138

This commit adds BC and POM in the 3rd mode (coarse) of MAM3 and MAM4
chemistry packages. To run the model is this configuration, user
has to configure the model using "rain_evap_to_coarse_aero" option.
This option will act as a CPP directive where turning this on would
add BC and POM into the coarse mode of MAM3 or MAM4 chemistry
packages.

This commit also fixes a bug in the chemistry preprocessor.

[BFB]
@susburrows
Copy link
Contributor

This is a part of the polar mods, the design document for which is here: https://acme-climate.atlassian.net/wiki/display/AMD/A5+Polar+Mods+Design+Document

@rljacob rljacob added BFB PR leaves answers BFB Stealth PR has feature which, if turned on, could change climate. fka FCC labels Nov 9, 2015
This commit adds a new file modal_aero_amicphys.F90 and modify
associated codes. A new namelist option "mam_amicphys_optaa"
is added to control the invokation of this code. This peice of
code is invoked when "mam_amicphys_optaa" is set to 1 (default
is 0).

Fixes #484
susburrows added a commit that referenced this pull request Nov 30, 2015
…ows/atm/atm_integration (PR #416)

Add bc and pom in the coarse mode of the MAM3/MAM4 chem pkgs

This commit adds BC and POM in the 3rd mode (coarse) of MAM3 and MAM4
chemistry packages. To run the model is this configuration, user
has to configure the model using "rain_evap_to_coarse_aero" option.
This option will act as a CPP directive where turning this on would
add BC and POM into the coarse mode of MAM3 or MAM4 chemistry
packages.

Another option "mam_amicphys_optaa_out" is added to control the invocation of amicphys codes.

This commit also fixes a bug in the chemistry preprocessor and a bug in RtmMod.F90 file.

Fixes #484

[BFB]
[NML]
[FCC]
AG-138
susburrows added a commit that referenced this pull request Dec 8, 2015
…#416)

This commit adds BC and POM in the 3rd mode (coarse) of MAM3 and MAM4
chemistry packages. To run the model is this configuration, user has
to configure the model using "rain_evap_to_coarse_aero" option.  This
option will act as a CPP directive where turning this on would add BC
and POM into the coarse mode of MAM3 or MAM4 chemistry packages.

Another option "mam_amicphys_optaa_out" is added to control the
invocation of amicphys codes.

This commit also fixes a bug in the chemistry preprocessor and a bug
in RtmMod.F90 file.

Fixes #484

[BFB]
[NML]
[FCC]
AG-138

Conflicts:
	components/cam/src/chemistry/modal_aero/modal_aero_initialize_data.F90
@susburrows susburrows merged commit 5caba47 into master Dec 9, 2015
susburrows added a commit that referenced this pull request Dec 9, 2015
Add bc and pom in the coarse mode of the MAM3/MAM4 chem pkgs

This commit adds BC and POM in the 3rd mode (coarse) of MAM3 and MAM4
chemistry packages. To run the model is this configuration, user has
to configure the model using "rain_evap_to_coarse_aero" option.  This
option will act as a CPP directive where turning this on would add BC
and POM into the coarse mode of MAM3 or MAM4 chemistry packages.

Another option "mam_amicphys_optaa_out" is added to control the
invocation of amicphys codes.

This commit also fixes a bug in the chemistry preprocessor and a bug
in RtmMod.F90 file.

Fixes #484

[BFB]
[NML]
[FCC]
AG-138
@susburrows susburrows deleted the singhbalwinder/atm/add-bc-pom-coarse-mode branch December 9, 2015 22:22
susburrows added a commit that referenced this pull request Dec 9, 2015
A new chemical mechanism is needed for MAM4 with resuspension, since
the code adds new chemical species in the coarse mode aerosol.  This
update does the following:

- Adds the chemistry mechanism files (produced by campp) into the
  source code as the trop_mam4_resus package.
- Implements trop_mam4_resus in configure scripts.
- Adds cases to if-statements that depend on the chemistry package in
  use, where needed.

These changes are needed in order to be able to run the code
introduced in PR #416 without a user-provided chemical mechanism file.
The new configuration can be turned on by using the CAM_CONFIG_OPTS
options "-chem trop_mam4" and "-rain_evap_to_coarse_aero" in
combination.

[BFB]
[FCC]
AG-138
yjinho added a commit that referenced this pull request Dec 11, 2015
#539)

A new chemical mechanism is needed for MAM4 with resuspension, since
the code adds new chemical species in the coarse mode aerosol. This
update does the following:

Adds the chemistry mechanism files (produced by campp) into the source code as the trop_mam4_resus package.
Implements trop_mam4_resus in configure scripts.
Adds cases to if-statements that depend on the chemistry package in use, where needed.
These changes are needed in order to be able to run the code
introduced in PR #416 without a user-provided chemical mechanism file.
The new configuration can be turned on by using the CAM_CONFIG_OPTS
options "-chem trop_mam4" and "-rain_evap_to_coarse_aero" in
combination.

[BFB]
[FCC]
AG-138

Conflicts:
	components/cam/bld/config_files/definition.xml
	components/cam/bld/configure
	components/cam/src/physics/cam/modal_aer_opt.F90
	components/cam/src/physics/cam/nucleate_ice.F90
	components/cam/src/physics/cam/phys_control.F90
yjinho added a commit that referenced this pull request Dec 11, 2015
yjinho added a commit that referenced this pull request Dec 11, 2015
)

Fixes a merge error between changes introduced in #415 and #416

[BFB]
susburrows added a commit that referenced this pull request Dec 21, 2015
…416)"

This reverts commit b324144, reversing
changes made to b4cd63c.

Conflicts:
	components/cam/bld/build-namelist
	components/cam/src/chemistry/utils/modal_aero_calcsize.F90
@susburrows susburrows restored the singhbalwinder/atm/add-bc-pom-coarse-mode branch December 21, 2015 23:24
susburrows added a commit that referenced this pull request Dec 22, 2015
susburrows added a commit that referenced this pull request Dec 22, 2015
…#416)

Merge version of branch that is updated with commit to fix error in
bulk aerosol treatment that caused build failures (PR #547).

After merge of original branch for PR #416, compsets using the
prescribed aerosols / bulk aerosol treatment failed to build on some
machines. This merge fixes the bugs that caused these failures.

[BFB]
Fixes #545
susburrows added a commit that referenced this pull request Dec 22, 2015
…416)"

This reverts commit b324144, reversing
changes made to b4cd63c.

This merge caused a test failure in FC5PM compset, and is being
reverted pending new integration testing on next.
@susburrows
Copy link
Contributor

@rljacob , since I've reverted this code, is it possible to re-open the PR? Or should I just make a new one?

Also, there were some additional fixes that I identified / implemented after originally merging this, for which I opened separate PRs (#539 and #545). I've now merged those changes to the same branch and could merge the entire set of changes in one bundle this time around.

@rljacob
Copy link
Member

rljacob commented Dec 22, 2015

I don't see a "re-open merged PR" option. You'll probably just need to make a new PR for that same branch. Maybe @douglasjacobsen knows.

@susburrows
Copy link
Contributor

I couldn't find one either. I'll make a new PR.

@rljacob
Copy link
Member

rljacob commented Dec 22, 2015

Make a note that it replaces this PR (which will make a link). Do the same for any other new PR's needed.

susburrows added a commit that referenced this pull request Dec 23, 2015
susburrows added a commit that referenced this pull request Dec 23, 2015
…de' (PR #416)""

This reverts commit 21ecb5b.

This re-implements the merge of PR #416.
douglasjacobsen added a commit that referenced this pull request Dec 23, 2015
This merge removes merge conflicts caused by competing reverts.

* master:
  Revert "Revert "Merge branch 'singhbalwinder/atm/add-bc-pom-coarse-mode' (PR #416)""
  Revert "Merge branch 'singhbalwinder/atm/add-bc-pom-coarse-mode' (PR #416)"
jgfouca added a commit that referenced this pull request Jun 2, 2017
improve err by removing rundir files and recopying from sta rest dire…

Remove files from the run directory and replace them from the sta rest directory improving the
scope of the err test.

Test suite: scripts_regression_tests.py, ERR.f09_g16.B1850
Test baseline:
Test namelist changes:
Test status: bit for bit
Fixes #416

User interface changes?:

Code review: @jgfouca
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Atmosphere BFB PR leaves answers BFB bug fix PR Stealth PR has feature which, if turned on, could change climate. fka FCC
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Floating invalid in RtmMod.F90
4 participants