-
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
Add phosphorous deposition stream file to ALM #391
Conversation
scripts/out file should not have been committed. |
3 commits all with the same commit message and 30 files changed? That is not enough information. |
069ad8c
to
874fd9a
Compare
@acme-y9s : Could you also update the message describing this PR?
Thanks. |
@acme-y9s Btw, thanks for squashing three commits into a single commit. |
Do we expect any acme_developer tests to fail when this PR is merged into next? |
I don't think it will cause the acme_developer tests to fail. I just added a new stream file and it will only change the result when the P cycle is on. Xiaoying Shi From: Gautam Bisht <notifications@github.commailto:notifications@github.com> Do we expect any acme_developer tests to fail when this PR is merged into next? Reply to this email directly or view it on GitHubhttps://github.com//pull/391#issuecomment-151231136. |
@acme-y9s: This PR is not just making changes to namelist, but is also modifying source-code. Thus, please run acme_developer tests on Titan/Edison/Cetus/Mira and report failure or success of tests.
Since you created
Btw, you forgot to include 'lnd' in your branch name, which should have been acme-y9s/lnd/pdepos. No need to fix the branch name for this PR, but something to keep in mind when you create the next branch. |
I do not have accounts on all Machines. I tried the test suit last Thursday on Titan, but have not finished all the procedures yet, will wrap up it on Titan tomorrow. Xiaoying Shi From: Gautam Bisht <notifications@github.commailto:notifications@github.com> @acme-y9shttps://github.com/acme-y9s: This PR is not just making changes to namelist, but is also modifying source-code. Thus, please run acme_developer tests on Titan/Edison/Cetus/Mira and report failure or success of tests. git checkout acme-y9s/pdepos git log -n 5 --oneline --graph --decorate
Since you created acme-y9s/pdepos branch starting from master at 526f878
Btw, you forgot to include 'lnd' in your branch name, which should have been acme-y9s/lnd/pdepos. No need to fix the branch name for this PR, but something to keep in mind when you create the next branch. Reply to this email directly or view it on GitHubhttps://github.com//pull/391#issuecomment-151264258. |
I didn't mean to imply that you have to run the tests on all machines. Running the acme_developer test on a single machine is sufficient. |
For the record, I added line breaks to the single line message describing this PR. |
Please rename this PR to be more descriptive. |
@acme-y9s : Any luck getting the tests running on Titan? If Titan is taking too long, Edison might be quicker to get the testing done. |
I tried several times, but It seems to me not all the cases are done. You can see there are some cases are missed in the below summary. It is my first time doing this test suit,I am not sure what exactly happened. PASS ERS.f19_g16_rx1.A.titan_pgi PASS ERS.f19_g16_rx1.A.titan_pgi.memleak PASS ERS.f19_g16_rx1.A.titan_pgi.compare_hist.baseline_testcases PASS ERS.f19_g16_rx1.A.titan_pgi.memcomp.baseline_testcases PASS ERS.f19_g16_rx1.A.titan_pgi.tputcomp.baseline_testcases FAIL ERS.f19_g16_rx1.A.titan_pgi.C.acme_dev.nlcomp PASS ERS.f45_g37.B1850C5.titan_pgi PASS ERS.f45_g37.B1850C5.titan_pgi.memleak PASS ERS.f45_g37.B1850C5.titan_pgi.compare_hist.baseline_testcases PASS ERS.f45_g37.B1850C5.titan_pgi.memcomp.baseline_testcases PASS ERS.f45_g37.B1850C5.titan_pgi.tputcomp.baseline_testcases FAIL ERS.f45_g37.B1850C5.titan_pgi.C.acme_dev.nlcomp PASS ERS.f45_g37_rx1.DTEST.titan_pgi PASS ERS.f45_g37_rx1.DTEST.titan_pgi.memleak PASS ERS.f45_g37_rx1.DTEST.titan_pgi.compare_hist.baseline_testcases PASS ERS.f45_g37_rx1.DTEST.titan_pgi.memcomp.baseline_testcases PASS ERS.f45_g37_rx1.DTEST.titan_pgi.tputcomp.baseline_testcases FAIL ERS.f45_g37_rx1.DTEST.titan_pgi.C.acme_dev.nlcomp PASS ERS.ne30_g16_rx1.A.titan_pgi PASS ERS.ne30_g16_rx1.A.titan_pgi.memleak PASS ERS.ne30_g16_rx1.A.titan_pgi.compare_hist.baseline_testcases PASS ERS.ne30_g16_rx1.A.titan_pgi.memcomp.baseline_testcases FAIL ERS.ne30_g16_rx1.A.titan_pgi.tputcomp.baseline_testcases COMMENT tput_decr = 12.876 tput_percent_decr = 10.4 FAIL ERS.ne30_g16_rx1.A.titan_pgi.C.acme_dev.nlcomp PASS ERS_IOP.f19_g16_rx1.A.titan_pgi PASS ERS_IOP.f19_g16_rx1.A.titan_pgi.memleak PASS ERS_IOP.f19_g16_rx1.A.titan_pgi.compare_hist.baseline_testcases PASS ERS_IOP.f19_g16_rx1.A.titan_pgi.memcomp.baseline_testcases FAIL ERS_IOP.f19_g16_rx1.A.titan_pgi.tputcomp.baseline_testcases COMMENT tput_decr = 0.7850000 tput_percent_decr = 2.15 PASS ERS.f19_g16_rx1.A.titan_pgi PASS ERS.f19_g16_rx1.A.titan_pgi.memleak FAIL ERS_IOP.f19_g16_rx1.A.titan_pgi.C.acme_dev.nlcomp PASS ERS_IOP.f45_g37_rx1.DTEST.titan_pgi PASS ERS_IOP.f45_g37_rx1.DTEST.titan_pgi.memleak PASS ERS_IOP.f45_g37_rx1.DTEST.titan_pgi.compare_hist.baseline_testcases PASS ERS_IOP.f45_g37_rx1.DTEST.titan_pgi.memcomp.baseline_testcases PASS ERS_IOP.f45_g37_rx1.DTEST.titan_pgi.tputcomp.baseline_testcases PASS ERS.f45_g37_rx1.DTEST.titan_pgi PASS ERS.f45_g37_rx1.DTEST.titan_pgi.memleak FAIL ERS_IOP.f45_g37_rx1.DTEST.titan_pgi.C.acme_dev.nlcomp PASS ERS_IOP.ne30_g16_rx1.A.titan_pgi PASS ERS_IOP.ne30_g16_rx1.A.titan_pgi.memleak PASS ERS_IOP.ne30_g16_rx1.A.titan_pgi.compare_hist.baseline_testcases PASS ERS_IOP.ne30_g16_rx1.A.titan_pgi.memcomp.baseline_testcases FAIL ERS_IOP.ne30_g16_rx1.A.titan_pgi.tputcomp.baseline_testcases COMMENT tput_decr = 10.563 tput_percent_decr = 8.67 PASS ERS.ne30_g16_rx1.A.titan_pgi PASS ERS.ne30_g16_rx1.A.titan_pgi.memleak FAIL ERS_IOP.ne30_g16_rx1.A.titan_pgi.C.acme_dev.nlcomp PASS ERS_IOP4c.f19_g16_rx1.A.titan_pgi PASS ERS_IOP4c.f19_g16_rx1.A.titan_pgi.memleak PASS ERS_IOP4c.f19_g16_rx1.A.titan_pgi.compare_hist.baseline_testcases PASS ERS_IOP4c.f19_g16_rx1.A.titan_pgi.memcomp.baseline_testcases FAIL ERS_IOP4c.f19_g16_rx1.A.titan_pgi.tputcomp.baseline_testcases COMMENT tput_decr = 1.296 tput_percent_decr = 3.68 PASS ERS.f19_g16_rx1.A.titan_pgi PASS ERS.f19_g16_rx1.A.titan_pgi.memleak FAIL ERS_IOP4c.f19_g16_rx1.A.titan_pgi.C.acme_dev.nlcomp PASS ERS_IOP4c.ne30_g16_rx1.A.titan_pgi PASS ERS_IOP4c.ne30_g16_rx1.A.titan_pgi.memleak PASS ERS_IOP4c.ne30_g16_rx1.A.titan_pgi.compare_hist.baseline_testcases PASS ERS_IOP4c.ne30_g16_rx1.A.titan_pgi.memcomp.baseline_testcases FAIL ERS_IOP4c.ne30_g16_rx1.A.titan_pgi.tputcomp.baseline_testcases COMMENT tput_decr = 10.91 tput_percent_decr = 12.1 PASS ERS.ne30_g16_rx1.A.titan_pgi PASS ERS.ne30_g16_rx1.A.titan_pgi.memleak FAIL ERS_IOP4c.ne30_g16_rx1.A.titan_pgi.C.acme_dev.nlcomp PASS ERS_IOP4p.f19_g16_rx1.A.titan_pgi PASS ERS_IOP4p.f19_g16_rx1.A.titan_pgi.memleak PASS ERS_IOP4p.f19_g16_rx1.A.titan_pgi.compare_hist.baseline_testcases PASS ERS_IOP4p.f19_g16_rx1.A.titan_pgi.memcomp.baseline_testcases FAIL ERS_IOP4p.f19_g16_rx1.A.titan_pgi.tputcomp.baseline_testcases COMMENT tput_decr = 0.2679999 PASS ERS.f19_g16_rx1.A.titan_pgi PASS ERS.f19_g16_rx1.A.titan_pgi.memleak FAIL ERS_IOP4p.f19_g16_rx1.A.titan_pgi.C.acme_dev.nlcomp PASS ERS_IOP4p.ne30_g16_rx1.A.titan_pgi PASS ERS_IOP4p.ne30_g16_rx1.A.titan_pgi.memleak PASS ERS_IOP4p.ne30_g16_rx1.A.titan_pgi.compare_hist.baseline_testcases PASS ERS_IOP4p.ne30_g16_rx1.A.titan_pgi.memcomp.baseline_testcases FAIL ERS_IOP4p.ne30_g16_rx1.A.titan_pgi.tputcomp.baseline_testcases COMMENT tput_decr = 7.7010000 tput_percent_decr = 5.86 PASS ERS.ne30_g16_rx1.A.titan_pgi PASS ERS.ne30_g16_rx1.A.titan_pgi.memleak FAIL ERS_IOP4p.ne30_g16_rx1.A.titan_pgi.C.acme_dev.nlcomp PASS NCK.f19_g16_rx1.A.titan_pgi PASS NCK.f19_g16_rx1.A.titan_pgi.compare_hist.baseline_testcases FAIL NCK.f19_g16_rx1.A.titan_pgi.C.acme_dev.nlcomp RUN PEA_P1_M.f45_g37_rx1.A.titan_pgi.C.acme_dev PASS SMS.f19_f19.I1850CLM45CN.titan_pgi PASS SMS.f19_f19.I1850CLM45CN.titan_pgi.memleak PASS SMS.f19_f19.I1850CLM45CN.titan_pgi.compare_hist.baseline_testcases PASS SMS.f19_f19.I1850CLM45CN.titan_pgi.memcomp.baseline_testcases FAIL SMS.f19_f19.I1850CLM45CN.titan_pgi.tputcomp.baseline_testcases COMMENT tput_decr = 0.34 FAIL SMS.f19_f19.I1850CLM45CN.titan_pgi.C.acme_dev.nlcomp PASS SMS.ne30_f19_g16_rx1.A.titan_pgi PASS SMS.ne30_f19_g16_rx1.A.titan_pgi.memleak PASS SMS.ne30_f19_g16_rx1.A.titan_pgi.compare_hist.baseline_testcases PASS SMS.ne30_f19_g16_rx1.A.titan_pgi.memcomp.baseline_testcases PASS SMS.ne30_f19_g16_rx1.A.titan_pgi.tputcomp.baseline_testcases FAIL SMS.ne30_f19_g16_rx1.A.titan_pgi.C.acme_dev.nlcomp Xiaoying Shi From: Gautam Bisht <notifications@github.commailto:notifications@github.com> @acme-y9shttps://github.com/acme-y9s : Any luck getting the tests running on Titan? If Titan is taking too long, Edison might be quicker to get the testing done. Reply to this email directly or view it on GitHubhttps://github.com//pull/391#issuecomment-152599820. |
Can you point me to your test directory on Titan, so I can investigate what is the cause of *nlcomp failures? |
For this nlcomp failures, I think it should be related to I changed the namelist files. My test directory is /lustre/atlas1/cli112/scratch/y9s/acme_dev/ Xiaoying Shi From: Gautam Bisht <notifications@github.commailto:notifications@github.com> Can you point me to your test directory on Titan, so I can investigate what is the cause of *nlcomp failures? Reply to this email directly or view it on GitHubhttps://github.com//pull/391#issuecomment-152607250. |
I can't access your scratch directory. Can you either:
You are probably correct that the nlcomp failures are due to changes to namelist files, but let's confirm it. |
I copied my whole test directory to proj-shared, /lustre/atlas1/cli112/proj-shared/y9s/acme_dev Xiaoying Shi From: Azamat Mametjanov <notifications@github.commailto:notifications@github.com> I can't access your scratch directory. Can you either:
You are probably correct that the nlcomp failures are due to changes to namelist files, but let's confirm it. Reply to this email directly or view it on GitHubhttps://github.com//pull/391#issuecomment-152612022. |
So it turns out that you didn't have correct version of python loaded
Do a But, before you resubmit the tests, can you confirm that you generated the baselines with git hash |
A quick question about how to run the test in background ? I used the below command line nohup ./create_test -xml_mach titan -xml_compiler pgi -xml_category acme_developer -testid acme_dev -testroot /lustre/atlas1/cli112/scratch/y9s/acme_dev -baselineroot /lustre/atlas1/cli112/scratch/y9s/acme_baseline -compare baseline_testcases -project cli112 >/lustre/atlas1/cli112/scratch/y9s/campare.log However, it did not work. Any ideas? Thank you! Xiaoying Shi From: Gautam Bisht <notifications@github.commailto:notifications@github.com> So it turns out didn't have correct version of python loaded more /lustre/atlas1/cli112/proj-shared/y9s/acme_dev/ERS.f19_g16_rx1.A.titan_pgi.C.acme_dev/TestStatus.out Do a module load python before resubmitting the tests. But, before you resubmit the tests, can you confirm that you generated the baselines with git hash 526f878 and are running comparison tests with git hash 874fd9a. Reply to this email directly or view it on GitHubhttps://github.com//pull/391#issuecomment-152635526. |
Thank you , I will load the correct version of python and try it again. Xiaoying Shi From: Gautam Bisht <notifications@github.commailto:notifications@github.com> So it turns out didn't have correct version of python loaded more /lustre/atlas1/cli112/proj-shared/y9s/acme_dev/ERS.f19_g16_rx1.A.titan_pgi.C.acme_dev/TestStatus.out Do a module load python before resubmitting the tests. But, before you resubmit the tests, can you confirm that you generated the baselines with git hash 526f878 and are running comparison tests with git hash 874fd9a. Reply to this email directly or view it on GitHubhttps://github.com//pull/391#issuecomment-152635526. |
Use the
Log out, go home and enjoy the weekend. The next time you do login Titan, remember to log back into the same |
This PR creates two expected nameless failures: FAIL ERS.f45_g37.B1850C5.titan_pgi.C.acme_dev.nlcomp |
Need to upload inputdata/lnd/clm2/pdepdata/fpdep_clm_hist_simyr2000_1.9x2.5_c150929.nc to ACME inputdata server. |
The phosphorus deposition data has been uploaded to ACME input data server. |
Thanks for the update. I will try to merge this in next. |
This commit adds phosphorus deposition stream file to ALM land surface model. This procedure is similar to add nitrogen deposition stream file. It is turned on by default, and will not change the result due to the phosphorus cycle turned off by default. It will change the result if the phosphorus cycle turned on. [NML] [BFB] Conflicts: components/clm/bld/CLMBuildNamelist.pm components/clm/src/biogeochem/CNEcosystemDynMod.F90 components/clm/src/biogeochem/CNStateType.F90 components/clm/src/main/clm_driver.F90 components/clm/src/main/clm_initializeMod.F90
@jgfouca : This PR is merged in next and has namelist changes. So, I expect that we will see four NLFAIL failures in nightly tests. |
@bishtgautam , thanks for the heads-up. I will rebless when I see them. |
This reverts commit dc2fe97. This commit adds phosphorus deposition stream file to ALM land surface model. This procedure is similar to add nitrogen deposition stream file. It is turned on by default, and will not change the result due to the phosphorus cycle turned off by default. It will change the result if the phosphorus cycle turned on. [NML] [BFB]
This commit adds phosphorus deposition stream file to ALM land surface model. This procedure is similar to add nitrogen deposition stream file. It is turned on by default, and will not change the result due to the phosphorus cycle turned off by default. It will change the result if the phosphorus cycle turned on. [NML] [BFB] Conflicts: components/clm/bld/CLMBuildNamelist.pm components/clm/src/biogeochem/CNEcosystemDynMod.F90 components/clm/src/biogeochem/CNStateType.F90 components/clm/src/main/clm_driver.F90 components/clm/src/main/clm_initializeMod.F90
@jgfouca : Now the commit is in master and there would be similar namelist failures on the nightly tests for master. @dmricciuto : With this merge a new phosphorous deposition stream can be read in, which is presently protected with |
Improve complete_run workflow
This commit adds phosphorus deposition stream file to ALM land surface model.
This procedure is similar to add nitrogen deposition stream file.
It is turned on by default, and will not change the result due to the
phosphorus cycle turned off by default.
It will change the result if the phosphorus cycle turned on.
[NML]
[BFB]