Skip to content

Commit

Permalink
Squashed 'cime/' changes from 51f1282..12d2135
Browse files Browse the repository at this point in the history
12d2135 Merge pull request #388 from ESMCI/jgfouca/need_to_report_build_exceptions
8f677cd Add test to ensure build fails report info to teststatus.log
7095ef0 Need to report build exception contents
7c9cc94 Merge pull request #387 from ESMCI/jgfouca/fix_case_build_return_code
bf941ed case.build needs to check success in order to return a sane error code
df432e8 update ChangeLog
154d5f8 Merge pull request #378 from ESMCI/rljacob/update-config-files
6b8fc76 Merge pull request #382 from ESMCI/sarich/fix-taskmaker-counter
5df46a2 Merge pull request #381 from jedwards4b/test_fixes
e58d624 component_compare_test was not properly reporting failures
0e0e577 Update acme config_files for mpas
84122dd Merge pull request #376 from ESMCI/jgfouca/changes_from_acme
38e2f8a More stuff from ACME
c86398e Merge pull request #375 from ESMCI/jgfouca/portable_run_cmd_utest
daaf621 Merge pull request #373 from ESMCI/jgfouca/enhance_bisect
e61ba96 Change MPAS compset for test
c77a64e Add homme python test
3031f00 Better support for 'none' module system
3ceef7b Make run_cmd_no_fail unit test more portable
bbd20fb Merge branch 'jgfouca/fix_module_list' (PR #374)
6eb8143 Reactivate creation of software_environment.txt
4dd30c6 Ensure module setup is sourced before list
c8bd20e fix bug in translation from perl
20a3412 cime_bisect: Add better support for modifying create_test run
77871de update changelog
e74906b comment out code until it works for tcsh users
4a13413 fix issue with module list
6ad4b2d update changelog
cef688d update changelog
835b511 Merge pull request #367 from jedwards4b/user_mod_0len_fix
b280b55 Merge pull request #362 from ESMCI/jgfouca/remove_perl_taskmaker
12a30ee Merge pull request #356 from ESMCI/jgfouca/minor_timing_chg
3fb0b80 Merge pull request #355 from ESMCI/jgfouca/wait_for_test_refactor
d083933 user_nl_ file was being removed if a user_nl file in any mods directory was missing
39de940 Fix comment
5d38420 Revert "Merge pull request #343 from ESMCI/wilke/scripts/xmlchange"
8dc2354 Merge pull request #363 from ESMCI/rljacob/machines/fix-acme
0773aac Increase default walltime for blues
c4dce0f Remove last uses of taskmaker.pl
76eb1bc Remove -A directive from edison
d67b267 Merge pull request #361 from billsacks/cism_nag
bf02e3e Merge pull request #357 from ekluzek/fixpionml
c9b8910 Seperate out modelio namelist definition since it uses the same names, but defines them differently
805ad7f Add -mismatch_all when compiling cism with nag
fff9a9b Set CHECK_TIMING to true in addition to SAVE_TIMING if --save-timing given to create_test
f25a518 wait_for_tests will now always specifically wait for the RUN phase
e19e72c Update drv buildnamelist test to work with cime5
db1538e Merge branch 'douglasjacobsen/add_lanl_machines' (PR #353)
893c6c6 Add support for LANL's mustang and wolf to cime
dea8a3a Merge pull request #350 from ESMCI/rerun_test_functionality
9b4488b Changes based on github feedback
c103e08 Add SAVE_TIMING_DIR for edison
98f95bb Merge pull request #341 from ESMCI/santos/fix-env-leakage
1b775e4 Fixes post-upstream-merge
ea97b56 Merge branch 'master' into rerun_test_functionality
1ca1b83 Merge pull request #348 from ESMCI/jayeshkrishna/machinefiles/get_acme_cime_dev_working_on_mira
252aea7 Merge pull request #343 from ESMCI/wilke/scripts/xmlchange
2db894f Add missing files
622b7d0 Complete
ba69385 progress
84000ee Fixing the runjob command for ACME on Mira
1a55232 Adding config for ERS_Ld3.ne30_g16_rx1.A test
d1df346 Error handling; check for correct length of key-value pair array after split
fa1cb49 listofsettings allways an array, test for length of array
a6a3d33 Changed number of expected positional arguments to 0 or 1 , warnings and debug statements
74d2100 checking for missing values in settings string from command line
cd350da Remove `GenericXML` check for env variables.
6ca6b59 progress
e7b334e Merge pull request #340 from ESMCI/douglasjacobsen/fix_test_template
43807a5 Add white space after batch directives in script templates
e061505 Merge pull request #337 from ESMCI/jgfouca/autosave_env_info
edc1671 Autosave environment information in case_setup.
33ce89b Merge pull request #336 from ESMCI/jgfouca/fix_create_test_not_catching_missing_project
c3f8f84 create_test was not failing the create_newcase phase when project info was missing
fef81df Merge pull request #335 from ESMCI/jgfouca/add_queue_option_to_create_test
731f8a0 Add ability to select queue to create_test and create_newcase
6f9613f Merge pull request #333 from ESMCI/jgfouca/even_more_sky_env_fixes
11877a2 Fix mismatch between MPI_PATH and the mpi module being loaded
d37e177 Merge pull request #322 from ESMCI/jgfouca/restore_good_python_version_error
ad18c34 Merge pull request #331 from ESMCI/jgfouca/reduce_output_from_check_input_data
0268cb7 Only report present files in debug mode
47b4216 Fix spelling mistake
dddd7f0 Merge pull request #327 from ESMCI/jgfouca/fix_more_sky_env_issues
07aeb52 Get cime_developer building again on skybridge.
0aceb94 Merge branch 'wilke/template/directives' (PR #324)
d8f331c moved batchdirectives to top of the template
dbbd3a1 Users should get a nice error when their python is too old
5eea798 Merge pull request #320 from ESMCI/jgfouca/fix_skybridge_env_issues
ca3e004 Fix skybridge environment problems, port to new SEMS modules
1a82a57 Merge pull request #318 from ESMCI/jgfouca/remove_sentinel_concept
e266dd9 Remove sentinel concept from jenkins_generic_job
aae8e30 comments for cime5.0.5
e20f807 Merge pull request #317 from billsacks/restore_lii
1967bb3 Restore LII test
c404dfa Merge remote-tracking branch 'origin/master'
0406b7d updates for cime5.0.4
7930cd7 Merge pull request #316 from ESMCI/jgfouca/update_code_checker
009f7a1 code_checker: Leverage .gitignore by using git ls-files instead of find to get list of ifles to check
c5555c7 Merge pull request #315 from Katetc/master
c4817d7 fix issue 314
7a493a0 remove multiple run lines from test file
c269ab9 Merge pull request #313 from ESMCI/jgfouca/correctly_report_problem_in_test
734e4b4 Rolling the Intel compiler back to v15.0.2
9a46a99 On batch systems, be sure to report that the problem is with wait_for_tests, not create_test
0e95d19 add some more info to README file
e9586c1 Changes required to support the new Hobart cluster configuration
cdb7805 update documentation for --xml options
98a0380 Merge pull request #307 from ESMCI/rljacob/tests/add-readme
46ff3c6 work on test rerunability
c5f2ae9 Merge pull request #308 from ESMCI/jgfouca/fix_check_input_bug
bddea72 document ERR test
8639ba1 create ability to run tests in same case more than once
b18580b Fix minor erroneous output bug in check_input_data
6f3e448 Add README back to Testcases
fd001a7 Add README back to SystemTests
929f05a Merge pull request #305 from ESMCI/jgfouca/advanced_profiling_tool
20c2e22 Make prof tools a bit more user friendly
1f9b49b Merge pull request #304 from jedwards4b/dynamic_system_test_dirs
0ba7f50 handle so that we dont have a list of test names to maintain
92a266e handle so that we dont have a list of test names to maintain
99f3d35 New tool 'advanced-py-prof'
4e6f7f5 initialize contents
3703d94 machine specific fixes for edison/cori/slurm systems
f6dc40a fixes git issue 303
7bacf48 repeat change for acme
503d5ad load system test directories dynamically based on paths in config_files.xml
b28ddff Merge pull request #302 from ESMCI/jgfouca/profiling_tool_etc
0e1553f Add a new tool for very simple python profiling
1eb2a56 Merge pull request #301 from jedwards4b/shell_commands_delete
2f78ec7 remove any existing shell_commands files from case before writing new ones
5f85c05 update changelog for tag
4ef656d pylint fixes
8624ece fix needed for scripts_regression_tests following PR298
6cc9110 These were supposed to be in PR296
d19afa9 Merge remote-tracking branch 'jedwards/testing_fixes' (PR #296)
b302243 Merge pull request #298 from ESMCI/jgfouca/restore_verbose
0a95b04 component_compare_test should fail if one of the components to be compared is not found"
9aa8683 Reintroduce verbose option into the refactored logging system
a796384 fix for lii test and response to review
d8c9b2e Merge pull request #286 from jedwards4b/buildnml_output_fix
1894e28 improve documetation of debug option, remove incorrect documentation of verbose option
21ef9ae remove whitespace surrounding test names
f6fdbb7 fix erp test update ChangeLog
b8b4723 Fix LII test
daa0c63 rename bisect unit test from acme to cime
4f1a079 move pecount code from create_test to create_newcase
24eb48f move clm include directory to prevent build confusion
1ee4449 add support for ascii testfile, allow multiple compilers in tests
d6c28b4 fix memleak test giving error if baseline not found
8ff5f19 Merge pull request #287 from ESMCI/nag_mismatch
a57e410 Remove `-mismatch_all` from NAG options in CESM.
5040500 output from buildnml scripts now prints

git-subtree-dir: cime
git-subtree-split: 12d2135
  • Loading branch information
rljacob committed Aug 11, 2016
1 parent 29d6d8c commit 333046c
Show file tree
Hide file tree
Showing 101 changed files with 4,277 additions and 4,331 deletions.
400 changes: 381 additions & 19 deletions ChangeLog

Large diffs are not rendered by default.

37 changes: 37 additions & 0 deletions cime_config/acme/allactive/config_pesall.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3811,6 +3811,43 @@
</pes>
</mach>
</grid>
<grid name="a%ne30np4_l%ne30np4_oi%gx1v6">
<mach name="cetus|mira">
<pes compset="A" pesize="any">
<comment>none</comment>
<ntasks>
<ntasks_atm>8</ntasks_atm>
<ntasks_lnd>8</ntasks_lnd>
<ntasks_rof>8</ntasks_rof>
<ntasks_ice>8</ntasks_ice>
<ntasks_ocn>8</ntasks_ocn>
<ntasks_glc>8</ntasks_glc>
<ntasks_wav>8</ntasks_wav>
<ntasks_cpl>8</ntasks_cpl>
</ntasks>
<nthrds>
<nthrds_atm>16</nthrds_atm>
<nthrds_lnd>16</nthrds_lnd>
<nthrds_rof>16</nthrds_rof>
<nthrds_ice>16</nthrds_ice>
<nthrds_ocn>16</nthrds_ocn>
<nthrds_glc>16</nthrds_glc>
<nthrds_wav>16</nthrds_wav>
<nthrds_cpl>16</nthrds_cpl>
</nthrds>
<rootpe>
<rootpe_atm>0</rootpe_atm>
<rootpe_lnd>0</rootpe_lnd>
<rootpe_rof>0</rootpe_rof>
<rootpe_ice>0</rootpe_ice>
<rootpe_ocn>0</rootpe_ocn>
<rootpe_glc>0</rootpe_glc>
<rootpe_wav>0</rootpe_wav>
<rootpe_cpl>0</rootpe_cpl>
</rootpe>
</pes>
</mach>
</grid>
<grid name="a%ne30np4_l%ne30np4_oi%gx1v6">
<mach name="cetus">
<pes compset="any" pesize="any">
Expand Down
28 changes: 24 additions & 4 deletions cime_config/acme/config_files.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,9 +88,9 @@
<value component="clm" >$SRCROOT/components/clm/cime_config/config_compsets.xml</value>
<value component="cice" >$SRCROOT/components/cice/cime_config/config_compsets.xml</value>
<value component="pop" >$SRCROOT/components/pop/cime_config/config_compsets.xml</value>
<value component="mpas-o" >$SRCROOT/components/mpas-o/cime_config/config_compsets.xml</value>
<value component="mpaso" >$SRCROOT/components/mpas-o/cime_config/config_compsets.xml</value>
<value component="mpasli" >$SRCROOT/components/mpasli/cime_config/config_compsets.xml</value>
<value component="mpas-cice" >$SRCROOT/components/mpas-cice/cime_config/config_compsets.xml</value>
<value component="mpascice" >$SRCROOT/components/mpas-cice/cime_config/config_compsets.xml</value>
</values>
<group>case_last</group>
<file>env_case.xml</file>
Expand All @@ -108,15 +108,30 @@
<value component="clm" >$CIMEROOT/cime_config/$MODEL/allactive/config_pesall.xml</value>
<value component="cice" >$CIMEROOT/cime_config/$MODEL/allactive/config_pesall.xml</value>
<value component="pop" >$CIMEROOT/cime_config/$MODEL/allactive/config_pesall.xml</value>
<value component="mpas-o" >$CIMEROOT/cime_config/$MODEL/allactive/config_pesall.xml</value>
<value component="mpaso" >$CIMEROOT/cime_config/$MODEL/allactive/config_pesall.xml</value>
<value component="mpasli" >$CIMEROOT/cime_config/$MODEL/allactive/config_pesall.xml</value>
<value component="mpas-cice" >$CIMEROOT/cime_config/$MODEL/allactive/config_pesall.xml</value>
<value component="mpascice" >$CIMEROOT/cime_config/$MODEL/allactive/config_pesall.xml</value>
</values>
<group>case_last</group>
<file>env_case.xml</file>
<desc>file containing specification of all pe-layouts for primary component (for documentation only - DO NOT EDIT)</desc>
</entry>

<entry id="SYSTEM_TESTS_DIR">
<type>char</type>
<values>
<value component="any">$CIMEROOT/utils/python/CIME/SystemTests</value>
<value component="clm">$SRCROOT/components/clm/cime_config/SystemTests</value>
<value component="cam">$SRCROOT/components/cam/cime_config/SystemTests</value>
<value component="pop">$SRCROOT/components/pop/cime_config/SystemTests</value>
<value component="cice">$SRCROOT/components/cice/cime_config/SystemTests</value>
<value component="cism">$SRCROOT/components/cism/cime_config/SystemTests</value>
</values>
<group>test</group>
<file>env_test.xml</file>
<desc>directories containing cime compatible system test modules</desc>
</entry>

<entry id="TESTS_SPEC_FILE">
<type>char</type>
<default_value>unset</default_value>
Expand Down Expand Up @@ -234,6 +249,7 @@
<type>char</type>
<default_value>unset</default_value>
<values>
<value component="mpascice">$SRCROOT/components/mpas-cice/cime_config/config_component.xml</value>
<value component="cice">$SRCROOT/components/cice/cime_config/config_component.xml</value>
<value component="dice">$CIMEROOT/components/data_comps/dice/cime_config/config_component.xml</value>
<value component="sice">$CIMEROOT/components/stub_comps/sice/cime_config/config_component.xml</value>
Expand All @@ -248,6 +264,7 @@
<type>char</type>
<default_value>unset</default_value>
<values>
<value component="mpaso" >$SRCROOT/components/mpas-o/cime_config/config_component.xml</value>
<value component="pop" >$SRCROOT/components/pop/cime_config/config_component.xml</value>
<value component="aquap">$SRCROOT/components/aquap/cime_config/config_component.xml</value>
<value component="docn" >$CIMEROOT/components/data_comps/docn/cime_config/config_component.xml</value>
Expand All @@ -263,6 +280,9 @@
<type>char</type>
<default_value>unset</default_value>
<values>
<value component="mpasli">$SRCROOT/components/mpasli/cime_config/config_component.xml</value>
<value component="mpaslisia">$SRCROOT/components/mpasli/cime_config/config_component.xml</value>
<value component="mpaslialb">$SRCROOT/components/mpasli/cime_config/config_component.xml</value>
<value component="cism">$SRCROOT/components/cism/cime_config/config_component.xml</value>
<value component="dglc">$CIMEROOT/components/data_comps/dglc/cime_config/config_component.xml</value>
<value component="sglc">$CIMEROOT/components/stub_comps/sglc/cime_config/config_component.xml</value>
Expand Down
10 changes: 1 addition & 9 deletions cime_config/acme/machines/config_batch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,12 @@
<queue>shared</queue>
</queues>
<walltimes>
<walltime default="true">00:15:00</walltime>
<walltime default="true">01:00:00</walltime>
</walltimes>
</batch_system>

<!-- edison is SLURM as of Jan-4-2016 -->
<batch_system MACH="edison" type="slurm" version="x.y">
<directives>
<directive> -A {{ account }} </directive>
</directives>
<queues>
<queue walltimemax="36:00:00" jobmin="1" jobmax="130181" default="true">regular</queue>
<queue walltimemax="00:30:00" jobmin="1" jobmax="12288">debug</queue>
Expand Down Expand Up @@ -255,7 +252,6 @@


<batch_system MACH="mustang" type="moab" version="x.y">
<batch_directive>#MSUB</batch_directive>
<directives>
<directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
</directives>
Expand All @@ -267,13 +263,9 @@
</batch_system>

<batch_system MACH="wolf" type="moab" version="x.y">
<batch_directive>#MSUB</batch_directive>
<directives>
<directive>-l nodes={{ num_nodes }}:ppn={{ tasks_per_node }}</directive>
</directives>
<BATCHQUERY>mshow</BATCHQUERY>
<BATCHSUBMIT>msub</BATCHSUBMIT>
<BATCHREDIRECT></BATCHREDIRECT>
<walltimes>
<walltime default="true">00:30:00</walltime>
<walltime ccsm_estcost="1">02:00:00</walltime>
Expand Down
30 changes: 20 additions & 10 deletions cime_config/acme/machines/config_compilers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -640,16 +640,12 @@ for mct, etc.
<ADD_CFLAGS DEBUG="FALSE"> -O2 </ADD_CFLAGS>
<NETCDF_PATH>$(NETCDFROOT)</NETCDF_PATH>
<PNETCDF_PATH>$(PNETCDFROOT)</PNETCDF_PATH>
<MPI_PATH MPILIB="openmpi">/opt/openmpi-1.8-intel</MPI_PATH>
<ESMF_LIBDIR>/projects/ccsm/esmf-6.3.0rp1/lib/libO/Linux.intel.64.openmpi.default</ESMF_LIBDIR>
<CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
<ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -L/projects/ccsm/BLAS-intel -lblas_LINUX</ADD_SLIBS>
<PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
<ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
<ALBANY_PATH>/projects/ccsm/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
</compiler>
Expand All @@ -663,12 +659,7 @@ for mct, etc.
<CONFIG_ARGS> --host=Linux </CONFIG_ARGS>
<ADD_SLIBS> $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -L/projects/ccsm/BLAS-intel -lblas_LINUX</ADD_SLIBS>
<PIO_FILESYSTEM_HINTS>lustre </PIO_FILESYSTEM_HINTS>
<ADD_SLIBS MPILIB="mpich"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpich2"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpt"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="openmpi"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mvapich"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="impi"> -mkl=cluster </ADD_SLIBS>
<ADD_SLIBS MPILIB="mpi-serial"> -mkl </ADD_SLIBS>
<ALBANY_PATH>/projects/ccsm/AlbanyTrilinos/Albany/build/install</ALBANY_PATH>
</compiler>
Expand Down Expand Up @@ -1184,4 +1175,23 @@ for mct, etc.
<GPTL_CPPDEFS> -DHAVE_VPRINTF -DHAVE_GETTIMEOFDAY </GPTL_CPPDEFS>
</compiler>

<compiler MACH="mustang">
<NETCDF_PATH>$(NETCDF)</NETCDF_PATH>
<PNETCDF_PATH>$(PARALLEL_NETCDF)</PNETCDF_PATH>
</compiler>

<compiler MACH="wolf">
<NETCDF_PATH>$(NETCDF)</NETCDF_PATH>
<PNETCDF_PATH>$(PARALLEL_NETCDF)</PNETCDF_PATH>
</compiler>

<compiler COMPILER="gnu" MACH="mustang">
<ADD_CFLAGS> -std=c99 </ADD_CFLAGS>
</compiler>

<compiler COMPILER="gnu" MACH="wolf">
<ADD_CFLAGS> -std=c99 </ADD_CFLAGS>
</compiler>


</config_compilers>
Loading

0 comments on commit 333046c

Please sign in to comment.