-
Notifications
You must be signed in to change notification settings - Fork 157
cam6_4_093: Update CAM testing. #1309
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
Merged
Merged
Changes from 17 commits
Commits
Show all changes
21 commits
Select commit
Hold shift + click to select a range
4915ea3
define compset PC7
brian-eaton 6bb8a69
add description for PC7
brian-eaton 11c4d31
add PC7 test
brian-eaton 617e916
testlist updates
brian-eaton 6ea03e2
bypass some chem initialization for offline driver configurations
brian-eaton 7794621
Merge branch 'cam_development' of https://github.com/ESCOMP/CAM into …
brian-eaton 9c9e91c
fix ChangeLog
brian-eaton 358ee03
update to cam6_4_090
brian-eaton 6ecc1fa
update testing; cam7 radiation diagnostics
brian-eaton 8ba7927
update ChangeLog
brian-eaton 0d9bcdb
change ERR test to ne16pg3; cleanup ncdata entries
brian-eaton 684be89
mods for nag-7
brian-eaton c71a2e6
ChangeLog update
brian-eaton 8251705
merge to cam6_4_091
brian-eaton 005bbb9
namelist defaults and ChangeLog updates
brian-eaton 85e9b1a
Merge branch 'cam_development' of https://github.com/ESCOMP/CAM into …
brian-eaton 3914dac
ChangeLog update
brian-eaton c66c785
update .gitmodules
brian-eaton 9323e77
update .gitmodules
brian-eaton b7727ae
update .gitmodules
brian-eaton e4b5b17
fix testlist; final ChangeLog
brian-eaton File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 0 additions & 15 deletions
15
cime_config/testdefs/testmods_dirs/cam/cam6_port_f09_rrtmgp/user_nl_cam
This file was deleted.
Oops, something went wrong.
7 changes: 7 additions & 0 deletions
7
cime_config/testdefs/testmods_dirs/cam/cosp_rad_diags/shell_commands
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,7 @@ | ||
| CAM_CONFIG_OPTS=`./xmlquery CAM_CONFIG_OPTS --value` | ||
| if [[ $CAM_CONFIG_OPTS != *"-cosp"* ]]; then | ||
| ./xmlchange -append CAM_CONFIG_OPTS="-cosp" | ||
| fi | ||
| ./xmlchange ROF_NCPL=\$ATM_NCPL | ||
| ./xmlchange GLC_NCPL=\$ATM_NCPL | ||
| ./xmlchange RUN_STARTDATE="19950101" |
60 changes: 60 additions & 0 deletions
60
cime_config/testdefs/testmods_dirs/cam/cosp_rad_diags/user_nl_cam
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| mfilt=1,1,1,1,1,1 | ||
| ndens=1,1,1,1,1,1 | ||
| nhtfrq=9,9,9,9,9,9 | ||
| inithist='ENDOFRUN' | ||
|
|
||
| fexcl1='CFAD_DBZE94_CS','CLDTOT_CALCS','CLD_CAL_NOTCS','CS_MIXCERT','CS_MIXPOSS','CS_NOPRECIP', | ||
| 'CS_PIA','CS_RAINPOSS','CS_RAINPROB','CS_RAINCERT','CS_RAINHARD','CS_SNOWCERT','CS_SNOWPOSS' | ||
|
|
||
| mode_defs= | ||
| 'mam4_mode1:accum:=', 'A:num_a1:N:num_c1:num_mr:+', | ||
| 'A:so4_a1:N:so4_c1:sulfate:$DIN_LOC_ROOT/atm/cam/physprops/sulfate_rrtmg_c080918.nc:+', | ||
| 'A:pom_a1:N:pom_c1:p-organic:$DIN_LOC_ROOT/atm/cam/physprops/ocpho_rrtmg_c130709.nc:+', | ||
| 'A:soa_a1:N:soa_c1:s-organic:$DIN_LOC_ROOT/atm/cam/physprops/ocphi_rrtmg_c100508.nc:+', | ||
| 'A:bc_a1:N:bc_c1:black-c:$DIN_LOC_ROOT/atm/cam/physprops/bcpho_rrtmg_c100508.nc:+', | ||
| 'A:dst_a1:N:dst_c1:dust:$DIN_LOC_ROOT/atm/cam/physprops/dust_aeronet_rrtmg_c141106.nc:+', | ||
| 'A:ncl_a1:N:ncl_c1:seasalt:$DIN_LOC_ROOT/atm/cam/physprops/ssam_rrtmg_c100508.nc', | ||
| 'mam4_mode2:aitken:=', 'A:num_a2:N:num_c2:num_mr:+', | ||
| 'A:so4_a2:N:so4_c2:sulfate:$DIN_LOC_ROOT/atm/cam/physprops/sulfate_rrtmg_c080918.nc:+', | ||
| 'A:soa_a2:N:soa_c2:s-organic:$DIN_LOC_ROOT/atm/cam/physprops/ocphi_rrtmg_c100508.nc:+', | ||
| 'A:ncl_a2:N:ncl_c2:seasalt:$DIN_LOC_ROOT/atm/cam/physprops/ssam_rrtmg_c100508.nc:+', | ||
| 'A:dst_a2:N:dst_c2:dust:$DIN_LOC_ROOT/atm/cam/physprops/dust_aeronet_rrtmg_c141106.nc', | ||
| 'mam4_mode3:coarse:=', 'A:num_a3:N:num_c3:num_mr:+', | ||
| 'A:dst_a3:N:dst_c3:dust:$DIN_LOC_ROOT/atm/cam/physprops/dust_aeronet_rrtmg_c141106.nc:+', | ||
| 'A:ncl_a3:N:ncl_c3:seasalt:$DIN_LOC_ROOT/atm/cam/physprops/ssam_rrtmg_c100508.nc:+', | ||
| 'A:so4_a3:N:so4_c3:sulfate:$DIN_LOC_ROOT/atm/cam/physprops/sulfate_rrtmg_c080918.nc', | ||
| 'mam4_mode4:primary_carbon:=', 'A:num_a4:N:num_c4:num_mr:+', | ||
| 'A:pom_a4:N:pom_c4:p-organic:$DIN_LOC_ROOT/atm/cam/physprops/ocpho_rrtmg_c130709.nc:+', | ||
| 'A:bc_a4:N:bc_c4:black-c:$DIN_LOC_ROOT/atm/cam/physprops/bcpho_rrtmg_c100508.nc', | ||
| 'mam4_m1_noso4:accum:=', 'A:num_a1:N:num_c1:num_mr:+', | ||
| 'A:pom_a1:N:pom_c1:p-organic:$DIN_LOC_ROOT/atm/cam/physprops/ocpho_rrtmg_c130709.nc:+', | ||
| 'A:soa_a1:N:soa_c1:s-organic:$DIN_LOC_ROOT/atm/cam/physprops/ocphi_rrtmg_c100508.nc:+', | ||
| 'A:bc_a1:N:bc_c1:black-c:$DIN_LOC_ROOT/atm/cam/physprops/bcpho_rrtmg_c100508.nc:+', | ||
| 'A:dst_a1:N:dst_c1:dust:$DIN_LOC_ROOT/atm/cam/physprops/dust_aeronet_rrtmg_c141106.nc:+', | ||
| 'A:ncl_a1:N:ncl_c1:seasalt:$DIN_LOC_ROOT/atm/cam/physprops/ssam_rrtmg_c100508.nc', | ||
| 'mam4_m2_noso4:aitken:=', 'A:num_a2:N:num_c2:num_mr:+', | ||
| 'A:soa_a2:N:soa_c2:s-organic:$DIN_LOC_ROOT/atm/cam/physprops/ocphi_rrtmg_c100508.nc:+', | ||
| 'A:ncl_a2:N:ncl_c2:seasalt:$DIN_LOC_ROOT/atm/cam/physprops/ssam_rrtmg_c100508.nc:+', | ||
| 'A:dst_a2:N:dst_c2:dust:$DIN_LOC_ROOT/atm/cam/physprops/dust_aeronet_rrtmg_c141106.nc', | ||
| 'mam4_m3_noso4:coarse:=', 'A:num_a3:N:num_c3:num_mr:+', | ||
| 'A:dst_a3:N:dst_c3:dust:$DIN_LOC_ROOT/atm/cam/physprops/dust_aeronet_rrtmg_c141106.nc:+', | ||
| 'A:ncl_a3:N:ncl_c3:seasalt:$DIN_LOC_ROOT/atm/cam/physprops/ssam_rrtmg_c100508.nc' | ||
|
|
||
| rad_climate= | ||
| 'A:Q:H2O', 'N:O2:O2', 'A:CO2:CO2', 'N:ozone:O3', 'A:N2O:N2O', 'A:CH4:CH4', 'N:CFC11STAR:CFC11', 'A:CFC12:CFC12', | ||
| 'M:mam4_mode1:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode1_rrtmg_aeronetdust_sig1.6_dgnh.48_c140304.nc', | ||
| 'M:mam4_mode2:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode2_rrtmg_aitkendust_c141106.nc', | ||
| 'M:mam4_mode3:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode3_rrtmg_aeronetdust_c141106.nc', | ||
| 'M:mam4_mode4:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode4_rrtmg_c130628.nc', | ||
| 'N:VOLC_MMR1:$DIN_LOC_ROOT/atm/cam/physprops/volc_camRRTMG_byradius_sigma1.6_mode1_c210211.nc', | ||
| 'N:VOLC_MMR2:$DIN_LOC_ROOT/atm/cam/physprops/volc_camRRTMG_byradius_sigma1.6_mode2_c210211.nc', | ||
| 'N:VOLC_MMR3:$DIN_LOC_ROOT/atm/cam/physprops/volc_camRRTMG_byradius_sigma1.2_mode3_c210211.nc' | ||
| rad_diag_1= | ||
| 'A:Q:H2O', 'N:O2:O2', 'A:CO2:CO2', 'N:ozone:O3', 'A:N2O:N2O', 'A:CH4:CH4', 'N:CFC11STAR:CFC11', 'A:CFC12:CFC12' | ||
| rad_diag_2= | ||
| 'A:Q:H2O', 'N:O2:O2', 'A:CO2:CO2', 'N:ozone:O3', 'A:N2O:N2O', 'A:CH4:CH4', 'N:CFC11STAR:CFC11', 'A:CFC12:CFC12', | ||
| 'M:mam4_m1_noso4:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode1_rrtmg_aeronetdust_sig1.6_dgnh.48_c140304.nc', | ||
| 'M:mam4_m2_noso4:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode2_rrtmg_aitkendust_c141106.nc', | ||
| 'M:mam4_m3_noso4:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode3_rrtmg_aeronetdust_c141106.nc', | ||
| 'M:mam4_mode4:$DIN_LOC_ROOT/atm/cam/physprops/mam4_mode4_rrtmg_c130628.nc' | ||
|
|
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would suggest that perhaps the load balance tests (or at least one) should be run on the SE dycore as it is the dycore of the future, while the FV dycore has had discussions about being deprecated
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The FV dycore is the only one that uses the
phys_loadbalancecapability. The other dycores all use the version ofphys_grid.F90which Steve implemented to address weak scaling issues and which does not support physics load balancing.