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

Bug fixes from NCAR:dyn(int to real),mem alloc fixes for modal aerosols #297

Merged

Conversation

singhbalwinder
Copy link
Contributor

This commit fixes the following bugs reported by NCAR:

  • All dynamic cores had an int in the denominator of an equation which
    should be real.
  • There were memory allocation bugs in modal aerosol files which are
    fixed. NCAR had a lot of other changes in these files. I took only the
    changes which are relevant to ACME codes.

See issues #293 and #292 for more details

Fixes #292, Fixes #293
[BFB]
AG-331, AG-332

This commit fixes the following bugs reported by NCAR:
- All dynamic cores had an int in the denominator of an equation which
should be real.
- There were memory allocation bugs in modal aerosol files which are
fixed. NCAR had a lot of other changes in these files. I took only the
changes which relevant to ACME codes.

See issues #293 and #292 for more details

Fixes #292, Fixes #293
[BFB]
AG-331, AG-332
@singhbalwinder
Copy link
Contributor Author

Passes acme_developer tests

@gold2718
Copy link

Balwinder,
Is there any way we can coordinate on moving code from NCAR to ACME? Every time you bring in a bunch of changes from NCAR, I have to redo my porting work on those files (since interfaces have changed in most of them). This is leading to a lot of duplication of effort.
Thanks,
--Steve

@singhbalwinder
Copy link
Contributor Author

Sure. Please let me know if you want me to hold off on merging these to master or any other solution which you prefer.

@gold2718
Copy link

This merge is already water under the bridge so go ahead and finish it. What would help would be to include me in the conversation when you decide you would like a fix or addition from NCAR (i.e., before moving code). Then, I could tell you if I already have that in my fork.

@singhbalwinder
Copy link
Contributor Author

Ok. Sounds good. I will let you know beforehand if I am going to incorporate any fixes or changes from NCAR into ACME.

@singhbalwinder
Copy link
Contributor Author

@susburrows : If you think you are too busy to integrate this branch, please feel free to assign it to other integrators.

@susburrows
Copy link
Contributor

Hi Balwinder, I can do it. Can you let me know if you ran the acme_developer test suite?

@susburrows
Copy link
Contributor

Never mind, I see that you mentioned it above. I'll do this one right away.

susburrows added a commit that referenced this pull request Aug 12, 2015
Bug fixes from NCAR:dyn(int to real),mem alloc fixes for modal aerosols

This commit fixes the following bugs reported by NCAR:

- All dynamic cores had an int in the denominator of an equation which
  should be real.

- There were memory allocation bugs in modal aerosol files which are
  fixed. NCAR had a lot of other changes in these files. I took only
  the changes which are relevant to ACME codes.

See issues #293 and #292 for more details

Passes acme_developer tests.

Fixes #292, Fixes #293
[BFB]
AG-331, AG-332
@rljacob
Copy link
Member

rljacob commented Aug 12, 2015

The next merge commit message title is missing "into next":
Merge 'singhbalwinder/atm/ncar-fixes-euldyn-water-uptake' (PR #297)
should say
Merge branch 'singhbalwinder/atm/ncar-fixes-euldyn-water-uptake' into next (PR #297)

@susburrows
Copy link
Contributor

I know, but the title then exceeds 72 characters and the repo hooks won't let me commit it. This is because the branch name is so long. What do you suggest we do?

@rljacob
Copy link
Member

rljacob commented Aug 12, 2015

I don't know but lets discuss on https://acme-climate.atlassian.net/wiki/display/SE/Help%3A+Git+and+GitHub

@susburrows
Copy link
Contributor

Since all tests are passing on next, I will merge this to master now.

@susburrows susburrows merged commit 762ff23 into master Aug 13, 2015
susburrows added a commit that referenced this pull request Aug 13, 2015
…297)

Bug fixes from NCAR:dyn(int to real),mem alloc fixes for modal aerosols

This commit fixes the following bugs reported by NCAR:

All dynamic cores had an int in the denominator of an equation which should be real.
There were memory allocation bugs in modal aerosol files which are fixed. NCAR had a lot of other changes in these files. I took only the changes which are relevant to ACME codes.
See issues #293 and #292 for more details

Fixes #292, Fixes #293
[BFB]
AG-331, AG-332
@susburrows susburrows deleted the singhbalwinder/atm/ncar-fixes-euldyn-water-uptake branch August 13, 2015 19:19
jonbob pushed a commit that referenced this pull request Jun 22, 2021
Merge to get #297 into coastal

* develop: (78 commits)
  Fixes byte to string conversion python3 error
  Add log message for lbc updates
  Update the descriptions of several initialization options for init case 9
  Change default value for config_blend_bdy_terrain to false
  Change default "lbc" stream's filename template to include minutes and seconds
  Communicate effective radii for cloud, ice, and snow between MPAS and WSM6
  Only access config_pio_stride and config_pio_num_iotasks when necessary
  Return error from read_stream() when inexact stream time not found
  Avoid calling mpas_atm_update_bdy_tend whenever config_apply_lbcs = false
  Fix race condition in file tests when clobber_mode = 'append' or 'overwrite'
  Remove broken log write of cf1,cf2,cf3 from init_atm_case_gfs
  When using specified zeta levels, set 'zt' for correct coordinate surface smoothing
  Introduce early check on whether boundary terrain blending will succeed or not
  Enable soundings to handle non-existence of config_sounding_interval option
  Check for a valid vertical grid in init_case 9 (LBC setup case)
  Update version number to 7.0
  Migrate code for modifying relhum into its own function, convert_relhum_wrt_ice
  Recompute initial RH w.r.t. ice below freezing for consistency with model output
  Verify that config_apply_lbcs is consistent with values in bdyMaskCell field
  Verify that the input_interval for the 'lbc_in' stream is not 'none'
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Change 86400_r8 to 86400._r8 in 3 restart_dynamics files Memory allocation errors in aerosol water uptake
4 participants