Creating Vertical Diffusion Solver #133
Conversation
Pull ZM 0.5 timestep removal into main
Replace original, locally-developed license with Apache 2.0 license.
Bring in development ESCOMP#108 (TUV-x) ESCOMP#112 (tropopause_find) to main
Bring in new directory structure from development
There was a problem hiding this comment.
Thanks @mwaxmonsky! This looks good, I just had a few minor comments. The most major one is just to check the name of the to-be-ccpp(-)ized folder since it's not in ESCOMP/atmospheric_physics now.
| @@ -0,0 +1,152 @@ | |||
| module coords_1d | |||
There was a problem hiding this comment.
Just confirming the directory is to be named to-be-ccpp-ized or to-be-ccppized (https://github.com/cacraigucar/atmospheric_physics/tree/atmos_phys_zmcleanup3/to_be_ccppized) since I've seen two variants around!
There was a problem hiding this comment.
Good catch @jimmielin!
@nusbaume, @cacraigucar, @peverwhee, we might have discussed this previously so my apologies for not taking better notes but do we have a preferred layout/naming convention for these non-ccppized files? Particularly with coords1d and linear_1d_operators being helper files (which might be needed by other files later) and the high level interface in the solver file.
I think having them at separate layers might be best for organization but not too sure on the naming conventions.
| ! The sizes must be consistent among all the coefficients that are | ||
| ! actually present, i.e. coef_q_diff and coef_q_adv should be one level | ||
| ! bigger than coef_q and coef_q_weight, and have the same column number. | ||
| real(r8), contiguous, intent(in), optional :: coef_q(:,:), & |
There was a problem hiding this comment.
Here contiguous is used directly but the CESM-specific CPP macro USE_CONTIGUOUS is used in coords_1d.F90 and linear_1d_operators.F90. Maybe the same macro could be used here?
There was a problem hiding this comment.
I think the old USE_CONTIGUOUS macro is not needed and should be discontinued. I think this harks back to a time when not all Fortran compilers supported the contiguous attribute.
There was a problem hiding this comment.
Since the solve module is a new wrapper around the solve step and the other 2 files are helper files being copied directly over from CAM, is it reasonable to leave linear_1d_operators and coords_1d as is and prefer contiguous in new/refactored code moving forward?
to-be-ccpp-ized/utilities/vertical_diffusion/vertical_diffusion_solver.F90
Show resolved
Hide resolved
to-be-ccpp-ized/utilities/vertical_diffusion/vertical_diffusion_solver.F90
Outdated
Show resolved
Hide resolved
There was a problem hiding this comment.
Thanks @mwaxmonsky for addressing my comments, I left the to-be-ccpp(-)ized and contiguous comments unresolved as there's some unfinished discussions on those. Once these are confirmed it should be good to go, I will approve the PR now.
Originator(s): mwaxmonsky
Summary (include the keyword ['closes', 'fixes', 'resolves'] and issue number):
Describe any changes made to the namelist: N\A
List all files eliminated and why: N\A
List all files added and what they do:
A to-be-ccpp-ized/utilities/coords_1d.F90
A to-be-ccpp-ized/utilities/linear_1d_operators.F90
A to-be-ccpp-ized/utilities/vertical_diffusion/vertical_diffusion_solver.F90
List all existing files that have been modified, and describe the changes: N\A
(Helpful git command:
git diff --name-status development...<your_branch_name>)List any test failures: None
Is this a science-changing update? New physics package, algorithm change, tuning changes, etc?
N\A