Skip to content

Comments

Merge RAMS V6.3.04 code changes into INCUS prod #9

Merged
jenbukow merged 8 commits intoCSU-INCUS:prodfrom
jenbukow:prod_mergeV6.3.04
Mar 15, 2024
Merged

Merge RAMS V6.3.04 code changes into INCUS prod #9
jenbukow merged 8 commits intoCSU-INCUS:prodfrom
jenbukow:prod_mergeV6.3.04

Conversation

@jenbukow
Copy link
Collaborator

@jenbukow jenbukow commented Mar 13, 2024

Updating RAMS from V6.3.02 (Database V0) to V6.3.04 (Database V1).

Note: JB fixed all the merge conflicts between V6.3.02 and V6.3.04 on personal repository fork before pulling them into INCUS prod.

Pull request attempt2 of pulling changes from JB's repository. Pull attempt1 did not work and was closed.

@jenbukow jenbukow requested a review from ldgrantcsu March 13, 2024 17:58
Copy link
Collaborator

@ldgrantcsu ldgrantcsu left a comment

Choose a reason for hiding this comment

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

Everything looks really good! I checked it very carefully given the issues we had with all the merges. I added some comments in two files: the INCUS RAMSIN template (run/CCCX.X-M-V1/RAMSIN.INCUS.V1), and the mic_init file (src/micro/mic_init.f90).

There are a couple important things in the INCUS RAMSIN that need addressing especially the array length of sponge_tau to be the same as # of grids, the cn1np name in lite file output, and the namelist variables ccn1_max and ccn2_max instead of ccn_max1 and ccn_max2. The rest are just comments about the ccn-1 and ccn-2 names.

In mic_init I left I comment about the local variable names. See what you think if it's worth updating for clarity. (I don't think we should rename all the variables in the namelist at this point - I'm just looking at the variables local to the routine.)

Please can you address the namelist comments I left with a commit(s) to your rpod_mergeV6.3.04 branch and either commit changes or leave a comment reply on the mic_init file. Thanks!!

@ldgrantcsu
Copy link
Collaborator

Also I think it's worth noting here at the least, the places in the code where main RAMS v6.3.04 changes were discarded. Specifically, these relate to the IFN initialization profiles and associated ranges on the namelist variables to avoid conflicts with our INCUS-specific IFN profile initializations. (Files: src/io/rname.f90 and src/micro/mic_init.f90; were there any others?)

@jenbukow
Copy link
Collaborator Author

I put the SPICULE/MC3E code back into mic_init.f90 for the IFN initialization profiles, but commented that section out with notes that INCUS doesn't use it. Search for JB in the code to find this section.

Copy link
Collaborator

@ldgrantcsu ldgrantcsu 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!

@jenbukow jenbukow merged commit 54e6ab9 into CSU-INCUS:prod Mar 15, 2024
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.

2 participants