-
Notifications
You must be signed in to change notification settings - Fork 383
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
Update MPAS components for v1 ACME #412
Update MPAS components for v1 ACME #412
Conversation
751cd1e
to
f819da9
Compare
BFB? CC? |
On Titan using PGI, the preprocessor (.F to .f90) interprets '' as the last nonblank character on a line as a continuation character. In consequence, the comment lines (1132-1136) in
are turned into one very long comment line, and compilation then fails with the error message:
I replaced these with a different character (not as aesthetically pleasing) and mpas-cice compiled with no problems. |
@worleyph Thanks for testing this, I'll make sure those changes happen on the MPAS side. |
Also, on Titan and with PGI something is not working right with some of the timer names in mpas-cice. They are 512 characters long, and mostly blank. The list follows (number of characters, nonblank characters):
where XXX is one of
They all appear to be generated in routines in mpas_cice_analysis_driver.F by logic of the form
The fix may be to add the following line:
after each line of the indicated form. I'll update after my test job runs, but I may not get to this until tomorrow. ... Nope - that did not change anything. Initializing the variable timerName to " " did nothing either. I'll keep looking for a fix, but if someone know how to fix this, please speak up :-). |
@worleyph Were you talking about these lines? https://github.com/ACME-Climate/MPAS/blob/cice/develop/src/core_cice/shared/mpas_cice_advection_incremental_remap.F#L1132 |
@douglasjacobsen , yes, those lines. |
@douglasjacobsen and @worleyph, Could we fix the offending lines by putting exclamation points at the end, like so?
|
Changing the |
Update on long mpas-cice timers. The problem is not in the string operations in mpas_cice_analysis_driver.F . The string sizes in mpas_cice_analysis_driver.F are accurate. The string sizes are not accurate inside of mpas_timer.F . The logic is
The nlen is "accurate" in that trimed_name is 512 characters long. |
Adding |
@worleyph Can you test the following for the long timer names? NOTE: You have to make the change in all MPAS components that you will be using in a run (i.e. if you are using the B case, you need to make the change in all MAPS-O, MPAS-LI, and MPAS-CICE). Change this line: From: And this line: From: |
@douglasjacobsen , will do. I'm trying passing in trim(timer_name) directly to t_startf/t_stopf at the moment. Once this is complete (maybe 30 minutes), I'll try your fix. |
Okay, replacing
by
(and similarly for t_stopf) worked. I'll try the above next. |
@douglasjacobsen , this change
also worked. I'll start using this. Thanks. Pat |
This commit updates the driver_cpl code to include BGC and frazil ice formation fields, which will be needed by the ocean and sea ice components. [NML]
This commit updates the versions of the MPAS components to their v1 versions. Specifically, versions are: mpas-cice: da0748c mpas-o: a1bc4e5 mpasli: 216448c Changes included are: MPAS-CICE: - Advection - BGC - Improved column package - Improved timers - Analysis infrastructure MPAS-O: - Several bug fixes - Additional analysis members - OpenMP - Performance improvements - Improved timers MPAS-LI: - Calving law - Thermodynamic solver - Analysis infrastructure
1b99456
to
aac0736
Compare
…xt (PR #412) This merge updates the MPAS components to include the scientific features for ACME v1 simulations. Additionally, it makes driver changes required to handle frazil ice between MPAS-O and MPAS-CICE, and to add BGC fields to MPAS-CICE. [CC] [NML] * douglasjacobsen/mpas/update-mpas-components-v1: Update MPAS components for ACME v1 simulations Modifying driver_cpl code to include BGC and frazil fields
Merged to next |
This merge updates the MPAS components to include the scientific features for ACME v1 simulations. Additionally, it makes driver changes required to handle frazil ice and BGC between MPAS-O and MPAS-CICE. [CC] [NML] * douglasjacobsen/mpas/update-mpas-components-v1: Update MPAS components for ACME v1 simulations Modifying driver_cpl code to include BGC and frazil fields
This merge updates the MPAS components to include the scientific features for ACME v1 simulations. Additionally, it makes driver changes required to handle frazil ice and BGC between MPAS-O and MPAS-CICE. [CC] [NML] * douglasjacobsen/mpas/update-mpas-components-v1: Update MPAS components for ACME v1 simulations Modifying driver_cpl code to include BGC and frazil fields
This merge updates the MPAS components to include the scientific features for ACME v1 simulations.
Additionally, it makes driver changes required to handle frazil ice and BGC between MPAS-O and MPAS-CICE.
[CC]
[NML]