incorporate updates for RAMS v6.3.03 into devel#3
Open
ldgrantcsu wants to merge 32 commits intodevelfrom
Open
Conversation
…or growth from evaporation into different variables.
…need to always change the version name directory. Git tags and release names will do this for us in the future.
…need since Git will handle version numbers and tags from now on.
Saleeby's version v6.3.03
Saleeby's updates for documentation for v6.3.03
Merge RAMS main updates for v6.3.03 release into INCUS RAMS main branch
Collaborator
Author
|
@smsaleeb Here's a good example of merge conflicts. I'm attempting to merge the updates for v6.3.03 into the INCUS-RAMS devel branch so the INCUS-RAMS devel updates can then be re-incorporated back into main RAMS. The merge conflicts are coming from the source directory version elimination, I think, and they need to be addressed manually via command line. Anyway, just wanted to highlight this in case you're interested. |
… grid to inner grid (by Leah Grant)
…nucleate new droplets at the minimum mean diameter.
…to improve ice crystal prediction, prevent artificial number adjustment, and permit small hydrometeor mixing ratio and number concentrations.
…perature in DeMott formula to -35C so that we do not improperly extrapolate nucleation rates to colder temperatures.
…can be either, and named them like CN1NP and CN2NP as condensation nuclei modes 1 & 2 number prognosed. Same done for the mass variables.
…nit_ifn. These are from SPICULE and MC3E field data. Also changed the CCN and GCCN naming convention in REVU files that had not been modified in previous commit.
Updated test simulation scripts and namelist to work correctly. Creating new version tag as v6.3.04 at this point.
Steve's updates past v6.3.03 for new tagged version v.6.3.04
… files to account for grib files that might not have the pressure levels already listed in order.
Updates to dprep Makefiles and Readme files. Also update to dprep f90…
Now that aerocat = 11 rather than 9, concen_tab should have a dimension of 11 rather than 9. Rather than hard-coding the value 11, I've changed the dimension to equal the value of aerocat. OLD: real, dimension(9) :: concen_tab NEW: real, dimension(aerocat) :: concen_tab
mic_nuc.f90 bug fix - dimension of concen_tab
Updating main branch to V6.3.04
Update to v6.3.4
Pulling RAMS Aggregation Code Changes (6.3.04a) into INCUS Main
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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.
It says "can't automatically merge," so there might be some conflicts in the changes made for INCUS and for v6.3.03. We'll see..