search

lanl / palm_lanl

LANL Contributions to PArallelized Large-eddy simulation Model (PALM)
3 stars 5 forks source link

Debug switch #6

Closed cbegeman closed 6 years ago

cbegeman commented 6 years ago

Added an option to palm_simple_build to compile palm in debug mode. compile_lanl was modified to demonstrate this option. Changed clean option from string to logical for consistency between palm_simple_build and palm_simple_run.

xylar commented 6 years ago

@cbegeman, it looks like there are changes here related to your ocean slope work, not just debug flags. Is that right? If so, it might be worth working together to disentangle these changes.

@vanroekel, could you review once we've cut this down to just the debug-related changes?

xylar commented 6 years ago

@cbegeman, I think what we want for this PR is for you to rebase only ad04c1c onto master. Assuming you have my remote as xylar, make sure you're on your debug_switch branch, and that would look like:

git rebase --interactive xylar/master

Pick only ad04c1c from the list of commits (delete the line with 4fd990f). Once the rebase is done,

git push --force origin debug_switch

Let me know if that gives you trouble.

vanroekel commented 6 years ago

Sure, happy to. Just let me know when to jump in.

cbegeman commented 6 years ago

@xylar Thanks for your help. It looks like I need to resolve a conflict before I can do this rebasing.

@vanroekel Should "make" be called twice in palm_simple_build, once with -f flag, once without?

vanroekel commented 6 years ago

@cbegeman, could you point to where you are thinking of in the code? The -f flag is normally only used to specify a makefile with a name other than Makefile or makefile. So I would think you shouldn't need to do this twice.

cbegeman commented 6 years ago

@vanroekel https://github.com/xylar/palm_les_lanl/blob/0f81695d09a2022820bd3798c87b0c029297ce70/trunk/SCRIPTS/palm_simple_build#L180

vanroekel commented 6 years ago

Thanks @cbegeman I missed that. We do need to keep both. The line before the one you reference builds the model. The one after builds the helper programs, most importantly the program to fill the 3d volume netcdf file.

cbegeman commented 6 years ago

@vanroekel Sounds good. I'm adding the debugging flag only to the model build.

cbegeman commented 6 years ago

@vanroekel I've rebased the branch, so it should be ready for your review.

cbegeman commented 6 years ago

@vanroekel I've added the suggested feature and I think I've cleaned up those files. Let me know if you notice anything else.

cbegeman commented 6 years ago

Thanks for catching that @vanroekel. I think it's ready now.

vanroekel commented 6 years ago

@xylar I think this is ready to merge unless you have any other comments.