From 5f8f9972e7b04e7634d7b0db16eb01ff7b25ef73 Mon Sep 17 00:00:00 2001 From: James Foucar Date: Tue, 19 Apr 2016 15:28:13 -0600 Subject: [PATCH] Global remove all whitespace --- LICENSE.TXT | 44 +- README.md | 68 +- .../acme/allactive/config_compsets.xml | 816 +-- cime_config/acme/allactive/config_pes.xml | 18 +- cime_config/acme/archive.xml | 322 +- cime_config/acme/config_grids.xml | 236 +- cime_config/acme/machines/Depends.cetus | 2 +- cime_config/acme/machines/Depends.intelmic | 12 +- cime_config/acme/machines/Depends.intelmic14 | 12 +- cime_config/acme/machines/Depends.mira | 4 +- cime_config/acme/machines/buildlib.csm_share | 10 +- cime_config/acme/machines/buildlib.gptl | 4 +- cime_config/acme/machines/buildlib.mct | 12 +- cime_config/acme/machines/buildlib.pio | 4 +- cime_config/acme/machines/ccsm_getenv | 18 +- cime_config/acme/machines/cesm_postbuild | 2 +- .../acme/machines/cesm_postbuild.perf_archive | 2 +- cime_config/acme/machines/cesm_postrun | 2 +- .../acme/machines/cesm_postrun.perf_archive | 4 +- cime_config/acme/machines/cesm_postrun2 | 2 +- .../acme/machines/cesm_postrun2.perf_archive | 2 +- cime_config/acme/machines/cesm_prerun | 6 +- .../acme/machines/cesm_prerun.perf_archive | 4 +- cime_config/acme/machines/config_batch.xsd | 8 +- cime_config/acme/machines/config_pio.xml | 98 +- cime_config/acme/machines/configure | 44 +- .../acme/machines/env_mach_specific.cascade | 4 +- .../acme/machines/env_mach_specific.cetus | 10 +- .../acme/machines/env_mach_specific.constance | 2 +- .../acme/machines/env_mach_specific.corip1 | 18 +- .../acme/machines/env_mach_specific.edison | 18 +- .../acme/machines/env_mach_specific.eos | 12 +- .../acme/machines/env_mach_specific.hopper | 16 +- .../acme/machines/env_mach_specific.juqueen | 10 +- .../machines/env_mach_specific.linux-generic | 2 +- .../acme/machines/env_mach_specific.mac | 4 +- .../acme/machines/env_mach_specific.mira | 14 +- .../acme/machines/env_mach_specific.oic2 | 6 +- .../acme/machines/env_mach_specific.oic5 | 6 +- .../acme/machines/env_mach_specific.sooty | 2 +- .../acme/machines/env_mach_specific.stampede | 2 +- .../acme/machines/env_mach_specific.titan | 24 +- .../acme/machines/env_mach_specific.tukey | 10 +- cime_config/acme/machines/mkDepends | 18 +- cime_config/acme/machines/mkSrcfiles | 2 +- cime_config/acme/machines/syslog.cetus | 4 +- cime_config/acme/machines/syslog.edison | 4 +- cime_config/acme/machines/syslog.generic | 4 +- cime_config/acme/machines/syslog.hopper | 4 +- cime_config/acme/machines/syslog.mira | 4 +- cime_config/acme/machines/syslog.noop | 4 +- cime_config/acme/machines/syslog.titan | 4 +- cime_config/acme/machines/taskmaker.pl | 2 +- cime_config/acme/machines/template.lt_archive | 26 +- .../acme/machines/template.ocn_diagnostics | 4 +- cime_config/acme/machines/template.timeseries | 4 +- .../userdefined_laptop_template/README.md | 6 +- .../config_compilers.xml | 6 +- .../mkbatch.no_batch_system | 14 +- cime_config/cesm/allactive/config_pes.xml | 1662 ++--- .../allactive/defaultio/user_nl_rtm | 4 +- cime_config/cesm/archive.xml | 322 +- cime_config/cesm/machines/Depends.babbageKnc | 12 +- cime_config/cesm/machines/Depends.bluewaters | 2 +- cime_config/cesm/machines/Depends.intelmic | 12 +- cime_config/cesm/machines/Depends.intelmic14 | 12 +- cime_config/cesm/machines/Depends.mira | 2 +- cime_config/cesm/machines/README | 16 +- cime_config/cesm/machines/buildlib.csm_share | 10 +- cime_config/cesm/machines/buildlib.gptl | 4 +- cime_config/cesm/machines/buildlib.mct | 12 +- cime_config/cesm/machines/buildlib.pio | 4 +- cime_config/cesm/machines/config_batch.xsd | 8 +- .../cesm/machines/config_compilers.xml | 62 +- cime_config/cesm/machines/config_machines.xml | 4 +- cime_config/cesm/machines/mkSrcfiles | 2 +- cime_config/cesm/machines/taskmaker.pl | 2 +- cime_config/cesm/machines/template.lt_archive | 26 +- .../userdefined_laptop_template/README.md | 6 +- .../config_compilers.xml | 6 +- .../mkbatch.no_batch_system | 14 +- cime_config/config_headers.xml | 70 +- cime_config/xml_schemas/archive.xsd | 2 +- components/data_comps/datm/atm_comp_esmf.F90 | 6 +- components/data_comps/datm/bld/build-namelist | 100 +- .../namelist_files/namelist_defaults_datm.xml | 68 +- .../bld/unit_testers/build-namelist_test.pl | 42 +- .../user_xml_dir/namelist_definition_datm.xml | 156 +- .../data_comps/datm/cime_config/buildnml | 12 +- .../datm/cime_config/config_component.xml | 62 +- .../data_comps/datm/cime_config/user_nl_datm | 12 +- components/data_comps/datm/datm_comp_mod.F90 | 58 +- components/data_comps/datm/datm_shr_mod.F90 | 14 +- components/data_comps/datm/doc/SOM.pdf | Bin 105847 -> 105777 bytes components/data_comps/datm/doc/datacomps.xml | 44 +- components/data_comps/datm/doc/intro.xml | 56 +- components/data_comps/datm/doc/streams.xml | 64 +- components/data_comps/dice/bld/build-namelist | 86 +- .../namelist_files/namelist_defaults_dice.xml | 10 +- .../namelist_definition_dice.xml | 148 +- .../data_comps/dice/cime_config/buildnml | 12 +- .../dice/cime_config/config_component.xml | 36 +- .../data_comps/dice/cime_config/user_nl_dice | 12 +- components/data_comps/dice/dice_comp_mod.F90 | 34 +- components/data_comps/dice/ice_comp_esmf.F90 | 6 +- components/data_comps/dlnd/bld/build-namelist | 84 +- .../namelist_files/namelist_defaults_dlnd.xml | 18 +- .../namelist_definition_dlnd.xml | 116 +- .../data_comps/dlnd/cime_config/buildnml | 12 +- .../dlnd/cime_config/config_component.xml | 24 +- .../data_comps/dlnd/cime_config/user_nl_dlnd | 12 +- components/data_comps/dlnd/dlnd_comp_mod.F90 | 24 +- components/data_comps/dlnd/lnd_comp_esmf.F90 | 6 +- components/data_comps/dlnd/lnd_comp_mct.F90 | 4 +- components/data_comps/docn/bld/build-namelist | 94 +- .../namelist_files/namelist_defaults_docn.xml | 24 +- .../namelist_definition_docn.xml | 116 +- .../data_comps/docn/cime_config/buildnml | 12 +- .../docn/cime_config/config_component.xml | 32 +- .../data_comps/docn/cime_config/user_nl_docn | 14 +- components/data_comps/docn/docn_comp_mod.F90 | 20 +- components/data_comps/docn/ocn_comp_esmf.F90 | 4 +- components/data_comps/docn/ocn_comp_mct.F90 | 2 +- .../data_comps/docn/tools/pop_som_frc/README | 6 +- .../data_comps/docn/tools/pop_som_frc/SOM.doc | Bin 40960 -> 40958 bytes .../data_comps/docn/tools/pop_som_frc/SOM.pdf | Bin 105847 -> 105777 bytes .../docn/tools/pop_som_frc/pop_frc.csh | 2 +- .../docn/tools/pop_som_frc/pop_frc_mlann.ncl | 38 +- .../docn/tools/pop_som_frc/pop_frc_mlt.ncl | 38 +- .../docn/tools/pop_som_frc/pop_interp.ncl | 38 +- .../docn/tools/pop_som_frc/read_from_mss.csh | 4 +- .../tools/pop_som_frc/read_from_mss_month.csh | 4 +- components/data_comps/drof/bld/build-namelist | 80 +- .../namelist_files/namelist_defaults_drof.xml | 18 +- .../namelist_definition_drof.xml | 128 +- .../data_comps/drof/cime_config/buildnml | 16 +- .../drof/cime_config/config_component.xml | 20 +- .../data_comps/drof/cime_config/user_nl_drof | 12 +- components/data_comps/drof/drof_comp_mod.F90 | 20 +- components/data_comps/drof/rof_comp_esmf.F90 | 4 +- components/data_comps/drof/rof_comp_mct.F90 | 2 +- components/data_comps/dwav/README | 4 +- components/data_comps/dwav/bld/build-namelist | 80 +- .../namelist_files/namelist_defaults_dwav.xml | 18 +- .../namelist_definition_dwav.xml | 118 +- .../data_comps/dwav/cime_config/buildnml | 16 +- .../dwav/cime_config/config_component.xml | 8 +- .../data_comps/dwav/cime_config/user_nl_dwav | 14 +- components/data_comps/dwav/dwav_comp_mod.F90 | 28 +- components/data_comps/dwav/wav_comp_mct.F90 | 2 +- .../satm/cime_config/config_component.xml | 6 +- .../stub_comps/satm/cpl/atm_comp_esmf.F90 | 2 +- .../stub_comps/satm/cpl/atm_comp_mct.F90 | 6 +- .../sglc/cime_config/config_component.xml | 6 +- .../stub_comps/sglc/cpl/glc_comp_esmf.F90 | 2 +- .../stub_comps/sglc/cpl/glc_comp_mct.F90 | 10 +- .../sice/cime_config/config_component.xml | 6 +- .../stub_comps/sice/cpl/ice_comp_esmf.F90 | 2 +- .../stub_comps/sice/cpl/ice_comp_mct.F90 | 6 +- .../slnd/cime_config/config_component.xml | 6 +- .../stub_comps/slnd/cpl/lnd_comp_esmf.F90 | 2 +- .../stub_comps/slnd/cpl/lnd_comp_mct.F90 | 14 +- .../socn/cime_config/config_component.xml | 6 +- .../stub_comps/socn/cpl/ocn_comp_esmf.F90 | 2 +- .../stub_comps/socn/cpl/ocn_comp_mct.F90 | 6 +- .../srof/cime_config/config_component.xml | 6 +- .../stub_comps/srof/cpl/rof_comp_esmf.F90 | 2 +- .../stub_comps/srof/cpl/rof_comp_mct.F90 | 8 +- .../swav/cime_config/config_component.xml | 6 +- .../stub_comps/swav/cpl/wav_comp_esmf.F90 | 2 +- .../stub_comps/swav/cpl/wav_comp_mct.F90 | 6 +- .../xcpl_comps/xatm/cime_config/buildnml | 6 +- .../xatm/cime_config/config_component.xml | 6 +- .../xcpl_comps/xatm/cpl/atm_comp_esmf.F90 | 18 +- .../xcpl_comps/xglc/cime_config/buildnml | 6 +- .../xglc/cime_config/config_component.xml | 6 +- .../xcpl_comps/xglc/cpl/glc_comp_esmf.F90 | 18 +- .../xcpl_comps/xice/cime_config/buildnml | 6 +- .../xice/cime_config/config_component.xml | 6 +- .../xcpl_comps/xice/cpl/ice_comp_esmf.F90 | 18 +- .../xcpl_comps/xlnd/cime_config/buildnml | 10 +- .../xlnd/cime_config/config_component.xml | 6 +- .../xcpl_comps/xlnd/cpl/lnd_comp_esmf.F90 | 24 +- .../xcpl_comps/xocn/cime_config/buildnml | 6 +- .../xocn/cime_config/config_component.xml | 6 +- .../xcpl_comps/xocn/cpl/ocn_comp_esmf.F90 | 18 +- .../xcpl_comps/xrof/cime_config/buildnml | 6 +- .../xrof/cime_config/config_component.xml | 8 +- .../xcpl_comps/xrof/cpl/rof_comp_esmf.F90 | 18 +- .../xcpl_comps/xshare/dead_data_mod.F90 | 2 +- components/xcpl_comps/xshare/dead_mct_mod.F90 | 46 +- components/xcpl_comps/xshare/dead_mod.F90 | 10 +- .../xcpl_comps/xwav/cime_config/buildnml | 6 +- .../xwav/cime_config/config_component.xml | 6 +- .../xcpl_comps/xwav/cpl/wav_comp_esmf.F90 | 18 +- doc/README | 2 +- doc/apidocs/Doxyfile | 12 +- doc/apidocs/doc_txt/main.txt | 14 +- doc/apidocs/doc_txt/perl.txt | 2 +- doc/apidocs/doc_txt/python.txt | 2 +- doc/apidocs/dox-filter.sh | 2 +- doc/apidocs/examples/template.py | 2 +- doc/modelnl/compsets.html | 5772 ++++++++-------- doc/modelnl/create_tables | 2 +- doc/modelnl/env_build.html | 76 +- doc/modelnl/env_case.html | 10 +- doc/modelnl/env_mach_pes.html | 6 +- doc/modelnl/env_pesetup.html | 6 +- doc/modelnl/env_run.html | 246 +- doc/modelnl/grid.html | 4142 ++++++------ doc/modelnl/index.html | 12 +- doc/modelnl/machines.html | 1074 +-- doc/modelnl/modelnl.html | 12 +- doc/modelnl/nl_cam.html | 228 +- doc/modelnl/nl_cice.html | 16 +- doc/modelnl/nl_cism.html | 8 +- doc/modelnl/nl_clm.html | 6 +- doc/modelnl/nl_clm40.html | 16 +- doc/modelnl/nl_clm45.html | 20 +- doc/modelnl/nl_datm.html | 48 +- doc/modelnl/nl_dice.html | 44 +- doc/modelnl/nl_dlnd.html | 34 +- doc/modelnl/nl_docn.html | 34 +- doc/modelnl/nl_drof.html | 40 +- doc/modelnl/nl_drv.html | 1190 ++-- doc/modelnl/nl_pop2.html | 98 +- doc/modelnl/nl_rtm.html | 12 +- doc/modelnl/nldef2html_cam | 8 +- doc/modelnl/nldef2html_cice | 12 +- doc/modelnl/nldef2html_cism | 8 +- doc/modelnl/nldef2html_clm | 10 +- doc/modelnl/nldef2html_clm40 | 10 +- doc/modelnl/nldef2html_clm45 | 10 +- doc/modelnl/nldef2html_datm | 14 +- doc/modelnl/nldef2html_dice | 10 +- doc/modelnl/nldef2html_dlnd | 10 +- doc/modelnl/nldef2html_docn | 10 +- doc/modelnl/nldef2html_drof | 10 +- doc/modelnl/nldef2html_drv | 10 +- doc/modelnl/nldef2html_pop2 | 12 +- doc/modelnl/nldef2html_rtm | 8 +- doc/modelnl/showinfo.js | 54 +- doc/modelnl/xmldef2html_compsets | 16 +- doc/modelnl/xmldef2html_env_build | 26 +- doc/modelnl/xmldef2html_env_case | 12 +- doc/modelnl/xmldef2html_env_pesetup | 12 +- doc/modelnl/xmldef2html_env_run | 16 +- doc/modelnl/xmldef2html_grid | 24 +- doc/modelnl/xmldef2html_machines | 16 +- doc/usersguide/128pe_layout.jpg | Bin 58035 -> 53967 bytes doc/usersguide/896pe_layout.jpg | Bin 34318 -> 34308 bytes doc/usersguide/buildcase.xml | 28 +- doc/usersguide/createcase.xml | 292 +- doc/usersguide/faq.xml | 146 +- doc/usersguide/glossary.xml | 4 +- doc/usersguide/greenland_pole_grid.jpg | Bin 55817 -> 55808 bytes doc/usersguide/grid_descriptions.jpg | Bin 135530 -> 131457 bytes doc/usersguide/introduction.xml | 174 +- doc/usersguide/newgrid.xml | 36 +- doc/usersguide/pe_layout.jpg | Bin 15911 -> 15903 bytes doc/usersguide/porting.xml | 56 +- doc/usersguide/runcase.xml | 244 +- doc/usersguide/stylesheet.dsl | 10 +- doc/usersguide/testing.xml | 84 +- doc/usersguide/tripolegrid.jpg | Bin 112129 -> 112122 bytes doc/usersguide/troubleshoot.xml | 18 +- doc/usersguide/ug.xml | 2 +- doc/usersguide/usecases.xml | 518 +- .../namelist_files/namelist_defaults_drv.xml | 38 +- .../namelist_definition_drv.xml | 1284 ++-- .../namelist_definition_drv_flds.xml | 14 +- .../namelist_definition_modio.xml | 50 +- driver_cpl/cime_config/buildnml | 8 +- driver_cpl/cime_config/config_compsets.xml | 22 +- driver_cpl/cime_config/user_nl_cpl | 58 +- driver_cpl/doc/chap1.xml | 266 +- driver_cpl/doc/chap2.xml | 216 +- driver_cpl/doc/figx1.jpg | Bin 85546 -> 85537 bytes driver_cpl/doc/namelist.xml | 4 +- driver_cpl/doc/stylesheet.dsl | 10 +- driver_cpl/driver/cesm_comp_mod.F90 | 226 +- driver_cpl/driver/cesm_driver.F90 | 12 +- driver_cpl/driver/component_mod.F90 | 142 +- driver_cpl/driver/component_type_mod.F90 | 22 +- driver_cpl/driver/cpl_comp_esmf.F90 | 20 +- driver_cpl/driver/cplcomp_exchange_mod.F90 | 54 +- driver_cpl/driver/map_glc2lnd_mod.F90 | 52 +- driver_cpl/driver/map_lnd2glc_mod.F90 | 48 +- driver_cpl/driver/prep_aoflux_mod.F90 | 36 +- driver_cpl/driver/prep_atm_mod.F90 | 112 +- driver_cpl/driver/prep_glc_mod.F90 | 54 +- driver_cpl/driver/prep_ice_mod.F90 | 54 +- driver_cpl/driver/prep_lnd_mod.F90 | 66 +- driver_cpl/driver/prep_ocn_mod.F90 | 156 +- driver_cpl/driver/prep_rof_mod.F90 | 40 +- driver_cpl/driver/prep_wav_mod.F90 | 30 +- driver_cpl/driver/seq_diag_mct.F90 | 94 +- driver_cpl/driver/seq_domain_mct.F90 | 50 +- driver_cpl/driver/seq_flux_mct.F90 | 208 +- driver_cpl/driver/seq_frac_mct.F90 | 86 +- driver_cpl/driver/seq_hist_mod.F90 | 50 +- driver_cpl/driver/seq_io_mod.F90 | 60 +- driver_cpl/driver/seq_map_mod.F90 | 86 +- driver_cpl/driver/seq_map_type_mod.F90 | 8 +- driver_cpl/driver/seq_rest_mod.F90 | 32 +- driver_cpl/driver/t_driver_timers_mod.F90 | 2 +- ...vertical_gradient_calculator_2nd_order.F90 | 26 +- .../vertical_gradient_calculator_base.F90 | 8 +- driver_cpl/shr/glc_elevclass_mod.F90 | 44 +- driver_cpl/shr/seq_cdata_mod.F90 | 2 +- driver_cpl/shr/seq_comm_mct.F90 | 60 +- driver_cpl/shr/seq_drydep_mod.F90 | 160 +- driver_cpl/shr/seq_flds_mod.F90 | 386 +- driver_cpl/shr/seq_infodata_mod.F90 | 222 +- driver_cpl/shr/seq_io_read_mod.F90 | 8 +- driver_cpl/shr/seq_timemgr_mod.F90 | 210 +- driver_cpl/shr/shr_carma_mod.F90 | 10 +- driver_cpl/shr/shr_expr_parser_mod.F90 | 22 +- driver_cpl/shr/shr_fire_emis_mod.F90 | 26 +- driver_cpl/shr/shr_megan_mod.F90 | 30 +- driver_cpl/shr_esmf/esmf2mct_mod.F90 | 24 +- driver_cpl/shr_esmf/esmfshr_infodata_mod.F90 | 2 +- driver_cpl/shr_esmf/esmfshr_util_mod.F90 | 14 +- driver_cpl/shr_esmf/mct2esmf_mod.F90 | 58 +- driver_cpl/unit_test/CMakeLists.txt | 2 +- .../avect_wrapper_test/test_avect_wrapper.pf | 4 +- .../glc_elevclass_test/test_glc_elevclass.pf | 42 +- .../map_glc2lnd_test/test_map_glc2lnd.pf | 82 +- .../map_lnd2glc_test/test_map_lnd2glc.pf | 106 +- .../unit_test/seq_map_test/test_seq_map.pf | 24 +- .../vertical_gradient_calculator_constant.F90 | 8 +- .../unit_test/utils/avect_wrapper_mod.F90 | 26 +- .../unit_test/utils/create_mapper_mod.F90 | 24 +- .../unit_test/utils/mct_wrapper_mod.F90 | 14 +- driver_cpl/unit_test/utils/simple_map_mod.F90 | 36 +- ..._vertical_gradient_calculator_2nd_order.pf | 56 +- externals/CMake/FindNETCDF_C.cmake | 6 +- externals/CMake/FindNETCDF_Fortran.cmake | 2 +- externals/CMake/FindPnetcdf.cmake | 8 +- externals/CMake/LibFindMacros.cmake | 8 +- externals/CMake/TryMPIIO.f90 | 2 +- externals/CMake/TryMPISERIAL.f90 | 2 +- externals/CMake/mpiexec.cmake | 2 +- externals/CMake/pFUnit_utils.cmake | 6 +- externals/genf90/ChangeLog | 6 +- externals/genf90/genf90.pl | 54 +- externals/mct/COPYRIGHT | 38 +- externals/mct/Makefile.conf.in | 6 +- externals/mct/README | 16 +- externals/mct/benchmarks/Makefile | 2 +- externals/mct/benchmarks/RouterTestDis.F90 | 22 +- externals/mct/benchmarks/RouterTestOvr.F90 | 22 +- externals/mct/benchmarks/importBench.F90 | 24 +- externals/mct/configure.ac | 44 +- externals/mct/doc/Makefile | 4 +- externals/mct/doc/coupler.bib | 38 +- externals/mct/doc/mct_APIs.tex | 6 +- externals/mct/examples/README | 4 +- .../mct/examples/climate_concur1/Makefile | 4 +- externals/mct/examples/climate_concur1/README | 4 +- .../mct/examples/climate_concur1/coupler.F90 | 26 +- .../mct/examples/climate_concur1/master.F90 | 10 +- .../mct/examples/climate_concur1/model.F90 | 22 +- .../mct/examples/climate_sequen1/Makefile | 4 +- externals/mct/examples/climate_sequen1/README | 2 +- .../mct/examples/climate_sequen1/coupler.F90 | 12 +- .../mct/examples/climate_sequen1/dstmodel.F90 | 8 +- .../mct/examples/climate_sequen1/master.F90 | 10 +- .../mct/examples/climate_sequen1/mutils.F90 | 6 +- .../mct/examples/climate_sequen1/srcmodel.F90 | 8 +- externals/mct/examples/simple/Makefile | 2 +- externals/mct/examples/simple/README | 2 +- externals/mct/examples/simple/script.babyblue | 10 +- externals/mct/examples/simple/twocmp.con.F90 | 14 +- externals/mct/examples/simple/twocmp.seq.F90 | 18 +- .../mct/examples/simple/twocmp.seqNB.F90 | 20 +- .../mct/examples/simple/twocmp.seqUnvn.F90 | 18 +- externals/mct/m4/ax_fc_version.m4 | 4 +- externals/mct/m4/fortran.m4 | 2 +- externals/mct/mct/Makefile | 6 +- externals/mct/mct/README | 4 +- externals/mct/mct/m_Accumulator.F90 | 490 +- externals/mct/mct/m_AccumulatorComms.F90 | 186 +- externals/mct/mct/m_AttrVect.F90 | 754 +-- externals/mct/mct/m_AttrVectComms.F90 | 238 +- externals/mct/mct/m_AttrVectReduce.F90 | 154 +- externals/mct/mct/m_ConvertMaps.F90 | 58 +- externals/mct/mct/m_ExchangeMaps.F90 | 116 +- externals/mct/mct/m_GeneralGrid.F90 | 664 +- externals/mct/mct/m_GeneralGridComms.F90 | 264 +- externals/mct/mct/m_GlobalMap.F90 | 138 +- externals/mct/mct/m_GlobalSegMap.F90 | 358 +- externals/mct/mct/m_GlobalSegMapComms.F90 | 66 +- externals/mct/mct/m_GlobalToLocal.F90 | 120 +- externals/mct/mct/m_MCTWorld.F90 | 78 +- externals/mct/mct/m_MatAttrVectMul.F90 | 80 +- externals/mct/mct/m_Merge.F90 | 478 +- externals/mct/mct/m_Navigator.F90 | 140 +- externals/mct/mct/m_Rearranger.F90 | 104 +- externals/mct/mct/m_Router.F90 | 38 +- externals/mct/mct/m_SparseMatrix.F90 | 462 +- externals/mct/mct/m_SparseMatrixComms.F90 | 124 +- externals/mct/mct/m_SparseMatrixDecomp.F90 | 166 +- externals/mct/mct/m_SparseMatrixPlus.F90 | 210 +- externals/mct/mct/m_SparseMatrixToMaps.F90 | 60 +- externals/mct/mct/m_SpatialIntegral.F90 | 524 +- externals/mct/mct/m_SpatialIntegralV.F90 | 332 +- externals/mct/mct/m_Transfer.F90 | 38 +- externals/mct/mpeu/README | 8 +- externals/mct/mpeu/assertmpeu.H | 4 +- externals/mct/mpeu/get_zeits.c | 2 +- externals/mct/mpeu/m_FcComms.F90 | 78 +- externals/mct/mpeu/m_FileResolv.F90 | 58 +- externals/mct/mpeu/m_Filename.F90 | 2 +- externals/mct/mpeu/m_IndexBin_char.F90 | 6 +- externals/mct/mpeu/m_IndexBin_integer.F90 | 6 +- externals/mct/mpeu/m_IndexBin_logical.F90 | 6 +- externals/mct/mpeu/m_List.F90 | 406 +- externals/mct/mpeu/m_MergeSorts.F90 | 4 +- externals/mct/mpeu/m_Permuter.F90 | 4 +- externals/mct/mpeu/m_SortingTools.F90 | 4 +- externals/mct/mpeu/m_StrTemplate.F90 | 2 +- externals/mct/mpeu/m_String.F90 | 84 +- externals/mct/mpeu/m_StringLinkedList.F90 | 2 +- externals/mct/mpeu/m_TraceBack.F90 | 30 +- externals/mct/mpeu/m_chars.F90 | 2 +- externals/mct/mpeu/m_die.F90 | 4 +- externals/mct/mpeu/m_dropdead.F90 | 6 +- externals/mct/mpeu/m_flow.F90 | 2 +- externals/mct/mpeu/m_inpak90.F90 | 376 +- externals/mct/mpeu/m_ioutil.F90 | 4 +- externals/mct/mpeu/m_mall.F90 | 6 +- externals/mct/mpeu/m_mpif.F90 | 2 +- externals/mct/mpeu/m_mpif90.F90 | 4 +- externals/mct/mpeu/m_mpout.F90 | 6 +- externals/mct/mpeu/m_rankMerge.F90 | 48 +- externals/mct/mpeu/m_realkinds.F90 | 4 +- externals/mct/mpeu/m_stdio.F90 | 2 +- externals/mct/mpeu/m_zeit.F90 | 18 +- externals/mct/mpi-serial/Makefile | 2 +- externals/mct/mpi-serial/NOTES | 2 +- externals/mct/mpi-serial/cart.c | 8 +- externals/mct/mpi-serial/collective.c | 36 +- externals/mct/mpi-serial/comm.c | 6 +- externals/mct/mpi-serial/copy.c | 10 +- externals/mct/mpi-serial/group.c | 12 +- externals/mct/mpi-serial/handles.c | 12 +- externals/mct/mpi-serial/list.c | 30 +- externals/mct/mpi-serial/list.h | 10 +- externals/mct/mpi-serial/listP.h | 2 +- externals/mct/mpi-serial/listops.h | 2 +- externals/mct/mpi-serial/m4/ax_fc_version.m4 | 4 +- externals/mct/mpi-serial/mpi.c | 8 +- externals/mct/mpi-serial/mpi.h | 50 +- externals/mct/mpi-serial/mpiP.h | 2 +- externals/mct/mpi-serial/mpif.h | 10 +- externals/mct/mpi-serial/op.c | 2 +- externals/mct/mpi-serial/pack.c | 16 +- externals/mct/mpi-serial/probe.c | 2 +- externals/mct/mpi-serial/recv.c | 2 +- externals/mct/mpi-serial/req.c | 6 +- externals/mct/mpi-serial/send.c | 2 +- externals/mct/mpi-serial/tests/ctest.c | 50 +- externals/mct/mpi-serial/tests/ctest_old.c | 6 +- externals/mct/mpi-serial/tests/ftest.F90 | 40 +- .../mct/mpi-serial/tests/ftest_internal.F90 | 26 +- externals/mct/mpi-serial/tests/ftest_old.F90 | 8 +- externals/mct/mpi-serial/type.c | 104 +- externals/mct/mpi-serial/type.h | 14 +- externals/mct/mpi-serial/type_const.c | 34 +- externals/mct/protex/protex | 62 +- externals/mct/testsystem/testall/Makefile | 4 +- .../testall/ReadSparseMatrixAsc.F90 | 28 +- externals/mct/testsystem/testall/ccm.F90 | 44 +- .../mct/testsystem/testall/convertPOPT.F90 | 30 +- .../mct/testsystem/testall/convertgauss.F90 | 38 +- externals/mct/testsystem/testall/cpl.F90 | 70 +- .../mct/testsystem/testall/job.ut-all.jaguar | 2 +- externals/mct/testsystem/testall/m_ACTEST.F90 | 72 +- externals/mct/testsystem/testall/m_AVTEST.F90 | 90 +- .../mct/testsystem/testall/m_GGRIDTEST.F90 | 74 +- .../mct/testsystem/testall/m_GMAPTEST.F90 | 20 +- .../mct/testsystem/testall/m_GSMAPTEST.F90 | 46 +- .../mct/testsystem/testall/m_MCTWORLDTEST.F90 | 16 +- .../mct/testsystem/testall/m_ROUTERTEST.F90 | 12 +- .../mct/testsystem/testall/m_SMATTEST.F90 | 76 +- externals/mct/testsystem/testall/master.F90 | 6 +- externals/mct/testsystem/testall/mph.F90 | 118 +- externals/mct/testsystem/testall/pop.F90 | 38 +- .../mct/testsystem/testall/processors_map.in | 4 +- .../mct/testsystem/testall/ut_SparseMatrix.rc | 6 +- externals/mct/testunit/AttrVect_Test.F90 | 42 +- externals/mct/testunit/Makefile | 4 +- externals/pio1/ChangeLog | 762 +-- externals/pio1/Doxyfile | 1498 ++--- externals/pio1/DoxygenLayout.xml | 4 +- externals/pio1/customdoxygen.css | 54 +- externals/pio1/doc/CAMexample.txt | 6 +- externals/pio1/doc/Decomp.txt | 60 +- externals/pio1/doc/DoxygenLayout.xml | 2 +- externals/pio1/doc/Error.txt | 10 +- externals/pio1/doc/Examples.txt | 18 +- externals/pio1/doc/GettingStarted.txt | 14 +- externals/pio1/doc/Installing.txt | 14 +- externals/pio1/doc/api.txt | 6 +- externals/pio1/doc/base.txt | 20 +- externals/pio1/doc/example/simple-bc | 2 +- externals/pio1/doc/example/simple-bc-rearr | 2 +- .../pio1/doc/example/simple-bc-rearr-pe1 | 2 +- .../pio1/doc/example/simple-bc-rearr-pe2 | 2 +- externals/pio1/doc/example/simple-dof | 2 +- externals/pio1/doc/example/simple-dof-rearr | 2 +- externals/pio1/doc/faq.txt | 14 +- .../pio1/doc/images/block-cyclic-rearr.eps | 450 +- .../pio1/doc/images/block-cyclic-rearr.png | Bin 30602 -> 30601 bytes externals/pio1/doc/images/block-cyclic.eps | 450 +- externals/pio1/doc/images/block-cyclic.png | Bin 21257 -> 21254 bytes externals/pio1/doc/images/dof-rearr.eps | 450 +- externals/pio1/doc/images/dof-rearr.png | Bin 29798 -> 29791 bytes externals/pio1/doc/images/dof.eps | 450 +- externals/pio1/doc/images/dof.png | Bin 21545 -> 21543 bytes externals/pio1/doc/testpio_example.txt | 64 +- externals/pio1/pio/CMakeLists.txt | 20 +- externals/pio1/pio/C_interface_mod.F90 | 6 +- externals/pio1/pio/Makefile.conf.in | 6 +- externals/pio1/pio/README.config | 4 +- externals/pio1/pio/alloc_mod.F90.in | 22 +- externals/pio1/pio/box_rearrange.F90.in | 106 +- externals/pio1/pio/calcdecomp.F90 | 38 +- externals/pio1/pio/calcdisplace_mod.F90 | 46 +- externals/pio1/pio/fdepends.awk | 12 +- externals/pio1/pio/iompi_mod.F90.in | 38 +- externals/pio1/pio/ionf_mod.F90 | 72 +- externals/pio1/pio/nf_mod.F90 | 188 +- externals/pio1/pio/pio.F90 | 10 +- externals/pio1/pio/pio_kinds.F90 | 2 +- externals/pio1/pio/pio_mpi_utils.F90 | 4 +- externals/pio1/pio/pio_msg_callbacks.F90 | 56 +- .../pio1/pio/pio_msg_getput_callbacks.F90.in | 52 +- externals/pio1/pio/pio_msg_mod.F90 | 28 +- externals/pio1/pio/pio_nf_utils.F90 | 8 +- externals/pio1/pio/pio_spmd_utils.F90.in | 40 +- externals/pio1/pio/pio_support.F90 | 40 +- externals/pio1/pio/pio_types.F90 | 80 +- externals/pio1/pio/pio_utils.F90 | 12 +- externals/pio1/pio/piodarray.F90.in | 160 +- externals/pio1/pio/piolib_mod.F90 | 542 +- externals/pio1/pio/pionfatt_mod.F90.in | 72 +- externals/pio1/pio/pionfget_mod.F90.in | 40 +- externals/pio1/pio/pionfput_mod.F90.in | 106 +- externals/pio1/pio/pionfread_mod.F90.in | 12 +- externals/pio1/pio/pionfwrite_mod.F90.in | 20 +- externals/pio1/pio/piovdc.F90 | 26 +- externals/pio1/pio/rearrange.F90.in | 10 +- externals/pio1/pio/topology.c | 98 +- externals/pio1/scripts/Utils.pm | 38 +- externals/pio1/scripts/config.pl | 4 +- externals/pio1/scripts/testpio_yellowstone.pl | 4 +- externals/pio1/tests/testpio/CMakeLists.txt | 2 +- externals/pio1/tests/testpio/MPASA30km.csh | 2 +- externals/pio1/tests/testpio/README.testpio | 64 +- .../pio1/tests/testpio/build_defaults.xml | 40 +- externals/pio1/tests/testpio/check_mod.F90 | 58 +- externals/pio1/tests/testpio/config_bench.xml | 30 +- externals/pio1/tests/testpio/fdepends.awk | 12 +- externals/pio1/tests/testpio/gdecomp_mod.F90 | 36 +- externals/pio1/tests/testpio/namelist_mod.F90 | 22 +- .../pio1/tests/testpio/perl5lib/ChangeLog | 14 +- .../pio1/tests/testpio/perl5lib/XML/Changes | 54 +- .../pio1/tests/testpio/perl5lib/XML/Lite.pm | 108 +- .../testpio/perl5lib/XML/Lite/Element.pm | 88 +- .../pio1/tests/testpio/perl5lib/XML/README | 2 +- .../testpio/perl5lib/XML/man3/XML::Lite.3 | 78 +- .../perl5lib/XML/man3/XML::Lite::Element.3 | 16 +- externals/pio1/tests/testpio/test_lib.F90 | 50 +- externals/pio1/tests/testpio/testdecomp.F90 | 4 +- externals/pio1/tests/testpio/testpio.F90 | 204 +- externals/pio1/tests/testpio/testpio_bench.pl | 16 +- externals/pio1/tests/testpio/testpio_build.pl | 4 +- externals/pio1/tests/testpio/testpio_run.pl | 18 +- externals/pio1/tests/testpio/utils_mod.F90 | 2 +- externals/pio1/tests/unittests/CMakeLists.txt | 2 +- externals/pio1/tests/unittests/Levy_Notes | 4 +- externals/pio1/tests/unittests/README | 2 +- .../pio1/tests/unittests/basic_tests.F90 | 2 +- externals/pio1/tests/unittests/driver.F90 | 4 +- externals/pio1/timing/CMakeLists.txt | 2 +- externals/pio1/timing/ChangeLog | 70 +- externals/pio1/timing/GPTLget_memusage.c | 12 +- externals/pio1/timing/GPTLprint_memusage.c | 20 +- externals/pio1/timing/GPTLutil.c | 10 +- externals/pio1/timing/Makefile | 6 +- externals/pio1/timing/README | 8 +- externals/pio1/timing/XXXdotF/perf_mod.F | 422 +- externals/pio1/timing/XXXdotF/perf_utils.F | 162 +- externals/pio1/timing/f_wrappers.c | 20 +- externals/pio1/timing/gptl.c | 400 +- externals/pio1/timing/gptl.inc | 8 +- externals/pio1/timing/gptl_papi.c | 142 +- externals/pio1/timing/perf_mod.F90 | 136 +- externals/pio1/timing/perf_utils.F90 | 38 +- externals/pio1/timing/private.h | 8 +- externals/pio1/timing/threadutil.c | 20 +- externals/pio2/CTestScript.cmake | 22 +- externals/pio2/README.md | 16 +- externals/pio2/cmake/FindGPTL.cmake | 6 +- externals/pio2/cmake/FindHDF5.cmake | 16 +- externals/pio2/cmake/FindLIBRT.cmake | 4 +- externals/pio2/cmake/FindLIBZ.cmake | 4 +- externals/pio2/cmake/FindMPE.cmake | 4 +- externals/pio2/cmake/FindMPISERIAL.cmake | 4 +- externals/pio2/cmake/FindNetCDF.cmake | 30 +- externals/pio2/cmake/FindPAPI.cmake | 2 +- externals/pio2/cmake/FindPnetCDF.cmake | 8 +- externals/pio2/cmake/FindSZIP.cmake | 4 +- externals/pio2/cmake/LibCheck.cmake | 26 +- externals/pio2/cmake/LibFind.cmake | 54 +- externals/pio2/cmake/LibMPI.cmake | 36 +- externals/pio2/cmake/mpiexec.alcf | 2 +- .../pio2/ctest/CTestEnvironment-alcf.cmake | 2 +- .../pio2/ctest/CTestEnvironment-ncsa.cmake | 2 +- .../pio2/ctest/CTestEnvironment-nersc.cmake | 2 +- .../pio2/ctest/CTestEnvironment-nwsc.cmake | 2 +- externals/pio2/ctest/CTestScript-Test.cmake | 6 +- externals/pio2/ctest/runcdash-nersc-intel.sh | 2 +- externals/pio2/ctest/runctest-ncsa.sh | 2 +- externals/pio2/ctest/runctest-nwsc.sh | 2 +- externals/pio2/doc/CMakeFiles/CMakeOutput.log | 28 +- externals/pio2/doc/CMakeLists.txt | 8 +- externals/pio2/doc/Doxyfile.in | 2 +- externals/pio2/doc/DoxygenLayout.xml | 2 +- externals/pio2/doc/customdoxygen.css | 54 +- .../pio2/doc/images/block-cyclic-rearr.eps | 450 +- .../pio2/doc/images/block-cyclic-rearr.png | Bin 30602 -> 30601 bytes externals/pio2/doc/images/block-cyclic.eps | 450 +- externals/pio2/doc/images/block-cyclic.png | Bin 21257 -> 21254 bytes externals/pio2/doc/images/dof-rearr.eps | 450 +- externals/pio2/doc/images/dof-rearr.png | Bin 29798 -> 29791 bytes externals/pio2/doc/images/dof.eps | 450 +- externals/pio2/doc/images/dof.png | Bin 21545 -> 21543 bytes externals/pio2/doc/source/CAMexample.txt | 6 +- externals/pio2/doc/source/Decomp.txt | 34 +- externals/pio2/doc/source/Error.txt | 10 +- externals/pio2/doc/source/Examples.txt | 18 +- externals/pio2/doc/source/GettingStarted.txt | 14 +- externals/pio2/doc/source/Installing.txt | 24 +- externals/pio2/doc/source/api.txt | 6 +- externals/pio2/doc/source/base.txt | 14 +- externals/pio2/doc/source/example/simple-bc | 2 +- .../pio2/doc/source/example/simple-bc-rearr | 2 +- .../doc/source/example/simple-bc-rearr-pe1 | 2 +- .../doc/source/example/simple-bc-rearr-pe2 | 2 +- externals/pio2/doc/source/example/simple-dof | 2 +- .../pio2/doc/source/example/simple-dof-rearr | 2 +- externals/pio2/doc/source/faq.txt | 14 +- .../pio2/doc/source/mach_walkthrough.txt | 28 +- externals/pio2/doc/source/testpio_example.txt | 64 +- externals/pio2/examples/basic/CMakeLists.txt | 4 +- externals/pio2/examples/basic/MPASA30km.csh | 2 +- externals/pio2/examples/basic/README.testpio | 64 +- .../pio2/examples/basic/alloc_mod.F90.in | 22 +- .../pio2/examples/basic/build_defaults.xml | 40 +- externals/pio2/examples/basic/check_mod.F90 | 58 +- .../pio2/examples/basic/config_bench.xml | 30 +- externals/pio2/examples/basic/fdepends.awk | 12 +- externals/pio2/examples/basic/gdecomp_mod.F90 | 36 +- .../pio2/examples/basic/namelist_mod.F90 | 24 +- .../pio2/examples/basic/perl5lib/ChangeLog | 14 +- .../pio2/examples/basic/perl5lib/XML/Changes | 54 +- .../pio2/examples/basic/perl5lib/XML/Lite.pm | 108 +- .../basic/perl5lib/XML/Lite/Element.pm | 88 +- .../pio2/examples/basic/perl5lib/XML/README | 2 +- .../basic/perl5lib/XML/man3/XML::Lite.3 | 78 +- .../perl5lib/XML/man3/XML::Lite::Element.3 | 16 +- externals/pio2/examples/basic/testdecomp.F90 | 4 +- externals/pio2/examples/basic/testpio.F90 | 202 +- .../pio2/examples/basic/testpio_bench.pl | 16 +- .../pio2/examples/basic/testpio_build.pl | 4 +- externals/pio2/examples/basic/testpio_run.pl | 18 +- externals/pio2/examples/basic/utils_mod.F90 | 2 +- externals/pio2/examples/basic/wstest.c | 10 +- externals/pio2/examples/c/example1.c | 60 +- externals/pio2/examples/c/example2.c | 76 +- externals/pio2/examples/c/examplePio.c | 110 +- externals/pio2/examples/cxx/examplePio.cxx | 16 +- externals/pio2/examples/f03/CMakeLists.txt | 2 +- externals/pio2/examples/f03/examplePio.f90 | 8 +- externals/pio2/scripts/prune_decomps.pl | 4 +- externals/pio2/src/CMakeLists.txt | 6 +- externals/pio2/src/clib/CMakeLists.txt | 28 +- externals/pio2/src/clib/bget.c | 14 +- externals/pio2/src/clib/config.h.in | 2 +- externals/pio2/src/clib/ncparser.pl | 58 +- externals/pio2/src/clib/ncputgetparser.pl | 36 +- externals/pio2/src/clib/pio.h | 386 +- externals/pio2/src/clib/pio_c_get_template.c | 4 +- externals/pio2/src/clib/pio_c_put_template.c | 8 +- externals/pio2/src/clib/pio_c_template.c | 2 +- externals/pio2/src/clib/pio_darray.c | 268 +- externals/pio2/src/clib/pio_file.c | 48 +- externals/pio2/src/clib/pio_get_nc.c | 390 +- externals/pio2/src/clib/pio_internal.h | 36 +- externals/pio2/src/clib/pio_lists.c | 20 +- externals/pio2/src/clib/pio_nc.c | 612 +- externals/pio2/src/clib/pio_nc4.c | 98 +- externals/pio2/src/clib/pio_put_nc.c | 650 +- externals/pio2/src/clib/pio_rearrange.c | 206 +- externals/pio2/src/clib/pio_spmd.c | 62 +- externals/pio2/src/clib/pioc.c | 100 +- externals/pio2/src/clib/pioc_sc.c | 38 +- externals/pio2/src/clib/pioc_support.c | 70 +- externals/pio2/src/clib/topology.c | 100 +- externals/pio2/src/flib/CMakeLists.txt | 30 +- externals/pio2/src/flib/pio.F90 | 16 +- externals/pio2/src/flib/pio_kinds.F90 | 6 +- externals/pio2/src/flib/pio_nf.F90 | 206 +- externals/pio2/src/flib/pio_support.F90 | 20 +- externals/pio2/src/flib/pio_types.F90 | 56 +- externals/pio2/src/flib/piodarray.F90.in | 42 +- externals/pio2/src/flib/piolib_mod.F90 | 288 +- externals/pio2/src/flib/pionfatt_mod.F90.in | 56 +- externals/pio2/src/flib/pionfget_mod.F90.in | 16 +- externals/pio2/src/flib/pionfput_mod.F90.in | 44 +- externals/pio2/src/gptl/CMakeLists.txt | 6 +- externals/pio2/src/gptl/ChangeLog | 70 +- externals/pio2/src/gptl/GPTLget_memusage.c | 12 +- externals/pio2/src/gptl/GPTLprint_memusage.c | 20 +- externals/pio2/src/gptl/GPTLutil.c | 10 +- externals/pio2/src/gptl/README | 8 +- externals/pio2/src/gptl/f_wrappers.c | 20 +- externals/pio2/src/gptl/gptl.c | 400 +- externals/pio2/src/gptl/gptl.inc | 8 +- externals/pio2/src/gptl/gptl_papi.c | 142 +- externals/pio2/src/gptl/perf_mod.F90 | 136 +- externals/pio2/src/gptl/perf_utils.F90 | 38 +- externals/pio2/src/gptl/private.h | 8 +- externals/pio2/src/gptl/threadutil.c | 20 +- externals/pio2/tests/general/CMakeLists.txt | 76 +- externals/pio2/tests/general/ncdf_fail.F90.in | 14 +- .../pio2/tests/general/ncdf_get_put.F90.in | 4 +- .../tests/general/ncdf_simple_tests.F90.in | 10 +- .../tests/general/pio_decomp_fillval.F90.in | 18 +- .../tests/general/pio_decomp_fillval2.F90 | 14 +- .../tests/general/pio_decomp_tests.F90.in | 6 +- .../pio2/tests/general/pio_file_fail.F90.in | 2 +- .../general/pio_file_simple_tests.F90.in | 2 +- externals/pio2/tests/general/test_fillval.c | 48 +- externals/pio2/tests/general/test_memleak.c | 48 +- .../pio2/tests/general/util/pio_tf_f90gen.pl | 28 +- .../pio2/tests/general/util/pio_tutil.F90 | 4 +- .../pio2/tests/performance/CMakeLists.txt | 4 +- .../pio2/tests/performance/pioperformance.F90 | 58 +- externals/pio2/tests/unit/CMakeLists.txt | 12 +- externals/pio2/tests/unit/Levy_Notes | 4 +- externals/pio2/tests/unit/README | 2 +- externals/pio2/tests/unit/basic_tests.F90 | 10 +- externals/pio2/tests/unit/driver.F90 | 4 +- externals/pio2/tests/unit/test_nc4.c | 60 +- scripts/Testing/Testcases/ERI_script | 74 +- scripts/Testing/Testcases/ERP_script | 28 +- scripts/Testing/Testcases/ERS_script | 22 +- scripts/Testing/Testcases/ERT_script | 22 +- scripts/Testing/Testcases/ICP_build.csh | 12 +- scripts/Testing/Testcases/ICP_script | 10 +- scripts/Testing/Testcases/LAR_script | 20 +- scripts/Testing/Testcases/LII_build.csh | 4 +- scripts/Testing/Testcases/NCR_build.csh | 14 +- scripts/Testing/Testcases/NCR_script | 28 +- scripts/Testing/Testcases/NOC_build.csh | 4 +- scripts/Testing/Testcases/NOC_script | 32 +- scripts/Testing/Testcases/OCP_build.csh | 6 +- scripts/Testing/Testcases/OCP_script | 8 +- scripts/Testing/Testcases/PEM_auto_pes_file | 48 +- scripts/Testing/Testcases/PEM_script | 24 +- scripts/Testing/Testcases/PET_script | 26 +- scripts/Testing/Testcases/PMT_build.csh | 16 +- scripts/Testing/Testcases/PMT_script | 24 +- scripts/Testing/Testcases/README | 50 +- scripts/Testing/Testcases/SEQ_script | 20 +- scripts/Testing/Testcases/SSP_script | 32 +- scripts/Testing/Testcases/config_tests.xml | 54 +- scripts/Testing/t/README | 4 +- scripts/Testing/t/test_manage_testlist.t | 88 +- scripts/Tools/README.post_process | 6 +- scripts/Tools/archive_metadata.sh | 10 +- scripts/Tools/baseline_gen_comp | 2 +- scripts/Tools/cesm_postbuild | 2 +- scripts/Tools/cesm_postbuild.noop | 2 +- scripts/Tools/check_case | 10 +- scripts/Tools/check_exactrestart.pl | 6 +- scripts/Tools/check_memory.pl | 138 +- scripts/Tools/compare_namelists.pl | 6 +- scripts/Tools/compare_throughput.pl | 54 +- scripts/Tools/component_compare_move.sh | 12 +- scripts/Tools/component_compare_test.sh | 18 +- scripts/Tools/component_compgen_baseline.sh | 16 +- scripts/Tools/component_generate.sh | 6 +- scripts/Tools/component_write_comparefail.pl | 8 +- scripts/Tools/create_production_test_readme | 20 +- scripts/Tools/create_train | 22 +- scripts/Tools/cs.submit | 52 +- scripts/Tools/getTiming | 2 +- scripts/Tools/lt_archive.sh | 34 +- scripts/Tools/mdiag_reduce.csh | 6 +- scripts/Tools/mdiag_reduce.pl | 10 +- scripts/Tools/pointclm/makepointdata.py | 24 +- scripts/Tools/pointclm/pointCLM.py | 48 +- scripts/Tools/pointclm/post_process.py | 4 +- scripts/Tools/pointclm/site_fullrun.py | 8 +- scripts/Tools/st_archive | 74 +- scripts/Tools/xmlquery | 28 +- scripts/Tools/xmltestentry | 10 +- scripts/Tools/year_string.sh | 2 +- scripts/manage_pes | 150 +- scripts/manage_testlists | 306 +- share/csm_share/README | 14 +- .../include/dynamic_vector_procdef.inc | 4 +- share/csm_share/shr/mct_mod.F90 | 86 +- share/csm_share/shr/shr_cal_mod.F90 | 26 +- share/csm_share/shr/shr_const_mod.F90 | 4 +- share/csm_share/shr/shr_dmodel_mod.F90 | 56 +- share/csm_share/shr/shr_file_mod.F90 | 100 +- share/csm_share/shr/shr_flux_mod.F90 | 390 +- share/csm_share/shr/shr_map_mod.F90 | 26 +- share/csm_share/shr/shr_mct_mod.F90 | 36 +- share/csm_share/shr/shr_mem_mod.F90 | 16 +- share/csm_share/shr/shr_mpi_mod.F90 | 34 +- share/csm_share/shr/shr_msg_mod.F90 | 24 +- share/csm_share/shr/shr_ncread_mod.F90 | 66 +- share/csm_share/shr/shr_nl_mod.F90 | 6 +- share/csm_share/shr/shr_orb_mod.F90 | 160 +- share/csm_share/shr/shr_pcdf_mod.F90 | 8 +- share/csm_share/shr/shr_pio_mod.F90 | 42 +- share/csm_share/shr/shr_reprosum_mod.F90 | 322 +- share/csm_share/shr/shr_scam_mod.F90 | 26 +- share/csm_share/shr/shr_spfn_mod.F90 | 8 +- share/csm_share/shr/shr_strconvert_mod.F90 | 4 +- share/csm_share/shr/shr_strdata_mod.F90 | 108 +- share/csm_share/shr/shr_stream_mod.F90 | 330 +- share/csm_share/shr/shr_string_mod.F90 | 54 +- share/csm_share/shr/shr_sys_mod.F90 | 2 +- share/csm_share/shr/shr_tInterp_mod.F90 | 26 +- share/csm_share/shr/shr_timer_mod.F90 | 34 +- share/csm_share/shr/shr_vmath_mod.F90 | 6 +- .../csm_share/test/old_unit_testers/Mkdepends | 10 +- .../test/old_unit_testers/bundle_expected.F90 | 4 +- .../test/old_unit_testers/make.Macros | 2 +- .../test/old_unit_testers/test_mod.F90 | 4 +- .../test/old_unit_testers/test_shr_file.F90 | 2 +- .../test/old_unit_testers/test_shr_log.F90 | 4 +- .../test/old_unit_testers/test_shr_scam.F90 | 6 +- .../old_unit_testers/test_shr_streams.F90 | 12 +- .../test/old_unit_testers/test_shr_sys.F90 | 2 +- .../old_unit_testers/test_shr_tInterp.F90 | 4 +- .../unit/shr_assert_test/test_assert_array.pf | 2 +- .../test/unit/shr_spfn_test/test_erf_r8.pf | 2 +- .../unit/shr_string_test/test_shr_string.pf | 20 +- .../test/unit/shr_vmath_test/CMakeLists.txt | 2 +- .../test/unit/shr_vmath_test/test_vmath.F90 | 2 +- share/csm_share/unit_test_stubs/pio/pio.F90 | 104 +- .../csm_share/unit_test_stubs/pio/pio.F90.in | 102 +- share/esmf_wrf_timemgr/ESMF.F90 | 4 +- share/esmf_wrf_timemgr/ESMF_AlarmClockMod.F90 | 4 +- share/esmf_wrf_timemgr/ESMF_AlarmMod.F90 | 40 +- share/esmf_wrf_timemgr/ESMF_BaseMod.F90 | 112 +- share/esmf_wrf_timemgr/ESMF_BaseTimeMod.F90 | 14 +- share/esmf_wrf_timemgr/ESMF_CalendarMod.F90 | 20 +- share/esmf_wrf_timemgr/ESMF_ClockMod.F90 | 142 +- share/esmf_wrf_timemgr/ESMF_Macros.inc | 4 +- share/esmf_wrf_timemgr/ESMF_Stubs.F90 | 8 +- .../esmf_wrf_timemgr/ESMF_TimeIntervalMod.F90 | 56 +- share/esmf_wrf_timemgr/ESMF_TimeMgr.inc | 8 +- share/esmf_wrf_timemgr/ESMF_TimeMod.F90 | 28 +- share/esmf_wrf_timemgr/Makefile | 4 +- share/esmf_wrf_timemgr/MeatMod.F90 | 4 +- share/esmf_wrf_timemgr/unittests/Makefile | 6 +- share/shr_RandNum/include/dSFMT-params.h | 2 +- .../src/dsfmt_f03/dSFMT_interface.F90 | 6 +- .../src/mt19937/mersennetwister_mod.F90 | 146 +- share/shr_RandNum/test/bench/Makefile | 6 +- share/timing/CMakeLists.txt | 2 +- share/timing/ChangeLog | 84 +- share/timing/GPTLget_memusage.c | 12 +- share/timing/GPTLprint_memusage.c | 20 +- share/timing/GPTLutil.c | 10 +- share/timing/Makefile | 8 +- share/timing/README | 8 +- share/timing/f_wrappers.c | 20 +- share/timing/gptl.c | 442 +- share/timing/gptl.inc | 8 +- share/timing/gptl_papi.c | 142 +- share/timing/perf_mod.F90 | 134 +- share/timing/perf_utils.F90 | 38 +- share/timing/private.h | 8 +- tools/Readme.configure | 6 +- tools/configure | 38 +- tools/cprnc/CMake/FindNetcdf.cmake | 14 +- tools/cprnc/CMakeLists.txt | 4 +- tools/cprnc/Makefile | 8 +- tools/cprnc/README | 30 +- tools/cprnc/compare_vars_mod.F90.in | 64 +- tools/cprnc/cprnc.F90 | 20 +- tools/cprnc/filestruct.F90 | 22 +- tools/cprnc/run_tests | 2 +- tools/cprnc/summarize_cprnc_diffs | 28 +- .../test_inputs/clm2.h0.subset.control.nc | Bin 120088 -> 120087 bytes .../cprnc/test_inputs/clm2.h0.subset.test.nc | Bin 120048 -> 120047 bytes .../test_inputs/clm2.h1.subset.control.nc | Bin 321552 -> 321550 bytes .../cprnc/test_inputs/clm2.h1.subset.test.nc | Bin 321512 -> 321511 bytes tools/cprnc/utils.F90 | 14 +- tools/load_balancing_tool/LICENSE.TXT | 44 +- tools/load_balancing_tool/README | 2 +- .../code/cesm_scaling.gplot | 8 +- tools/load_balancing_tool/code/f02_peList.txt | 5892 ++++++++--------- tools/load_balancing_tool/code/f05_peList.txt | 2734 ++++---- tools/load_balancing_tool/code/f09_peList.txt | 1420 ++-- tools/load_balancing_tool/code/f19_peList.txt | 666 +- tools/load_balancing_tool/code/fv_model.mod | 184 +- tools/load_balancing_tool/code/fv_model.run | 150 +- .../code/fv_second_pass.pl | 2 +- .../load_balancing_tool/code/load_balance.pl | 6 +- tools/load_balancing_tool/code/merge.py | 2 +- tools/load_balancing_tool/code/model.data | 2 +- tools/load_balancing_tool/code/model.mod | 182 +- tools/load_balancing_tool/code/model.run | 152 +- tools/load_balancing_tool/code/neos.py | 2 +- tools/load_balancing_tool/run_first.csh | 14 +- tools/load_balancing_tool/run_second.csh | 4 +- tools/mapping/SCRIP2plot.ncl | 442 +- tools/mapping/check_maps/README | 2 +- .../src/ESMF_RegridWeightGenCheck.F90 | 30 +- tools/mapping/check_maps/src/Makefile | 8 +- tools/mapping/examples/wrf_clm | 16 +- tools/mapping/gen_domain_files/README | 30 +- tools/mapping/gen_domain_files/src/Makefile | 20 +- .../gen_domain_files/src/gen_domain.F90 | 150 +- tools/mapping/gen_mapping_files/README | 40 +- .../gen_ESMF_mapping_file/README | 16 +- .../gen_ESMF_mapping_file/create_ESMF_map.sh | 14 +- .../regridbatch.yellowstone.sh | 4 +- .../gen_mapping_files/gen_cesm_maps.sh | 6 +- .../regridbatch.yellowstone.sh | 4 +- .../gen_mapping_files/runoff_to_ocn/README | 2 +- .../runoff_to_ocn/src/Makefile | 16 +- .../runoff_to_ocn/src/fixroff_mod.F90 | 38 +- .../runoff_to_ocn/src/main.F90 | 12 +- .../runoff_to_ocn/src/map_mod.F90 | 140 +- .../runoff_to_ocn/src/mapsort_mod.F90 | 46 +- .../runoff_to_ocn/src/shr_timer_mod.F90 | 38 +- .../runoff_to_ocn/src/smooth_mod.F90 | 174 +- .../runoff_to_ocn/tools/makdep.c | 50 +- tools/mapping/map_field/src/Makefile | 20 +- tools/mapping/map_field/src/map_field.F90 | 100 +- tools/statistical_ensemble_test/ensemble.sh | 38 +- .../ncl_library/Zscore.ncl | 2 +- .../ncl_library/area_avg.ncl | 6 +- .../ncl_library/create_ensemble.ncl | 2 +- .../ncl_library/global.ncl | 2 +- .../ncl_library/rmsz.ncl | 4 +- .../ncl_library/vinterp.ncl | 4 +- .../pyCECT/LICENSE.txt | 42 +- .../pyCECT/README_pyCECT.rst | 20 +- .../pyCECT/README_pyEnsSum.rst | 48 +- .../pyCECT/pyCECT.py | 26 +- .../pyCECT/pyEnsLib.py | 160 +- .../pyCECT/pyEnsSum.py | 98 +- tools/statistical_ensemble_test/single_run.sh | 2 +- .../test_run_against_ensemble.ncl | 2 +- .../user_nl_cam_LENS | 4 +- .../system_tests/configure.test/configtest.pl | 20 +- tools/unit_testing/python/machine_setup.py | 10 +- .../unit_testing/python/test_xml_test_list.py | 4 +- tools/unit_testing/run_tests.py | 2 +- utils/perl5lib/.env_mach_specific.csh | 6 +- utils/perl5lib/.env_mach_specific.sh | 22 +- utils/perl5lib/Build/Config.pm | 20 +- utils/perl5lib/Build/Namelist.pm | 76 +- utils/perl5lib/Build/NamelistDefaults.pm | 34 +- utils/perl5lib/Build/NamelistDefinition.pm | 42 +- utils/perl5lib/CPAN/MRO/Compat.pm | 2 +- utils/perl5lib/CPAN/Sub/Uplevel.pm | 48 +- utils/perl5lib/CPAN/Test/Exception.pm | 68 +- utils/perl5lib/Config/ConfigCase.pm | 58 +- utils/perl5lib/Config/ConfigCompsetGrid.pm | 162 +- utils/perl5lib/Config/ConfigMachine.pm | 40 +- utils/perl5lib/Config/ConfigPes.pm | 64 +- utils/perl5lib/Config/ConfigTests.pm | 8 +- utils/perl5lib/Decomp/Config.pm | 2 +- utils/perl5lib/Decomp/OverallConfig.pm | 2 +- utils/perl5lib/Depends/Checks.pm | 4 +- utils/perl5lib/File/Copy/Recursive.pm | 98 +- utils/perl5lib/File/DirCompare.pm | 38 +- utils/perl5lib/Log/Log4perl.pm | 464 +- utils/perl5lib/Log/Log4perl/Appender.pm | 134 +- .../perl5lib/Log/Log4perl/Appender/Buffer.pm | 24 +- utils/perl5lib/Log/Log4perl/Appender/DBI.pm | 100 +- utils/perl5lib/Log/Log4perl/Appender/Limit.pm | 36 +- utils/perl5lib/Log/Log4perl/Appender/RRDs.pm | 32 +- .../perl5lib/Log/Log4perl/Appender/Screen.pm | 24 +- .../Log4perl/Appender/ScreenColoredLevels.pm | 16 +- .../perl5lib/Log/Log4perl/Appender/Socket.pm | 26 +- .../perl5lib/Log/Log4perl/Appender/String.pm | 22 +- .../Log/Log4perl/Appender/Synchronized.pm | 60 +- .../Log/Log4perl/Appender/TestArrayBuffer.pm | 26 +- .../Log/Log4perl/Appender/TestBuffer.pm | 38 +- .../Log/Log4perl/Appender/TestFileCreeper.pm | 22 +- utils/perl5lib/Log/Log4perl/Catalyst.pm | 38 +- utils/perl5lib/Log/Log4perl/Config.pm | 138 +- .../Log/Log4perl/Config/BaseConfigurator.pm | 46 +- .../Log/Log4perl/Config/DOMConfigurator.pm | 152 +- .../Log4perl/Config/PropertyConfigurator.pm | 24 +- utils/perl5lib/Log/Log4perl/Config/Watch.pm | 44 +- utils/perl5lib/Log/Log4perl/DateFormat.pm | 44 +- utils/perl5lib/Log/Log4perl/FAQ.pm | 6 +- utils/perl5lib/Log/Log4perl/Filter.pm | 52 +- utils/perl5lib/Log/Log4perl/Filter/Boolean.pm | 32 +- .../Log/Log4perl/Filter/LevelMatch.pm | 18 +- .../Log/Log4perl/Filter/LevelRange.pm | 24 +- utils/perl5lib/Log/Log4perl/Filter/MDC.pm | 12 +- .../Log/Log4perl/Filter/StringMatch.pm | 20 +- utils/perl5lib/Log/Log4perl/InternalDebug.pm | 12 +- utils/perl5lib/Log/Log4perl/JavaMap.pm | 42 +- .../Log/Log4perl/JavaMap/ConsoleAppender.pm | 16 +- .../Log/Log4perl/JavaMap/FileAppender.pm | 18 +- .../Log/Log4perl/JavaMap/JDBCAppender.pm | 38 +- .../Log4perl/JavaMap/NTEventLogAppender.pm | 18 +- .../Log4perl/JavaMap/RollingFileAppender.pm | 20 +- .../Log/Log4perl/JavaMap/SyslogAppender.pm | 18 +- .../Log/Log4perl/JavaMap/TestBuffer.pm | 12 +- utils/perl5lib/Log/Log4perl/Layout.pm | 16 +- .../Log/Log4perl/Layout/NoopLayout.pm | 12 +- .../Log/Log4perl/Layout/PatternLayout.pm | 142 +- .../Layout/PatternLayout/Multiline.pm | 14 +- .../Log/Log4perl/Layout/SimpleLayout.pm | 16 +- utils/perl5lib/Log/Log4perl/Level.pm | 46 +- utils/perl5lib/Log/Log4perl/Logger.pm | 166 +- utils/perl5lib/Log/Log4perl/MDC.pm | 18 +- utils/perl5lib/Log/Log4perl/NDC.pm | 18 +- utils/perl5lib/Log/Log4perl/Resurrector.pm | 28 +- utils/perl5lib/Log/Log4perl/Util.pm | 22 +- utils/perl5lib/Log/Log4perl/Util/Semaphore.pm | 38 +- .../perl5lib/Log/Log4perl/Util/TimeTracker.pm | 32 +- utils/perl5lib/Module/ModuleLoader.pm | 2 +- utils/perl5lib/NMLTest/CompFiles.pm | 2 +- utils/perl5lib/Project/ProjectTools.pm | 12 +- utils/perl5lib/README.unittests.md | 4 +- utils/perl5lib/Run/RunChecks.pm | 14 +- utils/perl5lib/Streams/TemplateGeneric.pm | 44 +- utils/perl5lib/Task/TaskMaker.pm | 92 +- utils/perl5lib/Testing/TestLists.pm | 30 +- utils/perl5lib/UserMods/UserModsTools.pm | 18 +- utils/perl5lib/XML/Changes | 54 +- utils/perl5lib/XML/Lite.pm | 108 +- utils/perl5lib/XML/Lite/Element.pm | 88 +- utils/perl5lib/XML/README | 2 +- utils/perl5lib/XML/man3/XML_Lite.3 | 78 +- utils/perl5lib/XML/man3/XML_Lite_Element.3 | 16 +- utils/perl5lib/legacy_test/01.t | 4 +- utils/perl5lib/legacy_test/03.t | 46 +- utils/perl5lib/legacy_test/04.t | 18 +- utils/perl5lib/legacy_test/05.t | 10 +- utils/perl5lib/legacy_test/ConfigInfo.xml | 6 +- .../legacy_test/datm.template.streams.xml | 4 +- .../legacy_test/namelist_defaults_cam.xml | 4 +- .../legacy_test/namelist_defaults_clm.xml | 2 +- .../legacy_test/namelist_definition_cam.xml | 102 +- .../legacy_test/namelist_definition_clm.xml | 2 +- utils/perl5lib/legacy_test/run.log.same | 18 +- utils/perl5lib/legacy_test/testTestLists.t | 2 +- .../t/mocks_ModuleLoader/config_machines.xml | 110 +- .../env_mach_specific.babbage.csh | 4 +- .../env_mach_specific.babbage.sh | 14 +- .../env_mach_specific.babbageKnc.csh | 4 +- .../env_mach_specific.babbageKnc.sh | 18 +- .../env_mach_specific.bluewaters.csh | 4 +- .../env_mach_specific.bluewaters.sh | 28 +- .../env_mach_specific.brutus.csh | 6 +- .../env_mach_specific.brutus.sh | 10 +- .../env_mach_specific.eastwind.csh | 6 +- .../env_mach_specific.eastwind.sh | 14 +- .../env_mach_specific.edison.csh | 4 +- .../env_mach_specific.edison.sh | 54 +- .../env_mach_specific.eos.csh | 4 +- .../env_mach_specific.eos.sh | 24 +- .../env_mach_specific.erebus.csh | 6 +- .../env_mach_specific.erebus.sh | 18 +- .../env_mach_specific.gaea.csh | 4 +- .../env_mach_specific.gaea.sh | 22 +- .../env_mach_specific.goldbach.csh | 6 +- .../env_mach_specific.goldbach.sh | 6 +- .../env_mach_specific.hera.csh | 4 +- .../env_mach_specific.hera.sh | 12 +- .../env_mach_specific.hobart.csh | 6 +- .../env_mach_specific.hobart.sh | 8 +- .../env_mach_specific.mira.csh | 4 +- .../env_mach_specific.mira.sh | 14 +- .../env_mach_specific.olympus.csh | 6 +- .../env_mach_specific.olympus.sh | 16 +- .../env_mach_specific.pleiades-has.csh | 6 +- .../env_mach_specific.pleiades-has.sh | 18 +- .../env_mach_specific.pleiades-has.xml | 6 +- .../t/mocks_ModuleLoader/env_mach_specific.sh | 20 +- .../env_mach_specific.sierra.csh | 4 +- .../env_mach_specific.sierra.sh | 12 +- .../env_mach_specific.titan.csh | 4 +- .../env_mach_specific.titan.sh | 48 +- .../env_mach_specific.yellowstone.csh | 6 +- .../env_mach_specific.yellowstone.sh | 24 +- utils/perl5lib/t/test_ModuleLoader.pm | 192 +- utils/perl5lib/test_ModuleLoader.pl | 16 +- utils/python/CIME/XML/compsets.py | 8 +- utils/python/CIME/env_module.py | 4 +- utils/python/tests/cpl.hi1.nc.test | Bin 53394 -> 53393 bytes utils/python/tests/cpl.hi2.nc.test | Bin 53394 -> 53393 bytes 1114 files changed, 39537 insertions(+), 39537 deletions(-) diff --git a/LICENSE.TXT b/LICENSE.TXT index ff7f413b65fe..d832be2be936 100644 --- a/LICENSE.TXT +++ b/LICENSE.TXT @@ -1,34 +1,34 @@ Copyright (c) 2015, University Corporation for Atmospheric Research (UCAR) All rights reserved. -Developed by: +Developed by: University Corporation for Atmospheric Research - National Center for Atmospheric Research https://www2.cesm.ucar.edu/working-groups/sewg -Permission is hereby granted, free of charge, to any person obtaining -a copy of this software and associated documentation files (the "Software"), -to deal with the Software without restriction, including without limitation -the rights to use, copy, modify, merge, publish, distribute, sublicense, -and/or sell copies of the Software, and to permit persons to whom +Permission is hereby granted, free of charge, to any person obtaining +a copy of this software and associated documentation files (the "Software"), +to deal with the Software without restriction, including without limitation +the rights to use, copy, modify, merge, publish, distribute, sublicense, +and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - - Redistributions of source code must retain the above copyright notice, + - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimers. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimers in the documentation + - Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimers in the documentation and/or other materials provided with the distribution. - - Neither the names of [Name of Development Group, UCAR], - nor the names of its contributors may be used to endorse or promote + - Neither the names of [Name of Development Group, UCAR], + nor the names of its contributors may be used to endorse or promote products derived from this Software without specific prior written permission. -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE -LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS +INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN +CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) +ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index ebfc43f52960..1737b9992b82 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # cime Common Infrastructure for Modeling the Earth -cime (pronounced: seem) represents the infrastructure code for the +cime (pronounced: seem) represents the infrastructure code for the Community Earth System Model (CESM) version 1.4 @@ -10,64 +10,64 @@ See the CESM web site for documentation and information. The cime directory structure (other than the externals/ directory) was generated from the following subversion trunk tags: -* cime/driver_cpl +* cime/driver_cpl https://svn-ccsm-models.cgd.ucar.edu/drv/seq_mct/trunk_tags/drvseq5_1_15 -* cime/components/data_comps/datm +* cime/components/data_comps/datm https://svn-ccsm-models.cgd.ucar.edu/datm7/trunk_tags/datm8_150310 - -* cime/components/data_comps/dice + +* cime/components/data_comps/dice https://svn-ccsm-models.cgd.ucar.edu/dice7/trunk_tags/dice8_150310 - -* cime/components/data_comps/dlnd + +* cime/components/data_comps/dlnd https://svn-ccsm-models.cgd.ucar.edu/dlnd7/trunk_tags/dlnd8_150310 - -* cime/components/data_comps/docn + +* cime/components/data_comps/docn https://svn-ccsm-models.cgd.ucar.edu/docn7/trunk_tags/docn8_150310 - -* cime/components/data_comps/drof + +* cime/components/data_comps/drof https://svn-ccsm-models.cgd.ucar.edu/drof/trunk_tags/drof_150310 - -* cime/components/stub_comps + +* cime/components/stub_comps https://svn-ccsm-models.cgd.ucar.edu/stubs/trunk_tags/stubs1_4_08 - -* cime/components/xcpl_comps + +* cime/components/xcpl_comps https://svn-ccsm-models.cgd.ucar.edu/dead7/trunk_tags/dead7_8_04 -* cime/machines +* cime/machines https://svn-ccsm-models.cgd.ucar.edu/Machines/trunk_tags/Machines_150309 -* cime/scripts +* cime/scripts https://svn-ccsm-models.cgd.ucar.edu/scripts/trunk_tags/scripts_150309 -* cime/share/csm_share +* cime/share/csm_share https://svn-ccsm-models.cgd.ucar.edu/csm_share/trunk_tags/share3_150116 - -* cime/share/esmf_wrf_timemgr + +* cime/share/esmf_wrf_timemgr https://svn-ccsm-models.cgd.ucar.edu/esmf_wrf_timemgr/trunk_tags/esmf_wrf_timemgr_141217 - -* cime/share/timing + +* cime/share/timing https://svn-ccsm-models.cgd.ucar.edu/timing/trunk_tags/timing_150302 -* cime/utils/pythonlib +* cime/utils/pythonlib https://svn-ccsm-models.cgd.ucar.edu/scripts/trunk_tags/scripts4_150204/scripts/ccsm_utils/Tools/pythonlib - -* cime/utils/perl5lib + +* cime/utils/perl5lib https://svn-ccsm-models.cgd.ucar.edu/perl5lib/trunk_tags/perl5lib_150302 -* cime/tools/load_balancing_tool +* cime/tools/load_balancing_tool https://svn-ccsm-models.cgd.ucar.edu/tools/load_balancing_tool/trunk_tags/load_balancing_tool_141008 - -* cime/tools/unit_testing + +* cime/tools/unit_testing https://svn-ccsm-models.cgd.ucar.edu/unit_testing/trunk_tags/unit_testing_0_16 - -* cime/tools/statistical_ensemble_test + +* cime/tools/statistical_ensemble_test https://svn-ccsm-models.cgd.ucar.edu/validation_testing/trunk_tags/validation_20140708/run_CESM/ - -* cime/tools/mapping + +* cime/tools/mapping https://svn-ccsm-models.cgd.ucar.edu/tools/mapping/trunk_tags/mapping_141106 - -* cime/tools/cprnc + +* cime/tools/cprnc https://svn-ccsm-models.cgd.ucar.edu/tools/cprnc/trunk_tags/cprnc_150301 diff --git a/cime_config/acme/allactive/config_compsets.xml b/cime_config/acme/allactive/config_compsets.xml index 52f186dde764..424ac3c2ca03 100644 --- a/cime_config/acme/allactive/config_compsets.xml +++ b/cime_config/acme/allactive/config_compsets.xml @@ -8,7 +8,7 @@ ========================================= COMPSET naming convention ========================================= -The compset longname has the specified order +The compset longname has the specified order atm, lnd, ice, ocn, river, glc wave cesm-options The notation for the compset longname is TIME_ATM[%phys]_LND[%phys]_ICE[%phys]_OCN[%phys]_ROF[%phys]_GLC[%phys]_WAV[%phys][_BGC%phys] @@ -21,13 +21,13 @@ Where ROF = [RTM, MOSART, DROF, SROF, XROF] GLC = [CISM1, CISM2S, CISM2P, MPASLISIA, MPASLIALB, SGLC, XGLC] WAV = [WW3, DWAV, SWAV, XWAV] - BGC = optional BGC scenario + BGC = optional BGC scenario The OPTIONAL %phys attributes specify submodes of the given system For example DOCN%DOM is the data ocean model for DOCN - ALL the possible %phys choices for each component are listed + ALL the possible %phys choices for each component are listed with the -list command for create_newcase ALL data models must have a %phys option that corresponds to the data - model mode + model mode Each compset is associated with five names - longname (see above) - shortname (for backwards compatibility) @@ -38,10 +38,10 @@ Each compset is associated with five names ========================================= GRID naming convention ========================================= -The long grid name has the order atm,lnd,ocn/ice,river,mask,glc +The long grid name has the order atm,lnd,ocn/ice,river,mask,glc The following shortname is used a% => atm, l% => lnd, oi% => ocn/ice, r% => river, m% => mask, g% => glc, w% => wave -The notation is +The notation is a%name_l%name_oi%name_r%name_m%mask_g%name_w%name Each grid is associated with three names - longname (a%name_l%name_oi%name_r%name_m%mask_g%name_w%name) @@ -49,18 +49,18 @@ Each grid is associated with three names - alias (even shorter notation than shortname) - 2000_CAM4_CLM40%CN_CICE%PRES_DOCN%DOM_RTM_CISM1_SWAV -1850_CAM4_CLM40%CN_CICE%PRES_DOCN%DOM_RTM_CISM1_SWAV +1850_CAM4_CLM40%CN_CICE%PRES_DOCN%DOM_RTM_CISM1_SWAV 2000_CAM4_CLM40%CN_CICE%PRES_DOCN%DOM_RTM_CISM2P_SWAV 20TR_CAM4_CLM40%CN_CICE%PRES_DOCN%DOM_RTM_CISM1_SWAV @@ -295,27 +295,27 @@ value of RUN_STARTDATE will be date2. -2000_DATM%1PT_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV -2000_DATM%1PT_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV -2000_DATM%1PT_CLM50%SP_SICE_SOCN_RTM_SGLC_SWAV +2000_DATM%1PT_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV +2000_DATM%1PT_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV +2000_DATM%1PT_CLM50%SP_SICE_SOCN_RTM_SGLC_SWAV 2003_DATM%QIA_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV_TEST 2003_DATM%QIA_CLM40%CN_SICE_SOCN_RTM_SGLC_SWAV_TEST 2003_DATM%QIA_CLM45%CN_SICE_SOCN_RTM_SGLC_SWAV_TEST -1850_DATM%QIA_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV -1850_DATM%QIA_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV -2000_DATM%QIA_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV -2000_DATM%QIA_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV -2000_DATM%QIA_CLM45%SP_SICE_SOCN_MOSART_SGLC_SWAV -4804_DATM%QIA_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV -4804_DATM%QIA_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV -20TR_DATM%QIA_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV -20TR_DATM%QIA_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV +1850_DATM%QIA_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV +1850_DATM%QIA_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV +2000_DATM%QIA_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV +2000_DATM%QIA_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV +2000_DATM%QIA_CLM45%SP_SICE_SOCN_MOSART_SGLC_SWAV +4804_DATM%QIA_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV +4804_DATM%QIA_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV +20TR_DATM%QIA_CLM40%SP_SICE_SOCN_RTM_SGLC_SWAV +20TR_DATM%QIA_CLM45%SP_SICE_SOCN_RTM_SGLC_SWAV 20TR_DATM%QIA_CLM45%CN_SICE_SOCN_RTM_SGLC_SWAV 20TR_SATM%QIA_CLM45%CN_SICE_SOCN_RTM_SGLC_SWAV -2000_DATM%QIA_CLM40%CN_SICE_SOCN_RTM_SGLC_SWAV +2000_DATM%QIA_CLM40%CN_SICE_SOCN_RTM_SGLC_SWAV 2000_DATM%QIA_CLM40%CN_SICE_SOCN_MOSART_SGLC_SWAV 2000_DATM%NLDAS_CLM40%CN_SICE_SOCN_MOSART_SGLC_SWAV 1850_DATM%QIA_CLM40%CN_SICE_SOCN_RTM_SGLC_SWAV @@ -354,7 +354,7 @@ value of RUN_STARTDATE will be date2. 2000_DATM%QIA_CLM40%CNDV-CROP_SICE_SOCN_RTM_SGLC_SWAV -2000_DATM%QIA_CLM45%CNDV_SICE_SOCN_RTM_SGLC_SWAV +2000_DATM%QIA_CLM45%CNDV_SICE_SOCN_RTM_SGLC_SWAV 2000_DATM%QIA_CLM45%BGCDV-CROP_SICE_SOCN_RTM_SGLC_SWAV 2000_DATM%QIA_CLM45%SP-VIC_SICE_SOCN_RTM_SGLC_SWAV 2000_DATM%QIA_CLM45%CN-ED_SICE_SOCN_RTM_SGLC_SWAV @@ -447,13 +447,13 @@ value of RUN_STARTDATE will be date2. 2000_CAM4_CLM40%SP_CICE_POP2%1D_RTM_SGLC_SWAV 2000_DATM%NYF_SLND_DICE%SSMI_POP2%1D_DROF%NYF_SGLC_SWAV ---DO NOT USE FOR LONG SIMULATIONS: +--DO NOT USE FOR LONG SIMULATIONS: - + @@ -465,41 +465,41 @@ value of RUN_STARTDATE will be date2. -cam -datm -satm -xatm +cam +datm +satm +xatm -clm -dlnd -slnd -xlnd +clm +dlnd +slnd +xlnd rtm mosart -drof -srof -xrof +drof +srof +xrof -cice +cice dice -sice -xice +sice +xice mpas-cice -pop +pop docn socn xocn aquap mpas-o -cism +cism sglc xglc mpasli -ww3 +ww3 swav dwav xwav @@ -544,15 +544,15 @@ value of RUN_STARTDATE will be date2. XWAV: - + -1850 to present day: +1850 to present day: pre-industrial: present day: present day: -1850 to 2000 transient: -1955 to 2005 transient: +1850 to 2000 transient: +1955 to 2005 transient: RCP8.5 future scenario: RCP6.0 future scenario: RCP4.5 future scenario: @@ -560,13 +560,13 @@ value of RUN_STARTDATE will be date2. RCP4.5 based scenario from 2013 (control for WACCM/CARMA nuclear winter study): present day with conditions for solar minimum in 1996: 1992 to 2005 transient: -GEOS5 meteorology: +GEOS5 meteorology: CLM transient land use: -----------------------------WARNING ------------------------------------------------ -The compset F_1850-PDAY_CAM5 uses complete atmospheric forcing data from observed sources -up to the year 2005. Following this period it is a combination of observed sources -(SST, sea ice, CO2, CH4, N2O) to present day and IPCC RCP4.5 scenario data. +The compset F_1850-PDAY_CAM5 uses complete atmospheric forcing data from observed sources +up to the year 2005. Following this period it is a combination of observed sources +(SST, sea ice, CO2, CH4, N2O) to present day and IPCC RCP4.5 scenario data. ------------------------------------------------------------------------------------- @@ -581,13 +581,13 @@ conditions will be provided and this warning will be removed. ========================================= Time period (first four characters) ========================================= -1850 => pre-industrial -2000 => present day -PDAY => present day -20TR => transient 1850 to 2000 +1850 => pre-industrial +2000 => present day +PDAY => present day +20TR => transient 1850 to 2000 PIPD => transient pre-industrial to present day -5505 => transient 1955 to 2005 -9205 => transient 1992 to 2005 +5505 => transient 1955 to 2005 +9205 => transient 1992 to 2005 RCP8 => transient RCP8.5 future scenario RCP6 => transient RCP6.0 future scenario RCP4 => transient RCP4.5 future scenario @@ -599,18 +599,18 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM - + fv eul se --phys cam4 --phys cam5 +-phys cam4 +-phys cam5 -chem trop_mam4 -clubb_sgs -microphys mg2 -chem linoz_mam4_resus_mom -rain_evap_to_coarse_aero --cosp +-cosp -clubb_sgs -microphys mg2 -clubb_sgs -microphys mg2 @@ -625,11 +625,11 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM -chem trop_bam -chem trop_mozart -chem trop_mozart_soa -age_of_air_trcs --chem trop_mozart_mam3 -age_of_air_trcs --chem none --chem trop_strat_mam3 -age_of_air_trcs --chem trop_strat_mam7 -age_of_air_trcs --chem trop_strat_soa -age_of_air_trcs +-chem trop_mozart_mam3 -age_of_air_trcs +-chem none +-chem trop_strat_mam3 -age_of_air_trcs +-chem trop_strat_mam7 -age_of_air_trcs +-chem trop_strat_soa -age_of_air_trcs @@ -646,47 +646,47 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM -nlev 88 -chem super_fast_llnl --chem super_fast_llnl -age_of_air_trcs --co2_cycle +-chem super_fast_llnl -age_of_air_trcs +-co2_cycle -dyn eul -scam -nlev 60 --phys ideal --phys adiabatic --ocn aquaplanet +-phys ideal +-phys adiabatic +-ocn aquaplanet - + -2000_cam4_trop_chem -1850_cam4 -1850_cam5 -1850-2005_cam4 -1850-2005_cam5 -1850-2005_cam5 -1850-2005_cam4 -1850-2005_cam4_bgc -2005-2100_cam4_rcp26 -2005-2100_cam4_rcp45 -2005-2100_cam4_rcp45_bgc -2005-2100_cam4_rcp60 -2005-2100_cam4_rcp85 -2005-2100_cam4_rcp85_bgc -2006-2100_cam5_rcp26 -2006-2100_cam5_rcp45 -2006-2100_cam5_rcp60 -2006-2100_cam5_rcp85 -1850_cam4_super_fast_llnl -2000_cam4_super_fast_llnl -1850-2005_cam4_super_fast_llnl -2000_cam4_trop_chem -2000_cam5_trop_moz_mam3 -1850_cam5_pm +2000_cam4_trop_chem +1850_cam4 +1850_cam5 +1850-2005_cam4 +1850-2005_cam5 +1850-2005_cam5 +1850-2005_cam4 +1850-2005_cam4_bgc +2005-2100_cam4_rcp26 +2005-2100_cam4_rcp45 +2005-2100_cam4_rcp45_bgc +2005-2100_cam4_rcp60 +2005-2100_cam4_rcp85 +2005-2100_cam4_rcp85_bgc +2006-2100_cam5_rcp26 +2006-2100_cam5_rcp45 +2006-2100_cam5_rcp60 +2006-2100_cam5_rcp85 +1850_cam4_super_fast_llnl +2000_cam4_super_fast_llnl +1850-2005_cam4_super_fast_llnl +2000_cam4_trop_chem +2000_cam5_trop_moz_mam3 +1850_cam5_pm 2000_cam5_plmod 2000_cam5_plmod_plus_resus 2000_cam5_linoz_plmod_plus_resus @@ -703,7 +703,7 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM waccm_sc_2005-2100_cam4_rcp85 waccm_1850_cam4 waccm_2000_cam4 -waccm_1850-2005_cam4 +waccm_1850-2005_cam4 waccm_2005-2100_cam4_rcp26 waccm_2005-2100_cam4_rcp45 waccm_2005-2100_cam4_rcp85 @@ -714,7 +714,7 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM cam4_bam_radpsv_geos5 sd_waccm_geos5 sd_waccm_sulfur -soa_chem_megan_emis +soa_chem_megan_emis 2000_cam5_trop_strat_mam3 2000_cam5_trop_strat_mam7 2000_cam4_trop_strat_soa @@ -726,7 +726,7 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM scenario_ghg='RAMP_CO2_ONLY'ramp_co2_annual_rate=1 - + co2_cycle_rad_passive=.true. @@ -735,7 +735,7 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM - + @@ -766,7 +766,7 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM CAM WACCM specified chemistry: CAM WACCM with the stratospheric black carbon CARMA model: CAM WACCM with sulfur chemistry and the sulfate CARMA model: -CAM super_fast_llnl chemistry: +CAM super_fast_llnl chemistry: CAM trop_mozart chemistry: CAM trop_bam chemistry: CAM trop_mozart_mam3 chemistry: @@ -790,27 +790,27 @@ GEOS => GEOS5 meteorology for "stand-alone" CAM ========================================= CAM naming conventions in compset name ========================================= -CAM4% => cam4 physics -CAM5% => cam5 physics -CAM[45]%WCCM => CAM WACCM with daily solar data and SPEs: -CAM[45]%WCMX => CAM WACCM-X: -CAM[45]%WCSC => CAM WACCM specified chemistry: -CAM[45]%WCBC => CAM WACCM with the stratospheric black carbon CARMA model: -CAM[45]%WCSF => CAM WACCM with sulfur chemistry and the sulfate CARMA model: -CAM[45]%FCHM => CAM super_fast_llnl chemistry: -CAM[45]%TMOZ => CAM trop_mozart chemistry: -CAM[45]%MOZM => CAM trop_mozart_mam3 chemistry: -CAM[45]%MOZS => CAM trop_mozart_soa chemistry: -CAM[45]%SMA3 => CAM trop_strat_mam3 chemistry: -CAM[45]%SMA7 => CAM trop_strat_mam7 chemistry: -CAM[45]%SSOA => CAM trop_strat_soa chemistry: -CAM[45]%RCO2 => CAM CO2 ramp: -CAM[45]%SCAM => CAM single column mode: +CAM4% => cam4 physics +CAM5% => cam5 physics +CAM[45]%WCCM => CAM WACCM with daily solar data and SPEs: +CAM[45]%WCMX => CAM WACCM-X: +CAM[45]%WCSC => CAM WACCM specified chemistry: +CAM[45]%WCBC => CAM WACCM with the stratospheric black carbon CARMA model: +CAM[45]%WCSF => CAM WACCM with sulfur chemistry and the sulfate CARMA model: +CAM[45]%FCHM => CAM super_fast_llnl chemistry: +CAM[45]%TMOZ => CAM trop_mozart chemistry: +CAM[45]%MOZM => CAM trop_mozart_mam3 chemistry: +CAM[45]%MOZS => CAM trop_mozart_soa chemistry: +CAM[45]%SMA3 => CAM trop_strat_mam3 chemistry: +CAM[45]%SMA7 => CAM trop_strat_mam7 chemistry: +CAM[45]%SSOA => CAM trop_strat_soa chemistry: +CAM[45]%RCO2 => CAM CO2 ramp: +CAM[45]%SCAM => CAM single column mode: CAM[45]%L60 => CAM with 60 layers and full gravity wave spectrum: - + -phys clm4_0 @@ -827,38 +827,38 @@ CAM[45]%L60 => CAM with 60 layers and full gravity wave spectrum: - + -2000_control -2000_control -2000_control -1850-2100_rcp4.5_transient -2000_control -1850_control -20thC_transient -1850-2100_rcp6_transient -1850-2100_rcp4.5_transient -1850-2100_rcp2.6_transient -1850-2100_rcp8.5_transient -1850_glacierMEC_control -2000_glacierMEC_control +2000_control +2000_control +2000_control +1850-2100_rcp4.5_transient +2000_control +1850_control +20thC_transient +1850-2100_rcp6_transient +1850-2100_rcp4.5_transient +1850-2100_rcp2.6_transient +1850-2100_rcp8.5_transient +1850_glacierMEC_control +2000_glacierMEC_control 2000_glacierMEC_control -2000_glacierMEC_control -2000_glacierMEC_control -20thC_glacierMEC_transient +2000_glacierMEC_control +2000_glacierMEC_control +20thC_glacierMEC_transient 1850-2100_rcp8.5_glacierMEC_transient 1850-2100_rcp6_glacierMEC_transient 1850-2100_rcp4.5_glacierMEC_transient 1850-2100_rcp2.6_glacierMEC_transient 1850-2100_rcp4.5_glacierMEC_transient -20thC_transient -20thC_transient +20thC_transient +20thC_transient glacierMEC_pd 1850-2100_rcp4.5_transient -1850-2100_rcp4.5_transient -1850-2100_rcp4.5_transient +1850-2100_rcp4.5_transient +1850-2100_rcp4.5_transient -ignore_ic_year @@ -896,7 +896,7 @@ CAM[45]%L60 => CAM with 60 layers and full gravity wave spectrum: - + @@ -950,15 +950,15 @@ CLM50%[^_]*BGC => clm5.0 BGC (CN with vertically resolved soil BGC, based on C - + prognostic prescribed --bc_dep_to_snow_updates +-bc_dep_to_snow_updates -cam5=.true. +cam5=.true. @@ -976,22 +976,22 @@ CLM50%[^_]*BGC => clm5.0 BGC (CN with vertically resolved soil BGC, based on C CICE naming conventions in compset name ========================================= CICE => prognostic cice -CICE%PRES => prescribed cice +CICE%PRES => prescribed cice - + TRUE -iage -cfc -cfc -ecosys -$OCN_SUBMODEL +iage +cfc +cfc +ecosys +$OCN_SUBMODEL iage $OCN_SUBMODEL @@ -1032,7 +1032,7 @@ CICE%PRES => prescribed cice - + @@ -1060,7 +1060,7 @@ POP2%DAR => Darwin marine ecosystem (not supported in community releases) - + ACTIVE @@ -1096,7 +1096,7 @@ RTM%FLOOD => RTM model with flood - + ACTIVE @@ -1123,7 +1123,7 @@ MOSART%FLOOD => MOSART model with flood - + cism1 @@ -1133,8 +1133,8 @@ MOSART%FLOOD => MOSART model with flood TRUE FALSE -10 -10 +10 +10 TRUE TRUE @@ -1185,7 +1185,7 @@ MPASLIALBFO => external Albany First-order solver - + CORE2_NYF @@ -1194,12 +1194,12 @@ MPASLIALBFO => external Albany First-order solver NLDAS CLMCRUNCEP CLM1PT -CPLHIST3HrWx +CPLHIST3HrWx COPYALL_NPS_v1 COPYALL_NPS_CORE2_v1 WW3 -clim_2000 +clim_2000 clim_2000 clim_2000 clim_2000 @@ -1212,32 +1212,32 @@ MPASLIALBFO => external Albany First-order solver clim_1850 clim_2000 none -none +none -b40.1850.track1.1deg.006a -1 -960 -1030 +b40.1850.track1.1deg.006a +1 +960 +1030 1 1972 -2004 +2004 1 1948 -1972 +1972 1 1980 -1980 +1980 1 1901 -1920 +1920 1 1972 -2004 +2004 1895 1948 @@ -1251,21 +1251,21 @@ MPASLIALBFO => external Albany First-order solver 1948 2004 -2004 -1972 -2004 +2004 +1972 +2004 -2005 -1991 -2010 +2005 +1991 +2010 -1 -2002 -2003 +1 +2002 +2003 1 1901 -1920 +1920 1 1991 @@ -1275,9 +1275,9 @@ MPASLIALBFO => external Albany First-order solver 2002 2003 -1 -2003 -2003 +1 +2003 +2003 none rcp8.5 @@ -1294,10 +1294,10 @@ MPASLIALBFO => external Albany First-order solver - - - - + + + + @@ -1314,7 +1314,7 @@ MPASLIALBFO => external Albany First-order solver CRUNCEP atm input data for 1901-1920: CRUNCEP atm input data for 1991-2010: CPL history input data: -single point tower site atm input data: +single point tower site atm input data: COREv2 datm normal year forcing: (requires additional user-supplied data) COREv2 datm interannual year forcing: (requires additional user-supplied data) @@ -1336,10 +1336,10 @@ DATM%NPS => DATM NPS forcing - + -NULL +NULL CPLHIST @@ -1355,7 +1355,7 @@ DATM%NPS => DATM NPS forcing b.e10.BG1850CN.f09_g16.002 1 26 -100 +100 $DIN_LOC_ROOT/lnd/dlnd7/CPLHIST_SNO/b.e10.BG20TRCN.f09_g16.002_c121001 b.e10.BG20TRCN.f09_g16.002 @@ -1379,10 +1379,10 @@ DATM%NPS => DATM NPS forcing - - - - + + + + dlnd modes are DLND_MODE=NULL: @@ -1399,12 +1399,12 @@ DLND%LCPL => dlnd_mode is CPLHIST - + NULL DIATREN_ANN_RX1 -DIATREN_IAF_RX1 +DIATREN_IAF_RX1 NULL @@ -1426,12 +1426,12 @@ DROF%NULL => null mode - + ssmi -ssmi_iaf -prescribed +ssmi_iaf +prescribed copyall null @@ -1440,25 +1440,25 @@ DROF%NULL => null mode -dice mode is ssmi: -dice mode is ssmi_iaf: +dice mode is ssmi: +dice mode is ssmi_iaf: dice mode is prescribed: -dice mode is copy: -dice mode is null: +dice mode is copy: +dice mode is null: ========================================= DICE naming conventions ========================================= -DICE%SSMI => dice mode is ssmi -DICE%SIAF => dice mode is ssmi_iaf +DICE%SSMI => dice mode is ssmi +DICE%SIAF => dice mode is ssmi_iaf DICE%PRES => dice mode is prescribed DICE%COPY => dice mode is copy -DICE%NULL => dice mode is null +DICE%NULL => dice mode is null - + null @@ -1497,7 +1497,7 @@ DOCN%COPY => docn copy mode - + @@ -1514,7 +1514,7 @@ DOCN%COPY => docn copy mode $DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.1.9x2.5_gx1v6_090403.nc $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1.9x2.5_clim_c061031.nc $DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.0.9x1.25_gx1v6_090403.nc -$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_c040926.nc +$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_c040926.nc $DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.0.47x0.63_gx1v6_090408.nc $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.47x0.63_clim_c061106.nc $DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.0.23x0.31_gx1v6_101108.nc @@ -1523,7 +1523,7 @@ DOCN%COPY => docn copy mode CAMDATA 1850 1850 -2012 +2012 $DIN_LOC_ROOT/ocn/docn7/domain.ocn.1x1.111007.nc $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1x1_1850_2012_c130411.nc $DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.48x96_gx3v7_100114.nc @@ -1554,7 +1554,7 @@ DOCN%COPY => docn copy mode $DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.0.23x0.31_gx1v6_101108.nc $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.23x0.31_clim_pi_c101028.nc $DIN_LOC_ROOT/atm/cam/ocnfrac/domain.camocn.0.9x1.25_gx1v6_090403.nc -$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_c040926.nc +$DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_c040926.nc WW3 @@ -1577,27 +1577,27 @@ DOCN%COPY => docn copy mode - + -1979-01-01 -1850-01-01 -1955-01-01 +1979-01-01 +1850-01-01 +1955-01-01 2000-01-01 1996-01-01 -2005-01-01 -2010-01-01 -2008-01-01 +2005-01-01 +2010-01-01 +2008-01-01 2008-01-01 2005-01-01 2005-01-01 -2013-01-01 -0001-01-01 -1850-01-01 -2005-01-01 +2013-01-01 +0001-01-01 +1850-01-01 +2005-01-01 -1980-01-15 -1997-12-31 +1980-01-15 +1997-12-31 0001-01-01 0001-01-01 @@ -1613,17 +1613,17 @@ DOCN%COPY => docn copy mode 1997-06-18 84585 -1993-12-01 -nsteps -158 +1993-12-01 +nsteps +158 -1992-08-12 -nsteps -331 +1992-08-12 +nsteps +331 -0001-08-12 -nsteps -22772 +0001-08-12 +nsteps +22772 ndays 2 @@ -1638,7 +1638,7 @@ DOCN%COPY => docn copy mode nyears 10 -GREGORIAN +GREGORIAN nyears 1 @@ -1671,26 +1671,26 @@ DOCN%COPY => docn copy mode - + - + 48 48 - 48 - 48 + 48 + 48 144 288 - 48 - 72 + 48 + 72 4 24 24 - 24 - 48 - 48 - 1 + 24 + 48 + 48 + 1 96 96 @@ -1710,7 +1710,7 @@ DOCN%COPY => docn copy mode $ATM_NCPL 1 -4 +4 1 1 1 @@ -1725,7 +1725,7 @@ DOCN%COPY => docn copy mode CESM1_MOD CESM1_MOD_TIGHT -8 +8 $ATM_NCPL $ATM_NCPL $ATM_NCPL @@ -1803,11 +1803,11 @@ DOCN%COPY => docn copy mode 379.000 379.000 367.0 -367.0 -367.0 -367.0 -367.0 -367.0 +367.0 +367.0 +367.0 +367.0 +367.0 379.000 0.000001 0.000001 @@ -1818,9 +1818,9 @@ DOCN%COPY => docn copy mode 0.000001 0.000001 0.000001 -368.9 +368.9 368.9 -367.0 +367.0 0.000001 @@ -1837,7 +1837,7 @@ DOCN%COPY => docn copy mode - + @@ -1855,7 +1855,7 @@ DOCN%COPY => docn copy mode - + @@ -1867,35 +1867,35 @@ DOCN%COPY => docn copy mode -b40.1850.track1.2deg.wcm.007 +b40.1850.track1.2deg.wcm.007 0156-01-01 -b40.1850.track1.2deg.wcm.007 +b40.1850.track1.2deg.wcm.007 0156-01-01 -b40.1850.track1.2deg.003 -0501-01-01 +b40.1850.track1.2deg.003 +0501-01-01 -b40_1850_c02c_76jpf -0221-01-01 +b40_1850_c02c_76jpf +0221-01-01 -b40_1850_2d_r07c5cn_160jp -0070-01-01 +b40_1850_2d_r07c5cn_160jp +0070-01-01 -b40.1850.track1.2deg.003 -0501-01-01 +b40.1850.track1.2deg.003 +0501-01-01 -b40.1850.track1.2deg.003 -0501-01-01 +b40.1850.track1.2deg.003 +0501-01-01 -b40_1850_c02c_76jpf -0221-01-01 +b40_1850_c02c_76jpf +0221-01-01 -b40_1850_2d_r07c5cn_160jp -0070-01-01 +b40_1850_2d_r07c5cn_160jp +0070-01-01 -b40.1850.track1.2deg.wcm.007 -0156-01-01 +b40.1850.track1.2deg.wcm.007 +0156-01-01 b40.20th.track1.2deg.wcm.007 1955-01-01 @@ -1903,171 +1903,171 @@ DOCN%COPY => docn copy mode b40.20th.track1.2deg.wcm.007 1955-01-01 -I1850CN_f19_g16_c100503 -0001-01-01 +I1850CN_f19_g16_c100503 +0001-01-01 -I2000CN_f19_g16_c100503 -0001-01-01 +I2000CN_f19_g16_c100503 +0001-01-01 -I2000CN_f19_g16_c100503 -0001-01-01 +I2000CN_f19_g16_c100503 +0001-01-01 -I1850CN_f19_g16_c100503 -0001-01-01 +I1850CN_f19_g16_c100503 +0001-01-01 -I1850CN_f19_g16_c100503 -0001-01-01 +I1850CN_f19_g16_c100503 +0001-01-01 -I2000CN_f19_g16_c100503 -0001-01-01 +I2000CN_f19_g16_c100503 +0001-01-01 -I1850CN_f19_g16_c100503 -0001-01-01 +I1850CN_f19_g16_c100503 +0001-01-01 -I2000CN_f19_g16_c100503 -0001-01-01 +I2000CN_f19_g16_c100503 +0001-01-01 -I2000CN_f19_g16_c100503 -0001-01-01 +I2000CN_f19_g16_c100503 +0001-01-01 -I2000CN_f19_g16_c100503 -0001-01-01 +I2000CN_f19_g16_c100503 +0001-01-01 -I2000CN_f19_g16_c100503 -0001-01-01 +I2000CN_f19_g16_c100503 +0001-01-01 -b40.1955-2005.2deg.wcm.002 -2005-01-01 +b40.1955-2005.2deg.wcm.002 +2005-01-01 -b40.1955-2005.2deg.wcm.002 -2005-01-01 +b40.1955-2005.2deg.wcm.002 +2005-01-01 -b40.1955-2005.2deg.wcm.002 -2005-01-01 +b40.1955-2005.2deg.wcm.002 +2005-01-01 -b40.1955-2005.2deg.wcm.002 -2005-01-01 +b40.1955-2005.2deg.wcm.002 +2005-01-01 -b40.1955-2005.2deg.wcm.002 -2005-01-01 +b40.1955-2005.2deg.wcm.002 +2005-01-01 -b40.1955-2005.2deg.wcm.002 -2005-01-01 +b40.1955-2005.2deg.wcm.002 +2005-01-01 -b40_1850_1d_b08c5cn_138j -0320-01-01 +b40_1850_1d_b08c5cn_138j +0320-01-01 -b40.1850.track1.1deg.006 -0863-01-01 +b40.1850.track1.1deg.006 +0863-01-01 -bg40.1850.track1.1deg.006b -0863-01-01 +bg40.1850.track1.1deg.006b +0863-01-01 -b40.1850.track1.1deg.006 -0863-01-01 +b40.1850.track1.1deg.006 +0863-01-01 -trk1_1deg_chm_1850_b55.01 -0086-01-01 +trk1_1deg_chm_1850_b55.01 +0086-01-01 -b40.1850.track1.1deg.006 -0863-01-01 +b40.1850.track1.1deg.006 +0863-01-01 -trk1_1deg_chm_1850_b55.01 -0086-01-01 +trk1_1deg_chm_1850_b55.01 +0086-01-01 -b40_1850_1d_b08c5cn_138j -0320-01-01 +b40_1850_1d_b08c5cn_138j +0320-01-01 -b40.20th.track1.1deg.008 -2005-01-01 +b40.20th.track1.1deg.008 +2005-01-01 -b.e10.B20TRC5CN.f09_g16.001 -2006-01-01 +b.e10.B20TRC5CN.f09_g16.001 +2006-01-01 -b40.20th.track1.1deg.008 +b40.20th.track1.1deg.008 2005-01-01 -b.e10.B20TRC5CN.f09_g16.001 -2006-01-01 +b.e10.B20TRC5CN.f09_g16.001 +2006-01-01 -b40.20th.track1.1deg.008 -2005-01-01 +b40.20th.track1.1deg.008 +2005-01-01 -b.e10.B20TRC5CN.f09_g16.001 -2006-01-01 +b.e10.B20TRC5CN.f09_g16.001 +2006-01-01 -b40.20th.track1.1deg.008 -2005-01-01 +b40.20th.track1.1deg.008 +2005-01-01 -b.e10.B20TRC5CN.f09_g16.001 -2006-01-01 +b.e10.B20TRC5CN.f09_g16.001 +2006-01-01 -I2000CN_f09_g16_c100503 -0001-01-01 +I2000CN_f09_g16_c100503 +0001-01-01 -I2000CN_f09_g16_c100503 -0001-01-01 +I2000CN_f09_g16_c100503 +0001-01-01 -I1850CN_f09_g16_c100503 -0001-01-01 +I1850CN_f09_g16_c100503 +0001-01-01 -I1850CN_f09_g16_c100503 -0001-01-01 +I1850CN_f09_g16_c100503 +0001-01-01 -I1850CLM40CRUCN_f09_g16_clm4500_c130514 -1122-01-01 +I1850CLM40CRUCN_f09_g16_clm4500_c130514 +1122-01-01 -I1850CLM40CRUCN_f09_g16_clm4500_c130514 -1122-01-01 +I1850CLM40CRUCN_f09_g16_clm4500_c130514 +1122-01-01 -I2000CN_f09_g16_c100503 -0001-01-01 +I2000CN_f09_g16_c100503 +0001-01-01 -I1850CN_f09_g16_c100503 -0001-01-01 +I1850CN_f09_g16_c100503 +0001-01-01 -I2000CN_f09_g16_c100503 -0001-01-01 +I2000CN_f09_g16_c100503 +0001-01-01 -I2000CN_f09_g16_c100503 -0001-01-01 +I2000CN_f09_g16_c100503 +0001-01-01 -I2000CN_f09_g16_c100503 -0001-01-01 +I2000CN_f09_g16_c100503 +0001-01-01 -I2000CN_f09_g16_c100503 -0001-01-01 +I2000CN_f09_g16_c100503 +0001-01-01 -b40_20th_1d_b08c5cn_139jp -1979-01-01 +b40_20th_1d_b08c5cn_139jp +1979-01-01 -b40_20th_1d_b08c5cn_139jp -1979-01-01 +b40_20th_1d_b08c5cn_139jp +1979-01-01 -f.e12.FAMIPC5.ne30_ne30.amip_L30.001 -1979-01-01 +f.e12.FAMIPC5.ne30_ne30.amip_L30.001 +1979-01-01 -f.e12.FAMIPC5.ne30_ne30.amip_L60.001 -1979-01-01 +f.e12.FAMIPC5.ne30_ne30.amip_L60.001 +1979-01-01 -f.e12.FAMIPC5.ne30_ne30.amip_L30.001 -1979-01-01 +f.e12.FAMIPC5.ne30_ne30.amip_L30.001 +1979-01-01 -b40.20th.track1.1deg.004 -1979-01-01 +b40.20th.track1.1deg.004 +1979-01-01 -b40_20th_2d_r07c5cn_161jp -1979-01-01 +b40_20th_2d_r07c5cn_161jp +1979-01-01 -b40.20th.track1.2deg.001 +b40.20th.track1.2deg.001 1979-01-01 -b40.t31x3.037c -0507-01-01 +b40.t31x3.037c +0507-01-01 -b.e11.B1850C5CN.ne30_g16.tuning.004 -0026-01-01 +b.e11.B1850C5CN.ne30_g16.tuning.004 +0026-01-01 b40.rcp4_5.2deg.wcm.carma.bc0tg.002 2013-01-01 @@ -2075,35 +2075,35 @@ DOCN%COPY => docn copy mode - - + + - + --3 --3 --1 - 1 - 1 --1 - 1 --2 --2 +-3 +-3 +-1 + 1 + 1 +-1 + 1 +-2 +-2 -5 -5 -6 - 0 - 0 - 0 - 0 + 0 + 0 + 0 + 0 - 1 - 3 + 1 + 3 1 3 @@ -2123,15 +2123,15 @@ DOCN%COPY => docn copy mode - + - + NO - + diff --git a/cime_config/acme/allactive/config_pes.xml b/cime_config/acme/allactive/config_pes.xml index 9e3bbd0d327f..df2cf6de7056 100644 --- a/cime_config/acme/allactive/config_pes.xml +++ b/cime_config/acme/allactive/config_pes.xml @@ -15,16 +15,16 @@ CCSM_LCOMPSET: the value of the attribute can match ANYWHERE in the long compset name (similar to GEN_COMPSET_MATCH in config_compsets.xml). Note, though, that this uses regular - expressions, so you can match B compsets using CCSM_LCOMPSET="^B". + expressions, so you can match B compsets using CCSM_LCOMPSET="^B". - TEST: Matches on testname + test options (PET_PT_D) + TEST: Matches on testname + test options (PET_PT_D) The test name can be either specified as a text string, or with - a regular expression. If one wants to allow a specific test, - input the test name as a string. - If one wants to DISALLOW the pe layout for a specific test use - the following regex, which will be passed along to + a regular expression. If one wants to allow a specific test, + input the test name as a string. + If one wants to DISALLOW the pe layout for a specific test use + the following regex, which will be passed along to ConfigCase->set_pes: TEST="^(?:(?!PATTERN).)*$", and replace - PATTERN with the desired test name. + PATTERN with the desired test name. All other attributes: the value of the attribute must match the beginning of the variable. @@ -36,7 +36,7 @@ Compsets should be matched using their long name (using CCSM_LCOMPSET), NOT their short name. This allows for the use of compsets that do not have a short name. - + --> - + 192 1 0 192 1 0 diff --git a/cime_config/acme/archive.xml b/cime_config/acme/archive.xml index 1177673181fd..7d1c16f7dcf3 100644 --- a/cime_config/acme/archive.xml +++ b/cime_config/acme/archive.xml @@ -3,87 +3,87 @@ atm - logs + logs false - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - init + init true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true @@ -93,15 +93,15 @@ atm - rest + rest true - rest + rest true - - hist + + hist true @@ -111,67 +111,67 @@ lnd - logs + logs false - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - init + init true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true @@ -181,15 +181,15 @@ lnd - rest + rest true - rest + rest true - - hist + + hist true @@ -199,43 +199,43 @@ rof - logs + logs false - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true @@ -245,43 +245,43 @@ rof - logs + logs false - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true @@ -291,15 +291,15 @@ rof - rest + rest true - rest + rest true - - hist + + hist true @@ -309,19 +309,19 @@ ice - logs + logs false - rest + rest true - init + init false - - hist + + hist false @@ -331,15 +331,15 @@ ice - rest + rest true - rest + rest true - - hist + + hist true @@ -349,67 +349,67 @@ ocn - logs + logs false - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - hist + hist false - - hist + + hist false - - hist + + hist false - - hist + + hist false - - hist + + hist false @@ -419,15 +419,15 @@ ocn - rest + rest true - rest + rest true - - hist + + hist false @@ -437,23 +437,23 @@ glc - logs + logs false - rest + rest true - rest + rest true - init + init false - - hist + + hist false @@ -463,19 +463,19 @@ wav - logs + logs false - rest + rest true - init + init false - - hist + + hist false @@ -485,95 +485,95 @@ wav - rest + rest true - rest + rest true - - hist + + hist false - + dart - logs + logs false - hist + hist false - hist + hist false - hist + hist false - hist + hist false - hist + hist false - hist + hist false - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - + cpl - logs + logs false - rest + rest true - logs + logs false - hist + hist false diff --git a/cime_config/acme/config_grids.xml b/cime_config/acme/config_grids.xml index dbd431873299..85013e871a44 100644 --- a/cime_config/acme/config_grids.xml +++ b/cime_config/acme/config_grids.xml @@ -6,17 +6,17 @@ ========================================= GRID naming convention ========================================= - The long grid name has the order atm,lnd,ocn/ice,river,mask,glc + The long grid name has the order atm,lnd,ocn/ice,river,mask,glc The following shortname is used a% => atm, l% => lnd, oi% => ocn/ice, r% => river, m% => mask, g% => glc, w% => wav - The notation is + The notation is a%name_l%name_oi%name_r%name_m%mask_g%name_w%name Each grid is associated with three required elements and one optional element longname (a%name_l%name_oi%name_r%name_m%mask_g%name_w%name) shortname (for backwards compatibility) alias (even shorter notation than shortname) (optional) support (Description of the support level for this grid) (optional) - Each grid can also be associated with the following optional attributes + Each grid can also be associated with the following optional attributes compset (Regular expression for compsets that are required to match for this grid) (optional) @@ -100,13 +100,13 @@ T85_0.9x1.25_tx0.1v2 T85_f09_t12 a%T85_l%0.9x1.25_oi%tx0.1v2_r%r05_m%tx0.1v2_g%null_w%null - + T341_0.23x0.31_tx0.1v2 T341_f02_t12 a%T341_l%0.23x0.31_oi%tx0.1v2_r%r05_m%tx0.1v2_g%null_w%null - + T31_T31 @@ -130,7 +130,7 @@ T62_gx3v7 T62_g37 a%T62_l%T62_oi%gx3v7_r%rx1_m%gx3v7_g%null_w%null - + T62_tx1v1 @@ -198,7 +198,7 @@ 0.47x0.63_tx0.1v2 f05_t12 a%0.47x0.63_l%0.47x0.63_oi%tx0.1v2_r%r05_m%tx0.1v2_g%null_w%null - + 0.9x1.25_gx1v6 @@ -347,14 +347,14 @@ ne30_f19_g16 a%ne30np4_l%1.9x2.5_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null For testing tri-grid - + ne30np4_0.9x1.25_gx1v6 ne30_f09_g16 a%ne30np4_l%0.9x1.25_oi%gx1v6_r%r05_m%gx1v6_g%null_w%null For testing tri-grid - + ne60np4_gx1v6 @@ -389,39 +389,39 @@ ne16np4_ne16np4 - ne16_ne16 + ne16_ne16 a%ne16np4_l%ne16np4_oi%ne16np4_r%r05_m%gx3v7_g%null_w%null ne30np4_ne30np4 - ne30_ne30 + ne30_ne30 a%ne30np4_l%ne30np4_oi%ne30np4_r%r05_m%gx1v6_g%null_w%null ne60np4_ne60np4 - ne60_ne60 + ne60_ne60 a%ne60np4_l%ne60np4_oi%ne60np4_r%r05_m%gx1v6_g%null_w%null ne120np4_ne120np4 - ne120_ne120 + ne120_ne120 a%ne120np4_l%ne120np4_oi%ne120np4_r%r05_m%gx1v6_g%null_w%null ne240np4_ne240np4 - ne240_ne240 + ne240_ne240 a%ne240np4_l%ne240np4_oi%ne240np4_r%null_m%gx1v6_g%null_w%null - + 0.9x1.25_gx1v6_gland4 - f09_g16_gl4 + f09_g16_gl4 a%0.9x1.25_l%0.9x1.25_oi%gx1v6_r%r05_m%gx1v6_g%gland4_w%null @@ -561,7 +561,7 @@ ne30np4_1.9x2.5_gx1v6_rx1 ne30_f19_g16_rx1 a%ne30np4_l%1.9x2.5_oi%gx1v6_r%rx1_m%gx1v6_g%null_w%null - + @@ -592,7 +592,7 @@ - 1.9x2.5_gx1v6_rx1_ww3a + 1.9x2.5_gx1v6_rx1_ww3a f19_g16_rx1_ww3 a%1.9x2.5_l%1.9x2.5_oi%gx1v6_r%rx1_m%gx1v6_g%null_w%ww3a @@ -629,83 +629,83 @@ - 0 0 + 0 0 null is no grid: - - 1 1 + + 1 1 domain.lnd.${CLM_USRDAT_NAME}_navy.nc - $DIN_LOC_ROOT/share/domains/domain.clm - user specified domain - only valid for DATM/CLM compset + $DIN_LOC_ROOT/share/domains/domain.clm + user specified domain - only valid for DATM/CLM compset - 1 1 - domain.lnd.1x1pt-numaIA_navy.110106.nc - $DIN_LOC_ROOT/share/domains/domain.clm - 1x1 Numa Iowa -- only valid for DATM/CLM compset + 1 1 + domain.lnd.1x1pt-numaIA_navy.110106.nc + $DIN_LOC_ROOT/share/domains/domain.clm + 1x1 Numa Iowa -- only valid for DATM/CLM compset - 1 1 - domain.lnd.1x1pt-brazil_navy.090715.nc - $DIN_LOC_ROOT/share/domains/domain.clm - 1x1 Brazil -- only valid for DATM/CLM compset + 1 1 + domain.lnd.1x1pt-brazil_navy.090715.nc + $DIN_LOC_ROOT/share/domains/domain.clm + 1x1 Brazil -- only valid for DATM/CLM compset - 1 1 - domain.lnd.1x1pt-smallvilleIA_test.110106.nc - $DIN_LOC_ROOT/share/domains/domain.clm - 1x1 Smallville Iowa Crop Test Case -- only valid for DATM/CLM compset + 1 1 + domain.lnd.1x1pt-smallvilleIA_test.110106.nc + $DIN_LOC_ROOT/share/domains/domain.clm + 1x1 Smallville Iowa Crop Test Case -- only valid for DATM/CLM compset - 1 1 - domain.lnd.1x1pt-camdenNJ_navy.111004.nc - $DIN_LOC_ROOT/share/domains/domain.clm - 1x1 Camden New Jersey -- only valid for DATM/CLM compset + 1 1 + domain.lnd.1x1pt-camdenNJ_navy.111004.nc + $DIN_LOC_ROOT/share/domains/domain.clm + 1x1 Camden New Jersey -- only valid for DATM/CLM compset - 1 1 + 1 1 domain.lnd.1x1pt-mexicocityMEX_navy.090715.nc $DIN_LOC_ROOT/share/domains/domain.clm - 1x1 Mexico City Mexico -- only valid for DATM/CLM compset + 1x1 Mexico City Mexico -- only valid for DATM/CLM compset - 1 1 - domain.lnd.1x1pt-vancouverCAN_navy.090715.nc - $DIN_LOC_ROOT/share/domains/domain.clm - 1x1 Vancouver Canada -- only valid for DATM/CLM compset + 1 1 + domain.lnd.1x1pt-vancouverCAN_navy.090715.nc + $DIN_LOC_ROOT/share/domains/domain.clm + 1x1 Vancouver Canada -- only valid for DATM/CLM compset - 1 1 - domain.lnd.1x1pt-tropicAtl_test.111004.nc - $DIN_LOC_ROOT/share/domains/domain.clm - 1x1 Tropical Atlantic Test Case -- only valid for DATM/CLM compset + 1 1 + domain.lnd.1x1pt-tropicAtl_test.111004.nc + $DIN_LOC_ROOT/share/domains/domain.clm + 1x1 Tropical Atlantic Test Case -- only valid for DATM/CLM compset - 1 1 - domain.lnd.1x1pt-urbanc_alpha_test.110201.nc - $DIN_LOC_ROOT/share/domains/domain.clm - 1x1 Urban C Alpha Test Case -- only valid for DATM/CLM compset + 1 1 + domain.lnd.1x1pt-urbanc_alpha_test.110201.nc + $DIN_LOC_ROOT/share/domains/domain.clm + 1x1 Urban C Alpha Test Case -- only valid for DATM/CLM compset - 1 1 - domain.lnd.5x5pt-amazon_navy.090715.nc - $DIN_LOC_ROOT/share/domains/domain.clm - 5x5 Amazon regional case -- only valid for DATM/CLM compset + 1 1 + domain.lnd.5x5pt-amazon_navy.090715.nc + $DIN_LOC_ROOT/share/domains/domain.clm + 5x5 Amazon regional case -- only valid for DATM/CLM compset 720 360 - domain.lnd.360x720_cruncep.100429.nc + domain.lnd.360x720_cruncep.100429.nc $DIN_LOC_ROOT/share/domains/domain.clm Exact half-degree CRUNCEP datm forcing grid with CRUNCEP land-mask -- only valid for DATM/CLM compset @@ -720,25 +720,25 @@ - 1152 768 + 1152 768 domain.lnd.fv0.23x0.31_gx1v6.100517.nc domain.ocn.0.23x0.31_gx1v6_101108.nc domain.lnd.fv0.23x0.31_tx0.1v2_070929.nc - 0.23x0.31 is FV 1/4-deg grid: + 0.23x0.31 is FV 1/4-deg grid: - 576 384 + 576 384 domain.lnd.fv0.47x0.63_gx1v6.090407.nc domain.ocn.0.47x0.63_gx1v6_090408.nc domain.lnd.fv0.47x0.63_tx0.1v2_070929.nc - 0.47x0.63 is FV 1/2-deg grid: + 0.47x0.63 is FV 1/2-deg grid: - 288 192 + 288 192 domain.lnd.fv0.9x1.25_gx1v6.090309.nc domain.ocn.0.9x1.25_gx1v6_090403.nc domain.lnd.fv0.9x1.25_mp120v1.111018.nc @@ -748,61 +748,61 @@ domain.ocn.0.9x1.25_mpas120.151109.nc domain.ocn.0.9x1.25_mpas120.151109.nc - 0.9x1.25 is FV 1-deg grid: + 0.9x1.25 is FV 1-deg grid: - 144 96 + 144 96 domain.lnd.fv1.9x2.5_gx1v6.090206.nc domain.ocn.1.9x2.5_gx1v6_090403.nc domain.lnd.fv1.9x2.5_tx1v1_090713.nc - 1.9x2.5 is FV 2-deg grid: + 1.9x2.5 is FV 2-deg grid: - 72 46 + 72 46 domain.lnd.fv4x5_gx3v7.091218.nc domain.ocn.4x5_gx3v7_100120.nc - 4x5 is FV 4-deg grid: + 4x5 is FV 4-deg grid: - 108 72 + 108 72 domain.lnd.fv2.5x3.33_gx3v7.110223.nc domain.ocn.fv2.5x3.33_gx3v7_110223.nc - 2.5x3.33 is FV 3-deg grid: + 2.5x3.33 is FV 3-deg grid: - - 24 19 + + 24 19 domain.lnd.fv10x15_USGS.110713.nc domain.camocn.10x15_USGS_070807.nc $DIN_LOC_ROOT/share/domains/domain.clm $DIN_LOC_ROOT/share/domains/domain.clm - 10x15 is FV 10-deg grid: + 10x15 is FV 10-deg grid: For low resolution testing - - 1024 512 + + 1024 512 domain.lnd.T341_gx1v6.111226.nc - T341 is Gaussian grid: + T341 is Gaussian grid: Backward compatible for very high resolution Spectral-dycore experiments - 256 128 + 256 128 domain.lnd.T85_gx1v4.060403.nc domain.lnd.T85_gx1v4.060403.nc - T85 is Gaussian grid: + T85 is Gaussian grid: Backward compatible for high resolution Spectral-dycore experiments - - 192 96 + + 192 96 domain.lnd.T62_gx1v6.090320.nc domain.lnd.T62_gx3v7.090911.nc @@ -812,7 +812,7 @@ domain.lnd.T62_mpas120.121116.nc domain.lnd.T62_oEC60to30.150616.nc domain.lnd.T62_oRRS30to10.150722.nc - T62 is Gaussian grid: + T62 is Gaussian grid: @@ -821,80 +821,80 @@ domain.camocn.64x128_USGS_070807.nc $DIN_LOC_ROOT/share/domains/domain.clm $DIN_LOC_ROOT/atm/cam/ocnfrac - T42 is Gaussian grid: + T42 is Gaussian grid: 96 48 domain.lnd.T31_gx3v7.090928.nc domain.ocn.48x96_gx3v7_100114.nc - T31 is Gaussian grid: + T31 is Gaussian grid: - 13826 1 + 13826 1 domain.lnd.ne16np4_gx3v7.120406.nc domain.ocn.ne16np4_gx3v7.121113.nc - ne16np4 is Spectral Elem 2-deg grid: + ne16np4 is Spectral Elem 2-deg grid: For low resolution spectral element grid testing - 48602 1 + 48602 1 domain.lnd.ne30np4_gx1v6.110905.nc domain.ocn.ne30np4_gx1v6_110217.nc domain.lnd.ne30np4_mpas120.151113.nc domain.lnd.ne30np4_mpas120.151113.nc domain.ocn.ne30np4_mpas120.151113.nc domain.ocn.ne30np4_mpas120.151113.nc - ne30np4 is Spectral Elem 1-deg grid: + ne30np4 is Spectral Elem 1-deg grid: - 194402 1 + 194402 1 domain.lnd.ne60np4_gx1v6.120406.nc domain.ocn.ne60np4_gx1v6.121113.nc - ne60np4 is Spectral Elem 1/2-deg grid: + ne60np4 is Spectral Elem 1/2-deg grid: - 777602 1 + 777602 1 domain.lnd.ne120np4_gx1v6.110502.nc domain.ocn.ne120np4_gx1v6.121113.nc domain.lnd.ne120np4_tx01v2.120412.nc - ne120np4 is Spectral Elem 1/4-deg grid: + ne120np4 is Spectral Elem 1/4-deg grid: - 3110402 1 + 3110402 1 domain.lnd.ne240np4_gx1v6.111226.nc domain.ocn.ne240np4_gx1v6.111226.nc - ne240np4 is Spectral Elem 1/8-deg grid: + ne240np4 is Spectral Elem 1/8-deg grid: Experimental for very high resolution experiments - 320 384 + 320 384 domain.ocn.gx1v6.090206.nc domain.ocn.gx1v6.090206.nc gx1v6 is displaced Greenland pole v6 1-deg grid: - 100 116 + 100 116 domain.ocn.gx3v7.120323.nc gx3v7 is displaced Greenland pole v7 3-deg grid: - 3600 2400 + 3600 2400 domain.ocn.tx0.1v2_090218.nc tx0.1v2 is tripole v2 1/10-deg grid: Experimental for high resolution experiments - - 360 240 + + 360 240 domain.ocn.tx1v1.090122.nc tripole v1 1-deg grid: testing proxy for high-res tripole ocean grids- do not use for scientific experiments Experimental tripole ocean grid @@ -903,28 +903,28 @@ - 86354 1 + 86354 1 domain.ocn.mpasgx1.150903.nc mpasgx1 is a MPAS cice grid that is roughly 1 degree resolution: Experimental, under development - 28574 1 + 28574 1 domain.ocn.mpas120.121116.nc mpas120 is a MPAS ocean grid that is roughly 1 degree resolution: Experimental, under development - 234095 1 + 234095 1 domain.ocn.oEC60to30.150616.nc oEC60to30 is a MPAS ocean grid generated with the eddy closure density function that is roughly comparable to the pop 1 degree resolution: Experimental, under development - 1444565 1 + 1444565 1 domain.ocn.oRRS30to10.150722.nc oRRS30to10 is an MPAS ocean grid with a mesh density function that is roughly proportional to the Rossby radius of deformation, with 30 km gridcells at low and 10 km gridcells at high latitudes: Experimental, under development @@ -933,30 +933,30 @@ - 360 180 + 360 180 rx1 is 1 degree river routing grid (only valid for DROF): Can only be used by DROF - 720 360 + 720 360 r05 is 1/2 degree river routing grid: - 3600 1800 + 3600 1800 r01 is 1/10 degree river routing grid: For experimental use by high resolution grids - 28993 1 + 28993 1 mp120v1 is a MPAS ocean grid that is roughly 1 degree resolution: Experimental, under development - 139734 1 + 139734 1 mp120r10v1 is a MPAS grid: Experimental, under development @@ -1005,7 +1005,7 @@ - 90 50 + 90 50 domain.lnd.ww3a_ww3a.120222.nc domain.ocn.ww3a_ww3a.120222.nc $DIN_LOC_ROOT/share/domains @@ -1049,11 +1049,11 @@ - cpl/cpl6/map_fv0.47x0.63_to_tx0.1v2_aave_da_090218.nc - cpl/cpl6/map_fv0.47x0.63_to_tx0.1v2_bilin_da_090218.nc - cpl/cpl6/map_fv0.47x0.63_to_tx0.1v2_bilin_da_090218.nc - cpl/cpl6/map_tx0.1v2_to_fv0.47x0.63_aave_da_090218.nc - cpl/cpl6/map_tx0.1v2_to_fv0.47x0.63_aave_da_090218.nc + cpl/cpl6/map_fv0.47x0.63_to_tx0.1v2_aave_da_090218.nc + cpl/cpl6/map_fv0.47x0.63_to_tx0.1v2_bilin_da_090218.nc + cpl/cpl6/map_fv0.47x0.63_to_tx0.1v2_bilin_da_090218.nc + cpl/cpl6/map_tx0.1v2_to_fv0.47x0.63_aave_da_090218.nc + cpl/cpl6/map_tx0.1v2_to_fv0.47x0.63_aave_da_090218.nc @@ -1259,7 +1259,7 @@ cpl/cpl6/map_gx3v7_to_T31_aave_da_090903.nc - + cpl/gridmaps/T85/map_T85_to_gx1v6_aave_110411.nc cpl/gridmaps/T85/map_T85_to_gx1v6_bilin_110411.nc cpl/gridmaps/T85/map_T85_to_gx1v6_bilin_110411.nc @@ -1272,7 +1272,7 @@ cpl/gridmaps/fv0.9x1.25/map_fv0.9x1.25_to_T85_aave_110411.nc cpl/gridmaps/fv0.9x1.25/map_fv0.9x1.25_to_T85_bilin_110411.nc - + cpl/gridmaps/T85/map_T85_to_tx0.1v2_aave_110411.nc cpl/gridmaps/T85/map_T85_to_tx0.1v2_bilin_110411.nc cpl/gridmaps/T85/map_T85_to_tx0.1v2_bilin_110411.nc @@ -1286,14 +1286,14 @@ cpl/gridmaps/fv0.9x1.25/map_fv0.9x1.25_to_T85_aave_110411.nc - + cpl/gridmaps/T341/map_T341_to_tx0.1v2_aave_110413.nc cpl/gridmaps/T341/map_T341_to_tx0.1v2_aave_110413.nc cpl/gridmaps/T341/map_T341_to_tx0.1v2_aave_110413.nc cpl/gridmaps/tx0.1v2/map_tx0.1v2_to_T341_aave_110413.nc cpl/gridmaps/tx0.1v2/map_tx0.1v2_to_T341_aave_110413.nc - + cpl/gridmaps/T341/map_T341_to_fv0.23x0.31_aave_110413.nc cpl/gridmaps/T341/map_T341_to_fv0.23x0.31_aave_110413.nc cpl/gridmaps/fv0.23x0.31/map_fv0.23x0.31_to_T341_aave_110413.nc @@ -1475,7 +1475,7 @@ cpl/cpl6/map_r05_to_tx1v1_e1000r500_080505.nc - + cpl/cpl6/map_r05_to_tx0.1v2_r500e1000_080620.nc diff --git a/cime_config/acme/machines/Depends.cetus b/cime_config/acme/machines/Depends.cetus index 32413cb7ffbe..1a8e515a847c 100644 --- a/cime_config/acme/machines/Depends.cetus +++ b/cime_config/acme/machines/Depends.cetus @@ -1,4 +1,4 @@ -QSMPFLAGS:= +QSMPFLAGS:= ifeq ($(compile_threaded), true) QSMPFLAGS += -qsmp=noauto:noomp endif diff --git a/cime_config/acme/machines/Depends.intelmic b/cime_config/acme/machines/Depends.intelmic index 0f84949daa31..079098951049 100644 --- a/cime_config/acme/machines/Depends.intelmic +++ b/cime_config/acme/machines/Depends.intelmic @@ -1,6 +1,6 @@ - -derivative_mod.o: derivative_mod.F90 - $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) -O1 $< - -shr_ncread_mod.o: shr_ncread_mod.F90 - $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) $< + +derivative_mod.o: derivative_mod.F90 + $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) -O1 $< + +shr_ncread_mod.o: shr_ncread_mod.F90 + $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) $< diff --git a/cime_config/acme/machines/Depends.intelmic14 b/cime_config/acme/machines/Depends.intelmic14 index 0f84949daa31..079098951049 100644 --- a/cime_config/acme/machines/Depends.intelmic14 +++ b/cime_config/acme/machines/Depends.intelmic14 @@ -1,6 +1,6 @@ - -derivative_mod.o: derivative_mod.F90 - $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) -O1 $< - -shr_ncread_mod.o: shr_ncread_mod.F90 - $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) $< + +derivative_mod.o: derivative_mod.F90 + $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) -O1 $< + +shr_ncread_mod.o: shr_ncread_mod.F90 + $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) $< diff --git a/cime_config/acme/machines/Depends.mira b/cime_config/acme/machines/Depends.mira index 85453dd931af..e0f4963138e2 100644 --- a/cime_config/acme/machines/Depends.mira +++ b/cime_config/acme/machines/Depends.mira @@ -19,7 +19,7 @@ derivative_mod.o \ bndry_mod.o \ prim_advance_mod.o \ uwshcu.o \ -wetdep.o +wetdep.o ifeq ($(DEBUG),FALSE) $(PERFOBJS): %.o: %.F90 $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -qnostrict $< @@ -49,7 +49,7 @@ clmtypeInitMod.o: clmtypeInitMod.F90 # this takes 2 mins to compile with -qsmp=omp clmtype.o: clmtype.F90 $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -qsmp=noopt $< - + # disable inlining (some issues with pure functions therein) advance_xm_wpxp_module.o: advance_xm_wpxp_module.F90 $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -Q! $< diff --git a/cime_config/acme/machines/buildlib.csm_share b/cime_config/acme/machines/buildlib.csm_share index 718812349e04..36429bd06995 100755 --- a/cime_config/acme/machines/buildlib.csm_share +++ b/cime_config/acme/machines/buildlib.csm_share @@ -56,9 +56,9 @@ if($useesmf eq "noesmf"){ push(@filepath,"$CIMEROOT/share/esmf_wrf_timemgr"); }else{ push(@filepath,"$CIMEROOT/driver_cpl/shr_esmf"); -} +} -my @fp; +my @fp; if (-e "Filepath"){ open(F,"Filepath"); @fp = ; @@ -75,8 +75,8 @@ if($#fp != $#filepath){ my $multiinst_cppdefs = ""; $multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_ATM=$NINST_ATM"; $multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_LND=$NINST_LND"; -$multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_OCN=$NINST_OCN"; -$multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_ICE=$NINST_ICE"; +$multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_OCN=$NINST_OCN"; +$multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_ICE=$NINST_ICE"; $multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_GLC=$NINST_GLC"; $multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_WAV=$NINST_WAV"; $multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_ROF=$NINST_ROF"; @@ -96,7 +96,7 @@ if ($rc==0xff00){ print "coredump from "; } die "signal $rc\n"; -} +} #system("cp -p -f libcsm_share.a $sharedlibroot/lib"); #system("cp -p -f *.mod $sharedlibroot/include/"); diff --git a/cime_config/acme/machines/buildlib.gptl b/cime_config/acme/machines/buildlib.gptl index 29690140c08c..38676bfaf285 100755 --- a/cime_config/acme/machines/buildlib.gptl +++ b/cime_config/acme/machines/buildlib.gptl @@ -7,9 +7,9 @@ cd $CASEROOT # CASEROOT is always assumed to be an environment variable set CIMEROOT = `./xmlquery CIMEROOT -value ` -set GMAKE = `./xmlquery GMAKE -value ` +set GMAKE = `./xmlquery GMAKE -value ` -# NOTE- (mv, 2015-01-02) SHAREDPATH is an environment variable set in +# NOTE- (mv, 2015-01-02) SHAREDPATH is an environment variable set in # the $CASE.build script setenv GPTL_DIR $CIMEROOT/share/timing # gptl directory diff --git a/cime_config/acme/machines/buildlib.mct b/cime_config/acme/machines/buildlib.mct index e8fcbf1945eb..65cf5f5e5ef7 100755 --- a/cime_config/acme/machines/buildlib.mct +++ b/cime_config/acme/machines/buildlib.mct @@ -8,11 +8,11 @@ cd $CASEROOT set CIMEROOT = `./xmlquery CIMEROOT -value ` set CASETOOLS = `./xmlquery CASETOOLS -value ` -set GMAKE = `./xmlquery GMAKE -value ` -set GMAKE_J = `./xmlquery GMAKE_J -value ` -set MACH = `./xmlquery MACH -value ` -set MPILIB = `./xmlquery MPILIB -value ` -set OS = `./xmlquery OS -value ` +set GMAKE = `./xmlquery GMAKE -value ` +set GMAKE_J = `./xmlquery GMAKE_J -value ` +set MACH = `./xmlquery MACH -value ` +set MPILIB = `./xmlquery MPILIB -value ` +set OS = `./xmlquery OS -value ` setenv LIBDIR $1 setenv MCT_DIR $CIMEROOT/externals/mct # mct directory @@ -74,7 +74,7 @@ echo "MCT_LIBDIR $MCT_LIBDIR" $GMAKE -f $CASETOOLS/Makefile $MCT_LIBDIR/Makefile.conf MODEL=mct #if($? != 0) then # rm mct_conf* - #endif + #endif #endif if ($runclean == 1) then diff --git a/cime_config/acme/machines/buildlib.pio b/cime_config/acme/machines/buildlib.pio index 68560339d92c..569a26872511 100755 --- a/cime_config/acme/machines/buildlib.pio +++ b/cime_config/acme/machines/buildlib.pio @@ -4,8 +4,8 @@ cd $CASEROOT set CIMEROOT = `./xmlquery CIMEROOT -value ` set CASETOOLS = `./xmlquery CASETOOLS -value ` -set GMAKE = `./xmlquery GMAKE -value ` -set GMAKE_J = `./xmlquery GMAKE_J -value ` +set GMAKE = `./xmlquery GMAKE -value ` +set GMAKE_J = `./xmlquery GMAKE_J -value ` set BLDROOT = $1 # directory in which pio is built setenv PIO_VERSION `./xmlquery PIO_VERSION -value` diff --git a/cime_config/acme/machines/ccsm_getenv b/cime_config/acme/machines/ccsm_getenv index 5fa0d38a6105..759196466da5 100755 --- a/cime_config/acme/machines/ccsm_getenv +++ b/cime_config/acme/machines/ccsm_getenv @@ -95,15 +95,15 @@ setenv PROFILE_PAPI_ENABLE `./xmlquery PROFILE_PAPI_ENABLE -value` source $CASEROOT/env_mach_specific if ($status != 0) then echo "Error: problem sourcing env_mach_specific"; exit -2 -endif - -set MODELS = ( cpl atm lnd ice ocn glc wav rof) -set COMPONENTS = ( $COMP_CPL $COMP_ATM $COMP_LND $COMP_ICE $COMP_OCN $COMP_GLC $COMP_WAV $COMP_ROF) -set NTASKS = ( $NTASKS_CPL $NTASKS_ATM $NTASKS_LND $NTASKS_ICE $NTASKS_OCN $NTASKS_GLC $NTASKS_WAV $NTASKS_ROF) -set NTHRDS = ( $NTHRDS_CPL $NTHRDS_ATM $NTHRDS_LND $NTHRDS_ICE $NTHRDS_OCN $NTHRDS_GLC $NTHRDS_WAV $NTHRDS_ROF) -set ROOTPE = ( $ROOTPE_CPL $ROOTPE_ATM $ROOTPE_LND $ROOTPE_ICE $ROOTPE_OCN $ROOTPE_GLC $ROOTPE_WAV $ROOTPE_ROF) -set PSTRID = ( $PSTRID_CPL $PSTRID_ATM $PSTRID_LND $PSTRID_ICE $PSTRID_OCN $PSTRID_GLC $PSTRID_WAV $PSTRID_ROF) -set NINST = ( 1 $NINST_ATM $NINST_LND $NINST_ICE $NINST_OCN $NINST_GLC $NINST_WAV $NINST_ROF) +endif + +set MODELS = ( cpl atm lnd ice ocn glc wav rof) +set COMPONENTS = ( $COMP_CPL $COMP_ATM $COMP_LND $COMP_ICE $COMP_OCN $COMP_GLC $COMP_WAV $COMP_ROF) +set NTASKS = ( $NTASKS_CPL $NTASKS_ATM $NTASKS_LND $NTASKS_ICE $NTASKS_OCN $NTASKS_GLC $NTASKS_WAV $NTASKS_ROF) +set NTHRDS = ( $NTHRDS_CPL $NTHRDS_ATM $NTHRDS_LND $NTHRDS_ICE $NTHRDS_OCN $NTHRDS_GLC $NTHRDS_WAV $NTHRDS_ROF) +set ROOTPE = ( $ROOTPE_CPL $ROOTPE_ATM $ROOTPE_LND $ROOTPE_ICE $ROOTPE_OCN $ROOTPE_GLC $ROOTPE_WAV $ROOTPE_ROF) +set PSTRID = ( $PSTRID_CPL $PSTRID_ATM $PSTRID_LND $PSTRID_ICE $PSTRID_OCN $PSTRID_GLC $PSTRID_WAV $PSTRID_ROF) +set NINST = ( 1 $NINST_ATM $NINST_LND $NINST_ICE $NINST_OCN $NINST_GLC $NINST_WAV $NINST_ROF) diff --git a/cime_config/acme/machines/cesm_postbuild b/cime_config/acme/machines/cesm_postbuild index f9af81f212d2..3663f6565515 100755 --- a/cime_config/acme/machines/cesm_postbuild +++ b/cime_config/acme/machines/cesm_postbuild @@ -1,5 +1,5 @@ #!/bin/csh -# cesm_postbuild without support for performance data archving: +# cesm_postbuild without support for performance data archving: # ./cesm_postbuild with the following required argument keyword/value pairs, in any order # -cesmid <$LID in cesm-lingo> # -cesmroot diff --git a/cime_config/acme/machines/cesm_postbuild.perf_archive b/cime_config/acme/machines/cesm_postbuild.perf_archive index 7c8b16ad6260..59ea4d3a00fa 100755 --- a/cime_config/acme/machines/cesm_postbuild.perf_archive +++ b/cime_config/acme/machines/cesm_postbuild.perf_archive @@ -1,5 +1,5 @@ #!/bin/csh -# cesm_postbuild with support for performance data archiving: +# cesm_postbuild with support for performance data archiving: # ./cesm_postbuild.perf_archive with the following required argument keyword/value pairs, in any order # -cesmid <$LID in cesm-lingo> # -cesmroot diff --git a/cime_config/acme/machines/cesm_postrun b/cime_config/acme/machines/cesm_postrun index 42795af5c88c..dcf53730c922 100755 --- a/cime_config/acme/machines/cesm_postrun +++ b/cime_config/acme/machines/cesm_postrun @@ -1,5 +1,5 @@ #!/bin/csh -# cesm_postrun without performance data archiving: +# cesm_postrun without performance data archiving: # ./cesm_postrun with the following argument keyword/value pairs, in any order # -machine # -case diff --git a/cime_config/acme/machines/cesm_postrun.perf_archive b/cime_config/acme/machines/cesm_postrun.perf_archive index 92c6de619ade..1ccacc6a7957 100755 --- a/cime_config/acme/machines/cesm_postrun.perf_archive +++ b/cime_config/acme/machines/cesm_postrun.perf_archive @@ -1,5 +1,5 @@ #!/bin/csh -# cesm_postrun with performance data archiving: +# cesm_postrun with performance data archiving: # ./cesm_postrun.perf_archive with the following argument keyword/value pairs, in any order # -machine # -case @@ -85,7 +85,7 @@ if ($app_jobid != 'unknown') then if ($syslog_jobid != 0) then if ($machine == 'mira') then - if { kill -0 $syslog_jobid } then + if { kill -0 $syslog_jobid } then kill $syslog_jobid endif diff --git a/cime_config/acme/machines/cesm_postrun2 b/cime_config/acme/machines/cesm_postrun2 index 37f30fb10bdd..7f52abcf83f5 100755 --- a/cime_config/acme/machines/cesm_postrun2 +++ b/cime_config/acme/machines/cesm_postrun2 @@ -1,5 +1,5 @@ #!/bin/csh -# cesm_postrun2 without performance data archiving: +# cesm_postrun2 without performance data archiving: # ./cesm_postrun2 with the following argument keyword/value pairs, in any order # -machine # -case diff --git a/cime_config/acme/machines/cesm_postrun2.perf_archive b/cime_config/acme/machines/cesm_postrun2.perf_archive index 1c038e1379c7..aaab58ee603e 100755 --- a/cime_config/acme/machines/cesm_postrun2.perf_archive +++ b/cime_config/acme/machines/cesm_postrun2.perf_archive @@ -1,5 +1,5 @@ #!/bin/csh -# cesm_postrun2 with performance data archiving: +# cesm_postrun2 with performance data archiving: # ./cesm_postrun2.perf_archive with the following argument keyword/value pairs, in any order # -machine # -case diff --git a/cime_config/acme/machines/cesm_prerun b/cime_config/acme/machines/cesm_prerun index 798bc58702b7..08b9f2f0cbf7 100755 --- a/cime_config/acme/machines/cesm_prerun +++ b/cime_config/acme/machines/cesm_prerun @@ -1,8 +1,8 @@ #!/bin/csh -# cesm_prerun without performance data archiving: +# cesm_prerun without performance data archiving: # ./cesm_prerun with the following argument keyword/value pairs, in any order # -machine -# -compiler +# -compiler # -case # -jobid for Cobalt> # -cesmid <$LID in cesm-lingo> @@ -81,7 +81,7 @@ if ($app_jobid == 'unknown') then set app_jobid = $SLURM_JOB_ID - endif + endif endif if ($machine == 'titan') then diff --git a/cime_config/acme/machines/cesm_prerun.perf_archive b/cime_config/acme/machines/cesm_prerun.perf_archive index ff9e152856f4..c3f023386d61 100755 --- a/cime_config/acme/machines/cesm_prerun.perf_archive +++ b/cime_config/acme/machines/cesm_prerun.perf_archive @@ -1,8 +1,8 @@ #!/bin/csh -# cesm_prerun with performance data archiving: +# cesm_prerun with performance data archiving: # ./cesm_prerun.perf_archive with the following argument keyword/value pairs, in any order # -machine -# -compiler +# -compiler # -case # -jobid for Cobalt> # -cesmid <$LID in cesm-lingo> diff --git a/cime_config/acme/machines/config_batch.xsd b/cime_config/acme/machines/config_batch.xsd index 1eddc0e88fe1..4536bf976125 100644 --- a/cime_config/acme/machines/config_batch.xsd +++ b/cime_config/acme/machines/config_batch.xsd @@ -9,7 +9,7 @@ - + @@ -48,12 +48,12 @@ - + - + - + diff --git a/cime_config/acme/machines/config_pio.xml b/cime_config/acme/machines/config_pio.xml index 1a3dc465b3c8..56b489a98dae 100644 --- a/cime_config/acme/machines/config_pio.xml +++ b/cime_config/acme/machines/config_pio.xml @@ -2,20 +2,20 @@ - - @@ -24,8 +24,8 @@ 60 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -O -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none -O0 @@ -31,7 +31,7 @@ $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -framework Accelerate $ENV{HOME}/local/pfunit/pfunit-sf.git.ae92605e8e - + -DFORTRANUNDERSCORE -DNO_R16 @@ -42,7 +42,7 @@ -ffixed-form -ffree-form -g -Wall - -O -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none -O0 diff --git a/cime_config/acme/machines/userdefined_laptop_template/mkbatch.no_batch_system b/cime_config/acme/machines/userdefined_laptop_template/mkbatch.no_batch_system index c4f622331ef8..52a9487a68d7 100755 --- a/cime_config/acme/machines/userdefined_laptop_template/mkbatch.no_batch_system +++ b/cime_config/acme/machines/userdefined_laptop_template/mkbatch.no_batch_system @@ -20,7 +20,7 @@ foreach model ($MODELS) echo "ERROR, NTHRDS maximum is $MAX_TASKS_PER_NODE" echo "you have set NTHRDS = ( $NTHRDS[$n] ) - must reset" exit 1 - endif + endif if ($NTHRDS[$n] > $maxthrds) then set maxthrds = $NTHRDS[$n] endif @@ -44,7 +44,7 @@ if ($maxthrds > $minthrds) then else if ($maxthrds > 1) then @ ptile = $MAX_TASKS_PER_NODE / $maxthrds - endif + endif endif @ nodes = ${ntasks_tot} / ${ptile} @@ -58,9 +58,9 @@ endif ./xmlchange -noecho -file env_mach_pes.xml -id COST_PES -val ${costpes} if ($?TESTMODE) then - set file = $CASEROOT/${CASE}.test + set file = $CASEROOT/${CASE}.test else - set file = $CASEROOT/${CASE}.run + set file = $CASEROOT/${CASE}.run endif cat >! $file << EOF1 @@ -84,7 +84,7 @@ set maxthrds = $maxthrds set maxtasks = $maxtasks cd \$RUNDIR -echo "\`date\` -- CSM EXECUTION BEGINS HERE" +echo "\`date\` -- CSM EXECUTION BEGINS HERE" setenv MP_LABELIO yes setenv OMP_NUM_THREADS \$maxthrds if ( "\$MPILIB" == "mpi-serial" ) then @@ -94,7 +94,7 @@ else endif wait -echo "\`date\` -- CSM EXECUTION HAS FINISHED" +echo "\`date\` -- CSM EXECUTION HAS FINISHED" # ------------------------------------------------------------------------- # For Postprocessing @@ -119,5 +119,5 @@ else ################################################################################# endif ################################################################################# - + diff --git a/cime_config/cesm/allactive/config_pes.xml b/cime_config/cesm/allactive/config_pes.xml index 1909c1734598..3822f28a6989 100644 --- a/cime_config/cesm/allactive/config_pes.xml +++ b/cime_config/cesm/allactive/config_pes.xml @@ -7,34 +7,34 @@ none - -3 - -1 - -1 - -2 - -1 - -1 - -1 - -3 + -3 + -1 + -1 + -2 + -1 + -1 + -1 + -3 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 0 - 0 - 0 - -1 - -3 - 0 - 0 - 0 + 0 + 0 + 0 + -1 + -3 + 0 + 0 + 0 @@ -44,34 +44,34 @@ none - -4 - -2 - -2 - -2 - -2 - -1 - -1 - -4 + -4 + -2 + -2 + -2 + -2 + -1 + -1 + -4 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 0 - 0 - 0 - -2 - -4 - 0 - 0 - 0 + 0 + 0 + 0 + -2 + -4 + 0 + 0 + 0 @@ -81,34 +81,34 @@ none - -16 - -9 - -9 - -7 - -1 - -1 - -1 - -16 + -16 + -9 + -9 + -7 + -1 + -1 + -1 + -16 - 8 - 8 - 8 - 8 - 8 - 8 - 8 - 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 - 0 - 0 - 0 - -9 - -16 - 0 - 0 - 0 + 0 + 0 + 0 + -9 + -16 + 0 + 0 + 0 @@ -118,24 +118,24 @@ none - 60 - 15 - 15 - 45 - 15 - 60 - 60 - 60 + 60 + 15 + 15 + 45 + 15 + 60 + 60 + 60 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 0 @@ -152,27 +152,27 @@ - + js 16 sep 2014 ne16_g37 bc5 yellowstone-specific pe layout used for low res ensemble - 96 - 80 - 80 - 80 - 16 - 96 - 96 - 96 + 96 + 80 + 80 + 80 + 16 + 96 + 96 + 96 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 0 @@ -187,39 +187,39 @@ - + none - -8 - -8 - -8 - -8 - -8 - -8 - -8 - -8 + -8 + -8 + -8 + -8 + -8 + -8 + -8 + -8 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 @@ -229,34 +229,34 @@ none - -16 - -16 - -16 - -16 - -16 - -16 - -16 - -16 + -16 + -16 + -16 + -16 + -16 + -16 + -16 + -16 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 @@ -266,33 +266,33 @@ none - 2600 - 144 - 144 - 2456 - 192 - 1 + 2600 + 144 + 144 + 2456 + 192 + 1 192 - 2600 + 2600 - 8 - 8 - 8 - 8 - 8 - 8 + 8 + 8 + 8 + 8 + 8 + 8 8 8 - 0 - 0 - 144 - 0 - 2600 - 0 - 2600 + 0 + 0 + 144 + 0 + 2600 + 0 + 2600 0 @@ -303,30 +303,30 @@ none - 960 - 48 - 48 - 912 - 48 - 1 + 960 + 48 + 48 + 912 + 48 + 1 960 - 960 + 960 - 4 - 4 - 4 - 4 - 4 - 4 - 4 - 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 0 0 0 - 48 + 48 960 0 0 @@ -340,34 +340,34 @@ none - 900 - 300 - 300 - 600 - 60 - 900 - 900 - 900 + 900 + 300 + 300 + 600 + 60 + 900 + 900 + 900 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 - 0 - 0 - 0 - 300 - 900 - 0 - 0 - 0 + 0 + 0 + 0 + 300 + 900 + 0 + 0 + 0 @@ -377,34 +377,34 @@ none - 1024 - 1024 - 1024 - 1024 - 1024 - 1024 - 1024 - 1024 + 1024 + 1024 + 1024 + 1024 + 1024 + 1024 + 1024 + 1024 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 @@ -414,30 +414,30 @@ none - 12384 - 96 - 96 - 12288 - 4000 - 1 - 4000 - 12384 + 12384 + 96 + 96 + 12288 + 4000 + 1 + 4000 + 12384 - 8 - 8 - 8 - 8 - 8 - 8 - 8 - 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 - 0 - 0 - 0 - 96 + 0 + 0 + 0 + 96 12384 0 0 @@ -451,34 +451,34 @@ none - 1440 - 1440 - 1440 - 512 - 2048 - 1440 - 1440 - 1440 + 1440 + 1440 + 1440 + 512 + 2048 + 1440 + 1440 + 1440 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 0 - 0 - 0 - 0 + 0 + 0 + 0 + 0 1440 - 0 + 0 0 - 0 + 0 @@ -488,30 +488,30 @@ none - 4096 - 2048 - 512 - 2048 - 512 - 4096 - 4096 - 4096 + 4096 + 2048 + 512 + 2048 + 512 + 4096 + 4096 + 4096 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 - 0 - 0 - 0 - 2048 + 0 + 0 + 0 + 2048 4096 0 0 @@ -525,30 +525,30 @@ none - 4096 - 2048 - 2048 - 2048 - 512 - 4096 - 4096 - 4096 + 4096 + 2048 + 2048 + 2048 + 512 + 4096 + 4096 + 4096 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 - 0 - 0 - 0 - 2048 + 0 + 0 + 0 + 2048 4096 0 0 @@ -562,30 +562,30 @@ none - 9600 - 8640 - 600 - 960 - 960 - 960 - 960 - 960 + 9600 + 8640 + 600 + 960 + 960 + 960 + 960 + 960 - 4 - 4 - 4 - 4 - 4 - 4 - 4 - 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 - 0 - 0 + 0 + 0 0 - 8640 + 8640 9600 0 0 @@ -599,23 +599,23 @@ none - 48 - 8 - 8 - 40 - 32 - 48 - 48 - 48 + 48 + 8 + 8 + 40 + 32 + 48 + 48 + 48 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 0 @@ -634,33 +634,33 @@ none - -64 - -16 - -16 - -48 - -64 - -1 - -1 - -16 + -64 + -16 + -16 + -48 + -64 + -1 + -1 + -16 - 8 - 8 - 8 - 8 - 8 - 8 - 8 - 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 - 0 - 0 - 0 + 0 + 0 + 0 -16 - 0 - 0 - 0 + 0 + 0 + 0 -64 @@ -671,24 +671,24 @@ none - 160 - 80 - 80 - 80 - 160 - 160 - 160 - 240 + 160 + 80 + 80 + 80 + 160 + 160 + 160 + 240 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 1 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 1 0 @@ -707,24 +707,24 @@ none - 96 - 48 - 48 - 48 - 12 - 96 - 96 - 96 + 96 + 48 + 48 + 48 + 12 + 96 + 96 + 96 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 0 @@ -744,24 +744,24 @@ none - 192 - 72 - 72 - 120 - 24 - 192 - 192 - 192 + 192 + 72 + 72 + 120 + 24 + 192 + 192 + 192 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 0 @@ -781,24 +781,24 @@ none - 256 - 64 - 64 - 192 - 16 - 256 - 256 - 256 + 256 + 64 + 64 + 192 + 16 + 256 + 256 + 256 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 0 @@ -818,23 +818,23 @@ none - 240 - 40 - 40 - 200 - 20 - 240 - 240 - 240 + 240 + 40 + 40 + 200 + 20 + 240 + 240 + 240 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 0 @@ -854,24 +854,24 @@ none - 120 - 48 - 48 - 72 - 24 - 120 - 1 - 1 + 120 + 48 + 48 + 72 + 24 + 120 + 1 + 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 0 @@ -891,24 +891,24 @@ none - -12 - -5 - -5 - -7 - -2 - -1 - -12 - -12 + -12 + -5 + -5 + -7 + -2 + -1 + -12 + -12 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 0 @@ -928,24 +928,24 @@ none - 96 - 96 - 96 - 96 - 96 - 96 - 96 - 96 + 96 + 96 + 96 + 96 + 96 + 96 + 96 + 96 - 4 - 4 - 4 - 4 - 4 - 4 - 4 - 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 0 @@ -965,24 +965,24 @@ none - 96 - 96 - 96 - 96 - 96 - 96 - 96 - 96 + 96 + 96 + 96 + 96 + 96 + 96 + 96 + 96 - 4 - 4 - 4 - 4 - 4 - 4 - 4 - 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 0 @@ -1002,24 +1002,24 @@ none - 180 - 180 - 180 - 180 - 180 - 180 - 180 - 180 + 180 + 180 + 180 + 180 + 180 + 180 + 180 + 180 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 0 @@ -1039,34 +1039,34 @@ none - -8 - -4 - -4 - -4 - -1 - -8 - -8 - -8 + -8 + -4 + -4 + -4 + -1 + -8 + -8 + -8 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 0 - 0 - 0 - -4 - -8 - 0 - 0 - 0 + 0 + 0 + 0 + -4 + -8 + 0 + 0 + 0 @@ -1076,34 +1076,34 @@ none - -16 - -9 - -9 - -7 - -1 - -1 - -1 - -16 + -16 + -9 + -9 + -7 + -1 + -1 + -1 + -16 - 8 - 8 - 8 - 8 - 8 - 8 - 8 - 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 - 0 - 0 - 0 - -9 - -16 - 0 - 0 - 0 + 0 + 0 + 0 + -9 + -16 + 0 + 0 + 0 @@ -1114,34 +1114,34 @@ none - -208 - -32 - -32 - -80 - -48 - -1 - -1 - -208 + -208 + -32 + -32 + -80 + -48 + -1 + -1 + -208 - 8 - 8 - 8 - 8 - 8 - 8 - 8 - 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 + 8 - 0 - 0 - -32 - -64 - -208 - 0 - 0 - 0 + 0 + 0 + -32 + -64 + -208 + 0 + 0 + 0 @@ -1151,34 +1151,34 @@ none - 256 - 256 - 256 - 256 - 256 - 256 - 256 - 256 + 256 + 256 + 256 + 256 + 256 + 256 + 256 + 256 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 @@ -1188,24 +1188,24 @@ none - 240 - 240 - 240 - 240 - 240 - 240 - 240 - 240 + 240 + 240 + 240 + 240 + 240 + 240 + 240 + 240 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 0 @@ -1225,30 +1225,30 @@ none - 960 - 48 - 48 - 912 - 48 - 1 - 960 - 960 + 960 + 48 + 48 + 912 + 48 + 1 + 960 + 960 - 4 - 4 - 4 - 4 - 4 - 4 - 4 - 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 0 0 0 - 48 + 48 960 0 0 @@ -1262,24 +1262,24 @@ none - 384 - 64 - 64 - 320 - 32 - 384 - 384 - 64 + 384 + 64 + 64 + 320 + 32 + 384 + 384 + 64 - 4 - 4 - 4 - 4 - 4 - 4 - 4 - 1 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 1 0 @@ -1299,24 +1299,24 @@ none - 300 - 90 - 90 - 210 - 60 - 300 + 300 + 90 + 90 + 210 + 60 + 300 300 - 300 + 300 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 0 @@ -1336,24 +1336,24 @@ none - 600 - 210 - 210 - 390 - 30 - 600 - 600 - 600 + 600 + 210 + 210 + 390 + 30 + 600 + 600 + 600 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 0 @@ -1373,24 +1373,24 @@ none - 900 - 300 - 300 - 600 - 90 - 900 - 900 - 900 + 900 + 300 + 300 + 600 + 90 + 900 + 900 + 900 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 0 @@ -1410,24 +1410,24 @@ none - 300 - 120 - 120 - 180 - 180 - 300 - 300 - 300 + 300 + 120 + 120 + 180 + 180 + 300 + 300 + 300 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 0 @@ -1447,24 +1447,24 @@ none - 600 - 210 - 600 - 390 - 120 - 600 - 600 - 600 + 600 + 210 + 600 + 390 + 120 + 600 + 600 + 600 - 2 - 2 - 2 - 1 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 1 + 2 + 2 + 2 + 2 0 @@ -1484,24 +1484,24 @@ none - 192 - 192 - 192 - 192 - 192 - 192 - 192 - 192 + 192 + 192 + 192 + 192 + 192 + 192 + 192 + 192 - 4 - 4 - 4 - 4 - 4 - 4 - 4 - 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 + 4 0 @@ -1521,34 +1521,34 @@ none - 1024 - 416 - 1024 - 1024 - 1024 - 1024 - 1024 - 1024 + 1024 + 416 + 1024 + 1024 + 1024 + 1024 + 1024 + 1024 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 - 0 - 0 - 0 - 0 - 0 - 0 - 0 - 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 + 0 @@ -1558,24 +1558,24 @@ none - 15330 - 5115 - 5115 - 10215 - 30 - 15330 - 15330 - 15330 + 15330 + 5115 + 5115 + 10215 + 30 + 15330 + 15330 + 15330 - 1 - 1 - 1 - 1 - 1 - 1 - 1 - 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 + 1 0 @@ -1595,24 +1595,24 @@ none - 3200 - 1600 - 1600 - 1600 - 32 - 3200 - 3200 - 3200 + 3200 + 1600 + 1600 + 1600 + 32 + 3200 + 3200 + 3200 - 2 - 2 - 2 - 2 - 2 - 2 - 2 - 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 + 2 0 diff --git a/cime_config/cesm/allactive/testmods_dirs/allactive/defaultio/user_nl_rtm b/cime_config/cesm/allactive/testmods_dirs/allactive/defaultio/user_nl_rtm index 7d80b6384b46..ecd3d1730ede 100644 --- a/cime_config/cesm/allactive/testmods_dirs/allactive/defaultio/user_nl_rtm +++ b/cime_config/cesm/allactive/testmods_dirs/allactive/defaultio/user_nl_rtm @@ -1,6 +1,6 @@ !---------------------------------------------------------------------------------- -! Users should add all user specific namelist changes below in the form of -! namelist_var = new_namelist_value +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value ! NOTE: namelist variable rtm_tstep CAN ONLY be changed by modifying the value ! of the xml variable ROF_NCPL in env_run.xml ! NOTE: if the xml variable RTM_MODE in env_run.xml is set to 'NULL', then diff --git a/cime_config/cesm/archive.xml b/cime_config/cesm/archive.xml index 1177673181fd..7d1c16f7dcf3 100644 --- a/cime_config/cesm/archive.xml +++ b/cime_config/cesm/archive.xml @@ -3,87 +3,87 @@ atm - logs + logs false - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - init + init true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true @@ -93,15 +93,15 @@ atm - rest + rest true - rest + rest true - - hist + + hist true @@ -111,67 +111,67 @@ lnd - logs + logs false - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - init + init true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true @@ -181,15 +181,15 @@ lnd - rest + rest true - rest + rest true - - hist + + hist true @@ -199,43 +199,43 @@ rof - logs + logs false - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true @@ -245,43 +245,43 @@ rof - logs + logs false - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - - hist + + hist true - - hist + + hist true - - hist + + hist true - - hist + + hist true @@ -291,15 +291,15 @@ rof - rest + rest true - rest + rest true - - hist + + hist true @@ -309,19 +309,19 @@ ice - logs + logs false - rest + rest true - init + init false - - hist + + hist false @@ -331,15 +331,15 @@ ice - rest + rest true - rest + rest true - - hist + + hist true @@ -349,67 +349,67 @@ ocn - logs + logs false - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - hist + hist false - - hist + + hist false - - hist + + hist false - - hist + + hist false - - hist + + hist false @@ -419,15 +419,15 @@ ocn - rest + rest true - rest + rest true - - hist + + hist false @@ -437,23 +437,23 @@ glc - logs + logs false - rest + rest true - rest + rest true - init + init false - - hist + + hist false @@ -463,19 +463,19 @@ wav - logs + logs false - rest + rest true - init + init false - - hist + + hist false @@ -485,95 +485,95 @@ wav - rest + rest true - rest + rest true - - hist + + hist false - + dart - logs + logs false - hist + hist false - hist + hist false - hist + hist false - hist + hist false - hist + hist false - hist + hist false - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - rest + rest true - + cpl - logs + logs false - rest + rest true - logs + logs false - hist + hist false diff --git a/cime_config/cesm/machines/Depends.babbageKnc b/cime_config/cesm/machines/Depends.babbageKnc index 9e3c88642ebb..f5a6f335cc87 100644 --- a/cime_config/cesm/machines/Depends.babbageKnc +++ b/cime_config/cesm/machines/Depends.babbageKnc @@ -1,6 +1,6 @@ - -shr_ncread_mod.o: shr_ncread_mod.F90 - $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) $< - -quadrature_mod.o: quadrature_mod.F90 - $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -DIS_ACCELERATOR $< + +shr_ncread_mod.o: shr_ncread_mod.F90 + $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) $< + +quadrature_mod.o: quadrature_mod.F90 + $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -DIS_ACCELERATOR $< diff --git a/cime_config/cesm/machines/Depends.bluewaters b/cime_config/cesm/machines/Depends.bluewaters index 97d16ca07f60..e113298e08aa 100755 --- a/cime_config/cesm/machines/Depends.bluewaters +++ b/cime_config/cesm/machines/Depends.bluewaters @@ -1,5 +1,5 @@ # - ifeq ($(strip $(COMPILER)),pgi) + ifeq ($(strip $(COMPILER)),pgi) progseasalts_intr.o: progseasalts_intr.F90 $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -Mnovect $< endif diff --git a/cime_config/cesm/machines/Depends.intelmic b/cime_config/cesm/machines/Depends.intelmic index 0f84949daa31..079098951049 100644 --- a/cime_config/cesm/machines/Depends.intelmic +++ b/cime_config/cesm/machines/Depends.intelmic @@ -1,6 +1,6 @@ - -derivative_mod.o: derivative_mod.F90 - $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) -O1 $< - -shr_ncread_mod.o: shr_ncread_mod.F90 - $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) $< + +derivative_mod.o: derivative_mod.F90 + $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) -O1 $< + +shr_ncread_mod.o: shr_ncread_mod.F90 + $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) $< diff --git a/cime_config/cesm/machines/Depends.intelmic14 b/cime_config/cesm/machines/Depends.intelmic14 index 0f84949daa31..079098951049 100644 --- a/cime_config/cesm/machines/Depends.intelmic14 +++ b/cime_config/cesm/machines/Depends.intelmic14 @@ -1,6 +1,6 @@ - -derivative_mod.o: derivative_mod.F90 - $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) -O1 $< - -shr_ncread_mod.o: shr_ncread_mod.F90 - $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) $< + +derivative_mod.o: derivative_mod.F90 + $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) -O1 $< + +shr_ncread_mod.o: shr_ncread_mod.F90 + $(FC) -c $(FPPFLAGS) $(INCLDIR) $(INCS) $(FREEFLAGS) $(FFLAGS_NOOPT) $< diff --git a/cime_config/cesm/machines/Depends.mira b/cime_config/cesm/machines/Depends.mira index 7275bee0c320..c786f6248a46 100644 --- a/cime_config/cesm/machines/Depends.mira +++ b/cime_config/cesm/machines/Depends.mira @@ -15,7 +15,7 @@ derivative_mod.o \ bndry_mod.o \ prim_advance_mod.o \ uwshcu.o \ -wetdep.o +wetdep.o ifeq ($(DEBUG),FALSE) $(PERFOBJS): %.o: %.F90 $(FC) -c $(INCLDIR) $(INCS) $(FFLAGS) $(FREEFLAGS) -O3 -qnostrict $< diff --git a/cime_config/cesm/machines/README b/cime_config/cesm/machines/README index 22f727c7494d..3bafbe274ee1 100644 --- a/cime_config/cesm/machines/README +++ b/cime_config/cesm/machines/README @@ -1,12 +1,12 @@ config_pes_pop.xml -current assumptions: - prognostic: pop, cice - data: datm, drof - stub: slnd, sglc -DATM.+XLND.+CICE.+POP.+DROF.+SGLC -The current attributes that are supported are - lcompset_matchN= (where N can be any number) - pecount=[S,M,L,XL] +current assumptions: + prognostic: pop, cice + data: datm, drof + stub: slnd, sglc +DATM.+XLND.+CICE.+POP.+DROF.+SGLC +The current attributes that are supported are + lcompset_matchN= (where N can be any number) + pecount=[S,M,L,XL] Please refer to the documentation in the config_machines.xml and config_compilers.xml files. diff --git a/cime_config/cesm/machines/buildlib.csm_share b/cime_config/cesm/machines/buildlib.csm_share index 718812349e04..36429bd06995 100755 --- a/cime_config/cesm/machines/buildlib.csm_share +++ b/cime_config/cesm/machines/buildlib.csm_share @@ -56,9 +56,9 @@ if($useesmf eq "noesmf"){ push(@filepath,"$CIMEROOT/share/esmf_wrf_timemgr"); }else{ push(@filepath,"$CIMEROOT/driver_cpl/shr_esmf"); -} +} -my @fp; +my @fp; if (-e "Filepath"){ open(F,"Filepath"); @fp = ; @@ -75,8 +75,8 @@ if($#fp != $#filepath){ my $multiinst_cppdefs = ""; $multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_ATM=$NINST_ATM"; $multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_LND=$NINST_LND"; -$multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_OCN=$NINST_OCN"; -$multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_ICE=$NINST_ICE"; +$multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_OCN=$NINST_OCN"; +$multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_ICE=$NINST_ICE"; $multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_GLC=$NINST_GLC"; $multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_WAV=$NINST_WAV"; $multiinst_cppdefs = "$multiinst_cppdefs -DNUM_COMP_INST_ROF=$NINST_ROF"; @@ -96,7 +96,7 @@ if ($rc==0xff00){ print "coredump from "; } die "signal $rc\n"; -} +} #system("cp -p -f libcsm_share.a $sharedlibroot/lib"); #system("cp -p -f *.mod $sharedlibroot/include/"); diff --git a/cime_config/cesm/machines/buildlib.gptl b/cime_config/cesm/machines/buildlib.gptl index 29690140c08c..38676bfaf285 100755 --- a/cime_config/cesm/machines/buildlib.gptl +++ b/cime_config/cesm/machines/buildlib.gptl @@ -7,9 +7,9 @@ cd $CASEROOT # CASEROOT is always assumed to be an environment variable set CIMEROOT = `./xmlquery CIMEROOT -value ` -set GMAKE = `./xmlquery GMAKE -value ` +set GMAKE = `./xmlquery GMAKE -value ` -# NOTE- (mv, 2015-01-02) SHAREDPATH is an environment variable set in +# NOTE- (mv, 2015-01-02) SHAREDPATH is an environment variable set in # the $CASE.build script setenv GPTL_DIR $CIMEROOT/share/timing # gptl directory diff --git a/cime_config/cesm/machines/buildlib.mct b/cime_config/cesm/machines/buildlib.mct index e8fcbf1945eb..65cf5f5e5ef7 100755 --- a/cime_config/cesm/machines/buildlib.mct +++ b/cime_config/cesm/machines/buildlib.mct @@ -8,11 +8,11 @@ cd $CASEROOT set CIMEROOT = `./xmlquery CIMEROOT -value ` set CASETOOLS = `./xmlquery CASETOOLS -value ` -set GMAKE = `./xmlquery GMAKE -value ` -set GMAKE_J = `./xmlquery GMAKE_J -value ` -set MACH = `./xmlquery MACH -value ` -set MPILIB = `./xmlquery MPILIB -value ` -set OS = `./xmlquery OS -value ` +set GMAKE = `./xmlquery GMAKE -value ` +set GMAKE_J = `./xmlquery GMAKE_J -value ` +set MACH = `./xmlquery MACH -value ` +set MPILIB = `./xmlquery MPILIB -value ` +set OS = `./xmlquery OS -value ` setenv LIBDIR $1 setenv MCT_DIR $CIMEROOT/externals/mct # mct directory @@ -74,7 +74,7 @@ echo "MCT_LIBDIR $MCT_LIBDIR" $GMAKE -f $CASETOOLS/Makefile $MCT_LIBDIR/Makefile.conf MODEL=mct #if($? != 0) then # rm mct_conf* - #endif + #endif #endif if ($runclean == 1) then diff --git a/cime_config/cesm/machines/buildlib.pio b/cime_config/cesm/machines/buildlib.pio index 68560339d92c..569a26872511 100755 --- a/cime_config/cesm/machines/buildlib.pio +++ b/cime_config/cesm/machines/buildlib.pio @@ -4,8 +4,8 @@ cd $CASEROOT set CIMEROOT = `./xmlquery CIMEROOT -value ` set CASETOOLS = `./xmlquery CASETOOLS -value ` -set GMAKE = `./xmlquery GMAKE -value ` -set GMAKE_J = `./xmlquery GMAKE_J -value ` +set GMAKE = `./xmlquery GMAKE -value ` +set GMAKE_J = `./xmlquery GMAKE_J -value ` set BLDROOT = $1 # directory in which pio is built setenv PIO_VERSION `./xmlquery PIO_VERSION -value` diff --git a/cime_config/cesm/machines/config_batch.xsd b/cime_config/cesm/machines/config_batch.xsd index 1eddc0e88fe1..4536bf976125 100644 --- a/cime_config/cesm/machines/config_batch.xsd +++ b/cime_config/cesm/machines/config_batch.xsd @@ -9,7 +9,7 @@ - + @@ -48,12 +48,12 @@ - + - + - + diff --git a/cime_config/cesm/machines/config_compilers.xml b/cime_config/cesm/machines/config_compilers.xml index 78f6574c4ff9..910d71aa132c 100644 --- a/cime_config/cesm/machines/config_compilers.xml +++ b/cime_config/cesm/machines/config_compilers.xml @@ -1,21 +1,21 @@ - +--> @@ -83,7 +83,7 @@ for mct, etc. - - + @@ -197,7 +197,7 @@ for mct, etc. - + @@ -234,7 +234,7 @@ for mct, etc. -ta=nvidia -Mcuda=5.5,cc35 -O0 -g -Ktrap=fp -Mbounds -Kieee -mp - + -O0 -g -Ktrap=fp -Mbounds -Kieee -Mnovect -Mnovect @@ -350,7 +350,7 @@ for mct, etc. -O -g -Wall -O - -mcmodel=medium -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none -mcmodel=medium -std=gnu99 @@ -382,7 +382,7 @@ for mct, etc. -f free -N 255 -h byteswapio -x dir -O1,fp2,ipa0,scalar0,vector0 -s real64 - -Wl,--allow-multiple-definition -h byteswapio + -Wl,--allow-multiple-definition -h byteswapio TRUE @@ -444,7 +444,7 @@ for mct, etc. USERDEFINED_MUST_EDIT_THIS - # USERDEFINED $(shell $(NETCDF_PATH)/bin/nc-config --flibs) + # USERDEFINED $(shell $(NETCDF_PATH)/bin/nc-config --flibs) @@ -469,8 +469,8 @@ for mct, etc. - -O2 - -O2 + -O2 + -O2 --host=Linux -L$(NETCDF_DIR) -lnetcdff -Wl,--as-needed,-L$(NETCDF_DIR)/lib -lnetcdff -lnetcdf -DHAVE_PAPI @@ -551,18 +551,18 @@ for mct, etc. gpfs $(NETCDF) $(PNETCDF) - + -DNO_MPI2 mpicc mpif90 - + -O2 -O2 --host=Linux lustre - $(shell $(NETCDF_PATH)/bin/nf-config --flibs) + $(shell $(NETCDF_PATH)/bin/nf-config --flibs) TRUE @@ -571,7 +571,7 @@ for mct, etc. -O2 --host=Linux lustre - $(shell nf-config --flibs) + $(shell nf-config --flibs) /lustre/atlas1/cli900/world-shared/cesm/software/Trilinos/Trilinos-11.12.1/titan-pgi-cesm/install -lfmpich -lmpichf90_pgi $(PGI_PATH)/linux86-64/$(PGI_VERSION)/lib/f90main.o TRUE @@ -579,7 +579,7 @@ for mct, etc. -O2 - -O2 + -O2 -nofma -nofma -lmpichf90_pgi $(PGI_PATH)/linux86-64/$(PGI_VERSION)/lib/f90main.o @@ -587,7 +587,7 @@ for mct, etc. - lustre + lustre -DHAVE_PAPI @@ -597,7 +597,7 @@ for mct, etc. xlf2003_r mpxlf2003_r cc_r - mpcc_r + mpcc_r -DF2003 -qarch=auto -qtune=auto -qcache=auto -qarch=auto -qtune=auto -qcache=auto -qsclk=micro @@ -700,7 +700,7 @@ for mct, etc. mpich mpi --host=LINUX - + -O2 @@ -754,14 +754,14 @@ for mct, etc. -DLINUX -L$(NETCDF_PATH)/lib -lnetcdf -lnetcdff -lpmi - + -O2 -O2 /usr/local/tools/netcdf-pgi-4.1.3 /usr/local/tools/mvapich2-pgi-1.7/ mpich - $(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs) + $(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs) -Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib @@ -823,7 +823,7 @@ for mct, etc. /usr/local/tools/netcdf-pgi-4.1.3 /usr/local/tools/mvapich2-pgi-1.7/ mpich - $(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs) + $(shell /usr/local/tools/netcdf-pgi-4.1.3/bin/nc-config --flibs) -Wl,-rpath /usr/local/tools/netcdf-pgi-4.1.3/lib diff --git a/cime_config/cesm/machines/config_machines.xml b/cime_config/cesm/machines/config_machines.xml index f827b68bd564..52c38e084490 100644 --- a/cime_config/cesm/machines/config_machines.xml +++ b/cime_config/cesm/machines/config_machines.xml @@ -460,7 +460,7 @@ - srun + srun --mpi=none --ntasks={{ num_tasks }} @@ -469,7 +469,7 @@ - srun + srun --ntasks={{ num_tasks }} --cpu_bind=sockets --cpu_bind=verbose diff --git a/cime_config/cesm/machines/mkSrcfiles b/cime_config/cesm/machines/mkSrcfiles index 538e9851988c..4978fcaa59e2 100755 --- a/cime_config/cesm/machines/mkSrcfiles +++ b/cime_config/cesm/machines/mkSrcfiles @@ -1,7 +1,7 @@ #!/usr/bin/env perl # Make list of files containing source code. The source list contains all -# .F90, .f90, .F, .f, .c and .cpp files in a specified list of directories. +# .F90, .f90, .F, .f, .c and .cpp files in a specified list of directories. # The directories are specified one per line in a file called Filepath which # this script tries to open in the current directory. The current # directory is prepended to the specified list of directories. If Filepath diff --git a/cime_config/cesm/machines/taskmaker.pl b/cime_config/cesm/machines/taskmaker.pl index ae5eb5ed5ca2..dac6590c8fb2 100755 --- a/cime_config/cesm/machines/taskmaker.pl +++ b/cime_config/cesm/machines/taskmaker.pl @@ -233,7 +233,7 @@ my $maxthrds = $maxt[0]; my @sumt; $sumt[0] = 0; -for ($c1=1; $c1 < $tottasks; $c1++){ +for ($c1=1; $c1 < $tottasks; $c1++){ if ($maxt[$c1] < $minthrds) {$minthrds = $maxt[$c1] ;} if ($maxt[$c1] < 1) {$maxt[$c1] = 1;} if ($maxt[$c1] > $maxthrds) {$maxthrds = $maxt[$c1] ;} diff --git a/cime_config/cesm/machines/template.lt_archive b/cime_config/cesm/machines/template.lt_archive index 131fe443a897..af19966b79a2 100644 --- a/cime_config/cesm/machines/template.lt_archive +++ b/cime_config/cesm/machines/template.lt_archive @@ -51,14 +51,14 @@ sub checkRun my $statusFile = shift; my $runComplete = 0; - $logger->debug("In checkRun..."); + $logger->debug("In checkRun..."); # # check if the run completed successfully # - if( -f $statusFile ) + if( -f $statusFile ) { open my $CASESTATUS, "<", "$statusFile" or die qq(lt_archive: unable to open $statusFile. Exiting...\n); - while( <$CASESTATUS> ) + while( <$CASESTATUS> ) { chomp $_; if( /^run SUCCESSFUL/ ) @@ -78,14 +78,14 @@ sub checkSta my $statusFile = shift; my $staComplete = 0; - $logger->debug("In checkSta..."); + $logger->debug("In checkSta..."); # # check if the short term archive completed successfully # - if( -f $statusFile ) + if( -f $statusFile ) { open my $STASTATUS, "<", "$statusFile" or die qq(lt_archive: unable to open $statusFile. Exiting...\n); - while( <$STASTATUS> ) + while( <$STASTATUS> ) { chomp $_; if( /^st_archive process complete/ ) @@ -107,8 +107,8 @@ sub main # First, get the configuration from every xml file. %config = SetupTools::getAllResolved(); - - + + # Change to the case root chdir($config{'CASEROOT'}); my $testlog = "$config{CASEROOT}/TestStatus.log"; @@ -119,8 +119,8 @@ sub main close(TL); } $logger->info("lt_archive starting"); - - # set up envrionment vars and call the lt_archive.sh script + + # set up envrionment vars and call the lt_archive.sh script my $runComplete = checkRun( "$config{'CASEROOT'}/CaseStatus" ); my $staComplete = checkSta( "$config{'CASEROOT'}/stArchiveStatus" ); @@ -143,7 +143,7 @@ sub main if(-e $testlog) { open(TL, ">>$testlog"); - print TL "lt_archive complete\n"; + print TL "lt_archive complete\n"; close(TL); } $logger->info("lt_archive complete\n"); @@ -166,11 +166,11 @@ sub resubmitCheck() if(-e $testlog) { open(TL, ">>$testlog"); - print TL "lt_archive complete\n"; + print TL "lt_archive complete\n"; close(TL); } qx($resubmitcommand); - if($?) { $logger->warn("could not run CESM submit script, $! $?") ; } + if($?) { $logger->warn("could not run CESM submit script, $! $?") ; } chdir $cwd; } } diff --git a/cime_config/cesm/machines/userdefined_laptop_template/README.md b/cime_config/cesm/machines/userdefined_laptop_template/README.md index ad0ad3cc5559..15f2171c28ce 100644 --- a/cime_config/cesm/machines/userdefined_laptop_template/README.md +++ b/cime_config/cesm/machines/userdefined_laptop_template/README.md @@ -53,7 +53,7 @@ Setup - build cprnc : homebrew : - + cd ${CESMROOT}/tools/cprnc mkdir build cd build @@ -63,7 +63,7 @@ Setup -DNetcdf_INCLUDE_DIR=/usr/local/include .. make - + macports : cd ${CESMROOT}/tools/cprnc @@ -119,7 +119,7 @@ First Use -case ../junk-1x1_brazil \ -compset ICLM45CN \ -res 1x1_brazil - + - run `case_setup`, `$CASE_NAME.build`, `$CASE_NAME.run` as normal. - Test a global simulation, use: diff --git a/cime_config/cesm/machines/userdefined_laptop_template/config_compilers.xml b/cime_config/cesm/machines/userdefined_laptop_template/config_compilers.xml index e9b9da91fe77..03970f6a16b0 100644 --- a/cime_config/cesm/machines/userdefined_laptop_template/config_compilers.xml +++ b/cime_config/cesm/machines/userdefined_laptop_template/config_compilers.xml @@ -13,7 +13,7 @@ -ffixed-form -ffree-form -g -Wall - -O -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none -O0 @@ -31,7 +31,7 @@ $(shell $(NETCDF_PATH)/bin/nf-config --flibs) -framework Accelerate $ENV{HOME}/local/pfunit/pfunit-sf.git.ae92605e8e - + -DFORTRANUNDERSCORE -DNO_R16 @@ -42,7 +42,7 @@ -ffixed-form -ffree-form -g -Wall - -O -fconvert=big-endian -ffree-line-length-none -ffixed-line-length-none -O0 diff --git a/cime_config/cesm/machines/userdefined_laptop_template/mkbatch.no_batch_system b/cime_config/cesm/machines/userdefined_laptop_template/mkbatch.no_batch_system index 4cbb6cfb7cab..61bf07abc10d 100755 --- a/cime_config/cesm/machines/userdefined_laptop_template/mkbatch.no_batch_system +++ b/cime_config/cesm/machines/userdefined_laptop_template/mkbatch.no_batch_system @@ -20,7 +20,7 @@ foreach model ($MODELS) echo "ERROR, NTHRDS maximum is $MAX_TASKS_PER_NODE" echo "you have set NTHRDS = ( $NTHRDS[$n] ) - must reset" exit 1 - endif + endif if ($NTHRDS[$n] > $maxthrds) then set maxthrds = $NTHRDS[$n] endif @@ -44,7 +44,7 @@ if ($maxthrds > $minthrds) then else if ($maxthrds > 1) then @ ptile = $MAX_TASKS_PER_NODE / $maxthrds - endif + endif endif @ nodes = ${ntasks_tot} / ${ptile} @@ -58,9 +58,9 @@ endif ./xmlchange -noecho -file env_mach_pes.xml -id COST_PES -val ${costpes} if ($?TESTMODE) then - set file = $CASEROOT/${CASE}.test + set file = $CASEROOT/${CASE}.test else - set file = $CASEROOT/${CASE}.run + set file = $CASEROOT/${CASE}.run endif cat >! $file << EOF1 @@ -84,7 +84,7 @@ set maxthrds = $maxthrds set maxtasks = $maxtasks cd \$RUNDIR -echo "\`date\` -- CSM EXECUTION BEGINS HERE" +echo "\`date\` -- CSM EXECUTION BEGINS HERE" setenv MP_LABELIO yes setenv OMP_NUM_THREADS \$maxthrds if ( "\$MPILIB" == "mpi-serial" ) then @@ -94,7 +94,7 @@ else endif wait -echo "\`date\` -- CSM EXECUTION HAS FINISHED" +echo "\`date\` -- CSM EXECUTION HAS FINISHED" # ------------------------------------------------------------------------- # For Postprocessing @@ -119,5 +119,5 @@ else ################################################################################# endif ################################################################################# - + diff --git a/cime_config/config_headers.xml b/cime_config/config_headers.xml index 10172c849718..1b274784eb82 100644 --- a/cime_config/config_headers.xml +++ b/cime_config/config_headers.xml @@ -39,40 +39,40 @@
- These variables CANNOT be modified once case_setup has been - invoked without first invoking case_setup -clean. - - component task/thread settings - if the user wants to change the values below after ./case_setup, run - ./case_setup -clean - ./case_setup - to reset the pes for the run - - NTASKS are the total number of MPI tasks, a negative value in this field + These variables CANNOT be modified once case_setup has been + invoked without first invoking case_setup -clean. + + component task/thread settings + if the user wants to change the values below after ./case_setup, run + ./case_setup -clean + ./case_setup + to reset the pes for the run + + NTASKS are the total number of MPI tasks, a negative value in this field indicates nodes rather than tasks. - NTHRDS are the number of OpenMP threads per MPI task - ROOTPE is the global mpi task associated with the root task - of that component, a negative value in this field indicates nodes rather than tasks. PSTRID is the stride of MPI tasks across the global - set of pes (for now this is set to 1) - NINST is the number of instances of the component (will be spread - evenly across NTASKS) + NTHRDS are the number of OpenMP threads per MPI task + ROOTPE is the global mpi task associated with the root task + of that component, a negative value in this field indicates nodes rather than tasks. PSTRID is the stride of MPI tasks across the global + set of pes (for now this is set to 1) + NINST is the number of instances of the component (will be spread + evenly across NTASKS) - for example, for a setting with - NTASKS = 8 - NTHRDS = 2 - ROOTPE = 32 - NINST = 2 - the MPI tasks would be placed starting on global pe 32 - and each pe would be threaded 2-ways for this component. - These tasks will be divided amongst both instances (4 tasks each). - - Note: PEs that support threading never have an MPI task associated - with them for performance reasons. As a result, NTASKS and ROOTPE - are relatively independent of NTHRDS and they determine - the layout of mpi processors between components. NTHRDS is used - to determine how those mpi tasks should be placed across the machine. - - The following values should not be set by the user since they'll be + for example, for a setting with + NTASKS = 8 + NTHRDS = 2 + ROOTPE = 32 + NINST = 2 + the MPI tasks would be placed starting on global pe 32 + and each pe would be threaded 2-ways for this component. + These tasks will be divided amongst both instances (4 tasks each). + + Note: PEs that support threading never have an MPI task associated + with them for performance reasons. As a result, NTASKS and ROOTPE + are relatively independent of NTHRDS and they determine + the layout of mpi processors between components. NTHRDS is used + to determine how those mpi tasks should be placed across the machine. + + The following values should not be set by the user since they'll be overwritten by scripts. TOTALPES CCSM_PCOST @@ -82,7 +82,7 @@ PES_PER_NODE CCSM_TCOST CCSM_ESTCOST - + The user can copy env_mach_pes.xml from another run, but they'll need to do the following ./case_setup -clean @@ -93,9 +93,9 @@
- These are the variables specific to the short term + These are the variables specific to the short term archiver. For a detailed listing of the env_archive.xml file, run - ./st_archive -help + ./st_archive -help To validate the env_archive.xml file using xmllint, run xmllint -schema Tools/archive.xsd env_archive.xml from the case root. diff --git a/cime_config/xml_schemas/archive.xsd b/cime_config/xml_schemas/archive.xsd index 7297adbb68eb..37992efaea81 100644 --- a/cime_config/xml_schemas/archive.xsd +++ b/cime_config/xml_schemas/archive.xsd @@ -46,4 +46,4 @@ - + diff --git a/components/data_comps/datm/atm_comp_esmf.F90 b/components/data_comps/datm/atm_comp_esmf.F90 index 8d71266679c3..54a7cd711cbd 100644 --- a/components/data_comps/datm/atm_comp_esmf.F90 +++ b/components/data_comps/datm/atm_comp_esmf.F90 @@ -1,6 +1,6 @@ module atm_comp_esmf -#ifdef ESMF_INTERFACE +#ifdef ESMF_INTERFACE use shr_kind_mod, only: R8=>SHR_KIND_R8, IN=>SHR_KIND_IN, & CS=>SHR_KIND_CS, CL=>SHR_KIND_CL use shr_sys_mod ! shared system calls @@ -37,7 +37,7 @@ module atm_comp_esmf save ! save everything ! ! Author: Fei Liu - ! This module is ESMF compliant atm data component + ! This module is ESMF compliant atm data component !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ contains !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -256,7 +256,7 @@ subroutine atm_final_esmf(comp, import_state, export_state, EClock, rc) integer, intent(out) :: rc !---------------------------------------------------------------------------- - ! Finalize routine + ! Finalize routine !---------------------------------------------------------------------------- rc = ESMF_SUCCESS diff --git a/components/data_comps/datm/bld/build-namelist b/components/data_comps/datm/bld/build-namelist index 1794367539ca..7db8506a2572 100755 --- a/components/data_comps/datm/bld/build-namelist +++ b/components/data_comps/datm/bld/build-namelist @@ -20,22 +20,22 @@ sub usage { SYNOPSIS build-namelist [options] - Build the datm namelist + Build the datm namelist OPTIONS -debug Run script using default values for env variable settings for debugging. - -help [or -h] Print usage to STDOUT. - -infile "filepath" Specify a file or list of files (comma delimited) - containing namelists to read values from. - -namelist "namelist" Specify namelist settings directly on the commandline by - supplying a string containing FORTRAN namelist syntax, e.g., - -namelist "&datm_exp taxmode='extend'/" - -print "level" Print level for debugging: - 0 = silent - 1 = regular - 2 = verbose + -help [or -h] Print usage to STDOUT. + -infile "filepath" Specify a file or list of files (comma delimited) + containing namelists to read values from. + -namelist "namelist" Specify namelist settings directly on the commandline by + supplying a string containing FORTRAN namelist syntax, e.g., + -namelist "&datm_exp taxmode='extend'/" + -print "level" Print level for debugging: + 0 = silent + 1 = regular + 2 = verbose -test Enable checking that input datasets exist on local filesystem. - -user_xml_dir "directory" Directory of where to look for user versions of + -user_xml_dir "directory" Directory of where to look for user versions of namelist XML files (usually your SourceMods/src.datm directory) (such as namelist_definition_datm.xml, or namelist_defaults_datm.xml) -caseroot CASEROOT directory variable @@ -51,7 +51,7 @@ Note: The precedence for setting the values of namelist variables is (highest to NOTE: The following xml variables are REQUIRED (they are already set by scripts in the env_*.xml files) RUN_TYPE DIN_LOC_ROOT ATM_DOMAIN_FILE ATM_DOMAIN_PATH DATM_MODE DATM_PRESAERO DATM_TOPO DATM_CO2_TSERIES - ATM_GRID GRID + ATM_GRID GRID EOF } @@ -68,7 +68,7 @@ my $cmdline = "@ARGV"; # Command line arguments to script my $cwd = getcwd(); # current working directory my $cfgdir; # absolute pathname of directory that contains this script my $nm = "ProgName::"; # name to use if script dies -if ($ProgDir) { +if ($ProgDir) { $cfgdir = abs_path($ProgDir); } else { $cfgdir = $cwd; @@ -99,7 +99,7 @@ GetOptions( "test" => \$opts{'test'}, "caseroot=s" => \$opts{'caseroot'}, "cimeroot=s" => \$opts{'cimeroot'}, - "inst_string=s" => \$opts{'inst_string'}, + "inst_string=s" => \$opts{'inst_string'}, "user_xml_dir=s" => \$opts{'user_xml_dir'}, ) or usage(); @@ -143,7 +143,7 @@ EOF my $CASEROOT = $opts{'caseroot'}; my $CIMEROOT = $opts{'cimeroot'}; -my $INST_STRING = $opts{'inst_string'}; +my $INST_STRING = $opts{'inst_string'}; #----------------------------------------------------------------------------------------------- my $bldconfdir = "$CASEROOT/Buildconf/datmconf"; @@ -155,7 +155,7 @@ if ( $opts{'debug'} ) { chdir( "$bldconfdir" ); } -# build empty config_cache.xml file (needed below) +# build empty config_cache.xml file (needed below) my $config_cache = "$bldconfdir/$cfg_cache"; my $fh = new IO::File; $fh->open(">$config_cache") or die "** can't open file: $config_cache\n"; @@ -182,14 +182,14 @@ my $perl5lib = "$cimeroot/utils/perl5lib"; # The XML::Lite module is required to parse the XML files. #(-f "$perl5lib/XML/Lite.pm") or die <<"EOF"; -#** $ProgName - Cannot find perl module \"XML/Lite.pm\" in directory +#** $ProgName - Cannot find perl module \"XML/Lite.pm\" in directory #\"$perl5lib\" ** #EOF # The Build::Config module provides utilities to access the configuration information # in the config_cache.xml file (-f "$perl5lib/Build/Config.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/Config.pm\" in directory +** $ProgName - Cannot find perl module \"Build/Config.pm\" in directory \"$perl5lib\" ** EOF @@ -213,12 +213,12 @@ if ($print>=2) { print "Using namelist definition file $nl_definition_file$eol"; # The Build::NamelistDefinition module provides utilities to validate that the output # namelists are consistent with the namelist definition file (-f "$perl5lib/Build/NamelistDefinition.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/NamelistDefinition.pm\" in directory +** $ProgName - Cannot find perl module \"Build/NamelistDefinition.pm\" in directory \"$perl5lib\" ** EOF # The namelist defaults file contains default values for all required namelist variables. -my @nl_defaults_files = ( "$cfgdir/namelist_files/namelist_defaults_datm.xml"); +my @nl_defaults_files = ( "$cfgdir/namelist_files/namelist_defaults_datm.xml"); # If user has user namelist definition files if (defined $opts{'user_xml_dir'}) { my @filelist = @nl_defaults_files; @@ -240,14 +240,14 @@ EOF # The Build::NamelistDefaults module provides a utility to obtain default values of namelist # variables based on finding a best fit with the attributes specified in the defaults file. (-f "$perl5lib/Build/NamelistDefaults.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/NamelistDefaults.pm\" in directory +** $ProgName - Cannot find perl module \"Build/NamelistDefaults.pm\" in directory \"$perl5lib\" ** EOF # The Build::Namelist module provides utilities to parse input namelists, to query and modify # namelists, and to write output namelists. (-f "$perl5lib/Build/Namelist.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/Namelist.pm\" in directory +** $ProgName - Cannot find perl module \"Build/Namelist.pm\" in directory \"$perl5lib\" ** EOF @@ -265,7 +265,7 @@ require Streams::TemplateGeneric; require Config::SetupTools; #----------------------------------------------------------------------------------------------- -# Create a configuration object from the DATM config_cache.xml file. +# Create a configuration object from the DATM config_cache.xml file. my $cfg = Build::Config->new( $config_cache ); @@ -345,9 +345,9 @@ if (defined $opts{'infile'}) { my %xmlvars = (); SetupTools::getxmlvars(${CASEROOT},\%xmlvars); foreach my $attr (keys %xmlvars) { - $xmlvars{$attr} = SetupTools::expand_xml_var($xmlvars{$attr}, \%xmlvars); + $xmlvars{$attr} = SetupTools::expand_xml_var($xmlvars{$attr}, \%xmlvars); } -foreach my $var ( "RUN_TYPE", "DIN_LOC_ROOT", "ATM_DOMAIN_FILE", "ATM_DOMAIN_PATH", +foreach my $var ( "RUN_TYPE", "DIN_LOC_ROOT", "ATM_DOMAIN_FILE", "ATM_DOMAIN_PATH", "DATM_MODE", "DATM_PRESAERO", "DATM_TOPO", "DATM_CO2_TSERIES", "ATM_GRID", "GRID" ) { if ( $print > 1 ) { print "$var = $xmlvars{$var}\n"; } @@ -356,17 +356,17 @@ foreach my $var ( "RUN_TYPE", "DIN_LOC_ROOT", "ATM_DOMAIN_FILE", "ATM_DOMAIN_PAT } } -my $RUN_TYPE = $xmlvars{'RUN_TYPE'}; -my $DIN_LOC_ROOT = $xmlvars{'DIN_LOC_ROOT'}; +my $RUN_TYPE = $xmlvars{'RUN_TYPE'}; +my $DIN_LOC_ROOT = $xmlvars{'DIN_LOC_ROOT'}; my $ATM_DOMAIN_FILE = $xmlvars{'ATM_DOMAIN_FILE'}; my $ATM_DOMAIN_PATH = $xmlvars{'ATM_DOMAIN_PATH'}; -my $DATM_MODE = $xmlvars{'DATM_MODE'}; -my $DATM_PRESAERO = $xmlvars{'DATM_PRESAERO'}; -my $DATM_TOPO = $xmlvars{'DATM_TOPO'}; +my $DATM_MODE = $xmlvars{'DATM_MODE'}; +my $DATM_PRESAERO = $xmlvars{'DATM_PRESAERO'}; +my $DATM_TOPO = $xmlvars{'DATM_TOPO'}; my $DATM_CO2_TSERIES= $xmlvars{'DATM_CO2_TSERIES'}; -my $ATM_GRID = $xmlvars{'ATM_GRID'}; -my $GRID = $xmlvars{'GRID'}; -my $CLM_USRDAT_NAME = $xmlvars{'CLM_USRDAT_NAME'}; +my $ATM_GRID = $xmlvars{'ATM_GRID'}; +my $GRID = $xmlvars{'GRID'}; +my $CLM_USRDAT_NAME = $xmlvars{'CLM_USRDAT_NAME'}; # Validate some of the env values. if ( $DATM_MODE =~ /CLM/ && $DATM_PRESAERO eq "none" ) { @@ -402,8 +402,8 @@ $nl->set_variable_value( $group, $var, "\'$xmlvars{$var}\'" ); #################################### # Streams file(s) # #################################### - -# Get defaults for data manipulation options associated with + +# Get defaults for data manipulation options associated with # each stream (mapping, filling, time-interp etc.) if ($print>=1) { print " datm mode is $DATM_MODE \n"; } @@ -472,11 +472,11 @@ foreach my $stream ( @streams ) { # Exit if there is no prescribed aerosol stream if ($stream eq "presaero" && $DATM_PRESAERO eq "none" ) { next; - } + } if ($print>=1) { print " datm stream is $stream$INST_STRING \n";} # Create hash needed to parse namelist_defaults.xml file - # Hash default_namelist_opts contains the attribute values needed for $defaults->get_value + # Hash default_namelist_opts contains the attribute values needed for $defaults->get_value $default_namelist_opts{'stream'} = $stream; if ($DATM_PRESAERO ne 'none') { $default_namelist_opts{'presaero_flag'} = "active"; @@ -490,7 +490,7 @@ foreach my $stream ( @streams ) { } $default_namelist_opts{'grid'} = $GRID; $default_namelist_opts{'presaero_mode'} = $DATM_PRESAERO; - + # Determine stream txt file my $outstream = "datm.streams.txt" . ".$stream" . "$INST_STRING"; if (-e "$CASEROOT/user_$outstream") { @@ -515,7 +515,7 @@ foreach my $stream ( @streams ) { $stream_template_opts{'ProgName'} = $ProgName; $stream_template_opts{'ProgDir'} = "$cfgdir"; $stream_template_opts{'cmdline'} = $cmdline; - + $stream_template_opts{'offset'} = $defaults->get_value( "strm_offset" , \%default_namelist_opts ); $stream_template_opts{'filepath'} = $defaults->get_value( "strm_datdir" , \%default_namelist_opts ); $stream_template_opts{'filenames'} = $defaults->get_value( "strm_datfil" , \%default_namelist_opts ); @@ -525,7 +525,7 @@ foreach my $stream ( @streams ) { $stream_template_opts{'domvarnames'}= $defaults->get_value( "strm_domvar" , \%default_namelist_opts ); $stream_template_opts{'yearfirst'} = $defaults->get_value( "strm_year_start", \%default_namelist_opts ); $stream_template_opts{'yearlast'} = $defaults->get_value( "strm_year_end" , \%default_namelist_opts ); - + $stream_template_opts{'filepath'} = SetupTools::expand_xml_var( $stream_template_opts{'filepath'} , \%xmlvars ); $stream_template_opts{'filenames'} = SetupTools::expand_xml_var( $stream_template_opts{'filenames'} , \%xmlvars ); $stream_template_opts{'domainpath'} = SetupTools::expand_xml_var( $stream_template_opts{'domainpath'}, \%xmlvars ); @@ -538,20 +538,20 @@ foreach my $stream ( @streams ) { die "$ProgName ERROR:: bad $item for stream: $stream\n"; } } - + # Create the streams txt file for this stream (from a generic template) my $stream_template = Streams::TemplateGeneric->new( \%stream_template_opts ); $stream_template->Read( "${CASEROOT}/Buildconf/datm.template.streams.xml" ); $stream_template->Write( $outstream ); - + # Append to datm.input_data_list my @filenames = $stream_template->GetDataFilenames( 'domain'); my $i = 0; foreach my $file ( @filenames ) { - $i++; + $i++; print $fh_out "domain${i} = $file\n"; } - + my @filenames = $stream_template->GetDataFilenames( 'data'); my $i = 0; foreach my $file ( @filenames ) { @@ -609,7 +609,7 @@ foreach my $stream ( @streams ) { } $fh_out->close; - + ########################################################## # namelist group: shr_strdata_nml (in file datm_atm_in) # ########################################################## @@ -645,8 +645,8 @@ if ($DATM_PRESAERO eq "none" ) { } add_default($nl, 'decomp', 'val'=>'1d'); add_default($nl, 'force_prognostic_true', 'val'=>'.false.'); -add_default($nl, 'restfilm', 'val'=>'undefined'); -add_default($nl, 'restfils', 'val'=>'undefined'); +add_default($nl, 'restfilm', 'val'=>'undefined'); +add_default($nl, 'restfils', 'val'=>'undefined'); if ( $RUN_TYPE =~ /branch/ ) { # The datm master restart file is currently unused @@ -753,7 +753,7 @@ sub add_default { $val = $defaults->get_value($var, \%opts); # Truncate model_version appropriately - + if ( $var eq "model_version" ) { $val =~ /(URL: https:\/\/[a-zA-Z0-9._-]+\/)([a-zA-Z0-9\/._-]+)(\/bld\/.+)/; $val = $2; @@ -762,7 +762,7 @@ sub add_default { unless ( defined($val) ) { unless ($opts{'nofail'}) { - die "$ProgName - No default value found for $var.\n" . + die "$ProgName - No default value found for $var.\n" . " Are defaults provided? \n"; } else { diff --git a/components/data_comps/datm/bld/namelist_files/namelist_defaults_datm.xml b/components/data_comps/datm/bld/namelist_files/namelist_defaults_datm.xml index 08d57d0307f1..cb2ade1546c8 100644 --- a/components/data_comps/datm/bld/namelist_files/namelist_defaults_datm.xml +++ b/components/data_comps/datm/bld/namelist_files/namelist_defaults_datm.xml @@ -12,20 +12,20 @@ attributes to express the dependency. The recognized attributes are: grid, datm_presaero and all configuration attributes from the config_cache.xml file (with keys converted to upper-case). -strm_year_first is the first year of the stream data that will be used -strm_year_last is the last year of the stream data that will be used -strm_year_align is the model year that will be aligned with stream data for year_first +strm_year_first is the first year of the stream data that will be used +strm_year_last is the last year of the stream data that will be used +strm_year_align is the model year that will be aligned with stream data for year_first Replace any instance of the following substring indicators with the appropriate values: %y => year from the range yearfirst to yearlast - using in build-namelist $namelist_defaults_opts{'yearfirst'} - using in build-namelist $namelist_defaults_opts{'yearlast'} + using in build-namelist $namelist_defaults_opts{'yearfirst'} + using in build-namelist $namelist_defaults_opts{'yearlast'} %ym => year-month from the range yearfirst to yearlast with all 12 months - using in build-namelist $namelist_defaults_opts{'yearfirst'} - using in build-namelist $namelist_defaults_opts{'yearlast'} + using in build-namelist $namelist_defaults_opts{'yearfirst'} + using in build-namelist $namelist_defaults_opts{'yearlast'} %ymd => year-month-day from the range yearfirst to yearlast with all 12 months - using in build-namelist $namelist_defaults_opts{'yearfirst'} - using in build-namelist $namelist_defaults_opts{'yearlast'} + using in build-namelist $namelist_defaults_opts{'yearfirst'} + using in build-namelist $namelist_defaults_opts{'yearlast'} In datm_atm_in, streams namelist input has the form streams = 'stream1.txt year_align year_first year_last ', @@ -53,8 +53,8 @@ Currently the following streams are supported (term definitions precede the stre BC = Bias Correction for a stream to a given set of observations WW3 = Wave model forcing - Anomaly.Forcing.Humidity - Anomaly.Forcing.Longwave + Anomaly.Forcing.Humidity + Anomaly.Forcing.Longwave Anomaly.Forcing.Precip Anomaly.Forcing.Pressure Anomaly.Forcing.Shortwave @@ -270,7 +270,7 @@ Currently the following streams are supported (term definitions precede the stre $DIN_LOC_ROOT/atm/datm7/domain.clm domain.lnd.1x1pt-urbanc_alpha_navy.090715.nc $DIN_LOC_ROOT/atm/datm7/CLM1PT_data/urbanc_alpha.c080416 - + clm1pt-0001-08.nc clm1pt-0001-09.nc clm1pt-0001-10.nc @@ -411,7 +411,7 @@ Currently the following streams are supported (term definitions precede the stre a2x3h_Sa_u u a2x3h_Sa_v v a2x3h_Sa_tbot tbot - a2x3h_Sa_ptem ptem + a2x3h_Sa_ptem ptem a2x3h_Sa_shum shum a2x3h_Sa_pbot pbot a2x3h_Faxa_lwdn lwdn @@ -745,7 +745,7 @@ Currently the following streams are supported (term definitions precede the stre lwdn lwdn - swdn swdn + swdn swdn swup swup @@ -935,7 +935,7 @@ SOFS.daily.03-09.2010.nc mask mask - swdn swdn + swdn swdn 2010 @@ -2139,7 +2139,7 @@ ncep.v_10.T62.2009.20120412.nc qian.bc.domain.c130531.nc $DIN_LOC_ROOT/atm/datm7/bias_correction/precip/gpcp/qian -bias_correction.Prec.%y.nc +bias_correction.Prec.%y.nc 0 linear @@ -2164,9 +2164,9 @@ bias_correction.Prec.%y.nc 1979 $DIN_LOC_ROOT/atm/datm7/clm_output/cruncep_precip_1deg/gpcp_1deg_bias_correction cruncep.bc.domain.0.9x1.25.nc -$DIN_LOC_ROOT/atm/datm7/clm_output/cruncep_precip_1deg/gpcp_1deg_bias_correction +$DIN_LOC_ROOT/atm/datm7/clm_output/cruncep_precip_1deg/gpcp_1deg_bias_correction -bias_correction.Prec.%y.nc +bias_correction.Prec.%y.nc 0 nearest @@ -2190,7 +2190,7 @@ bias_correction.Prec.%y.nc cruncep.bc.domain.c100429.nc $DIN_LOC_ROOT/atm/datm7/bias_correction/precip/cmap/cruncep -bias_correction.Prec.%y.nc +bias_correction.Prec.%y.nc 0 nearest @@ -2407,20 +2407,20 @@ af.rlds.ccsm4.rcp45.2006-2300.nc mask mask - BCDEPWET bcphiwet - BCPHODRY bcphodry + BCDEPWET bcphiwet + BCPHODRY bcphodry BCPHIDRY bcphidry - OCDEPWET ocphiwet - OCPHIDRY ocphidry - OCPHODRY ocphodry - DSTX01WD dstwet1 - DSTX01DD dstdry1 - DSTX02WD dstwet2 - DSTX02DD dstdry2 - DSTX03WD dstwet3 - DSTX03DD dstdry3 - DSTX04WD dstwet4 - DSTX04DD dstdry4 + OCDEPWET ocphiwet + OCPHIDRY ocphidry + OCPHODRY ocphodry + DSTX01WD dstwet1 + DSTX01DD dstdry1 + DSTX02WD dstwet2 + DSTX02DD dstdry2 + DSTX03WD dstwet3 + DSTX03DD dstdry3 + DSTX04WD dstwet4 + DSTX04DD dstdry4 1 @@ -2661,10 +2661,10 @@ af.rlds.ccsm4.rcp45.2006-2300.nc 1 -unused +unused $DIN_LOC_ROOT/atm/datm7/CORE2/COREv2.correction_factors.T62.121007.nc $DIN_LOC_ROOT/atm/datm7/CORE2/COREv2.correction_factors.T62.121007.nc -unused +unused diff --git a/components/data_comps/datm/bld/unit_testers/build-namelist_test.pl b/components/data_comps/datm/bld/unit_testers/build-namelist_test.pl index 5a75a17044e7..37073c9202ae 100755 --- a/components/data_comps/datm/bld/unit_testers/build-namelist_test.pl +++ b/components/data_comps/datm/bld/unit_testers/build-namelist_test.pl @@ -20,9 +20,9 @@ sub usage { SYNOPSIS build-namelist_test.pl [options] - Test the the datm build-namelist + Test the the datm build-namelist OPTIONS - -help [or -h] Print usage to STDOUT. + -help [or -h] Print usage to STDOUT. -compare Compare namelists for this version to namelists created by another version. -generate Leave the namelists in place to do a later compare. @@ -74,7 +74,7 @@ sub usage { # Check that CIMEROOT set so can run if ( $ENV{'CIMEROOT'} eq "" ) { - my $dir = abs_path("../../../../.."); + my $dir = abs_path("../../../../.."); if ( ! -d "$dir/scripts" ) { die "CIMEROOT NOT set, and scripts directory $dir/scripts does not exist\n"; } @@ -86,7 +86,7 @@ sub usage { } } # -# +# my $bldnml = "../build-namelist -debug -caseroot $CASEROOT -cimeroot $ENV{'CIMEROOT'}"; my $tempfile = "temp_file.txt"; @@ -150,8 +150,8 @@ sub usage { system( "/bin/rm -rf $confdir" ); my %wc; -# Run all the different options -foreach my $option ( "-print 0", "-print 1", "-print 2", "-test -print 2", +# Run all the different options +foreach my $option ( "-print 0", "-print 1", "-print 2", "-test -print 2", "-namelist \"&datm_exp taxmode='extend'/\"", "-user_xml_dir .", "-user_xml_dir $cwd/user_xml_dir -print 2" ) { @@ -210,17 +210,17 @@ sub usage { $xmlenv{'RUN_TYPE'} = "startup"; print "RUN_TYPE = $xmlenv{'RUN_TYPE'}\n"; # Run different presaero -foreach my $presaero ( - "1x1_brazil", +foreach my $presaero ( + "1x1_brazil", "1x1_camdenNJ", - "1x1_tropicAtl", - "1x1_asphaltjungleNJ", + "1x1_tropicAtl", + "1x1_asphaltjungleNJ", "1x1_vancouverCAN", - "1x1_mexicocityMEX", + "1x1_mexicocityMEX", "1x1_urbanc_alpha", - "1x1_numaIA", + "1x1_numaIA", "1x1_smallvilleIA", - "5x5_amazon", + "5x5_amazon", "clim_1850.1x1_tropicAtl", "clim_2000.1x1_tropicAtl",, "trans_1850-2000.1x1_tropicAtl", @@ -387,7 +387,7 @@ sub usage { MISSING_CHYR_START =>{ DATM_MODE =>"CPLHIST3HrWx", DATM_CPLHIST_YR_START=>undef }, MISSING_CHYR_END =>{ DATM_MODE =>"CPLHIST3HrWx", DATM_CPLHIST_YR_END =>undef }, MISSING_CHYR_ALIGN =>{ DATM_MODE =>"CPLHIST3HrWx", DATM_CPLHIST_YR_ALIGN=>undef }, - BAD_CHYR_RANGE =>{ DATM_MODE =>"CPLHIST3HrWx", + BAD_CHYR_RANGE =>{ DATM_MODE =>"CPLHIST3HrWx", DATM_CPLHIST_YR_START=>1000, DATM_CPLHIST_YR_END=>500 }, BAD_DATM_CO2TSERIES =>{ DATM_CO2_TSERIES=>"thing" }, READONLY_USERSTRM =>{ DATM_MODE =>"CLM_QIAN" }, @@ -453,10 +453,10 @@ sub checkfilesexist { # # Check that files exist # - my @files = ( + my @files = ( "atm_modelio.nml", "../datm.input_data_list", "config_cache.xml", "datm_atm_in", - "datm_in" + "datm_in" ); foreach my $file ( glob("$confdir/datm.streams.txt.*") ) { $file =~ s|$confdir/||; @@ -567,10 +567,10 @@ sub shownmldiff { return; } print "Diff in in $file to $type $comp_mode version"; - system( "diff $file1 $file2" ); + system( "diff $file1 $file2" ); } -} +} sub dodiffonfile { # @@ -586,7 +586,7 @@ sub dodiffonfile { my $mode = $xmlenv{'DATM_MODE'}; if ( exists($$diffref{$mode}{$type}{$file}) ) { $$diffref{$mode}{$type}{$file} = 1; - } + } } sub doNOTdodiffonfile { @@ -596,12 +596,12 @@ sub doNOTdodiffonfile { my $diffref = shift; my $file = shift; my $type = shift; - + if ( ! defined($type) ) { $type = "default"; } my $mode = $xmlenv{'DATM_MODE'}; if ( exists($$diffref{$mode}{$type}{$file}) ) { $$diffref{$mode}{$type}{$file} = 0; - } + } } diff --git a/components/data_comps/datm/bld/unit_testers/user_xml_dir/namelist_definition_datm.xml b/components/data_comps/datm/bld/unit_testers/user_xml_dir/namelist_definition_datm.xml index 32c12f5067c8..947936c0a9c4 100644 --- a/components/data_comps/datm/bld/unit_testers/user_xml_dir/namelist_definition_datm.xml +++ b/components/data_comps/datm/bld/unit_testers/user_xml_dir/namelist_definition_datm.xml @@ -8,18 +8,18 @@ - Data Model mode to process forcing data - Prescribed aerosol mode @@ -32,25 +32,25 @@ Prescribed aerosol mode - - spatial gridfile associated with the strdata. grid information will be read from this file and that grid will serve as the target grid -for all input data for this strdata input. +for all input data for this strdata input. - @@ -58,22 +58,22 @@ array (up to 30 elements) of fill algorithms associated with the array of streams. valid options are just copy (ie. no fill), special value, nearest neighbor, nearest neighbor in "i" direction, or nearest neighbor in "j" direction. -valid values: 'copy','spval','nn','nnoni','nnonj' +valid values: 'copy','spval','nn','nnoni','nnonj' default: "nn". -plays no role is fill algorithm at the present time. +plays no role is fill algorithm at the present time. valid values: "nomask,srcmask,dstmask,bothmask" default: "nomask" - array (up to 30 elements) of filenames associated with the array of @@ -83,18 +83,18 @@ and fillmask are ignored. default: unset - array (up to 30 elements) of filenames associated with the array of streams. specifies the weights file to generate after weights are computed on the fly for the fill operation. this allows a user to -save and reuse a set of weights later. +save and reuse a set of weights later. default="unset". - - array (up to 30 elements) of fill algorithms associated with the array of streams. valid options are copy by index, set to special value, nearest neighbor, nearest neighbor in "i" direction, nearest neighbor -in "j" direction, or bilinear. +in "j" direction, or bilinear. valid values: copy,spval,nn,nnoni,nnonj,bilinear default: bilinear - +group="shr_strdata_nml"> array (up to 30 elements) of filenames associated with the array of streams. specifies the weights file to read instead of computing weights on the fly for the mapping (interpolation) operation. if this is set, mapalgo and mapmask are ignored. default="unset". - array (up to 30 elements) of filenames associated with the array of @@ -141,13 +141,13 @@ allows a user to save and reuse a set of weights later. default="unset". - array (up to 30 elements) of time interpolation options associated with the array of -streams. +streams. valid values: lower,upper,nearest,linear,coszen lower = Use lower time-value upper = Use upper time-value @@ -157,13 +157,13 @@ valid values: lower,upper,nearest,linear,coszen default="linear". - array of time axis modes associated with the array of streams for -handling data outside the specified stream time axis. +handling data outside the specified stream time axis. valid options are to cycle the data based on the first, last, and align settings associated with the stream dataset, to extend the first and last valid value indefinitely, or to limit the interpolated data @@ -172,8 +172,8 @@ valid values: cycle,extend,limit default="cycle". - array (up to 30 elements) of delta time ratio limits placed on the @@ -188,11 +188,11 @@ maximum ratio should be about 1.1. the running value of the delta time is computed as data is read and any wraparound or cycling is also included. this input helps trap missing data or errors in cycling. to turn off trapping, set the value to 1.0e30 or something similar. -default=1.5. +default=1.5. - character array (up to 30 elements) of stream input files. this @@ -202,12 +202,12 @@ specified by the stream module. this string consists of a stream_input_filename is a stream text input file and the format and options are described elsewhere. year_align, year_first, and year_last provide information about the time axis of the file and how -to relate the input time axis to the model time axis. +to relate the input time axis to the model time axis. default="null". - list of paired colon delimited field names that should be treated as @@ -215,13 +215,13 @@ vectors when carrying out spatial interpolation. unlike other character arrays in this namelist, this array is completely decoupled from the list of streams. this is a list of vector pairs that span all input streams where different fields of the vector pair could -appear in different streams. -for example, vectors = 'u:v','taux:tauy'. +appear in different streams. +for example, vectors = 'u:v','taux:tauy'. default="". - The data atmosphere specific namelist input is as follows. The @@ -237,49 +237,49 @@ default: datm_atm_in. - Set the decomposition option for the data model. valid options are placing the global array on the root task or a simple stride-one load balanced one-dimensional decomposition. other decompositions -may be added in the future. +may be added in the future. valid values are ['root','1d']. 1d = Vector decomposition root = run only on the master task -default='1d'. +default='1d'. - filename containing correction factors for use only with CORE2 modes (CORE2_IAF and CORE2_NYF). -default='null'. +default='null'. - If TRUE, prescribed aerosols are sent from datm (must be true for running with CLM). If TRUE, prognostic is forced to true. -default=false +default=false - Frequency to update radiation in number of steps (or hours if negative) irdasw is the radiation setting used to compute the next shortwave @@ -291,10 +291,10 @@ present time plus 1 timestep. default=0. - Model restart filename for the data atmosphere model data. This is optional. If both restfils and restfilm are undefined, the restart @@ -302,10 +302,10 @@ filename will be read from the DATM restart pointer file (or files for multiple default='undefined'. - Stream restart filename for the data atmosphere stream data. This is optional. If both restfils and restfilm are undefined, the restart @@ -317,10 +317,10 @@ default='undefined'. - DATM logfile name default='atm.log' diff --git a/components/data_comps/datm/cime_config/buildnml b/components/data_comps/datm/cime_config/buildnml index 76772a63bbc2..c98c811b5a94 100755 --- a/components/data_comps/datm/cime_config/buildnml +++ b/components/data_comps/datm/cime_config/buildnml @@ -15,7 +15,7 @@ my $RUNDIR = `./xmlquery RUNDIR -value`; my @dirs = ("${CIMEROOT}/utils/perl5lib"); unshift @INC, @dirs; require Config::SetupTools; -my $sysmod; +my $sysmod; if (! -d "$CASEROOT/Buildconf/datmconf" ) { $sysmod = "mkdir $CASEROOT/Buildconf/datmconf"; @@ -28,10 +28,10 @@ my $inst_counter = 1; while ($inst_counter <= $NINST_ATM) { # ----------------------------------------------------- - # determine instance string + # determine instance string # ----------------------------------------------------- - $inst_string = ""; + $inst_string = ""; if ($NINST_ATM > 1) { $inst_string = `printf _%04d $inst_counter`; @@ -47,9 +47,9 @@ while ($inst_counter <= $NINST_ATM) { # create datmconf/cesm_namelist # ----------------------------------------------------- - SetupTools::create_namelist_infile("$CASEROOT", - "$CASEROOT/user_nl_datm${inst_string}", - "$CASEROOT/Buildconf/datmconf/cesm_namelist"); + SetupTools::create_namelist_infile("$CASEROOT", + "$CASEROOT/user_nl_datm${inst_string}", + "$CASEROOT/Buildconf/datmconf/cesm_namelist"); # ----------------------------------------------------- # call build-namelist diff --git a/components/data_comps/datm/cime_config/config_component.xml b/components/data_comps/datm/cime_config/config_component.xml index 00cf33729852..f893e253d615 100644 --- a/components/data_comps/datm/cime_config/config_component.xml +++ b/components/data_comps/datm/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char datm datm @@ -20,8 +20,8 @@ run_component_datm env_run.xml Mode for data atmosphere component. - The default is CORE2_NYF (CORE2 normal year forcing) is the - DATM mode used in C and G compsets. CLM_QIAN, CLMCRUNCEP, CLMGSWP3 and CLM1PT are + The default is CORE2_NYF (CORE2 normal year forcing) is the + DATM mode used in C and G compsets. CLM_QIAN, CLMCRUNCEP, CLMGSWP3 and CLM1PT are modes using observational data for forcing CLM in I compsets. CORE2_NYF @@ -32,10 +32,10 @@ CLMCRUNCEP CLMGSWP3 CLM1PT - CPLHIST3HrWx + CPLHIST3HrWx - + char none,clim_1850,clim_2000,trans_1850-2000,rcp2.6,rcp4.5,rcp6.0,rcp8.5,pt1_pt1 @@ -94,7 +94,7 @@ UNSET - b40.1850.track1.1deg.006a + b40.1850.track1.1deg.006a run_component_datm env_run.xml @@ -106,7 +106,7 @@ 1 - 1 + 1 run_component_datm env_run.xml @@ -118,7 +118,7 @@ -999 - 960 + 960 run_component_datm env_run.xml @@ -130,7 +130,7 @@ -999 - 1030 + 1030 run_component_datm env_run.xml @@ -151,10 +151,10 @@ 1901 1901 1 - 2004 - 2005 - 2005 - 1 + 2004 + 2005 + 2005 + 1 1 1 1 @@ -181,10 +181,10 @@ 1901 1901 1948 - 1972 - 1991 - 1991 - 2002 + 1972 + 1991 + 1991 + 2002 1901 1991 2002 @@ -202,23 +202,23 @@ 2004 - 2004 - 1972 - 1920 - 1920 - 2004 + 2004 + 1972 + 1920 + 1920 + 2004 1972 1920 1920 2004 - 2004 - 2010 - 2010 - 2003 - 1920 + 2004 + 2010 + 2010 + 2003 + 1920 2010 2003 - 1920 + 1920 2010 2003 @@ -245,7 +245,7 @@ GSWP3 atm input data for 1901-1920: GSWP3 atm input data for 1991-2010: CPL history input data: - single point tower site atm input data: + single point tower site atm input data: COREv2 datm normal year forcing: (requires additional user-supplied data) COREv2 datm interannual year forcing: (requires additional user-supplied data) DATM NPS forcing: @@ -257,5 +257,5 @@ ========================================= - + diff --git a/components/data_comps/datm/cime_config/user_nl_datm b/components/data_comps/datm/cime_config/user_nl_datm index c20ac289738a..fb8503100b19 100644 --- a/components/data_comps/datm/cime_config/user_nl_datm +++ b/components/data_comps/datm/cime_config/user_nl_datm @@ -1,13 +1,13 @@ !------------------------------------------------------------------------ ! Users should ONLY USE user_nl_datm to change namelists variables -! Users should add all user specific namelist changes below in the form of -! namelist_var = new_namelist_value -! Note that any namelist variable from shr_strdata_nml and datm_nml can -! be modified below using the above syntax +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! Note that any namelist variable from shr_strdata_nml and datm_nml can +! be modified below using the above syntax ! User preview_namelists to view (not modify) the output namelist in the ! directory $CASEROOT/CaseDocs ! To modify the contents of a stream txt file, first use preview_namelists ! to obtain the contents of the stream txt files in CaseDocs, and then -! place a copy of the modified stream txt file in $CASEROOT with the string -! user_ prepended. +! place a copy of the modified stream txt file in $CASEROOT with the string +! user_ prepended. !------------------------------------------------------------------------ diff --git a/components/data_comps/datm/datm_comp_mod.F90 b/components/data_comps/datm/datm_comp_mod.F90 index a1aa73351599..4e060319f405 100644 --- a/components/data_comps/datm/datm_comp_mod.F90 +++ b/components/data_comps/datm/datm_comp_mod.F90 @@ -57,7 +57,7 @@ module datm_comp_mod integer(IN) :: logunit ! logging unit number integer :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "lnd_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance ! (ie. "_0001" or "") character(CL) :: atm_mode ! mode integer(IN) :: dbug = 0 ! debug level (higher is more) @@ -116,7 +116,7 @@ module datm_comp_mod real(R8), pointer :: windFactor(:) real(R8), pointer :: winddFactor(:) real(R8), pointer :: qsatFactor(:) - + ! ! for anomaly forcing ! @@ -164,7 +164,7 @@ module datm_comp_mod "taux ","tauy ","lat ","sen ", & "lwup ","evap ","co2lnd ","co2ocn ", & ! add precsf - "dms ","precsf ", & + "dms ","precsf ", & ! add Sa_precsf for precip scale factor "prec_af ","u_af ","v_af ","tbot_af ", & "pbot_af ","shum_af ","swdn_af ","lwdn_af " & @@ -257,7 +257,7 @@ subroutine datm_comp_init( EClock, cdata, x2a, a2x, NLFilename ) type(seq_infodata_type), pointer :: infodata type(mct_gsMap) , pointer :: gsMap type(mct_gGrid) , pointer :: ggrid - type(iosystem_desc_t) , pointer :: iosystem + type(iosystem_desc_t) , pointer :: iosystem character(CL) :: filePath ! generic file path character(CL) :: fileName ! generic file name @@ -423,7 +423,7 @@ subroutine datm_comp_init( EClock, cdata, x2a, a2x, NLFilename ) !---------------------------------------------------------------------------- ! Initialize PIO !---------------------------------------------------------------------------- - + iosystem => shr_pio_getiosys(trim(inst_name)) call shr_strdata_pioinit(SDATM, iosystem, & shr_pio_getiotype(trim(inst_name))) @@ -499,7 +499,7 @@ subroutine datm_comp_init( EClock, cdata, x2a, a2x, NLFilename ) call seq_infodata_PutData(infodata, & atm_present=atm_present, atm_prognostic=atm_prognostic, & atm_nx=SDATM%nxg, atm_ny=SDATM%nyg ) - call seq_infodata_PutData( infodata, atm_aero=presaero) + call seq_infodata_PutData( infodata, atm_aero=presaero) !---------------------------------------------------------------------------- ! Initialize MCT global seg map, 1d decomp @@ -825,7 +825,7 @@ subroutine datm_comp_run( EClock, cdata, x2a, a2x) call seq_timemgr_EClockGetData( EClock, curr_ymd=CurrentYMD, curr_tod=CurrentTOD) call seq_timemgr_EClockGetData( EClock, curr_yr=yy, curr_mon=mm, curr_day=dd) call seq_timemgr_EClockGetData( EClock, stepno=stepno, dtime=idt) - call seq_timemgr_EClockGetData( EClock, calendar=calendar) + call seq_timemgr_EClockGetData( EClock, calendar=calendar) dt = idt * 1.0_r8 write_restart = seq_timemgr_RestartAlarmIsOn(EClock) @@ -869,10 +869,10 @@ subroutine datm_comp_run( EClock, cdata, x2a, a2x) enddo endif if (firstcall) then - allocate(ilist_av(SDATM%nstreams)) - allocate(olist_av(SDATM%nstreams)) - allocate(ilist_st(SDATM%nstreams)) - allocate(olist_st(SDATM%nstreams)) + allocate(ilist_av(SDATM%nstreams)) + allocate(olist_av(SDATM%nstreams)) + allocate(ilist_st(SDATM%nstreams)) + allocate(olist_st(SDATM%nstreams)) allocate(count_av(SDATM%nstreams)) allocate(count_st(SDATM%nstreams)) end if @@ -891,7 +891,7 @@ subroutine datm_comp_run( EClock, cdata, x2a, a2x) call shr_dmodel_translate_list(SDATM%avs(n),avstrm,& stifld(1:ktranss),stofld,ilist_st(n),olist_st(n),count_st(n)) end if - if (count_st(n) > 0) then + if (count_st(n) > 0) then call shr_dmodel_translateAV_list(SDATM%avs(n),avstrm,& ilist_st(n),olist_st(n),rearr) end if @@ -906,10 +906,10 @@ subroutine datm_comp_run( EClock, cdata, x2a, a2x) select case (trim(atm_mode)) - case('COPYALL') + case('COPYALL') ! do nothing extra - case('CPLHIST') + case('CPLHIST') ! do nothing extra case ('WRF') @@ -1018,7 +1018,7 @@ subroutine datm_comp_run( EClock, cdata, x2a, a2x) endif !------------------------------------------------------------------------- - ! RADIATION DATA + ! RADIATION DATA !------------------------------------------------------------------------- !--- fabricate required swdn components from net swdn --- @@ -1077,7 +1077,7 @@ subroutine datm_comp_run( EClock, cdata, x2a, a2x) if (sz < 1) a2x%rAttr(kz,n) = 30.0_R8 !--- temperature --- - if (tbotmax < 50.0_R8) a2x%rAttr(ktbot,n) = a2x%rAttr(ktbot,n) + tkFrz + if (tbotmax < 50.0_R8) a2x%rAttr(ktbot,n) = a2x%rAttr(ktbot,n) + tkFrz a2x%rAttr(kptem,n) = a2x%rAttr(ktbot,n) !--- pressure --- @@ -1188,7 +1188,7 @@ subroutine datm_comp_run( EClock, cdata, x2a, a2x) ! lsize = mct_avect_lsize(avstrm) - ! bias correct precipitation relative to observed + ! bias correct precipitation relative to observed ! (via bias_correct nameslist option) if (sprecsf > 0) then do n = 1,lsize @@ -1199,7 +1199,7 @@ subroutine datm_comp_run( EClock, cdata, x2a, a2x) end do endif - + ! adjust atmospheric input fields if anomaly forcing streams exist ! (via anomaly_forcing nameslist option) @@ -1215,36 +1215,36 @@ subroutine datm_comp_run( EClock, cdata, x2a, a2x) if (sshum_af > 0) then do n = 1,lsize a2x%rAttr(kshum,n) = a2x%rAttr(kshum,n) + avstrm%rAttr(sshum_af,n) - + ! avoid possible negative q values - if(a2x%rAttr(kshum,n) < 0._r8) then + if(a2x%rAttr(kshum,n) < 0._r8) then a2x%rAttr(kshum,n) = 1.e-6_r8 endif end do endif - + ! pressure if (spbot_af > 0) then do n = 1,lsize a2x%rAttr(kpbot,n) = a2x%rAttr(kpbot,n) + avstrm%rAttr(spbot_af,n) end do endif - + ! temperature if (stbot_af > 0) then do n = 1,lsize a2x%rAttr(ktbot,n) = a2x%rAttr(ktbot,n) + avstrm%rAttr(stbot_af,n) end do endif - + ! longwave if (slwdn_af > 0) then do n = 1,lsize a2x%rAttr(klwdn,n) = a2x%rAttr(klwdn,n)*avstrm%rAttr(slwdn_af,n) end do endif - + ! precipitation if (sprec_af > 0) then do n = 1,lsize @@ -1304,9 +1304,9 @@ subroutine datm_comp_run( EClock, cdata, x2a, a2x) write(logunit,F04) trim(myModelName),': model date ', CurrentYMD,CurrentTOD call shr_sys_flush(logunit) end if - + firstcall = .false. - + call shr_file_setLogUnit (shrlogunit) call shr_file_setLogLevel(shrloglev) call shr_sys_flush(logunit) @@ -1346,11 +1346,11 @@ subroutine datm_comp_final() call t_startf('DATM_FINAL') if (my_task == master_task) then - write(logunit,F91) + write(logunit,F91) write(logunit,F00) trim(myModelName),': end of main integration loop' - write(logunit,F91) + write(logunit,F91) end if - + call t_stopf('DATM_FINAL') end subroutine datm_comp_final diff --git a/components/data_comps/datm/datm_shr_mod.F90 b/components/data_comps/datm/datm_shr_mod.F90 index ffa8a020e6f9..b8e4bcac13a2 100644 --- a/components/data_comps/datm/datm_shr_mod.F90 +++ b/components/data_comps/datm/datm_shr_mod.F90 @@ -62,7 +62,7 @@ real(R8) function datm_shr_getNextRadCDay( ymd, tod, stepno, dtime, iradsw, cale integer(IN), intent(IN) :: stepno integer(IN), intent(IN) :: dtime integer(IN), intent(IN) :: iradsw - character(*),intent(in) :: calendar + character(*),intent(in) :: calendar !EOP @@ -77,7 +77,7 @@ real(R8) function datm_shr_getNextRadCDay( ymd, tod, stepno, dtime, iradsw, cale ! !------------------------------------------------------------------------------- - liradsw = iradsw + liradsw = iradsw if (liradsw < 0) liradsw = nint((-liradsw *3600._r8)/dtime) call shr_cal_date2julian(ymd,tod,julday,calendar) @@ -88,7 +88,7 @@ real(R8) function datm_shr_getNextRadCDay( ymd, tod, stepno, dtime, iradsw, cale else nextsw_cday = -1._r8 end if - else + else nextsw_cday = julday + dtime/SHR_CONST_CDAY end if datm_shr_getNextRadCDay = nextsw_cday @@ -386,7 +386,7 @@ subroutine datm_shr_getFactors(fileName,windF,winddF,qsatF,mpicom,compid, & endif deallocate(tempR4D) - deallocate(tempR1D) + deallocate(tempR1D) domap = .false. if (ni0 /= nxgo .or. nj0 /= nygo) then @@ -422,15 +422,15 @@ subroutine datm_shr_getFactors(fileName,windF,winddF,qsatF,mpicom,compid, & allocate(tempR1D(lsizeo)) if (size(windF ) >= lsizeo) then call mct_aVect_exportRattr(avo,'wind' ,tempR1D,lsizeo) - windF = tempR1D + windF = tempR1D endif if (size(winddF) >= lsizeo) then call mct_aVect_exportRattr(avo,'windd',tempR1D,lsizeo) - winddF = tempR1D + winddF = tempR1D endif if (size(qsatF ) >= lsizeo) then call mct_aVect_exportRattr(avo,'qsat' ,tempR1D,lsizeo) - qsatF = tempR1D + qsatF = tempR1D endif deallocate(tempR1D) diff --git a/components/data_comps/datm/doc/SOM.pdf b/components/data_comps/datm/doc/SOM.pdf index 92d15e00483dd84b55dab702150f8486cdf8584a..3e29dd298c44470bb14a5571f659c1f3bc3e569e 100644 GIT binary patch delta 1050 zcmZXTze)r#5XM=A1MNh?_U;8FlT4DCN^AuS>%-z+K=2X7!oteN_~$@<0KsFCg)0Po z10TUhxXRY-tx5LgwpzZOU*?-Hv%mAfY(98<8rRR`(V+gC?4Q<)kG<<=^Qd~=Xqw~d z$~Fg=)%z}QsrZ0GaC+Fjs^QsEQpz|>LLxStqyTr-PKUR(M%Eg?b|O*_zbLq61CY+` zx@!bhtC9ncCQ0EtT#OzU$<{da&%+Go_ zf{{2vaoWx9&`?e@RFB!bL%)tQ!GnY*YCj}=JlS)%{wWORAn?%Hr;|MQ3oZ~_X zoUIZPL;N*TRag`}`t%}s2G$}DM(8c=;WW?AXyhd`qRu&W^Tg%CY$)7hJnp=8tF^5} Q`IeS=l&EY+_?cF>f7X`ZVgLXD delta 1277 zcmZvbJx;?w5QViu1VKavh}K*Hc6MiHXRd(62_lMIfGfD5prE3`K#+0*Bp^bOQXo!5 zOUr~K* zxSOQ!a_v42kE%Vd7kC5;)$-9-S5@O4+(Eti2w=p3Al_&M8Kc!Or_|TLM`7DUwNPltpaY+^FxtOnqJjc)?wU04xDG96 z>i72oIoV!fV{TC&?uoF!XmNl=Q- z0Qxm(2(c@%+K+0*Jf!njM-pPN^VEcSLqP!xD2o(!R;_Rqdqr-x z&z{J-nOQ(V_MN6;w9qte?R+$MlMb5VDgINnsLSXXSf|N$Z~+Mxq@X6-Ty0_JsRd)< lDp9(YxLO=-viia{*5jGTData Model Science Modes - + When a given data models run, the user must specify which science mode it will run in. Each data model has a fixed set of fields that it must send to the coupler, but it is the @@ -15,9 +15,9 @@ computed. Each mode activates various assumptions about what input fields are available from the input data streams, what input fields are available from the the coupler, and how to use this input data to compute the output fields sent to the coupler. - + - + In general, a mode might specify... that fields be set to a time invariant constant (so that no input data is needed) @@ -39,15 +39,15 @@ with the science mode and should verify that the data model is providing data to the coupler as expected. - + The data model mode is a character string that is set in the namelist variable "datamode" in the namelist group "shr_strdata_nml". -Although each data model, -datm, -dlnd, -drof, +Although each data model, +datm, +dlnd, +drof, docn, and -dicn, +dicn, has its own set of valid datamode values, two modes are common to all data models: COPYALL and NULL. @@ -55,10 +55,10 @@ data models: COPYALL and NULL. -The default mode is COPYALL -- the model will assume all +The default mode is COPYALL -- the model will assume all the data that must be sent to the coupler will be found in the input data streams, and that this data can be sent to the coupler, unaltered, except for spatial and -temporal interpolation. +temporal interpolation. @@ -146,7 +146,7 @@ these names for use within the data atmosphere model. Namelists - + The land model is unique because it supports land data and snow data (lnd and sno) almost as if they were two separate components, but they are in fact running in one @@ -159,14 +159,14 @@ with an active glacier model (TG compsets). Both sets of data are assumed to be on the same grid. - + DLND namelists can be separated into two groups, stream-independent namelist variables that are specific to the DLND model and stream-specific namelist variables that are contained in share code and whose -names are common to all the data models. +names are common to all the data models. @@ -179,7 +179,7 @@ things (array of ...). For stream-dependent input, the namelist input file is -dlnd_lnd_in and +dlnd_lnd_in and dlnd_sno_in (or dlnd_lnd_in_NNNN and dlnd_sno_in_NNNN for NNNN multiple instances) and the namelist group @@ -215,7 +215,7 @@ these names for use within the data land model. "avsdf ","anidf ","snowh ","taux ","tauy ", & "lat ","sen ","lwup ","evap ","swnet ", & "lfrac ","fv ","ram1 ", & - "flddst1 ","flxdst2 ","flxdst3 ","flxdst4 ", & + "flddst1 ","flxdst2 ","flxdst3 ","flxdst4 ", & "tsrf01 ","topo01 ","tsrf02 ","topo02 ","tsrf03 ", & "topo03 ","tsrf04 ","topo04 ","tsrf05 ","topo05 ", & "tsrf06 ","topo06 ","tsrf07 ","topo07 ","tsrf08 ", & @@ -235,13 +235,13 @@ these names for use within the data land model. Namelists - + The data river runoff model is new and is effectively the runoff part of the dlnd model in CESM1.0 that has been made its own top level component. - + DROF namelists can be separated into two groups, stream-independent @@ -336,7 +336,7 @@ scientifically appropriate data for their particular application or use one of the standard SOM forcing files from the CESM control runs. Some of these are available in the inputdata repository. The user then edits the DOCN_SOM_FILENAME variable in env_run.xml to point to the -appropriate SOM forcing dataset. A tool is available to derive valid SOM +appropriate SOM forcing dataset. A tool is available to derive valid SOM forcing. More information on creating the SOM forcing is also available. @@ -376,11 +376,11 @@ url="../../cesm/doc/modelnl/nl_ice.html#nonstream">stream-independent namelist variables that are specific to the DATM model and stream-specific namelist variables that are contained in share code and whose names are -common to all the data models. +common to all the data models. For stream-independent input, the namelist input filename is hardwired in the data model code to "dice_in" (or dice_in_NNNN for -multiple instances) and the namelist group is called "dice_nml". +multiple instances) and the namelist group is called "dice_nml". Its important to point out that the only currently supported @@ -426,7 +426,7 @@ these names for use within the data ocean model. Data Land-Ice Model - + This model does not yet exist. diff --git a/components/data_comps/datm/doc/intro.xml b/components/data_comps/datm/doc/intro.xml index efa0bd993edf..a69a96443fa4 100644 --- a/components/data_comps/datm/doc/intro.xml +++ b/components/data_comps/datm/doc/intro.xml @@ -7,7 +7,7 @@ Overview - + The CESM1.2 data models continue to perform the basic function of reading external data files, modifying that data, and then sending it @@ -26,9 +26,9 @@ significant amounts of source code. Methods for reading and interpolating data have been established and can easily be reused. There is a natural hierarchy in the system. The data model calls strdata -("stream data") methods which then call stream methods. +("stream data") methods which then call stream methods. There are inputs associated with the -data model, strdata, and +data model, strdata, and streams to configure the setup. The stream methods are responsible for managing lists of input data files and their time axis. @@ -37,7 +37,7 @@ data is read and interpolated in space and time. The interpolated data is passed up to the data model where final fields are derived, packed, and returned to the coupler. - + @@ -109,14 +109,14 @@ changing the order of operations will not fundamentally change the results. The present order of operations generally minimizes the mapping cost for typical data model use cases. - + There are several limitations in both options and usage within the data models at the present time. Spatial interpolation can -only be performed from a two-dimensional latitude-longitude +only be performed from a two-dimensional latitude-longitude input grid. The target grid can be arbitrary but the source -grid must be able to be described by simple one-dimensional lists of longitudes +grid must be able to be described by simple one-dimensional lists of longitudes and latitudes, although they don't have to have equally spaced. @@ -135,22 +135,22 @@ is hardwired into the Macros file for the specific machine. To turn on pnetcdf in the build, make sure the Macros variables PNETCDF_PATH, INC_PNETCDF, and LIB_PNETCDF are set and that the pio CONFIG_ARGS sets the PNETCDF_PATH argument. See the CESM1.2 users -guide for more information. +guide for more information. Beyond just the option of selecting IO with pio, -several namelist are available to help optimize pio IO performance. +several namelist are available to help optimize pio IO performance. Those are TODO - list these. The total mpi tasks that can be used for IO is limited to the total number of tasks used by the data model. Often though, fewer io tasks result in improved performance. In -general, [io_root + (num_iotasks-1)*io_stride + 1] has to be less +general, [io_root + (num_iotasks-1)*io_stride + 1] has to be less than the total number of data model tasks. In practice, pio seems -to perform optimally somewhere between the extremes of 1 task and -all tasks, and is highly machine and problem dependent. +to perform optimally somewhere between the extremes of 1 task and +all tasks, and is highly machine and problem dependent. - + @@ -186,7 +186,7 @@ restart without it but may need to reread data from the input data files that would have been stored in the stream restart file. This will take extra time but will not impact the results. - + @@ -198,7 +198,7 @@ The hierarchy of data models, strdata, and streams also compartmentalize grids and fields. In CESM1.2, data models communicate with the coupler with fields on only the data model model grid (in CESM1.0 the data land model communicated with the coupler on two different grids, -a land grid and a runoff grid). +a land grid and a runoff grid). Although for each strdata namelist, data is interpolated to a single model grid, each strdata namelist input can have multiple stream description files and each stream input file @@ -211,15 +211,15 @@ model time. The text box below provides a schematic of the hierarchy driver : call data land model data model : data land model - data model : land_data - data model : grid - data model : strdata - strdata : interpa interpb interpc - strdata : streama streamb streamc - stream : grida gridb gridc - stream : filea_01 fileb_01 filec_01 - stream : ... ... - stream : filea_04 filec_96 + data model : land_data + data model : grid + data model : strdata + strdata : interpa interpb interpc + strdata : streama streamb streamc + stream : grida gridb gridc + stream : filea_01 fileb_01 filec_01 + stream : ... ... + stream : filea_04 filec_96 @@ -233,14 +233,14 @@ filename. The detailed namelist options for each data model will be described later, but each model will specify a filename or filenames for strdata namelist input and each strdata namelist will specify a set of stream input files. - + To continue with the above example, the following inputs would be consistent with the above figure. The data model namelist input file is hardwired to "dlnd_in" and in this case, the namelist would look something like - + file="dlnd_in": @@ -327,7 +327,7 @@ linkend="streams_description_file">later. In general, these examples of input files are not complete, but they do show the general hierarchy and feel of the data model input. - + @@ -347,7 +347,7 @@ From a user perspective, for any data model, it's important to know what modes are supported and the internal field names in the data model. That information will be used in the strdata namelist and stream input files. - + Next Sections diff --git a/components/data_comps/datm/doc/streams.xml b/components/data_comps/datm/doc/streams.xml index c06f789108af..e31758631203 100644 --- a/components/data_comps/datm/doc/streams.xml +++ b/components/data_comps/datm/doc/streams.xml @@ -17,7 +17,7 @@ An input data stream is a time-series of input data files where all the fields in the stream are located in the same data file - and all share the same spatial and temporal coordinates + and all share the same spatial and temporal coordinates (ie. are all on the same grid and share the same time axis). Normally a time axis has a uniform dt, but this is not a requirement. @@ -36,9 +36,9 @@ The data models can loop over stream data -- repeatedly cycle over some subset of an input stream's time axis. When looping, the models can only loop over whole years. - For example, an input stream might have SST data for years 1950 through 2000, + For example, an input stream might have SST data for years 1950 through 2000, but a model could loop over the data for years 1960 through 1980. - A model cannot loop over partial years, for example, + A model cannot loop over partial years, for example, from 1950-Feb-10 through 1980-Mar-15. @@ -65,7 +65,7 @@ to use them is input via the strdata ("stream data") Fortran namelist, while meta-data that describes the stream data itself is found in an xml-like text file called a "stream description file." - + @@ -86,7 +86,7 @@ - The following namelist are available with the strdata namelist. + The following namelist are available with the strdata namelist. dataMode - component specific mode @@ -180,16 +180,16 @@ fillmask = 'nomask','nomask','nomask','nomask' mapalgo = 'bilinear','bilinear','bilinear','bilinear' mapmask = 'nomask','nomask','nomask','nomask' - streams = "datm.streams.txt.CLM_QIAN.Solar 1895 1948 1972 ", + streams = "datm.streams.txt.CLM_QIAN.Solar 1895 1948 1972 ", "datm.streams.txt.CLM_QIAN.Precip 1895 1948 1972 ", - "datm.streams.txt.CLM_QIAN.TPQW 1895 1948 1972 ", + "datm.streams.txt.CLM_QIAN.TPQW 1895 1948 1972 ", "datm.streams.txt.presaero.trans_1850-2000 1849 1849 2006" taxmode = 'cycle','cycle','cycle','cycle' tintalgo = 'coszen','nearest','linear','linear' vectors = 'null' - + - + As is discussed in the CESM1.2 User's Guide, to change the contents of datm_atm_in, you can edit $CASEROOT/user_nl_datm to change any of the above @@ -207,26 +207,26 @@ !------------------------------------------------------------------------ ! Users should ONLY USE user_nl_datm to change namelists variables - ! Users should add all user specific namelist changes below in the form of - ! namelist_var = new_namelist_value - ! Note that any namelist variable from shr_strdata_nml and datm_nml can - ! be modified below using the above syntax + ! Users should add all user specific namelist changes below in the form of + ! namelist_var = new_namelist_value + ! Note that any namelist variable from shr_strdata_nml and datm_nml can + ! be modified below using the above syntax ! User preview_namelists to view (not modify) the output namelist in the ! directory $CASEROOT/CaseDocs ! To modify the contents of a stream txt file, first use preview_namelists ! to obtain the contents of the stream txt files in CaseDocs, and then - ! place a copy of the modified stream txt file in $CASEROOT with the string - ! user_ prepended. + ! place a copy of the modified stream txt file in $CASEROOT with the string + ! user_ prepended. !------------------------------------------------------------------------ - streams = "datm.streams.txt.CLM_QIAN.Solar 1895 1948 1900 ", + streams = "datm.streams.txt.CLM_QIAN.Solar 1895 1948 1900 ", "datm.streams.txt.CLM_QIAN.Precip 1895 1948 1900 ", - "datm.streams.txt.CLM_QIAN.TPQW 1895 1948 1900 ", + "datm.streams.txt.CLM_QIAN.TPQW 1895 1948 1900 ", "datm.streams.txt.presaero.trans_1850-2000 1849 1849 2006" and the contents of shr_strdata_nml (in both $CASEROOT/CaseDocs and $RUNDIR) - would be + would be @@ -237,14 +237,14 @@ fillmask = 'nomask','nomask','nomask','nomask' mapalgo = 'bilinear','bilinear','bilinear','bilinear' mapmask = 'nomask','nomask','nomask','nomask' - streams = "datm.streams.txt.CLM_QIAN.Solar 1895 1948 1900 ", + streams = "datm.streams.txt.CLM_QIAN.Solar 1895 1948 1900 ", "datm.streams.txt.CLM_QIAN.Precip 1895 1948 1900 ", - "datm.streams.txt.CLM_QIAN.TPQW 1895 1948 1900 ", + "datm.streams.txt.CLM_QIAN.TPQW 1895 1948 1900 ", "datm.streams.txt.presaero.trans_1850-2000 1849 1849 2006" taxmode = 'cycle','cycle','cycle','cycle' tintalgo = 'coszen','nearest','linear','linear' vectors = 'null' - + As is discussed in the User's Guide, you should use preview_namelists to view (not modify) the output @@ -266,8 +266,8 @@ specifies the names of the fields in the stream, the names of the input data files, and the file system directory where the data files are located. In addition, a few other options are available such as - the time axis offset parameter. - + the time axis offset parameter. + In CESM1.2, each data model's build-namelist @@ -313,7 +313,7 @@ - Edit user_datm.streams.txt.CLM_QIAN.Solar + Edit user_datm.streams.txt.CLM_QIAN.Solar with your desired changes. @@ -321,7 +321,7 @@ Be sure not to put any tab characters in the file: use spaces instead. - In contrast to other user_nl_xxx files, be sure to set all relevant data model settings in the xml files, issue the preview_namelist + In contrast to other user_nl_xxx files, be sure to set all relevant data model settings in the xml files, issue the preview_namelist command and THEN edit the user_datm.streams.txt.CLM_QIAN.Solar file. @@ -329,7 +329,7 @@ Once you have created a user_xxx.streams.txt.* file, further modifications to the relevant data model settings in the xml files will be ignored. - If you later realize that you need to change some settings in an xml file, you should remove the user_xxx.streams.txt.* file(s), make the modifications in the xml file, rerun preview_namelists, + If you later realize that you need to change some settings in an xml file, you should remove the user_xxx.streams.txt.* file(s), make the modifications in the xml file, rerun preview_namelists, and then reintroduce your modifications into a new user_xxx.streams.txt.* stream file(s). @@ -337,7 +337,7 @@ - Call preview_namelists + Call preview_namelists Verify that your changes do indeed appear in the @@ -348,9 +348,9 @@ - + - + The data elements found in the stream description file are: @@ -376,8 +376,8 @@ The file system directory where the data files are located. - The list of data files to use. If there is more than one file, - the files must be in chronological order, that is, the dates in time axis + The list of data files to use. If there is more than one file, + the files must be in chronological order, that is, the dates in time axis of the first file are before the dates in the time axis of the second file. @@ -446,7 +446,7 @@ Actual example: - + <stream> diff --git a/components/data_comps/dice/bld/build-namelist b/components/data_comps/dice/bld/build-namelist index c12cc09e476e..9abf6cca743e 100755 --- a/components/data_comps/dice/bld/build-namelist +++ b/components/data_comps/dice/bld/build-namelist @@ -23,22 +23,22 @@ sub usage { SYNOPSIS build-namelist [options] - Build the dice namelist + Build the dice namelist OPTIONS - -help [or -h] Print usage to STDOUT. - -infile "filepath" Specify a file or list of files (comma delimited) - containing namelists to read values from. - -namelist "namelist" Specify namelist settings directly on the commandline by - supplying a string containing FORTRAN namelist syntax, e.g., - -namelist "&dice_exp taxmode='extend'/" - -print "level" Print level for debugging: - 0 = silent - 1 = regular - 2 = verbose + -help [or -h] Print usage to STDOUT. + -infile "filepath" Specify a file or list of files (comma delimited) + containing namelists to read values from. + -namelist "namelist" Specify namelist settings directly on the commandline by + supplying a string containing FORTRAN namelist syntax, e.g., + -namelist "&dice_exp taxmode='extend'/" + -print "level" Print level for debugging: + 0 = silent + 1 = regular + 2 = verbose -caseroot CASEROOT directory variable -cimeroot CIMEROOT directory variable -inst_string INST_STRING variable - -user_xml_dir "directory" Directory of where to look for user versions of + -user_xml_dir "directory" Directory of where to look for user versions of namelist XML files (usually your SourceMods/src.dice directory) (such as namelist_definition_dice.xml, or namelist_defaults_dice.xml) @@ -65,7 +65,7 @@ my $cmdline = "@ARGV"; # Command line arguments to script my $cwd = getcwd(); # current working directory my $cfgdir; # absolute pathname of directory that contains this script my $nm = "ProgName::"; # name to use if script dies -if ($ProgDir) { +if ($ProgDir) { $cfgdir = abs_path($ProgDir); } else { $cfgdir = $cwd; @@ -91,7 +91,7 @@ GetOptions( "print=i" => \$opts{'print'}, "caseroot=s" => \$opts{'caseroot'}, "cimeroot=s" => \$opts{'cimeroot'}, - "inst_string=s" => \$opts{'inst_string'}, + "inst_string=s" => \$opts{'inst_string'}, "user_xml_dir=s" => \$opts{'user_xml_dir'}, ) or usage(); @@ -122,9 +122,9 @@ EOF } } -my $CASEROOT = $opts{'caseroot'}; -my $CIMEROOT = $opts{'cimeroot'}; -my $INST_STRING = $opts{'inst_string'}; +my $CASEROOT = $opts{'caseroot'}; +my $CIMEROOT = $opts{'cimeroot'}; +my $INST_STRING = $opts{'inst_string'}; if ($print>=2) { print "Setting dice configuration script directory to $cfgdir$eol"; } @@ -154,14 +154,14 @@ my $perl5lib = "$cimeroot/utils/perl5lib"; # The XML::Lite module is required to parse the XML files. (-f "$perl5lib/XML/Lite.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"XML/Lite.pm\" in directory +** $ProgName - Cannot find perl module \"XML/Lite.pm\" in directory \"$perl5lib\" ** EOF # The Build::Config module provides utilities to access the configuration information # in the config_cache.xml file (-f "$perl5lib/Build/Config.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/Config.pm\" in directory +** $ProgName - Cannot find perl module \"Build/Config.pm\" in directory \"$perl5lib\" ** EOF @@ -187,12 +187,12 @@ if ($print>=2) { print "Using namelist definition file $nl_definition_file$eol"; # The Build::NamelistDefinition module provides utilities to validate that the output # namelists are consistent with the namelist definition file (-f "$perl5lib/Build/NamelistDefinition.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/NamelistDefinition.pm\" in directory +** $ProgName - Cannot find perl module \"Build/NamelistDefinition.pm\" in directory \"$perl5lib\" ** EOF # The namelist defaults file contains default values for all required namelist variables. -my $nl_defaults_file = "$cfgdir/namelist_files/namelist_defaults_dice.xml"; +my $nl_defaults_file = "$cfgdir/namelist_files/namelist_defaults_dice.xml"; # If user has user namelist defaults files if (defined $opts{'user_xml_dir'}) { @@ -213,14 +213,14 @@ if ($print>=2) { print "Using namelist defaults file $nl_defaults_file$eol"; } # The Build::NamelistDefaults module provides a utility to obtain default values of namelist # variables based on finding a best fit with the attributes specified in the defaults file. (-f "$perl5lib/Build/NamelistDefaults.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/NamelistDefaults.pm\" in directory +** $ProgName - Cannot find perl module \"Build/NamelistDefaults.pm\" in directory \"$perl5lib\" ** EOF # The Build::Namelist module provides utilities to parse input namelists, to query and modify # namelists, and to write output namelists. (-f "$perl5lib/Build/Namelist.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/Namelist.pm\" in directory +** $ProgName - Cannot find perl module \"Build/Namelist.pm\" in directory \"$perl5lib\" ** EOF @@ -237,7 +237,7 @@ require Streams::TemplateGeneric; require Config::SetupTools; #----------------------------------------------------------------------------------------------- -# Create a configuration object from the DICE config_cache.xml file. +# Create a configuration object from the DICE config_cache.xml file. my $cfg = Build::Config->new('config_cache.xml'); # Validate some of the commandline option values. @@ -307,7 +307,7 @@ if (defined $opts{'infile'}) { my %xmlvars = (); SetupTools::getxmlvars(${CASEROOT},\%xmlvars); foreach my $attr (keys %xmlvars) { - $xmlvars{$attr} = SetupTools::expand_xml_var($xmlvars{$attr}, \%xmlvars); + $xmlvars{$attr} = SetupTools::expand_xml_var($xmlvars{$attr}, \%xmlvars); } my $RUN_TYPE = $xmlvars{'RUN_TYPE'}; @@ -319,8 +319,8 @@ my $DICE_MODE = $xmlvars{'DICE_MODE'}; (-d $DIN_LOC_ROOT) or mkdir $DIN_LOC_ROOT; -if ($print>=2) { - print " Inputdata root directory: $DIN_LOC_ROOT$eol"; +if ($print>=2) { + print " Inputdata root directory: $DIN_LOC_ROOT$eol"; print " dice_mode is $DICE_MODE \n"; print " dice grid is $ICE_GRID \n"; } @@ -355,7 +355,7 @@ foreach my $stream ( @streams ) { # Set stream specific part of default_namelist_opts hash $default_namelist_opts{'stream'} = $stream; - + my $outstream = "dice.streams.txt" . ".$stream" . "$INST_STRING"; if ($print>=1) { print " dice stream is $stream$INST_STRING \n"; } @@ -363,7 +363,7 @@ foreach my $stream ( @streams ) { # do nothing - } elsif (-e "$CASEROOT/user_$outstream") { + } elsif (-e "$CASEROOT/user_$outstream") { my $command = "cp -p $CASEROOT/user_$outstream $CASEROOT/Buildconf/diceconf/$outstream"; system($command) == 0 or die "system $command failed: $? \n"; @@ -381,17 +381,17 @@ foreach my $stream ( @streams ) { $stream_template_opts{'ProgName'} = $ProgName; $stream_template_opts{'ProgDir'} = "$cfgdir"; $stream_template_opts{'cmdline'} = $cmdline; - + if ($stream eq "prescribed" || $stream eq "copyall") { # Currently ASSUME ONLY 1 FILE for prescribed mode my $grid_file = $defaults->get_value( "strm_grid_file", \%default_namelist_opts ); my $data_file = $defaults->get_value( "strm_data_file", \%default_namelist_opts ); my $grid_file = SetupTools::expand_xml_var($grid_file, \%xmlvars); my $data_file = SetupTools::expand_xml_var($data_file, \%xmlvars); - $stream_template_opts{'domainpath'} = dirname($grid_file); - $stream_template_opts{'domain'} = basename($grid_file); - $stream_template_opts{'filepath'} = dirname($data_file); - $stream_template_opts{'filenames'} = basename($data_file); + $stream_template_opts{'domainpath'} = dirname($grid_file); + $stream_template_opts{'domain'} = basename($grid_file); + $stream_template_opts{'filepath'} = dirname($data_file); + $stream_template_opts{'filenames'} = basename($data_file); } else { $stream_template_opts{'filepath'} = $defaults->get_value( "strm_datdir" , \%default_namelist_opts ); $stream_template_opts{'filenames'} = $defaults->get_value( "strm_datfil" , \%default_namelist_opts ); @@ -403,26 +403,26 @@ foreach my $stream ( @streams ) { $stream_template_opts{'domvarnames'}= $defaults->get_value( "strm_domvar" , \%default_namelist_opts ); $stream_template_opts{'yearfirst'} = $defaults->get_value( "strm_year_start", \%default_namelist_opts ); $stream_template_opts{'yearlast'} = $defaults->get_value( "strm_year_end" , \%default_namelist_opts ); - + $stream_template_opts{'filepath'} = SetupTools::expand_xml_var($stream_template_opts{'filepath'} , \%xmlvars); $stream_template_opts{'filenames'} = SetupTools::expand_xml_var($stream_template_opts{'filenames'} , \%xmlvars); $stream_template_opts{'domainpath'} = SetupTools::expand_xml_var($stream_template_opts{'domainpath'}, \%xmlvars); $stream_template_opts{'domain'} = SetupTools::expand_xml_var($stream_template_opts{'domain'} , \%xmlvars); $stream_template_opts{'yearfirst'} = SetupTools::expand_xml_var($stream_template_opts{'yearfirst'} , \%xmlvars); $stream_template_opts{'yearlast'} = SetupTools::expand_xml_var($stream_template_opts{'yearlast'} , \%xmlvars); - - + + # Create the streams txt file for this stream (from a generic template) my $stream_template = Streams::TemplateGeneric->new( \%stream_template_opts ); $stream_template->Read( "${CASEROOT}/Buildconf/dice.template.streams.xml" ); $stream_template->Write( $outstream ); - - + + # Append to dice.input_data_list my @filenames = $stream_template->GetDataFilenames( 'domain'); my $i = 0; foreach my $file ( @filenames ) { - $i++; + $i++; print $fh_out "domain${i} = $file\n"; } @@ -474,7 +474,7 @@ foreach my $stream ( @streams ) { } $fh_out->close; - + ######################################################### # namelist group: shr_strdata_nml (in file dice_ice_in) # ######################################################### @@ -608,7 +608,7 @@ sub add_default { $val = $defaults->get_value($var, \%opts); # Truncate model_version appropriately - + if ( $var eq "model_version" ) { $val =~ /(URL: https:\/\/[a-zA-Z0-9._-]+\/)([a-zA-Z0-9\/._-]+)(\/bld\/.+)/; $val = $2; @@ -617,7 +617,7 @@ sub add_default { unless ( defined($val) ) { unless ($opts{'nofail'}) { - die "$ProgName - No default value found for $var.\n" . + die "$ProgName - No default value found for $var.\n" . " Are defaults provided? \n"; } else { diff --git a/components/data_comps/dice/bld/namelist_files/namelist_defaults_dice.xml b/components/data_comps/dice/bld/namelist_files/namelist_defaults_dice.xml index d46d94a0c9d2..9b62d7bf6931 100644 --- a/components/data_comps/dice/bld/namelist_files/namelist_defaults_dice.xml +++ b/components/data_comps/dice/bld/namelist_files/namelist_defaults_dice.xml @@ -7,11 +7,11 @@ diff --git a/components/data_comps/dice/bld/namelist_files/namelist_definition_dice.xml b/components/data_comps/dice/bld/namelist_files/namelist_definition_dice.xml index 9346a8b20271..3a53ec15dd44 100644 --- a/components/data_comps/dice/bld/namelist_files/namelist_definition_dice.xml +++ b/components/data_comps/dice/bld/namelist_files/namelist_definition_dice.xml @@ -12,10 +12,10 @@ - general method that operates on the data. this is generally implemented in the data models but is set in the strdata method for @@ -40,23 +40,23 @@ data to the data ocean model. They are normally found in the same file because the SST and ice fraction data are derived from the same observational data sets and are consistent with each other. Set by the xml variable DICE_MODE in env_run.xml - Currently, DICE_MODE can be [ssmi, ssmi_iaf, null] + Currently, DICE_MODE can be [ssmi, ssmi_iaf, null] If DICE_MODE is set to ssmi or ssmi_iaf, datamode will be set to SSTDATA -If DICE_MODE is set to null, datamodel will be set to NULL +If DICE_MODE is set to null, datamodel will be set to NULL - spatial gridfile associated with the strdata. grid information will be read from this file and that grid will serve as the target grid -for all input data for this strdata input. +for all input data for this strdata input. - @@ -64,22 +64,22 @@ array (up to 30 elements) of fill algorithms associated with the array of streams. valid options are just copy (ie. no fill), special value, nearest neighbor, nearest neighbor in "i" direction, or nearest neighbor in "j" direction. -valid values: 'copy','spval','nn','nnoni','nnonj' +valid values: 'copy','spval','nn','nnoni','nnonj' default: "nn". -plays no role is fill algorithm at the present time. +plays no role is fill algorithm at the present time. valid values: "nomask,srcmask,dstmask,bothmask" default: "nomask" - array (up to 30 elements) of filenames associated with the array of @@ -89,18 +89,18 @@ and fillmask are ignored. default: unset - array (up to 30 elements) of filenames associated with the array of streams. specifies the weights file to generate after weights are computed on the fly for the fill operation. this allows a user to -save and reuse a set of weights later. +save and reuse a set of weights later. default="unset". - - array (up to 30 elements) of fill algorithms associated with the array of streams. valid options are copy by index, set to special value, nearest neighbor, nearest neighbor in "i" direction, nearest neighbor -in "j" direction, or bilinear. +in "j" direction, or bilinear. valid values: copy,spval,nn,nnoni,nnonj,bilinear default: bilinear - +group="shr_strdata_nml"> array (up to 30 elements) of filenames associated with the array of streams. specifies the weights file to read instead of computing weights on the fly for the mapping (interpolation) operation. if this is set, mapalgo and mapmask are ignored. default="unset". - array (up to 30 elements) of filenames associated with the array of @@ -147,13 +147,13 @@ allows a user to save and reuse a set of weights later. default="unset". - array (up to 30 elements) of time interpolation options associated with the array of -streams. +streams. valid values: lower,upper,nearest,linear,coszen lower = Use lower time-value upper = Use upper time-value @@ -163,13 +163,13 @@ valid values: lower,upper,nearest,linear,coszen default="linear". - array of time axis modes associated with the array of streams for -handling data outside the specified stream time axis. +handling data outside the specified stream time axis. valid options are to cycle the data based on the first, last, and align settings associated with the stream dataset, to extend the first and last valid value indefinitely, or to limit the interpolated data @@ -181,8 +181,8 @@ valid values: cycle,extend,limit default="cycle". - array (up to 30 elements) of delta time ratio limits placed on the @@ -197,11 +197,11 @@ maximum ratio should be about 1.1. the running value of the delta time is computed as data is read and any wraparound or cycling is also included. this input helps trap missing data or errors in cycling. to turn off trapping, set the value to 1.0e30 or something similar. -default=1.5. +default=1.5. - character array (up to 30 elements) of stream input files. this @@ -211,7 +211,7 @@ specified by the stream module. this string consists of a stream_input_filename is a stream text input file and the format and options are described elsewhere. year_align, year_first, and year_last provide information about the time axis of the file and how -to relate the input time axis to the model time axis. +to relate the input time axis to the model time axis. default="null". @@ -219,102 +219,102 @@ default="null". - The data ice specific namelist input is as follows. The namelist input filename is hardwired in the data model code to "dice_in". The namelist group is called "dice_nml". The variable formats are character string (char), integer (int), double precision real (r8), or -logical (log) or one dimensional arrays of any of those things. -ice_in sets the filename for the data ice shr_strmdata namelist. +logical (log) or one dimensional arrays of any of those things. +ice_in sets the filename for the data ice shr_strmdata namelist. default: dice_ice_in. - set the decomposition option for the data model. valid options are placing the global array on the root task or a simple stride-one load balanced one-dimensional decomposition. other decompositions -may be added in the future. +may be added in the future. valid values are ['root','1d']. 1d = Vector decomposition root = run only on the master task -default='1d'. +default='1d'. - activates water accumulation/melt wrt Q default: .false. - initial water accumulation value default: 0. - bound on melt rate default: -300.0e0 - short-wave penatration factor default: 0. - Model restart filename for the data ice model data. This is optional. If both restfils and restfilm are undefined, the restart filename will -be read from the ICE restart pointer file (or files for multiple instances). +be read from the ICE restart pointer file (or files for multiple instances). default='undefined'. - Stream restart filename for the data ice stream data. This is optional. If both restfils and restfilm are undefined, the restart filename will be read from the DICE restart pointer file (or files for -multiple instances). +multiple instances). default: 'undefined' If TRUE, prognostic is forced to true. -default=false +default=false - DICE logfile name default: 'ice.log' diff --git a/components/data_comps/dice/cime_config/buildnml b/components/data_comps/dice/cime_config/buildnml index b3b13f2a6c83..2aa280286f6f 100755 --- a/components/data_comps/dice/cime_config/buildnml +++ b/components/data_comps/dice/cime_config/buildnml @@ -16,7 +16,7 @@ my $CIMEROOT = `./xmlquery CIMEROOT -value`; my @dirs = ("${CIMEROOT}/utils/perl5lib"); unshift @INC, @dirs; require Config::SetupTools; -my $sysmod; +my $sysmod; if (! -d "$CASEROOT/Buildconf/diceconf" ) { $sysmod = "mkdir $CASEROOT/Buildconf/diceconf"; @@ -29,10 +29,10 @@ my $inst_counter = 1; while ($inst_counter <= $NINST_ICE) { # ----------------------------------------------------- - # determine instance string + # determine instance string # ----------------------------------------------------- - $inst_string = ""; + $inst_string = ""; if ($NINST_ICE > 1) { $inst_string = `printf _%04d $inst_counter`; @@ -48,9 +48,9 @@ while ($inst_counter <= $NINST_ICE) { # create diceconf/cesm_namelist # ----------------------------------------------------- - SetupTools::create_namelist_infile("$CASEROOT", - "$CASEROOT/user_nl_dice${inst_string}", - "$CASEROOT/Buildconf/diceconf/cesm_namelist"); + SetupTools::create_namelist_infile("$CASEROOT", + "$CASEROOT/user_nl_dice${inst_string}", + "$CASEROOT/Buildconf/diceconf/cesm_namelist"); # ----------------------------------------------------- # call build-namelist diff --git a/components/data_comps/dice/cime_config/config_component.xml b/components/data_comps/dice/cime_config/config_component.xml index 6354edc818d4..2fd6f5ae47c1 100644 --- a/components/data_comps/dice/cime_config/config_component.xml +++ b/components/data_comps/dice/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char dice dice @@ -13,43 +13,43 @@ Name of ice component - + char prescribed,ssmi,ssmi_iaf,copyall,null ssmi ssmi - ssmi_iaf - prescribed + ssmi_iaf + prescribed copyall null run_component_dice env_run.xml - DICE mode. DICE is a combination of a data model and a prognostic model. - The data functionality reads in ice coverage. The prognostic functionality - calculates the ice/atmosphere and ice/ocean fluxes. DICE receives the same - atmospheric input from the coupler as the active CICE model (i.e., atmospheric + DICE mode. DICE is a combination of a data model and a prognostic model. + The data functionality reads in ice coverage. The prognostic functionality + calculates the ice/atmosphere and ice/ocean fluxes. DICE receives the same + atmospheric input from the coupler as the active CICE model (i.e., atmospheric states, shortwave fluxes, and ocean ice melt flux). DICE acts very similarly to CICE running in prescribed mode.) Currently, this component is only used to drive POP in C compsets. - If DICE_MODE is set to ssmi or ssmi_iaf, it is a prognostic mode. - It requires data be sent to the ice model. + If DICE_MODE is set to ssmi or ssmi_iaf, it is a prognostic mode. + It requires data be sent to the ice model. Ice fraction (extent) data is read from an input stream, atmosphere state variables are received from the coupler, and then an atmosphere-ice surface flux is computed and sent to the - coupler. Normally the ice fraction data is found in the same data files - that provide SST data to the data ocean model. They are normally found + coupler. Normally the ice fraction data is found in the same data files + that provide SST data to the data ocean model. They are normally found in the same file because the SST and ice fraction data are derived from the same observational data sets and are consistent with each other. - dice mode is ssmi: - dice mode is ssmi_iaf: + dice mode is ssmi: + dice mode is ssmi_iaf: dice mode is prescribed: - dice mode is copy: - dice mode is null: + dice mode is copy: + dice mode is null: @@ -58,4 +58,4 @@ ========================================= - + diff --git a/components/data_comps/dice/cime_config/user_nl_dice b/components/data_comps/dice/cime_config/user_nl_dice index c49dbead1f74..b497393570c5 100644 --- a/components/data_comps/dice/cime_config/user_nl_dice +++ b/components/data_comps/dice/cime_config/user_nl_dice @@ -1,13 +1,13 @@ !------------------------------------------------------------------------ ! Users should ONLY USE user_nl_dice to change namelists variables -! Users should add all user specific namelist changes below in the form of -! namelist_var = new_namelist_value -! Note that any namelist variable from shr_strdata_nml and dice_nml can -! be modified below using the above syntax +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! Note that any namelist variable from shr_strdata_nml and dice_nml can +! be modified below using the above syntax ! User preview_namelists to view (not modify) the output namelist in the ! directory $CASEROOT/CaseDocs ! To modify the contents of a stream txt file, first use preview_namelists ! to obtain the contents of the stream txt files in CaseDocs, and then -! place a copy of the modified stream txt file in $CASEROOT with the string -! user_ prepended. +! place a copy of the modified stream txt file in $CASEROOT with the string +! user_ prepended. !------------------------------------------------------------------------ diff --git a/components/data_comps/dice/dice_comp_mod.F90 b/components/data_comps/dice/dice_comp_mod.F90 index 5b4f66769dde..2f0f1e5993b7 100644 --- a/components/data_comps/dice/dice_comp_mod.F90 +++ b/components/data_comps/dice/dice_comp_mod.F90 @@ -56,7 +56,7 @@ module dice_comp_mod integer(IN) :: logunit ! logging unit number integer :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "lnd_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance ! (ie. "_0001" or "") character(CL) :: ice_mode ! mode integer(IN) :: dbug = 0 ! debug level (higher is more) @@ -285,7 +285,7 @@ subroutine dice_comp_init( EClock, cdata, x2i, i2x, NLFilename ) decomp = "1d" flux_swpf = 0.0_R8 ! no penetration flux_Qmin = -300.0_R8 ! kg/s/m^2 - flux_Qacc = .false. ! no accumulation + flux_Qacc = .false. ! no accumulation flux_Qacc0 = 0.0_R8 ! no water restfilm = trim(nullstr) restfils = trim(nullstr) @@ -336,10 +336,10 @@ subroutine dice_comp_init( EClock, cdata, x2i, i2x, NLFilename ) !---------------------------------------------------------------------------- ! Initialize IO !---------------------------------------------------------------------------- - + ice_pio_subsystem=>shr_pio_getiosys(trim(inst_name)) - + call shr_strdata_pioinit(SDICE, ice_pio_subsystem, shr_pio_getiotype(trim(inst_name))) !---------------------------------------------------------------------------- @@ -703,14 +703,14 @@ subroutine dice_comp_run( EClock, cdata, x2i, i2x) select case (trim(ice_mode)) - case('COPYALL') + case('COPYALL') ! do nothing extra case('SSTDATA') if (firstcall .and. .not. read_restart) then ! iFrac0 = iFrac ! previous step's ice fraction water = 0.0_R8 ! previous step's water accumulation - where (i2x%rAttr(kiFrac,:) > 0.0_R8) water(:) = flux_Qacc0 + where (i2x%rAttr(kiFrac,:) > 0.0_R8) water(:) = flux_Qacc0 endif ! tcraig, feb 10, 2012, ymd2eday no longer exists, use ymd2julian instead @@ -727,20 +727,20 @@ subroutine dice_comp_run( EClock, cdata, x2i, i2x) do n = 1,lsize !--- fix erroneous iFrac --- - i2x%rAttr(kiFrac,n) = min(1.0_R8,max(0.0_R8,i2x%rAttr(kiFrac,n))) + i2x%rAttr(kiFrac,n) = min(1.0_R8,max(0.0_R8,i2x%rAttr(kiFrac,n))) !--- fabricate ice surface T, fix erroneous iFrac --- - if ( yc(n) > 0.0_R8) then + if ( yc(n) > 0.0_R8) then i2x%rAttr(kt,n) = 260.0_R8 + 10.0_R8*cos(cosArg) else i2x%rAttr(kt,n) = 260.0_R8 - 10.0_R8*cos(cosArg) end if !--- set albedos (constant) --- - i2x%rAttr(kavsdr,n) = ax_vsdr - i2x%rAttr(kanidr,n) = ax_nidr - i2x%rAttr(kavsdf,n) = ax_vsdf - i2x%rAttr(kanidf,n) = ax_nidf + i2x%rAttr(kavsdr,n) = ax_vsdr + i2x%rAttr(kanidr,n) = ax_nidr + i2x%rAttr(kavsdf,n) = ax_vsdf + i2x%rAttr(kanidf,n) = ax_nidf !--- swnet is sent to cpl as a diagnostic quantity only --- !--- newly recv'd swdn goes with previously sent albedo --- @@ -807,7 +807,7 @@ subroutine dice_comp_run( EClock, cdata, x2i, i2x) end if !--- modify T wrt iFrac: (iFrac -> 0) => (T -> Tfrz) --- - i2x%rAttr(kt,n) = Tfrz + i2x%rAttr(kiFrac,n)*(i2x%rAttr(kt,n)-Tfrz) + i2x%rAttr(kt,n) = Tfrz + i2x%rAttr(kiFrac,n)*(i2x%rAttr(kt,n)-Tfrz) end do @@ -901,7 +901,7 @@ subroutine dice_comp_run( EClock, cdata, x2i, i2x) call shr_sys_flush(logunit) end if firstcall = .false. - + call shr_file_setLogUnit (shrlogunit) call shr_file_setLogLevel(shrloglev) call shr_sys_flush(logunit) @@ -941,11 +941,11 @@ subroutine dice_comp_final() call t_startf('DICE_FINAL') if (my_task == master_task) then - write(logunit,F91) + write(logunit,F91) write(logunit,F00) trim(myModelName),': end of main integration loop' - write(logunit,F91) + write(logunit,F91) end if - + call t_stopf('DICE_FINAL') end subroutine dice_comp_final diff --git a/components/data_comps/dice/ice_comp_esmf.F90 b/components/data_comps/dice/ice_comp_esmf.F90 index f1b7e31515af..31d449898957 100644 --- a/components/data_comps/dice/ice_comp_esmf.F90 +++ b/components/data_comps/dice/ice_comp_esmf.F90 @@ -1,6 +1,6 @@ module ice_comp_esmf -#ifdef ESMF_INTERFACE +#ifdef ESMF_INTERFACE use shr_kind_mod, only: R8=>SHR_KIND_R8, IN=>SHR_KIND_IN, & CS=>SHR_KIND_CS, CL=>SHR_KIND_CL use shr_sys_mod ! shared system calls @@ -38,7 +38,7 @@ module ice_comp_esmf ! ! Author: Fei Liu - ! This module is ESMF compliant ice data component + ! This module is ESMF compliant ice data component !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ contains !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -238,7 +238,7 @@ subroutine ice_final_esmf(comp, import_state, export_state, EClock, rc) integer, intent(out) :: rc !---------------------------------------------------------------------------- - ! Finalize routine + ! Finalize routine !---------------------------------------------------------------------------- rc = ESMF_SUCCESS diff --git a/components/data_comps/dlnd/bld/build-namelist b/components/data_comps/dlnd/bld/build-namelist index 31c54ee4e1f5..d807cfac06cd 100755 --- a/components/data_comps/dlnd/bld/build-namelist +++ b/components/data_comps/dlnd/bld/build-namelist @@ -22,22 +22,22 @@ sub usage { SYNOPSIS build-namelist [options] - Build the dlnd namelist + Build the dlnd namelist OPTIONS - -help [or -h] Print usage to STDOUT. - -infile "filepath" Specify a file or list of files (comma delimited) - containing namelists to read values from. - -namelist "namelist" Specify namelist settings directly on the commandline by - supplying a string containing FORTRAN namelist syntax, e.g., - -namelist "&dlnd_exp taxmode='extend'/" - -print "level" Print level for debugging: - 0 = silent - 1 = regular - 2 = verbose + -help [or -h] Print usage to STDOUT. + -infile "filepath" Specify a file or list of files (comma delimited) + containing namelists to read values from. + -namelist "namelist" Specify namelist settings directly on the commandline by + supplying a string containing FORTRAN namelist syntax, e.g., + -namelist "&dlnd_exp taxmode='extend'/" + -print "level" Print level for debugging: + 0 = silent + 1 = regular + 2 = verbose -caseroot CASEROOT directory variable -cimeroot CIMEROOT directory variable -inst_string INST_STRING variable - -user_xml_dir "directory" Directory of where to look for user versions of + -user_xml_dir "directory" Directory of where to look for user versions of namelist XML files (usually your SourceMods/src.dlnd directory) (such as namelist_definition_dlnd.xml, or namelist_defaults_dlnd.xml) @@ -64,7 +64,7 @@ my $cmdline = "@ARGV"; # Command line arguments to script my $cwd = getcwd(); # current working directory my $cfgdir; # absolute pathname of directory that contains this script my $nm = "ProgName::"; # name to use if script dies -if ($ProgDir) { +if ($ProgDir) { $cfgdir = abs_path($ProgDir); } else { $cfgdir = $cwd; @@ -90,7 +90,7 @@ GetOptions( "print=i" => \$opts{'print'}, "caseroot=s" => \$opts{'caseroot'}, "cimeroot=s" => \$opts{'cimeroot'}, - "inst_string=s" => \$opts{'inst_string'}, + "inst_string=s" => \$opts{'inst_string'}, "user_xml_dir=s" => \$opts{'user_xml_dir'}, ) or usage(); @@ -121,9 +121,9 @@ EOF } } -my $CASEROOT = $opts{'caseroot'}; -my $CIMEROOT = $opts{'cimeroot'}; -my $INST_STRING = $opts{'inst_string'}; +my $CASEROOT = $opts{'caseroot'}; +my $CIMEROOT = $opts{'cimeroot'}; +my $INST_STRING = $opts{'inst_string'}; if ($print>=2) { print "Setting dlnd configuration script directory to $cfgdir$eol"; } @@ -155,20 +155,20 @@ my $perl5lib = "$cimeroot/utils/perl5lib"; # The XML::Lite module is required to parse the XML files. (-f "$perl5lib/XML/Lite.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"XML/Lite.pm\" in directory +** $ProgName - Cannot find perl module \"XML/Lite.pm\" in directory \"$perl5lib\" ** EOF # The Build::Config module provides utilities to access the configuration information # in the config_cache.xml file (-f "$perl5lib/Build/Config.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/Config.pm\" in directory +** $ProgName - Cannot find perl module \"Build/Config.pm\" in directory \"$perl5lib\" ** EOF # The namelist definition file contains entries for all namelist variables that # can be output by build-namelist. The version of the file that is associate with a -# fixed dlnd tag is $cfgdir/namelist_files/namelist_definition_dlnd.xml. +# fixed dlnd tag is $cfgdir/namelist_files/namelist_definition_dlnd.xml. my $nl_definition_file = "${cfgdir}/namelist_files/namelist_definition_dlnd.xml"; # If user has user namelist definition files @@ -189,10 +189,10 @@ if ($print>=2) { print "Using namelist definition file $nl_definition_file$eol"; # The Build::NamelistDefinition module provides utilities to validate that the output # namelists are consistent with the namelist definition file (-f "$perl5lib/Build/NamelistDefinition.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/NamelistDefinition.pm\" in directory +** $ProgName - Cannot find perl module \"Build/NamelistDefinition.pm\" in directory \"$perl5lib\" ** EOF - + # The namelist defaults file contains default values for most namelist variables # can be output by build-namelist. The version of the file that is associated with a # fixed dlnd tag is $cfgdir/namelist_files/namelist_defaults_dlnd.xml. @@ -216,14 +216,14 @@ if ($print>=2) { print "Using namelist defaults file $nl_defaults_file$eol"; } # The Build::NamelistDefaults module provides a utility to obtain default values of namelist # variables based on finding a best fit with the attributes specified in the defaults file. (-f "$perl5lib/Build/NamelistDefaults.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/NamelistDefaults.pm\" in directory +** $ProgName - Cannot find perl module \"Build/NamelistDefaults.pm\" in directory \"$perl5lib\" ** EOF # The Build::Namelist module provides utilities to parse input namelists, to query and modify # namelists, and to write output namelists. (-f "$perl5lib/Build/Namelist.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/Namelist.pm\" in directory +** $ProgName - Cannot find perl module \"Build/Namelist.pm\" in directory \"$perl5lib\" ** EOF @@ -240,7 +240,7 @@ require Streams::TemplateGeneric; require Config::SetupTools; #----------------------------------------------------------------------------------------------- -# Create a configuration object from the DLND config_cache.xml file. +# Create a configuration object from the DLND config_cache.xml file. my $cfg = Build::Config->new($config_cache); # Validate some of the commandline option values. @@ -313,14 +313,14 @@ foreach my $attr (keys %xmlvars) { } my $RUN_TYPE = $xmlvars{'RUN_TYPE'}; -my $DIN_LOC_ROOT = $xmlvars{'DIN_LOC_ROOT'}; -my $LND_DOMAIN_FILE = $xmlvars{'LND_DOMAIN_FILE'}; -my $LND_DOMAIN_PATH = $xmlvars{'LND_DOMAIN_PATH'}; -my $LND_GRID = $xmlvars{'LND_GRID'}; -my $DLND_MODE = $xmlvars{'DLND_MODE'}; +my $DIN_LOC_ROOT = $xmlvars{'DIN_LOC_ROOT'}; +my $LND_DOMAIN_FILE = $xmlvars{'LND_DOMAIN_FILE'}; +my $LND_DOMAIN_PATH = $xmlvars{'LND_DOMAIN_PATH'}; +my $LND_GRID = $xmlvars{'LND_GRID'}; +my $DLND_MODE = $xmlvars{'DLND_MODE'}; my $GLC_NEC = $xmlvars{'GLC_NEC'}; -(-d $DIN_LOC_ROOT) or mkdir $DIN_LOC_ROOT; +(-d $DIN_LOC_ROOT) or mkdir $DIN_LOC_ROOT; if ($print>=2) { print "Inputdata root directory: $DIN_LOC_ROOT$eol"; } #################################### @@ -353,7 +353,7 @@ foreach my $stream ( @streams ) { # Set stream specific part of default_namelist_opts hash $default_namelist_opts{'stream'} = $stream; - + my $outstream = "dlnd.streams.txt" . ".$stream" . "$INST_STRING"; if ($print>=1) { print " dlnd stream is $stream$INST_STRING \n";} @@ -361,7 +361,7 @@ foreach my $stream ( @streams ) { # do nothing - } elsif (-e "$CASEROOT/user_$outstream") { + } elsif (-e "$CASEROOT/user_$outstream") { my $command = "cp -p $CASEROOT/user_$outstream $CASEROOT/CaseDocs/$outstream"; system($command) == 0 or die "system $command failed: $? \n"; @@ -379,7 +379,7 @@ foreach my $stream ( @streams ) { $stream_template_opts{'ProgName'} = $ProgName; $stream_template_opts{'ProgDir'} = "$cfgdir"; $stream_template_opts{'cmdline'} = $cmdline; - + $stream_template_opts{'offset'} = 0; $stream_template_opts{'filepath'} = $defaults->get_value( "strm_datdir" , \%default_namelist_opts ); $stream_template_opts{'filenames'} = $defaults->get_value( "strm_datfil" , \%default_namelist_opts ); @@ -389,29 +389,29 @@ foreach my $stream ( @streams ) { $stream_template_opts{'domvarnames'}= $defaults->get_value( "strm_domvar" , \%default_namelist_opts ); $stream_template_opts{'yearfirst'} = $defaults->get_value( "strm_year_start", \%default_namelist_opts ); $stream_template_opts{'yearlast'} = $defaults->get_value( "strm_year_end" , \%default_namelist_opts ); - + $stream_template_opts{'filepath'} = SetupTools::expand_xml_var($stream_template_opts{'filepath'} , \%xmlvars); $stream_template_opts{'filenames'} = SetupTools::expand_xml_var($stream_template_opts{'filenames'} , \%xmlvars); $stream_template_opts{'domainpath'} = SetupTools::expand_xml_var($stream_template_opts{'domainpath'}, \%xmlvars); $stream_template_opts{'domain'} = SetupTools::expand_xml_var($stream_template_opts{'domain'} , \%xmlvars); $stream_template_opts{'yearfirst'} = SetupTools::expand_xml_var($stream_template_opts{'yearfirst'} , \%xmlvars); $stream_template_opts{'yearlast'} = SetupTools::expand_xml_var($stream_template_opts{'yearlast'} , \%xmlvars); - + $stream_template_opts{'glc_nec'} = $GLC_NEC; # Create the streams txt file for this stream (from a generic template) my $stream_template = Streams::TemplateGeneric->new( \%stream_template_opts ); $stream_template->Read( "${CASEROOT}/Buildconf/dlnd.template.streams.xml" ); $stream_template->Write( $outstream ); - + # Append to dice.input_data_list my @filenames = $stream_template->GetDataFilenames( 'domain'); my $i = 0; foreach my $file ( @filenames ) { - $i++; + $i++; print $fh_out "domain${i} = $file\n"; } - + my @filenames = $stream_template->GetDataFilenames( 'data'); my $i = 0; foreach my $file ( @filenames ) { @@ -462,7 +462,7 @@ foreach my $stream ( @streams ) { } $fh_out->close; - + #################################### # namelist group: shr_strdata_nml # #################################### @@ -598,7 +598,7 @@ sub add_default { $val = $defaults->get_value($var, \%opts); # Truncate model_version appropriately - + if ( $var eq "model_version" ) { $val =~ /(URL: https:\/\/[a-zA-Z0-9._-]+\/)([a-zA-Z0-9\/._-]+)(\/bld\/.+)/; $val = $2; @@ -607,7 +607,7 @@ sub add_default { unless ( defined($val) ) { unless ($opts{'nofail'}) { - die "$ProgName - No default value found for $var.\n" . + die "$ProgName - No default value found for $var.\n" . " Are defaults provided? \n"; } else { diff --git a/components/data_comps/dlnd/bld/namelist_files/namelist_defaults_dlnd.xml b/components/data_comps/dlnd/bld/namelist_files/namelist_defaults_dlnd.xml index 4d3f3ce25b07..a9ca57434cd2 100644 --- a/components/data_comps/dlnd/bld/namelist_files/namelist_defaults_dlnd.xml +++ b/components/data_comps/dlnd/bld/namelist_files/namelist_defaults_dlnd.xml @@ -12,23 +12,23 @@ attributes to express the dependency. The recognized attributes are: grid, dlnd_presaero and all configuration attributes from the config_cache.xml file (with keys converted to upper-case). -strm_year_first is the first year of the stream data that will be used -strm_year_last is the last year of the stream data that will be used -strm_year_align is the model year that will be aligned with stream data for year_first +strm_year_first is the first year of the stream data that will be used +strm_year_last is the last year of the stream data that will be used +strm_year_align is the model year that will be aligned with stream data for year_first For cplhist forcing - the following substitutions will be made below Replace any instance of the following substring indicators with the appropriate values: %y => year from the range yearfirst to yearlast - using in build-namelist $namelist_defaults_opts{'yearfirst'} - using in build-namelist $namelist_defaults_opts{'yearlast'} + using in build-namelist $namelist_defaults_opts{'yearfirst'} + using in build-namelist $namelist_defaults_opts{'yearlast'} obtained from values of -> below %ym => year-month from the range yearfirst to yearlast with all 12 months - using in build-namelist $namelist_defaults_opts{'yearfirst'} - using in build-namelist $namelist_defaults_opts{'yearlast'} + using in build-namelist $namelist_defaults_opts{'yearfirst'} + using in build-namelist $namelist_defaults_opts{'yearlast'} obtained from values of -> below %ymd => year-month-day from the range yearfirst to yearlast with all 12 months - using in build-namelist $namelist_defaults_opts{'yearfirst'} - using in build-namelist $namelist_defaults_opts{'yearlast'} + using in build-namelist $namelist_defaults_opts{'yearfirst'} + using in build-namelist $namelist_defaults_opts{'yearlast'} obtained from values of -> below For strm_datvar - the following substitutions will be made below diff --git a/components/data_comps/dlnd/bld/namelist_files/namelist_definition_dlnd.xml b/components/data_comps/dlnd/bld/namelist_files/namelist_definition_dlnd.xml index d1221bf31b3d..a7175032ffd8 100644 --- a/components/data_comps/dlnd/bld/namelist_files/namelist_definition_dlnd.xml +++ b/components/data_comps/dlnd/bld/namelist_files/namelist_definition_dlnd.xml @@ -13,14 +13,14 @@ - valid values: NULL,COPYALL datamode = "NULL" - NULL is always a valid option and means no data will be generated. + NULL is always a valid option and means no data will be generated. Turns off the data model as a provider of data to the coupler. The ice_present flag will be set to false and the coupler will assume no exchange of data to or from the data model. @@ -29,22 +29,22 @@ dataMode = "COPYALL" fields not found on an input stream will be set to zero. Set by the following xml variables in env_run.xml -DLND_MODE - default value: NULL +DLND_MODE + default value: NULL - spatial gridfile associated with the strdata. grid information will be read from this file and that grid will serve as the target grid -for all input data for this strdata input. +for all input data for this strdata input. - @@ -52,22 +52,22 @@ array (up to 30 elements) of fill algorithms associated with the array of streams. valid options are just copy (ie. no fill), special value, nearest neighbor, nearest neighbor in "i" direction, or nearest neighbor in "j" direction. -valid values: 'copy','spval','nn','nnoni','nnonj' +valid values: 'copy','spval','nn','nnoni','nnonj' default: "nn". -plays no role is fill algorithm at the present time. +plays no role is fill algorithm at the present time. valid values: "nomask,srcmask,dstmask,bothmask" default: "nomask" - array (up to 30 elements) of filenames associated with the array of @@ -77,18 +77,18 @@ and fillmask are ignored. default: unset - array (up to 30 elements) of filenames associated with the array of streams. specifies the weights file to generate after weights are computed on the fly for the fill operation. this allows a user to -save and reuse a set of weights later. +save and reuse a set of weights later. default="unset". - - array (up to 30 elements) of fill algorithms associated with the array of streams. valid options are copy by index, set to special value, nearest neighbor, nearest neighbor in "i" direction, nearest neighbor -in "j" direction, or bilinear. +in "j" direction, or bilinear. valid values: copy,spval,nn,nnoni,nnonj,bilinear default: bilinear - +group="shr_strdata_nml"> array (up to 30 elements) of filenames associated with the array of streams. specifies the weights file to read instead of computing weights on the fly for the mapping (interpolation) operation. if this is set, mapalgo and mapmask are ignored. default="unset". - array (up to 30 elements) of filenames associated with the array of @@ -135,13 +135,13 @@ allows a user to save and reuse a set of weights later. default="unset". - array (up to 30 elements) of time interpolation options associated with the array of -streams. +streams. valid values: lower,upper,nearest,linear,coszen lower = Use lower time-value upper = Use upper time-value @@ -151,13 +151,13 @@ valid values: lower,upper,nearest,linear,coszen default="linear". - array of time axis modes associated with the array of streams for -handling data outside the specified stream time axis. +handling data outside the specified stream time axis. valid options are to cycle the data based on the first, last, and align settings associated with the stream dataset, to extend the first and last valid value indefinitely, or to limit the interpolated data @@ -169,8 +169,8 @@ valid values: cycle,extend,limit default="cycle". - array (up to 30 elements) of delta time ratio limits placed on the @@ -185,11 +185,11 @@ maximum ratio should be about 1.1. the running value of the delta time is computed as data is read and any wraparound or cycling is also included. this input helps trap missing data or errors in cycling. to turn off trapping, set the value to 1.0e30 or something similar. -default=1.5. +default=1.5. - character array (up to 30 elements) of stream input files. this @@ -199,7 +199,7 @@ specified by the stream module. this string consists of a stream_input_filename is a stream text input file and the format and options are described elsewhere. year_align, year_first, and year_last provide information about the time axis of the file and how -to relate the input time axis to the model time axis. +to relate the input time axis to the model time axis. default="null". @@ -207,46 +207,46 @@ default="null". - Namelist filename for data model lnd share stream data namelist - DLND Decomposition strategy 1d = Vector decomposition root = run only on the master task - Master restart file name for dlnd model - Stream restart file name for dlnd model, needed for branch simulations If TRUE, prognostic is forced to true. -default=false +default=false diff --git a/components/data_comps/dlnd/cime_config/buildnml b/components/data_comps/dlnd/cime_config/buildnml index 170481580123..255b1f57bdab 100755 --- a/components/data_comps/dlnd/cime_config/buildnml +++ b/components/data_comps/dlnd/cime_config/buildnml @@ -16,7 +16,7 @@ my $CIMEROOT = `./xmlquery CIMEROOT -value`; my @dirs = ("${CIMEROOT}/utils/perl5lib"); unshift @INC, @dirs; require Config::SetupTools; -my $sysmod; +my $sysmod; if (! -d "$CASEROOT/Buildconf/dlndconf" ) { $sysmod = "mkdir $CASEROOT/Buildconf/dlndconf"; @@ -29,10 +29,10 @@ my $inst_counter = 1; while ($inst_counter <= $NINST_LND) { # ----------------------------------------------------- - # determine instance string + # determine instance string # ----------------------------------------------------- - $inst_string = ""; + $inst_string = ""; if ($NINST_LND > 1) { $inst_string = `printf _%04d $inst_counter`; @@ -48,9 +48,9 @@ while ($inst_counter <= $NINST_LND) { # create dlndconf/cesm_namelist # ----------------------------------------------------- - SetupTools::create_namelist_infile("$CASEROOT", - "$CASEROOT/user_nl_dlnd${inst_string}", - "$CASEROOT/Buildconf/dlndconf/cesm_namelist"); + SetupTools::create_namelist_infile("$CASEROOT", + "$CASEROOT/user_nl_dlnd${inst_string}", + "$CASEROOT/Buildconf/dlndconf/cesm_namelist"); # ----------------------------------------------------- # call build-namelist diff --git a/components/data_comps/dlnd/cime_config/config_component.xml b/components/data_comps/dlnd/cime_config/config_component.xml index c829a3bcbfe8..a756c634e627 100644 --- a/components/data_comps/dlnd/cime_config/config_component.xml +++ b/components/data_comps/dlnd/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char dlnd dlnd @@ -13,20 +13,20 @@ Name of land component - + char CPLHIST,GLC_CPLHIST,NULL NULL - NULL + NULL CPLHIST GLC_CPLHIST run_component_dlnd env_run.xml - DLND mode. In CPLHIST mode, land forcing data (produced by CLM) from a previous + DLND mode. In CPLHIST mode, land forcing data (produced by CLM) from a previous model run is output in coupler history files and read in by the data land model. IN GLC_CPLHIST, - glc coupling fields are read in from a coupler history file. In NULL mode, land forcing is + glc coupling fields are read in from a coupler history file. In NULL mode, land forcing is set to zero and not utilized. The default is NULL. @@ -44,7 +44,7 @@ directory for coupler history data mode (only used for CPLHIST mode) - + char UNSET @@ -58,7 +58,7 @@ case name for coupler history data mode (only used for CPLHIST mode) - + integer 1 @@ -72,7 +72,7 @@ year align (only used for CPLHIST mode) - + integer 1 @@ -86,12 +86,12 @@ starting year to loop data over (only used for CPLHIST mode) - + integer 1 2005 - 100 + 100 2005 2100 @@ -112,5 +112,5 @@ ========================================= - + diff --git a/components/data_comps/dlnd/cime_config/user_nl_dlnd b/components/data_comps/dlnd/cime_config/user_nl_dlnd index 55f49b74cfcf..69b4ba55b0ed 100644 --- a/components/data_comps/dlnd/cime_config/user_nl_dlnd +++ b/components/data_comps/dlnd/cime_config/user_nl_dlnd @@ -1,13 +1,13 @@ !------------------------------------------------------------------------ ! Users should ONLY USE user_nl_dlnd to change namelists variables -! Users should add all user specific namelist changes below in the form of -! namelist_var = new_namelist_value -! Note that any namelist variable from shr_strdata_nml and dlnd_nml can -! be modified below using the above syntax +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! Note that any namelist variable from shr_strdata_nml and dlnd_nml can +! be modified below using the above syntax ! User preview_namelists to view (not modify) the output namelist in the ! directory $CASEROOT/CaseDocs ! To modify the contents of a stream txt file, first use preview_namelists ! to obtain the contents of the stream txt files in CaseDocs, and then -! place a copy of the modified stream txt file in $CASEROOT with the string -! user_ prepended. +! place a copy of the modified stream txt file in $CASEROOT with the string +! user_ prepended. !------------------------------------------------------------------------ diff --git a/components/data_comps/dlnd/dlnd_comp_mod.F90 b/components/data_comps/dlnd/dlnd_comp_mod.F90 index 9a798c45dec6..158f0d2bb564 100644 --- a/components/data_comps/dlnd/dlnd_comp_mod.F90 +++ b/components/data_comps/dlnd/dlnd_comp_mod.F90 @@ -51,10 +51,10 @@ module dlnd_comp_mod integer(IN) :: logunit ! logging unit number integer :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "lnd_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance ! (ie. "_0001" or "") - character(CL) :: lnd_mode - character(CL) :: sno_mode + character(CL) :: lnd_mode + character(CL) :: sno_mode integer(IN) :: dbug = 0 ! debug level (higher is more) logical :: scmMode = .false. ! single column mode real(R8) :: scmLat = shr_const_SPVAL ! single column lat @@ -63,7 +63,7 @@ module dlnd_comp_mod character(len=*),parameter :: rpfile = 'rpointer.lnd' character(len=*),parameter :: nullstr = 'undefined' - + type(shr_strdata_type),save :: SDLND type(mct_rearr) :: rearr_l @@ -267,7 +267,7 @@ subroutine dlnd_comp_init( EClock, cdata_l, x2l, l2x, NLFilename ) call shr_mpi_bcast(restfilm,mpicom,'restfilm') call shr_mpi_bcast(restfilsl,mpicom,'restfilsl') call shr_mpi_bcast(force_prognostic_true,mpicom,'force_prognostic_true') - + rest_file = trim(restfilm) rest_file_strm_l = trim(restfilsl) if (force_prognostic_true) then @@ -469,7 +469,7 @@ subroutine dlnd_comp_init( EClock, cdata_l, x2l, l2x, NLFilename ) ! ************ lnd_present **************** - end if + end if ! ************ lnd_present **************** !---------------------------------------------------------------------------- @@ -507,8 +507,8 @@ subroutine dlnd_comp_run( EClock, cdata_l, x2l, l2x) type(ESMF_Clock) ,intent(in) :: EClock type(seq_cdata) ,intent(inout) :: cdata_l - type(mct_aVect) ,intent(inout) :: x2l - type(mct_aVect) ,intent(inout) :: l2x + type(mct_aVect) ,intent(inout) :: x2l + type(mct_aVect) ,intent(inout) :: l2x !EOP @@ -643,7 +643,7 @@ subroutine dlnd_comp_run( EClock, cdata_l, x2l, l2x) write(logunit,F04) trim(myModelName),': model date ', CurrentYMD,CurrentTOD call shr_sys_flush(logunit) end if - + call shr_file_setLogUnit (shrlogunit) call shr_file_setLogLevel(shrloglev) call shr_sys_flush(logunit) @@ -683,11 +683,11 @@ subroutine dlnd_comp_final() call t_startf('DLND_FINAL') if (my_task == master_task) then - write(logunit,F91) + write(logunit,F91) write(logunit,F00) trim(myModelName),': end of main integration loop' - write(logunit,F91) + write(logunit,F91) end if - + call t_stopf('DLND_FINAL') end subroutine dlnd_comp_final diff --git a/components/data_comps/dlnd/lnd_comp_esmf.F90 b/components/data_comps/dlnd/lnd_comp_esmf.F90 index e551660cd976..b7db917480e5 100644 --- a/components/data_comps/dlnd/lnd_comp_esmf.F90 +++ b/components/data_comps/dlnd/lnd_comp_esmf.F90 @@ -1,6 +1,6 @@ module lnd_comp_esmf -#ifdef ESMF_INTERFACE +#ifdef ESMF_INTERFACE use shr_kind_mod, only: R8=>SHR_KIND_R8, IN=>SHR_KIND_IN, & CS=>SHR_KIND_CS, CL=>SHR_KIND_CL use shr_sys_mod ! shared system calls @@ -38,7 +38,7 @@ module lnd_comp_esmf ! ! Author: Fei Liu - ! This module is ESMF compliant lnd data component + ! This module is ESMF compliant lnd data component !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ contains !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -239,7 +239,7 @@ subroutine lnd_final_esmf(comp, import_state, export_state, EClock, rc) integer, intent(out) :: rc !---------------------------------------------------------------------------- - ! Finalize routine + ! Finalize routine !---------------------------------------------------------------------------- rc = ESMF_SUCCESS diff --git a/components/data_comps/dlnd/lnd_comp_mct.F90 b/components/data_comps/dlnd/lnd_comp_mct.F90 index 695e9d03f6bf..1054b90f9d21 100644 --- a/components/data_comps/dlnd/lnd_comp_mct.F90 +++ b/components/data_comps/dlnd/lnd_comp_mct.F90 @@ -85,7 +85,7 @@ subroutine lnd_run_mct( EClock, cdata_l, x2l, l2x) type(ESMF_Clock) ,intent(inout) :: EClock type(seq_cdata) ,intent(inout) :: cdata_l - type(mct_aVect) ,intent(inout) :: x2l, l2x + type(mct_aVect) ,intent(inout) :: x2l, l2x !EOP @@ -116,7 +116,7 @@ subroutine lnd_final_mct( EClock, cdata, x2l, l2x) type(ESMF_Clock) ,intent(inout) :: EClock type(seq_cdata) ,intent(inout) :: cdata - type(mct_aVect) ,intent(inout) :: x2l, l2x + type(mct_aVect) ,intent(inout) :: x2l, l2x !EOP diff --git a/components/data_comps/docn/bld/build-namelist b/components/data_comps/docn/bld/build-namelist index 281de5309533..d9e8369ff0e9 100755 --- a/components/data_comps/docn/bld/build-namelist +++ b/components/data_comps/docn/bld/build-namelist @@ -23,22 +23,22 @@ sub usage { SYNOPSIS build-namelist [options] - Build the docn namelist + Build the docn namelist OPTIONS - -help [or -h] Print usage to STDOUT. - -infile "filepath" Specify a file or list of files (comma delimited) - containing namelists to read values from. - -namelist "namelist" Specify namelist settings directly on the commandline by - supplying a string containing FORTRAN namelist syntax, e.g., - -namelist "&docn_exp taxmode='extend'/" - -print "level" Print level for debugging: - 0 = silent - 1 = regular - 2 = verbose + -help [or -h] Print usage to STDOUT. + -infile "filepath" Specify a file or list of files (comma delimited) + containing namelists to read values from. + -namelist "namelist" Specify namelist settings directly on the commandline by + supplying a string containing FORTRAN namelist syntax, e.g., + -namelist "&docn_exp taxmode='extend'/" + -print "level" Print level for debugging: + 0 = silent + 1 = regular + 2 = verbose -caseroot CASEROOT directory variable -cimeroot CIMEROOT directory variable -inst_string INST_STRING variable - -user_xml_dir "directory" Directory of where to look for user versions of + -user_xml_dir "directory" Directory of where to look for user versions of namelist XML files (usually your SourceMods/src.docn directory) (such as namelist_definition_docn.xml, or namelist_defaults_docn.xml) @@ -65,7 +65,7 @@ my $cmdline = "@ARGV"; # Command line arguments to script my $cwd = getcwd(); # current working directory my $cfgdir; # absolute pathname of directory that contains this script my $nm = "ProgName::"; # name to use if script dies -if ($ProgDir) { +if ($ProgDir) { $cfgdir = abs_path($ProgDir); } else { $cfgdir = $cwd; @@ -92,7 +92,7 @@ GetOptions( "print=i" => \$opts{'print'}, "caseroot=s" => \$opts{'caseroot'}, "cimeroot=s" => \$opts{'cimeroot'}, - "inst_string=s" => \$opts{'inst_string'}, + "inst_string=s" => \$opts{'inst_string'}, "user_xml_dir=s" => \$opts{'user_xml_dir'}, ) or usage(); @@ -123,9 +123,9 @@ EOF } } -my $CASEROOT = $opts{'caseroot'}; -my $CIMEROOT = $opts{'cimeroot'}; -my $INST_STRING = $opts{'inst_string'}; +my $CASEROOT = $opts{'caseroot'}; +my $CIMEROOT = $opts{'cimeroot'}; +my $INST_STRING = $opts{'inst_string'}; if ($print>=2) { print "Setting docn configuration script directory to $cfgdir$eol"; } @@ -156,14 +156,14 @@ my $perl5lib = "$cimeroot/utils/perl5lib"; # The XML::Lite module is required to parse the XML files. (-f "$perl5lib/XML/Lite.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"XML/Lite.pm\" in directory +** $ProgName - Cannot find perl module \"XML/Lite.pm\" in directory \"$perl5lib\" ** EOF # The Build::Config module provides utilities to access the configuration information # in the config_cache.xml file (-f "$perl5lib/Build/Config.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/Config.pm\" in directory +** $ProgName - Cannot find perl module \"Build/Config.pm\" in directory \"$perl5lib\" ** EOF @@ -190,12 +190,12 @@ if ($print>=2) { print "Using namelist definition file $nl_definition_file$eol"; # The Build::NamelistDefinition module provides utilities to validate that the output # namelists are consistent with the namelist definition file (-f "$perl5lib/Build/NamelistDefinition.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/NamelistDefinition.pm\" in directory +** $ProgName - Cannot find perl module \"Build/NamelistDefinition.pm\" in directory \"$perl5lib\" ** EOF # The namelist defaults file contains default values for all required namelist variables. -my $nl_defaults_file = "$cfgdir/namelist_files/namelist_defaults_docn.xml"; +my $nl_defaults_file = "$cfgdir/namelist_files/namelist_defaults_docn.xml"; # If user has user namelist defaults files if (defined $opts{'user_xml_dir'}) { @@ -215,14 +215,14 @@ if ($print>=2) { print "Using namelist defaults file $nl_defaults_file$eol"; } # The Build::NamelistDefaults module provides a utility to obtain default values of namelist # variables based on finding a best fit with the attributes specified in the defaults file. (-f "$perl5lib/Build/NamelistDefaults.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/NamelistDefaults.pm\" in directory +** $ProgName - Cannot find perl module \"Build/NamelistDefaults.pm\" in directory \"$perl5lib\" ** EOF # The Build::Namelist module provides utilities to parse input namelists, to query and modify # namelists, and to write output namelists. (-f "$perl5lib/Build/Namelist.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/Namelist.pm\" in directory +** $ProgName - Cannot find perl module \"Build/Namelist.pm\" in directory \"$perl5lib\" ** EOF @@ -239,7 +239,7 @@ require Streams::TemplateGeneric; require Config::SetupTools; #----------------------------------------------------------------------------------------------- -# Create a configuration object from the DOCN config_cache.xml file. +# Create a configuration object from the DOCN config_cache.xml file. my $cfg = Build::Config->new('config_cache.xml'); # Validate some of the commandline option values. @@ -322,8 +322,8 @@ my $SSTICE_STREAM = $xmlvars{'SSTICE_STREAM'}; (-d $DIN_LOC_ROOT) or mkdir $DIN_LOC_ROOT; -if ($print>=2) { - print "Inputdata root directory: $DIN_LOC_ROOT \n"; +if ($print>=2) { + print "Inputdata root directory: $DIN_LOC_ROOT \n"; print " docn mode is $DOCN_MODE \n"; print " docn grid is $OCN_GRID \n"; } @@ -342,7 +342,7 @@ my %default_namelist_opts; $default_namelist_opts{'docn_mode'} = $DOCN_MODE; $default_namelist_opts{'ocn_grid'} = $OCN_GRID; $default_namelist_opts{'sstice_stream'} = $SSTICE_STREAM; - + # Create streams template file(s) - loop over streams my $streams = $defaults->get_value( "streamslist", \%default_namelist_opts ); my @streams = split ",", $streams, -1; @@ -354,12 +354,12 @@ my $otintalgo = undef; my $otaxmode = undef; my $ofillalgo = undef; my $ofillmask = undef; -my $filepath = undef ; +my $filepath = undef ; foreach my $stream ( @streams ) { # Set stream specific part of default_namelist_opts hash $default_namelist_opts{'stream'} = $stream; - + my $outstream = "docn.streams.txt" . ".$stream" . "$INST_STRING"; if ($print>=1) {print " docn stream is $stream$INST_STRING \n";} @@ -367,7 +367,7 @@ foreach my $stream ( @streams ) { # do nothing - } elsif (-e "$CASEROOT/user_$outstream") { + } elsif (-e "$CASEROOT/user_$outstream") { my $command = "cp -p $CASEROOT/user_$outstream $CASEROOT/Buildconf/docnconf/$outstream"; system($command) == 0 or die "system $command failed: $? \n"; @@ -376,7 +376,7 @@ foreach my $stream ( @streams ) { # Create hash to initialze streams object my %stream_template_opts; - + if ( $print == 0 ) { $stream_template_opts{'printing'} = 0; } else { @@ -386,7 +386,7 @@ foreach my $stream ( @streams ) { $stream_template_opts{'ProgName'} = $ProgName; $stream_template_opts{'ProgDir'} = "$cfgdir"; $stream_template_opts{'cmdline'} = $cmdline; - + if ($stream eq "prescribed" || $stream eq "copyall") { # Currently ASSUME ONLY 1 FILE for prescribed mode my $grid_file = $defaults->get_value( "strm_grid_file", \%default_namelist_opts ); @@ -395,43 +395,43 @@ foreach my $stream ( @streams ) { my $grid_file = SetupTools::expand_xml_var($grid_file, \%xmlvars); my $data_file = SetupTools::expand_xml_var($data_file, \%xmlvars); - $stream_template_opts{'domainpath'} = dirname($grid_file); - $stream_template_opts{'domain'} = basename($grid_file); - $stream_template_opts{'filepath'} = dirname($data_file); - $stream_template_opts{'filenames'} = basename($data_file); + $stream_template_opts{'domainpath'} = dirname($grid_file); + $stream_template_opts{'domain'} = basename($grid_file); + $stream_template_opts{'filepath'} = dirname($data_file); + $stream_template_opts{'filenames'} = basename($data_file); } else { $stream_template_opts{'domainpath'} = SetupTools::expand_xml_var($defaults->get_value( "strm_domdir", \%default_namelist_opts ), \%xmlvars); $stream_template_opts{'domain'} = SetupTools::expand_xml_var($defaults->get_value( "strm_domfil", \%default_namelist_opts ), \%xmlvars); $stream_template_opts{'filepath'} = SetupTools::expand_xml_var($defaults->get_value( "strm_datdir", \%default_namelist_opts ), \%xmlvars); $stream_template_opts{'filenames'} = SetupTools::expand_xml_var($defaults->get_value( "strm_datfil", \%default_namelist_opts ), \%xmlvars); - } - + } + $stream_template_opts{'offset'} = 0; $stream_template_opts{'datvarnames'}= $defaults->get_value( "strm_datvar" , \%default_namelist_opts ); $stream_template_opts{'domvarnames'}= $defaults->get_value( "strm_domvar" , \%default_namelist_opts ); $stream_template_opts{'yearfirst'} = SetupTools::expand_xml_var($defaults->get_value( "strm_year_start", \%default_namelist_opts ), \%xmlvars); $stream_template_opts{'yearlast'} = SetupTools::expand_xml_var($defaults->get_value( "strm_year_end" , \%default_namelist_opts ), \%xmlvars); - + # Create the streams txt file for this stream (from a generic template) my $stream_template = Streams::TemplateGeneric->new( \%stream_template_opts ); $stream_template->Read( "${CASEROOT}/Buildconf/docn.template.streams.xml" ); $stream_template->Write( $outstream ); - + # Append to docn.input_data_list my @filenames = $stream_template->GetDataFilenames( 'domain'); my $i = 0; foreach my $file ( @filenames ) { - $i++; + $i++; print $fh_out "domain${i} = $file\n"; } - + my @filenames = $stream_template->GetDataFilenames( 'data'); my $i = 0; foreach my $file ( @filenames ) { $i++; print $fh_out "file${i} = $file\n"; } - + } # Stream specific namelist variables used below for $nl @@ -444,7 +444,7 @@ foreach my $stream ( @streams ) { my $beg_year = SetupTools::expand_xml_var($defaults->get_value( 'strm_year_start', \%default_namelist_opts), \%xmlvars); my $end_year = SetupTools::expand_xml_var($defaults->get_value( 'strm_year_end' , \%default_namelist_opts), \%xmlvars); my $align_year = SetupTools::expand_xml_var($defaults->get_value( 'strm_year_align', \%default_namelist_opts), \%xmlvars); - + if ( $beg_year > $end_year ) { print "\n\nbeg_year=$beg_year end_year=$end_year\n"; die "$ProgName ERROR:: beg_year greater than end_year\n"; @@ -470,7 +470,7 @@ foreach my $stream ( @streams ) { } $fh_out->close; - + #################################### # namelist group: shr_strdata_nml # #################################### @@ -603,7 +603,7 @@ sub add_default { $val = $defaults->get_value($var, \%opts); # Truncate model_version appropriately - + if ( $var eq "model_version" ) { $val =~ /(URL: https:\/\/[a-zA-Z0-9._-]+\/)([a-zA-Z0-9\/._-]+)(\/bld\/.+)/; $val = $2; @@ -612,7 +612,7 @@ sub add_default { unless ( defined($val) ) { unless ($opts{'nofail'}) { - die "$ProgName - No default value found for $var.\n" . + die "$ProgName - No default value found for $var.\n" . " Are defaults provided? \n"; } else { diff --git a/components/data_comps/docn/bld/namelist_files/namelist_defaults_docn.xml b/components/data_comps/docn/bld/namelist_files/namelist_defaults_docn.xml index b6c919502dab..f10a358e3aff 100644 --- a/components/data_comps/docn/bld/namelist_files/namelist_defaults_docn.xml +++ b/components/data_comps/docn/bld/namelist_files/namelist_defaults_docn.xml @@ -12,9 +12,9 @@ attributes to express the dependency. The recognized attributes are: grid, docn_presaero and all configuration attributes from the config_cache.xml file (with keys converted to upper-case). -strm_year_first is the first year of the stream data that will be used -strm_year_last is the last year of the stream data that will be used -strm_year_align is the model year that will be aligned with stream data for year_first +strm_year_first is the first year of the stream data that will be used +strm_year_last is the last year of the stream data that will be used +strm_year_align is the model year that will be aligned with stream data for year_first Replace any instance of the following substring indicators with the appropriate values: %y = year from the range yearfirst to yearlast @@ -31,8 +31,8 @@ Each mode below, except for presaero, has a set of streams associated with it The presaero stream, is associated with all modes Currently the following docn modes are supported - docn_mode datamode - (env_run.xml) (build-namelist) + docn_mode datamode + (env_run.xml) (build-namelist) ------------ ---------------- prescribed SSTDATA (Run with prescribed SST, ICE_COV) som SOM (Slab ocean model) @@ -62,9 +62,9 @@ Currently the following docn modes are supported - + - + @@ -136,9 +136,9 @@ Currently the following docn modes are supported - + - + @@ -153,7 +153,7 @@ Currently the following docn modes are supported gridLon lon gridLat lat - + iceCon s @@ -175,7 +175,7 @@ Currently the following docn modes are supported area area mask mask - + T t S s U u @@ -202,7 +202,7 @@ Currently the following docn modes are supported lon lon lat lat - + SST_cpl t diff --git a/components/data_comps/docn/bld/namelist_files/namelist_definition_docn.xml b/components/data_comps/docn/bld/namelist_files/namelist_definition_docn.xml index f7c1e4417bc6..5a10f2393aca 100644 --- a/components/data_comps/docn/bld/namelist_files/namelist_definition_docn.xml +++ b/components/data_comps/docn/bld/namelist_files/namelist_definition_docn.xml @@ -13,18 +13,18 @@ - valid values: SSTDATA,SOM,IAF,NULL,COPYALL General method that operates on the data. This is generally implemented in the data models but is set in the strdata method for -convenience. +convenience. datamode = "NULL" - NULL is always a valid option and means no data will be generated. + NULL is always a valid option and means no data will be generated. Turns off the data model as a provider of data to the coupler. The ice_present flag will be set to false and the coupler will assume no exchange of data to or from the data model. @@ -57,7 +57,7 @@ dataMode = "SOM" the box, the default SOM forcing file is not scientifically appropriate and is provided for testing and development purposes only. Users must create scientifically appropriate data for their particular - application. A tool is available to derive valid SOM forcing. + application. A tool is available to derive valid SOM forcing. Set by the xml variable DOCN_MODE in env_run.xml Currently, DOCN_MODE can be [prescribed,som,interannual,null] @@ -69,18 +69,18 @@ Currently, DOCN_MODE can be [prescribed,som,interannual,null] default: SSTDATA (prescribed setting for DOCN_MODE)' - spatial gridfile associated with the strdata. grid information will be read from this file and that grid will serve as the target grid -for all input data for this strdata input. +for all input data for this strdata input. - @@ -88,22 +88,22 @@ array (up to 30 elements) of fill algorithms associated with the array of streams. valid options are just copy (ie. no fill), special value, nearest neighbor, nearest neighbor in "i" direction, or nearest neighbor in "j" direction. -valid values: 'copy','none','spval','nn','nnoni','nnonj' +valid values: 'copy','none','spval','nn','nnoni','nnonj' default: "nn". -plays no role is fill algorithm at the present time. +plays no role is fill algorithm at the present time. valid values: "nomask,srcmask,dstmask,bothmask" default: "nomask" - array (up to 30 elements) of filenames associated with the array of @@ -113,18 +113,18 @@ and fillmask are ignored. default: unset - array (up to 30 elements) of filenames associated with the array of streams. specifies the weights file to generate after weights are computed on the fly for the fill operation. this allows a user to -save and reuse a set of weights later. +save and reuse a set of weights later. default="unset". - - array (up to 30 elements) of fill algorithms associated with the array of streams. valid options are copy by index, set to special value, nearest neighbor, nearest neighbor in "i" direction, nearest neighbor -in "j" direction, or bilinear. +in "j" direction, or bilinear. valid values: copy,spval,nn,nnoni,nnonj,bilinear default: bilinear - +group="shr_strdata_nml"> array (up to 30 elements) of filenames associated with the array of streams. specifies the weights file to read instead of computing weights on the fly for the mapping (interpolation) operation. if this is set, mapalgo and mapmask are ignored. default="unset". - array (up to 30 elements) of filenames associated with the array of @@ -171,13 +171,13 @@ allows a user to save and reuse a set of weights later. default="unset". - array (up to 30 elements) of time interpolation options associated with the array of -streams. +streams. valid values: lower,upper,nearest,linear,coszen lower = Use lower time-value upper = Use upper time-value @@ -187,13 +187,13 @@ valid values: lower,upper,nearest,linear,coszen default="linear". - array of time axis modes associated with the array of streams for -handling data outside the specified stream time axis. +handling data outside the specified stream time axis. valid options are to cycle the data based on the first, last, and align settings associated with the stream dataset, to extend the first and last valid value indefinitely, or to limit the interpolated data @@ -205,8 +205,8 @@ valid values: cycle,extend,limit default="cycle". - array (up to 30 elements) of delta time ratio limits placed on the @@ -221,11 +221,11 @@ maximum ratio should be about 1.1. the running value of the delta time is computed as data is read and any wraparound or cycling is also included. this input helps trap missing data or errors in cycling. to turn off trapping, set the value to 1.0e30 or something similar. -default=1.5. +default=1.5. - character array (up to 30 elements) of stream input files. this @@ -235,7 +235,7 @@ specified by the stream module. this string consists of a stream_input_filename is a stream text input file and the format and options are described elsewhere. year_align, year_first, and year_last provide information about the time axis of the file and how -to relate the input time axis to the model time axis. +to relate the input time axis to the model time axis. default="null". @@ -243,46 +243,46 @@ default="null". - Namelist filename for data model share stream data namelist - DOCN Decomposition strategy 1d = Vector decomposition root = run only on the master task - Master restart file name for docn model - Stream restart file name for docn model, needed for branch simulations If TRUE, prognostic is forced to true. -default=false +default=false diff --git a/components/data_comps/docn/cime_config/buildnml b/components/data_comps/docn/cime_config/buildnml index 084154519f69..c8cf1cad0426 100755 --- a/components/data_comps/docn/cime_config/buildnml +++ b/components/data_comps/docn/cime_config/buildnml @@ -15,7 +15,7 @@ my $RUNDIR = `./xmlquery RUNDIR -value`; my @dirs = ("${CIMEROOT}/utils/perl5lib"); unshift @INC, @dirs; require Config::SetupTools; -my $sysmod; +my $sysmod; if (! -d "$CASEROOT/Buildconf/docnconf" ) { $sysmod = "mkdir $CASEROOT/Buildconf/docnconf"; @@ -28,10 +28,10 @@ my $inst_counter = 1; while ($inst_counter <= $NINST_OCN) { # ----------------------------------------------------- - # determine instance string + # determine instance string # ----------------------------------------------------- - $inst_string = ""; + $inst_string = ""; if ($NINST_OCN > 1) { $inst_string = `printf _%04d $inst_counter`; @@ -47,9 +47,9 @@ while ($inst_counter <= $NINST_OCN) { # create docnconf/cesm_namelist # ----------------------------------------------------- - SetupTools::create_namelist_infile("$CASEROOT", - "$CASEROOT/user_nl_docn${inst_string}", - "$CASEROOT/Buildconf/docnconf/cesm_namelist"); + SetupTools::create_namelist_infile("$CASEROOT", + "$CASEROOT/user_nl_docn${inst_string}", + "$CASEROOT/Buildconf/docnconf/cesm_namelist"); # ----------------------------------------------------- # call build-namelist diff --git a/components/data_comps/docn/cime_config/config_component.xml b/components/data_comps/docn/cime_config/config_component.xml index e74379dce732..3b63537ade6e 100644 --- a/components/data_comps/docn/cime_config/config_component.xml +++ b/components/data_comps/docn/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char docn docn @@ -13,7 +13,7 @@ Name of ocn component - + char prescribed,som,copyall,interannual,null prescribed @@ -60,7 +60,7 @@ the box, the default SOM forcing file is not scientifically appropriate and is provided for testing and development purposes only. Users must create scientifically appropriate data for their particular - application. A tool is available to derive valid SOM forcing. + application. A tool is available to derive valid SOM forcing. Default is prescribed. @@ -76,7 +76,7 @@ Sets SOM forcing data filename for pres runs, only used in D and E compset - + char CAMDATA @@ -96,7 +96,7 @@ $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_48x96_clim_c050526.nc $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1.9x2.5_clim_c061031.nc - $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_c040926.nc + $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_c040926.nc $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.47x0.63_clim_c061106.nc $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.23x0.31_clim_c110526.nc $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_1x1_1850_2012_c130411.nc @@ -111,14 +111,14 @@ $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_pi_c101028.nc $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.47x0.63_clim_pi_c101028.nc $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.23x0.31_clim_pi_c101028.nc - $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_c040926.nc + $DIN_LOC_ROOT/atm/cam/sst/sst_HadOIBl_bc_0.9x1.25_clim_c040926.nc $DIN_LOC_ROOT/wav/ww3/core2_G4_ice_30min_20000601_to_05.nc run_component_docn env_run.xml Prescribed SST and ice coverage data file name. Sets SST and ice coverage data file name for DOCN prescribed runs. - + char @@ -149,9 +149,9 @@ env_run.xml Prescribed SST and ice coverage grid file name. Sets SST and ice coverage grid file name for prescribed runs. - + - + integer 1 @@ -170,9 +170,9 @@ default behavior is to assume that the data from SSTICE_YEAR_START to SSTICE_YEAR_END cyclically repeats. This behavior is controlled by the "taxmode" stream option; see the data model documentation for more details. - + - + integer 0 @@ -185,15 +185,15 @@ This is the first year of prescribed SST and ice coverage data to use. For example, if a data file has data for years 0-99, and SSTICE_YEAR_START is 10, years 0-9 in the file will not be used. - + - + value integer 0 - 2012 + 2012 2000 run_component_cam_sstice @@ -219,5 +219,5 @@ ========================================= - + diff --git a/components/data_comps/docn/cime_config/user_nl_docn b/components/data_comps/docn/cime_config/user_nl_docn index 3df0b5258a72..be007da82f03 100644 --- a/components/data_comps/docn/cime_config/user_nl_docn +++ b/components/data_comps/docn/cime_config/user_nl_docn @@ -1,15 +1,15 @@ !------------------------------------------------------------------------ ! Users should ONLY USE user_nl_docn to change namelists variables -! Users should add all user specific namelist changes below in the form of -! namelist_var = new_namelist_value -! Note that any namelist variable from shr_strdata_nml and docn_nml can -! be modified below using the above syntax +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! Note that any namelist variable from shr_strdata_nml and docn_nml can +! be modified below using the above syntax ! User preview_namelists to view (not modify) the output namelist in the ! directory $CASEROOT/CaseDocs ! To modify the contents of a stream txt file, first use preview_namelists ! to obtain the contents of the stream txt files in CaseDocs, and then -! place a copy of the modified stream txt file in $CASEROOT with the string -! user_ prepended. -! As an example, to modify docn.streams.txt.prescribed, place the modified +! place a copy of the modified stream txt file in $CASEROOT with the string +! user_ prepended. +! As an example, to modify docn.streams.txt.prescribed, place the modified ! version in $CASEROOT with the name user_docn.streams.txt.prescribed !------------------------------------------------------------------------ diff --git a/components/data_comps/docn/docn_comp_mod.F90 b/components/data_comps/docn/docn_comp_mod.F90 index 075282a9b7b3..611467478c79 100644 --- a/components/data_comps/docn/docn_comp_mod.F90 +++ b/components/data_comps/docn/docn_comp_mod.F90 @@ -55,7 +55,7 @@ module docn_comp_mod integer(IN) :: logunit ! logging unit number integer :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "lnd_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance ! (ie. "_0001" or "") character(CL) :: ocn_mode ! mode integer(IN) :: dbug = 0 ! debug level (higher is more) @@ -273,7 +273,7 @@ subroutine docn_comp_init( EClock, cdata, x2o, o2x, NLFilename ) call shr_mpi_bcast(restfilm,mpicom,'restfilm') call shr_mpi_bcast(restfils,mpicom,'restfils') call shr_mpi_bcast(force_prognostic_true,mpicom,'force_prognostic_true') - + rest_file = trim(restfilm) rest_file_strm = trim(restfils) if (force_prognostic_true) then @@ -320,7 +320,7 @@ subroutine docn_comp_init( EClock, cdata, x2o, o2x, NLFilename ) ocn_present = .true. call seq_timemgr_EClockGetData( EClock, calendar=calendar ) iosystem => shr_pio_getiosys(trim(inst_name)) - + call shr_strdata_pioinit(SDOCN, iosystem, shr_pio_getiotype(trim(inst_name))) if (scmmode) then @@ -555,7 +555,7 @@ subroutine docn_comp_run( EClock, cdata, x2o, o2x) type(seq_infodata_type), pointer :: infodata real(R8), parameter :: swp = 0.67_R8*(exp((-1._R8*shr_const_zsrflyr) & - /1.0_R8)) + 0.33_R8*exp((-1._R8*shr_const_zsrflyr)/17.0_R8) + /1.0_R8)) + 0.33_R8*exp((-1._R8*shr_const_zsrflyr)/17.0_R8) character(*), parameter :: F00 = "('(docn_comp_run) ',8a)" character(*), parameter :: F04 = "('(docn_comp_run) ',2a,2i8,'s')" character(*), parameter :: subName = "(docn_comp_run) " @@ -643,7 +643,7 @@ subroutine docn_comp_run( EClock, cdata, x2o, o2x) select case (trim(ocn_mode)) - case('COPYALL') + case('COPYALL') ! do nothing extra case('SSTDATA') @@ -692,7 +692,7 @@ subroutine docn_comp_run( EClock, cdata, x2o, o2x) hn = avstrm%rAttr(kh,n) !--- compute new temp --- o2x%rAttr(kt,n) = somtp(n) + & - (x2o%rAttr(kswnet,n) + & ! shortwave + (x2o%rAttr(kswnet,n) + & ! shortwave x2o%rAttr(klwup ,n) + & ! longwave x2o%rAttr(klwdn ,n) + & ! longwave x2o%rAttr(ksen ,n) + & ! sensible @@ -754,7 +754,7 @@ subroutine docn_comp_run( EClock, cdata, x2o, o2x) call shr_sys_flush(logunit) end if firstcall = .false. - + call shr_file_setLogUnit (shrlogunit) call shr_file_setLogLevel(shrloglev) call shr_sys_flush(logunit) @@ -793,11 +793,11 @@ subroutine docn_comp_final() call t_startf('DOCN_FINAL') if (my_task == master_task) then - write(logunit,F91) + write(logunit,F91) write(logunit,F00) trim(myModelName),': end of main integration loop' - write(logunit,F91) + write(logunit,F91) end if - + call t_stopf('DOCN_FINAL') end subroutine docn_comp_final diff --git a/components/data_comps/docn/ocn_comp_esmf.F90 b/components/data_comps/docn/ocn_comp_esmf.F90 index 7ad1f88778ad..2896980063a1 100644 --- a/components/data_comps/docn/ocn_comp_esmf.F90 +++ b/components/data_comps/docn/ocn_comp_esmf.F90 @@ -38,7 +38,7 @@ module ocn_comp_esmf ! ! Author: Fei Liu - ! This module is ESMF compliant ocn data component + ! This module is ESMF compliant ocn data component !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ contains !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -238,7 +238,7 @@ subroutine ocn_final_esmf(comp, import_state, export_state, EClock, rc) integer, intent(out) :: rc !---------------------------------------------------------------------------- - ! Finalize routine + ! Finalize routine !---------------------------------------------------------------------------- rc = ESMF_SUCCESS diff --git a/components/data_comps/docn/ocn_comp_mct.F90 b/components/data_comps/docn/ocn_comp_mct.F90 index b4b024159c2c..1f9e6ee85d16 100644 --- a/components/data_comps/docn/ocn_comp_mct.F90 +++ b/components/data_comps/docn/ocn_comp_mct.F90 @@ -106,7 +106,7 @@ end subroutine ocn_run_mct ! finalize method for dead ocn model ! ! !REVISION HISTORY: - ! + ! ! !INTERFACE: ------------------------------------------------------------------ ! subroutine ocn_final_mct(EClock, cdata, x2d, d2x) diff --git a/components/data_comps/docn/tools/pop_som_frc/README b/components/data_comps/docn/tools/pop_som_frc/README index 4091e7a26d48..e059ced0954e 100644 --- a/components/data_comps/docn/tools/pop_som_frc/README +++ b/components/data_comps/docn/tools/pop_som_frc/README @@ -12,7 +12,7 @@ pop_frc*.ncl Step 1: First, one needs to edit the 'pop_frc.csh' script to select a particular case -name from which to make a monthly-mean annual climatology. +name from which to make a monthly-mean annual climatology. 1. Change CASE to the case name you are interested in. 2. Set BEGYR and ENDYR to the appropriate years for your climatology. @@ -32,8 +32,8 @@ on gale, gust, breeze, etc. Step 2: -Once the two climatogical files have been created, you can run one of -the NCL scripts, 'pop_frc*.ncl'. You will need to edit the script and +Once the two climatogical files have been created, you can run one of +the NCL scripts, 'pop_frc*.ncl'. You will need to edit the script and point to the POP and coupler (popmac and cplmac) climatological files. pop_frc_mlt.ncl* -> uses mixed-layer temperature to derive the Q-flux diff --git a/components/data_comps/docn/tools/pop_som_frc/SOM.doc b/components/data_comps/docn/tools/pop_som_frc/SOM.doc index b190296448583d6a26d02bb163859dbd14e4f267..08c6f02578f54eace390b247c7d675b8f64eb3bc 100644 GIT binary patch delta 19 bcmZoT!1QlF(*{qA&0ZE6VVgJi`3eF6S^5Zg delta 23 fcmeyjpQ+&h(*{oqMup9u78zlTyqh=n`3eF6auW!o diff --git a/components/data_comps/docn/tools/pop_som_frc/SOM.pdf b/components/data_comps/docn/tools/pop_som_frc/SOM.pdf index 92d15e00483dd84b55dab702150f8486cdf8584a..3e29dd298c44470bb14a5571f659c1f3bc3e569e 100644 GIT binary patch delta 1050 zcmZXTze)r#5XM=A1MNh?_U;8FlT4DCN^AuS>%-z+K=2X7!oteN_~$@<0KsFCg)0Po z10TUhxXRY-tx5LgwpzZOU*?-Hv%mAfY(98<8rRR`(V+gC?4Q<)kG<<=^Qd~=Xqw~d z$~Fg=)%z}QsrZ0GaC+Fjs^QsEQpz|>LLxStqyTr-PKUR(M%Eg?b|O*_zbLq61CY+` zx@!bhtC9ncCQ0EtT#OzU$<{da&%+Go_ zf{{2vaoWx9&`?e@RFB!bL%)tQ!GnY*YCj}=JlS)%{wWORAn?%Hr;|MQ3oZ~_X zoUIZPL;N*TRag`}`t%}s2G$}DM(8c=;WW?AXyhd`qRu&W^Tg%CY$)7hJnp=8tF^5} Q`IeS=l&EY+_?cF>f7X`ZVgLXD delta 1277 zcmZvbJx;?w5QViu1VKavh}K*Hc6MiHXRd(62_lMIfGfD5prE3`K#+0*Bp^bOQXo!5 zOUr~K* zxSOQ!a_v42kE%Vd7kC5;)$-9-S5@O4+(Eti2w=p3Al_&M8Kc!Or_|TLM`7DUwNPltpaY+^FxtOnqJjc)?wU04xDG96 z>i72oIoV!fV{TC&?uoF!XmNl=Q- z0Qxm(2(c@%+K+0*Jf!njM-pPN^VEcSLqP!xD2o(!R;_Rqdqr-x z&z{J-nOQ(V_MN6;w9qte?R+$MlMb5VDgINnsLSXXSf|N$Z~+Mxq@X6-Ty0_JsRd)< lDp9(YxLO=-viia{*5jGTdhdy = (/dhdy/) fout->hblt = (/hblt/) fout->qdp = (/qdp/) - + end diff --git a/components/data_comps/docn/tools/pop_som_frc/pop_frc_mlt.ncl b/components/data_comps/docn/tools/pop_som_frc/pop_frc_mlt.ncl index 4acb1b3dfbec..8ca0896f0ce0 100644 --- a/components/data_comps/docn/tools/pop_som_frc/pop_frc_mlt.ncl +++ b/components/data_comps/docn/tools/pop_som_frc/pop_frc_mlt.ncl @@ -6,9 +6,9 @@ ; quantities over the mixed-layer including temperature, salinity, and ; the ocean currents. -load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_code.ncl" -load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_csm.ncl" -load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/contributed.ncl" +load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_code.ncl" +load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_csm.ncl" +load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/contributed.ncl" case = "b40.1850.track1.2deg.003" @@ -223,46 +223,46 @@ begin time@units = "days since 0001-01-01 00:00:00" time@long_name = "observation time" time@calendar = "noleap" - + area@units = "area" area@long_name = "area of grid cell in radians squared" - + maskr@long_name = "domain maskr" maskr@units = "unitless" xc@long_name = "longitude of grid cell center" xc@units = "degrees east" - + yc@long_name = "latitude of grid cell center" yc@units = "degrees north" - + S@long_name = "salinity" S@units = "ppt" - + T@long_name = "temperature" T@units = "degC" - + U@long_name = "u ocean current" U@units = "m/s" - + V@long_name = "v ocean current" V@units = "m/s" - + dhdx@long_name = "ocean surface slope: zonal" dhdx@units = "m/m" - + dhdy@long_name = "ocean surface slope: meridional" dhdy@units = "m/m" - + hblt@long_name = "boundary layer depth" hblt@units = "m" - + qdp@long_name = "ocean heat flux convergence" qdp@units = "W/m^2" - + fout = addfile("oceanmixed_ice.nc","c") setfileoption(fout,"DefineMode",True) - + fileAtt = True fileAtt@title = "Monthly averaged ocean forcing from POP output" fileAtt@conventions = "CCSM data model domain description" @@ -276,12 +276,12 @@ begin fileAtt@comment = "This data is on the displaced pole grid gx1v5" fileAtt@creation_date = systemfunc("date") fileattdef(fout,fileAtt) - + dimNames = (/"time","nj","ni"/) dimSizes = (/ntime,nlat,nlon/) dimUnlim = (/False,False,False/) filedimdef(fout,dimNames,dimSizes,dimUnlim) - + filevardef(fout,"area",typeof(area),(/"nj","ni"/)) filevarattdef(fout,"area",area) filevardef(fout,"mask",typeof(maskr),(/"nj","ni"/)) @@ -324,5 +324,5 @@ begin fout->dhdy = (/dhdy/) fout->hblt = (/hblt/) fout->qdp = (/qdp/) - + end diff --git a/components/data_comps/docn/tools/pop_som_frc/pop_interp.ncl b/components/data_comps/docn/tools/pop_som_frc/pop_interp.ncl index e649137a4e18..1e3e1fd759c6 100644 --- a/components/data_comps/docn/tools/pop_som_frc/pop_interp.ncl +++ b/components/data_comps/docn/tools/pop_som_frc/pop_interp.ncl @@ -1,7 +1,7 @@ -load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_code.ncl" -load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_csm.ncl" -load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/contributed.ncl" +load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_code.ncl" +load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/gsn_csm.ncl" +load "$NCARG_ROOT/lib/ncarg/nclscripts/csm/contributed.ncl" begin @@ -128,46 +128,46 @@ begin time@units = "days since 0001-01-01 00:00:00" time@long_name = "observation time" time@calendar = "noleap" - + area@units = "area" area@long_name = "area of grid cell in radians squared" - + maskr@long_name = "domain maskr" maskr@units = "unitless" xc@long_name = "longitude of grid cell center" xc@units = "degrees east" - + yc@long_name = "latitude of grid cell center" yc@units = "degrees north" - + S@long_name = "salinity" S@units = "ppt" - + T@long_name = "temperature" T@units = "degC" - + U@long_name = "u ocean current" U@units = "m/s" - + V@long_name = "v ocean current" V@units = "m/s" - + dhdx@long_name = "ocean surface slope: zonal" dhdx@units = "m/m" - + dhdy@long_name = "ocean surface slope: meridional" dhdy@units = "m/m" - + hblt@long_name = "boundary layer depth" hblt@units = "m" - + qdp@long_name = "ocean heat flux convergence" qdp@units = "W/m^2" - + fout = addfile("oceanmixed_ice.nc","c") setfileoption(fout,"DefineMode",True) - + fileAtt = True fileAtt@title = "Monthly averaged ocean forcing from POP output" fileAtt@conventions = "CCSM2.0 data model domain description" @@ -181,12 +181,12 @@ begin fileAtt@comment = "This data is on the displaced pole grid gx1v3" fileAtt@creation_date = systemfunc("date") fileattdef(fout,fileAtt) - + dimNames = (/"time","nj","ni"/) dimSizes = (/ntime,nj,ni/) dimUnlim = (/False,False,False/) filedimdef(fout,dimNames,dimSizes,dimUnlim) - + filevardef(fout,"area",typeof(area),(/"nj","ni"/)) filevarattdef(fout,"area",area) filevardef(fout,"mask",typeof(maskr),(/"nj","ni"/)) @@ -229,5 +229,5 @@ begin fout->dhdy = (/dhdy/) fout->hblt = (/hblt/) fout->qdp = (/qdp/) - + end diff --git a/components/data_comps/docn/tools/pop_som_frc/read_from_mss.csh b/components/data_comps/docn/tools/pop_som_frc/read_from_mss.csh index ea3fa47e0984..287798a71e6e 100755 --- a/components/data_comps/docn/tools/pop_som_frc/read_from_mss.csh +++ b/components/data_comps/docn/tools/pop_som_frc/read_from_mss.csh @@ -6,7 +6,7 @@ set echo on # get the monthly files from Mass Storage System if needed #***************************************************************** -# This file reads in files from MSS +# This file reads in files from MSS # $DATE_FORMAT form of date in history file name (eg. yyyy-mm), input # $read_dir case name of file to read , input # $BEG_READ first year of data to read , input @@ -29,7 +29,7 @@ set read_dir = $2 if ( $read_dir == b20.003 ) then set msspwd = '-rpwd ccsm1330' else - set msspwd = ' ' + set msspwd = ' ' endif echo GETTING MONTHLY FILES FROM THE MSS diff --git a/components/data_comps/docn/tools/pop_som_frc/read_from_mss_month.csh b/components/data_comps/docn/tools/pop_som_frc/read_from_mss_month.csh index a4de376140ec..592321f0f914 100755 --- a/components/data_comps/docn/tools/pop_som_frc/read_from_mss_month.csh +++ b/components/data_comps/docn/tools/pop_som_frc/read_from_mss_month.csh @@ -5,7 +5,7 @@ # get the monthly files from Mass Storage System if needed #***************************************************************** -# This file reads in files from MSS +# This file reads in files from MSS # $DATE_FORMAT form of date in history file name (eg. yyyy-mm), input # $read_dir case name of file to read , input # $BEG_READ first year of data to read , input @@ -29,7 +29,7 @@ set month = $5 if ( $read_dir == b20.003 ) then set msspwd = '-rpwd ccsm1330' else - set msspwd = ' ' + set msspwd = ' ' endif echo GETTING MONTHLY FILES FROM THE MSS diff --git a/components/data_comps/drof/bld/build-namelist b/components/data_comps/drof/bld/build-namelist index 9526e48c0f86..b140d9492ffc 100755 --- a/components/data_comps/drof/bld/build-namelist +++ b/components/data_comps/drof/bld/build-namelist @@ -22,22 +22,22 @@ sub usage { SYNOPSIS build-namelist [options] - Build the drof namelist + Build the drof namelist OPTIONS - -help [or -h] Print usage to STDOUT. - -infile "filepath" Specify a file or list of files (comma delimited) - containing namelists to read values from. - -namelist "namelist" Specify namelist settings directly on the commandline by - supplying a string containing FORTRAN namelist syntax, e.g., - -namelist "&drof_exp taxmode='extend'/" - -print "level" Print level for debugging: - 0 = silent - 1 = regular - 2 = verbose + -help [or -h] Print usage to STDOUT. + -infile "filepath" Specify a file or list of files (comma delimited) + containing namelists to read values from. + -namelist "namelist" Specify namelist settings directly on the commandline by + supplying a string containing FORTRAN namelist syntax, e.g., + -namelist "&drof_exp taxmode='extend'/" + -print "level" Print level for debugging: + 0 = silent + 1 = regular + 2 = verbose -caseroot CASEROOT directory variable -cimeroot CIMEROOT directory variable -inst_string INST_STRING variable - -user_xml_dir "directory" Directory of where to look for user versions of + -user_xml_dir "directory" Directory of where to look for user versions of namelist XML files (usually your SourceMods/src.drof directory) (such as namelist_definition_drof.xml, or namelist_defaults_drof.xml) @@ -64,7 +64,7 @@ my $cmdline = "@ARGV"; # Command line arguments to script my $cwd = getcwd(); # current working directory my $cfgdir; # absolute pathname of directory that contains this script my $nm = "ProgName::"; # name to use if script dies -if ($ProgDir) { +if ($ProgDir) { $cfgdir = abs_path($ProgDir); } else { $cfgdir = $cwd; @@ -90,7 +90,7 @@ GetOptions( "print=i" => \$opts{'print'}, "caseroot=s" => \$opts{'caseroot'}, "cimeroot=s" => \$opts{'cimeroot'}, - "inst_string=s" => \$opts{'inst_string'}, + "inst_string=s" => \$opts{'inst_string'}, "user_xml_dir=s" => \$opts{'user_xml_dir'}, ) or usage(); @@ -121,9 +121,9 @@ EOF } } -my $CASEROOT = $opts{'caseroot'}; -my $CIMEROOT = $opts{'cimeroot'}; -my $INST_STRING = $opts{'inst_string'}; +my $CASEROOT = $opts{'caseroot'}; +my $CIMEROOT = $opts{'cimeroot'}; +my $INST_STRING = $opts{'inst_string'}; if ($print>=2) { print "Setting drof configuration script directory to $cfgdir$eol"; } @@ -155,20 +155,20 @@ my $perl5lib = "$cimeroot/utils/perl5lib"; # The XML::Lite module is required to parse the XML files. (-f "$perl5lib/XML/Lite.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"XML/Lite.pm\" in directory +** $ProgName - Cannot find perl module \"XML/Lite.pm\" in directory \"$perl5lib\" ** EOF # The Build::Config module provides utilities to access the configuration information # in the config_cache.xml file (-f "$perl5lib/Build/Config.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/Config.pm\" in directory +** $ProgName - Cannot find perl module \"Build/Config.pm\" in directory \"$perl5lib\" ** EOF # The namelist definition file contains entries for all namelist variables that # can be output by build-namelist. The version of the file that is associate with a -# fixed drof tag is $cfgdir/namelist_files/namelist_definition_drof.xml. +# fixed drof tag is $cfgdir/namelist_files/namelist_definition_drof.xml. my $nl_definition_file = "${cfgdir}/namelist_files/namelist_definition_drof.xml"; # If user has user namelist definition files @@ -189,10 +189,10 @@ if ($print>=2) { print "Using namelist definition file $nl_definition_file$eol"; # The Build::NamelistDefinition module provides utilities to validate that the output # namelists are consistent with the namelist definition file (-f "$perl5lib/Build/NamelistDefinition.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/NamelistDefinition.pm\" in directory +** $ProgName - Cannot find perl module \"Build/NamelistDefinition.pm\" in directory \"$perl5lib\" ** EOF - + # The namelist defaults file contains default values for most namelist variables # can be output by build-namelist. The version of the file that is associated with a # fixed drof tag is $cfgdir/namelist_files/namelist_defaults_drof.xml. @@ -216,14 +216,14 @@ if ($print>=2) { print "Using namelist defaults file $nl_defaults_file$eol"; } # The Build::NamelistDefaults module provides a utility to obtain default values of namelist # variables based on finding a best fit with the attributes specified in the defaults file. (-f "$perl5lib/Build/NamelistDefaults.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/NamelistDefaults.pm\" in directory +** $ProgName - Cannot find perl module \"Build/NamelistDefaults.pm\" in directory \"$perl5lib\" ** EOF # The Build::Namelist module provides utilities to parse input namelists, to query and modify # namelists, and to write output namelists. (-f "$perl5lib/Build/Namelist.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/Namelist.pm\" in directory +** $ProgName - Cannot find perl module \"Build/Namelist.pm\" in directory \"$perl5lib\" ** EOF @@ -240,7 +240,7 @@ require Streams::TemplateGeneric; require Config::SetupTools; #----------------------------------------------------------------------------------------------- -# Create a configuration object from the DROF config_cache.xml file. +# Create a configuration object from the DROF config_cache.xml file. my $cfg = Build::Config->new($config_cache); # Validate some of the commandline option values. @@ -314,8 +314,8 @@ foreach my $attr (keys %xmlvars) { } my $RUN_TYPE = $xmlvars{'RUN_TYPE'}; -my $DIN_LOC_ROOT = $xmlvars{'DIN_LOC_ROOT'}; -my $ROF_GRID = $xmlvars{'ROF_GRID'}; +my $DIN_LOC_ROOT = $xmlvars{'DIN_LOC_ROOT'}; +my $ROF_GRID = $xmlvars{'ROF_GRID'}; my $DROF_MODE = $xmlvars{'DROF_MODE'}; if ($ROF_GRID eq "null") { @@ -338,7 +338,7 @@ $fh_out->open(">>$CASEROOT/Buildconf/drof.input_data_list") or # Create hash needed to parse namelist_defaults_drof.xml file my %default_namelist_opts; -$default_namelist_opts{'drof_mode'} = $DROF_MODE; +$default_namelist_opts{'drof_mode'} = $DROF_MODE; $default_namelist_opts{'rof_grid'} = $ROF_GRID; # Create streams template file(s) - loop over streams @@ -357,7 +357,7 @@ foreach my $stream ( @streams ) { # Set stream specific part of default_namelist_opts hash $default_namelist_opts{'stream'} = $stream; - + my $outstream = "drof.streams.txt" . ".$stream" . "$INST_STRING"; if ($print>=1) { print " drof stream is $stream$INST_STRING \n";} @@ -365,7 +365,7 @@ foreach my $stream ( @streams ) { # do nothing - } elsif (-e "$CASEROOT/user_$outstream") { + } elsif (-e "$CASEROOT/user_$outstream") { my $command = "cp -p $CASEROOT/user_$outstream $CASEROOT/Buildconf/drofconf/$outstream"; system($command) == 0 or die "system $command failed: $? \n"; @@ -383,7 +383,7 @@ foreach my $stream ( @streams ) { $stream_template_opts{'ProgName'} = $ProgName; $stream_template_opts{'ProgDir'} = "$cfgdir"; $stream_template_opts{'cmdline'} = $cmdline; - + $stream_template_opts{'offset'} = 0; $stream_template_opts{'filepath'} = $defaults->get_value( "strm_datdir" , \%default_namelist_opts ); $stream_template_opts{'filenames'} = $defaults->get_value( "strm_datfil" , \%default_namelist_opts ); @@ -393,28 +393,28 @@ foreach my $stream ( @streams ) { $stream_template_opts{'domvarnames'}= $defaults->get_value( "strm_domvar" , \%default_namelist_opts ); $stream_template_opts{'yearfirst'} = $defaults->get_value( "strm_year_start", \%default_namelist_opts ); $stream_template_opts{'yearlast'} = $defaults->get_value( "strm_year_end" , \%default_namelist_opts ); - + $stream_template_opts{'filepath'} = SetupTools::expand_xml_var($stream_template_opts{'filepath'} , \%xmlvars); $stream_template_opts{'filenames'} = SetupTools::expand_xml_var($stream_template_opts{'filenames'} , \%xmlvars); $stream_template_opts{'domainpath'} = SetupTools::expand_xml_var($stream_template_opts{'domainpath'}, \%xmlvars); $stream_template_opts{'domain'} = SetupTools::expand_xml_var($stream_template_opts{'domain'} , \%xmlvars); $stream_template_opts{'yearfirst'} = SetupTools::expand_xml_var($stream_template_opts{'yearfirst'} , \%xmlvars); $stream_template_opts{'yearlast'} = SetupTools::expand_xml_var($stream_template_opts{'yearlast'} , \%xmlvars); - + # Create the streams txt file for this stream (from a generic template) # QL, 150527,typos fixed, dice->drof my $stream_template = Streams::TemplateGeneric->new( \%stream_template_opts ); $stream_template->Read( "${CASEROOT}/Buildconf/drof.template.streams.xml" ); $stream_template->Write( $outstream ); - + # Append to drof.input_data_list my @filenames = $stream_template->GetDataFilenames( 'domain'); my $i = 0; foreach my $file ( @filenames ) { - $i++; + $i++; print $fh_out "domain${i} = $file\n"; } - + my @filenames = $stream_template->GetDataFilenames( 'data'); my $i = 0; foreach my $file ( @filenames ) { @@ -465,13 +465,13 @@ foreach my $stream ( @streams ) { } $fh_out->close; - + #################################### # namelist group: shr_strdata_nml # #################################### my $datamode = $defaults->get_value( "datamode", \%default_namelist_opts ); -add_default($nl, 'datamode', 'val' => "$datamode"); +add_default($nl, 'datamode', 'val' => "$datamode"); if ($datamode ne 'NULL') { add_default($nl, 'streams', 'val' => "$ostreams" ); add_default($nl, 'mapalgo', 'val' => "$omapalgo" ); @@ -600,7 +600,7 @@ sub add_default { $val = $defaults->get_value($var, \%opts); # Truncate model_version appropriately - + if ( $var eq "model_version" ) { $val =~ /(URL: https:\/\/[a-zA-Z0-9._-]+\/)([a-zA-Z0-9\/._-]+)(\/bld\/.+)/; $val = $2; @@ -609,7 +609,7 @@ sub add_default { unless ( defined($val) ) { unless ($opts{'nofail'}) { - die "$ProgName - No default value found for $var.\n" . + die "$ProgName - No default value found for $var.\n" . " Are defaults provided? \n"; } else { diff --git a/components/data_comps/drof/bld/namelist_files/namelist_defaults_drof.xml b/components/data_comps/drof/bld/namelist_files/namelist_defaults_drof.xml index 39b5422f2929..ce50d372ae26 100644 --- a/components/data_comps/drof/bld/namelist_files/namelist_defaults_drof.xml +++ b/components/data_comps/drof/bld/namelist_files/namelist_defaults_drof.xml @@ -11,23 +11,23 @@ variables. Values that depend on the model configuration use attributes to express the dependency. The recognized attributes are: grid.attributes from the config_cache.xml file (with keys converted to upper-case). -strm_year_first is the first year of the stream data that will be used -strm_year_last is the last year of the stream data that will be used -strm_year_align is the model year that will be aligned with stream data for year_first +strm_year_first is the first year of the stream data that will be used +strm_year_last is the last year of the stream data that will be used +strm_year_align is the model year that will be aligned with stream data for year_first For cplhist forcing - the following substitutions will be made belwo Replace any instance of the following substring indicators with the appropriate values: %y => year from the range yearfirst to yearlast - using in build-namelist $namelist_defaults_opts{'yearfirst'} - using in build-namelist $namelist_defaults_opts{'yearlast'} + using in build-namelist $namelist_defaults_opts{'yearfirst'} + using in build-namelist $namelist_defaults_opts{'yearlast'} obtained from values of -> below %ym => year-month from the range yearfirst to yearlast with all 12 months - using in build-namelist $namelist_defaults_opts{'yearfirst'} - using in build-namelist $namelist_defaults_opts{'yearlast'} + using in build-namelist $namelist_defaults_opts{'yearfirst'} + using in build-namelist $namelist_defaults_opts{'yearlast'} obtained from values of -> below %ymd => year-month-day from the range yearfirst to yearlast with all 12 months - using in build-namelist $namelist_defaults_opts{'yearfirst'} - using in build-namelist $namelist_defaults_opts{'yearlast'} + using in build-namelist $namelist_defaults_opts{'yearfirst'} + using in build-namelist $namelist_defaults_opts{'yearlast'} obtained from values of -> below Replace any instance of $VARNAME with the environment variable obtained from any diff --git a/components/data_comps/drof/bld/namelist_files/namelist_definition_drof.xml b/components/data_comps/drof/bld/namelist_files/namelist_definition_drof.xml index 90e84ea5142b..f8ec980d26c3 100644 --- a/components/data_comps/drof/bld/namelist_files/namelist_definition_drof.xml +++ b/components/data_comps/drof/bld/namelist_files/namelist_definition_drof.xml @@ -12,19 +12,19 @@ - valid values: NULL,CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1 -The runoff data is associated with the runoff model -and is normally on a different grid than the land data. -In the data model, the land and snow modes are treated completely +The runoff data is associated with the runoff model +and is normally on a different grid than the land data. +In the data model, the land and snow modes are treated completely independently as if there were two models. datamode = "NULL" - NULL is always a valid option and means no data will be generated. + NULL is always a valid option and means no data will be generated. Turns off the data model as a provider of data to the coupler. The ice_present flag will be set to false and the coupler will assume no exchange of data to or from the data model. @@ -32,29 +32,29 @@ dataMode = "COPYALL" Copies all fields directly from the input data streams Any required fields not found on an input stream will be set to zero. datamode = "CPLHIST" - Reads in data from coupler history files generated by a previous run + Reads in data from coupler history files generated by a previous run datamode = DIATREN_ANN_RX1,DIATREN_IAF_RX1 Reads in annual and intra-annual forcing runoff data used for CORE2 forcing runs Only valid for rof mode Set by the following xml variables in env_run.xml -DROF_MODE +DROF_MODE specifies values for rof mode: CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,NULL default value: DIATREN_ANN_RX1 - spatial gridfile associated with the strdata. grid information will be read from this file and that grid will serve as the target grid -for all input data for this strdata input. +for all input data for this strdata input. - @@ -62,22 +62,22 @@ array (up to 30 elements) of fill algorithms associated with the array of streams. valid options are just copy (ie. no fill), special value, nearest neighbor, nearest neighbor in "i" direction, or nearest neighbor in "j" direction. -valid values: 'copy','spval','nn','nnoni','nnonj' +valid values: 'copy','spval','nn','nnoni','nnonj' default: "nn". -plays no role is fill algorithm at the present time. +plays no role is fill algorithm at the present time. valid values: "nomask,srcmask,dstmask,bothmask" default: "nomask" - array (up to 30 elements) of filenames associated with the array of @@ -87,18 +87,18 @@ and fillmask are ignored. default: unset - array (up to 30 elements) of filenames associated with the array of streams. specifies the weights file to generate after weights are computed on the fly for the fill operation. this allows a user to -save and reuse a set of weights later. +save and reuse a set of weights later. default="unset". - - array (up to 30 elements) of fill algorithms associated with the array of streams. valid options are copy by index, set to special value, nearest neighbor, nearest neighbor in "i" direction, nearest neighbor -in "j" direction, or bilinear. +in "j" direction, or bilinear. valid values: copy,spval,nn,nnoni,nnonj,bilinear default: bilinear - +group="shr_strdata_nml"> array (up to 30 elements) of filenames associated with the array of streams. specifies the weights file to read instead of computing weights on the fly for the mapping (interpolation) operation. if this is set, mapalgo and mapmask are ignored. default="unset". - array (up to 30 elements) of filenames associated with the array of @@ -145,13 +145,13 @@ allows a user to save and reuse a set of weights later. default="unset". - array (up to 30 elements) of time interpolation options associated with the array of -streams. +streams. valid values: lower,upper,nearest,linear,coszen lower = Use lower time-value upper = Use upper time-value @@ -161,13 +161,13 @@ valid values: lower,upper,nearest,linear,coszen default="linear". - array of time axis modes associated with the array of streams for -handling data outside the specified stream time axis. +handling data outside the specified stream time axis. valid options are to cycle the data based on the first, last, and align settings associated with the stream dataset, to extend the first and last valid value indefinitely, or to limit the interpolated data @@ -179,8 +179,8 @@ valid values: cycle,extend,limit default="cycle". - array (up to 30 elements) of delta time ratio limits placed on the @@ -195,11 +195,11 @@ maximum ratio should be about 1.1. the running value of the delta time is computed as data is read and any wraparound or cycling is also included. this input helps trap missing data or errors in cycling. to turn off trapping, set the value to 1.0e30 or something similar. -default=1.5. +default=1.5. - character array (up to 30 elements) of stream input files. this @@ -209,7 +209,7 @@ specified by the stream module. this string consists of a stream_input_filename is a stream text input file and the format and options are described elsewhere. year_align, year_first, and year_last provide information about the time axis of the file and how -to relate the input time axis to the model time axis. +to relate the input time axis to the model time axis. default="null". @@ -217,54 +217,54 @@ default="null". - Namelist filename for data model rof share stream data namelist - Namelist filename for data model rof share stream data namelist - DROF Decomposition strategy 1d = Vector decomposition root = run only on the master task - Master restart file name for drof model - Stream restart file name for drof model, needed for branch simulations If TRUE, prognostic is forced to true. -default=false +default=false diff --git a/components/data_comps/drof/cime_config/buildnml b/components/data_comps/drof/cime_config/buildnml index 2a569718bd22..1eafd115cf8f 100755 --- a/components/data_comps/drof/cime_config/buildnml +++ b/components/data_comps/drof/cime_config/buildnml @@ -15,7 +15,7 @@ my $RUNDIR = `./xmlquery RUNDIR -value`; my @dirs = ("${CIMEROOT}/utils/perl5lib"); unshift @INC, @dirs; require Config::SetupTools; -my $sysmod; +my $sysmod; # Verify rof grid is supported my $check_grid = "fail"; @@ -38,10 +38,10 @@ my $inst_counter = 1; while ($inst_counter <= $NINST_ROF) { # ----------------------------------------------------- - # determine instance string + # determine instance string # ----------------------------------------------------- - $inst_string = ""; + $inst_string = ""; if ($NINST_ROF > 1) { $inst_string = `printf _%04d $inst_counter`; @@ -57,9 +57,9 @@ while ($inst_counter <= $NINST_ROF) { # create drofconf/cesm_namelist # ----------------------------------------------------- - SetupTools::create_namelist_infile("$CASEROOT", - "$CASEROOT/user_nl_drof${inst_string}", - "$CASEROOT/Buildconf/drofconf/cesm_namelist"); + SetupTools::create_namelist_infile("$CASEROOT", + "$CASEROOT/user_nl_drof${inst_string}", + "$CASEROOT/Buildconf/drofconf/cesm_namelist"); # ----------------------------------------------------- # call build-namelist @@ -71,7 +71,7 @@ while ($inst_counter <= $NINST_ROF) { $sysmod = "$sysmod -cimeroot $CIMEROOT"; $sysmod = "$sysmod -inst_string \"$inst_string\""; $sysmod = "$sysmod -user_xml_dir \"$CASEROOT/SourceMods/src.drof\""; - + system($sysmod) == 0 or die "ERROR drof.buildnml: $sysmod failed: $?\n"; if (-d ${RUNDIR}) { @@ -82,7 +82,7 @@ while ($inst_counter <= $NINST_ROF) { system($sysmod) == 0 or die "ERROR drof.buildnml: $sysmod failed: $?\n"; $sysmod = "cp $CASEROOT/Buildconf/drofconf/*txt* ${RUNDIR}/ >& /dev/null"; - system($sysmod) == 0; + system($sysmod) == 0; } # ----------------------------------------------------- diff --git a/components/data_comps/drof/cime_config/config_component.xml b/components/data_comps/drof/cime_config/config_component.xml index 479e242d4283..373af732a213 100644 --- a/components/data_comps/drof/cime_config/config_component.xml +++ b/components/data_comps/drof/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char drof drof @@ -13,14 +13,14 @@ Name of rof component - + char CPLHIST,DIATREN_ANN_RX1,DIATREN_IAF_RX1,NULL DIATREN_ANN_RX1 NULL DIATREN_ANN_RX1 - DIATREN_IAF_RX1 + DIATREN_IAF_RX1 NULL run_component_drof @@ -35,7 +35,7 @@ default is DIATREN_ANN_RX1. - + char UNSET @@ -44,7 +44,7 @@ directory for coupler history data mode (only used for CPLHIST mode) - + char UNSET @@ -53,7 +53,7 @@ case name for coupler history data mode (only used for CPLHIST mode) - + integer 1 @@ -62,7 +62,7 @@ year align (only used for CPLHIST mode) - + integer 1 @@ -71,7 +71,7 @@ starting year to loop data over (only used for CPLHIST mode) - + integer 1 @@ -92,4 +92,4 @@ ========================================= - + diff --git a/components/data_comps/drof/cime_config/user_nl_drof b/components/data_comps/drof/cime_config/user_nl_drof index 956f882ee360..ffb71d1124ad 100644 --- a/components/data_comps/drof/cime_config/user_nl_drof +++ b/components/data_comps/drof/cime_config/user_nl_drof @@ -1,13 +1,13 @@ !------------------------------------------------------------------------ ! Users should ONLY USE user_nl_drof to change namelists variables -! Users should add all user specific namelist changes below in the form of -! namelist_var = new_namelist_value -! Note that any namelist variable from shr_strdata_nml and drof_nml can -! be modified below using the above syntax +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! Note that any namelist variable from shr_strdata_nml and drof_nml can +! be modified below using the above syntax ! User preview_namelists to view (not modify) the output namelist in the ! directory $CASEROOT/CaseDocs ! To modify the contents of a stream txt file, first use preview_namelists ! to obtain the contents of the stream txt files in CaseDocs, and then -! place a copy of the modified stream txt file in $CASEROOT with the string -! user_ prepended. +! place a copy of the modified stream txt file in $CASEROOT with the string +! user_ prepended. !------------------------------------------------------------------------ diff --git a/components/data_comps/drof/drof_comp_mod.F90 b/components/data_comps/drof/drof_comp_mod.F90 index 3539787c2b53..d6cd9b4b60d9 100644 --- a/components/data_comps/drof/drof_comp_mod.F90 +++ b/components/data_comps/drof/drof_comp_mod.F90 @@ -50,15 +50,15 @@ module drof_comp_mod integer(IN) :: logunit ! logging unit number integer :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "rof_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance ! (ie. "_0001" or "") - character(CL) :: rof_mode + character(CL) :: rof_mode integer(IN) :: dbug = 0 ! debug level (higher is more) logical :: read_restart ! start from restart character(len=*),parameter :: rpfile = 'rpointer.rof' character(len=*),parameter :: nullstr = 'undefined' - + type(shr_strdata_type),save :: SDROF type(mct_rearr) :: rearr @@ -237,7 +237,7 @@ subroutine drof_comp_init( EClock, cdata, x2r, r2x, NLFilename ) call shr_mpi_bcast(restfilm,mpicom,'restfilm') call shr_mpi_bcast(restfilsr,mpicom,'restfilsr') call shr_mpi_bcast(force_prognostic_true,mpicom,'force_prognostic_true') - + rest_file = trim(restfilm) rest_file_strm_r = trim(restfilsr) if (force_prognostic_true) then @@ -288,7 +288,7 @@ subroutine drof_comp_init( EClock, cdata, x2r, r2x, NLFilename ) call shr_strdata_pioinit(SDROF,rof_pio_subsys,rof_pio_iotype) call shr_strdata_init(SDROF,mpicom,compid,name='rof',& calendar=calendar) - endif + endif if (my_task == master_task) then call shr_strdata_print(SDROF,'SDROF data') @@ -509,7 +509,7 @@ subroutine drof_comp_run( EClock, cdata, x2r, r2x) if (trim(rof_mode) /= 'NULL') then call t_startf('drof_r_strdata_advance') - + call shr_strdata_advance(SDROF,currentYMD,currentTOD,mpicom,'drof_r') call t_stopf('drof_r_strdata_advance') call t_barrierf('drof_r_scatter_BARRIER',mpicom) @@ -564,7 +564,7 @@ subroutine drof_comp_run( EClock, cdata, x2r, r2x) write(logunit,F04) trim(myModelName),': model date ', CurrentYMD,CurrentTOD call shr_sys_flush(logunit) end if - + call shr_file_setLogUnit (shrlogunit) call shr_file_setLogLevel(shrloglev) call shr_sys_flush(logunit) @@ -604,11 +604,11 @@ subroutine drof_comp_final() call t_startf('DROF_FINAL') if (my_task == master_task) then - write(logunit,F91) + write(logunit,F91) write(logunit,F00) trim(myModelName),': end of main integration loop' - write(logunit,F91) + write(logunit,F91) end if - + call t_stopf('DROF_FINAL') end subroutine drof_comp_final diff --git a/components/data_comps/drof/rof_comp_esmf.F90 b/components/data_comps/drof/rof_comp_esmf.F90 index 451e2ad9b665..7bae23027eff 100644 --- a/components/data_comps/drof/rof_comp_esmf.F90 +++ b/components/data_comps/drof/rof_comp_esmf.F90 @@ -37,7 +37,7 @@ module rof_comp_esmf save ! save everything ! ! Author: Mariana Vertenstein - ! This module is ESMF compliant rof data component + ! This module is ESMF compliant rof data component !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ contains !~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -237,7 +237,7 @@ subroutine rof_final_esmf(comp, import_state, export_state, EClock, rc) integer, intent(out) :: rc !---------------------------------------------------------------------------- - ! Finalize routine + ! Finalize routine !---------------------------------------------------------------------------- rc = ESMF_SUCCESS diff --git a/components/data_comps/drof/rof_comp_mct.F90 b/components/data_comps/drof/rof_comp_mct.F90 index acb989de7f47..7390d688a73d 100644 --- a/components/data_comps/drof/rof_comp_mct.F90 +++ b/components/data_comps/drof/rof_comp_mct.F90 @@ -49,7 +49,7 @@ subroutine rof_init_mct( EClock, cdata, x2r, r2x, NLFilename ) type(ESMF_Clock) , intent(inout) :: EClock type(seq_cdata) , intent(inout) :: cdata type(mct_aVect) , intent(inout) :: x2r, r2x - character(len=*), optional , intent(in) :: NLFilename + character(len=*), optional , intent(in) :: NLFilename !EOP diff --git a/components/data_comps/dwav/README b/components/data_comps/dwav/README index 0a465557ce5a..164509d523a4 100644 --- a/components/data_comps/dwav/README +++ b/components/data_comps/dwav/README @@ -1,4 +1,4 @@ QL, 150527 -read climatological enhancement factor for +read climatological enhancement factor for Langmuir mixing parameterization (vr12-ma) -and Surface Stokes drift +and Surface Stokes drift diff --git a/components/data_comps/dwav/bld/build-namelist b/components/data_comps/dwav/bld/build-namelist index 40412aa25ea4..89f88efe088e 100755 --- a/components/data_comps/dwav/bld/build-namelist +++ b/components/data_comps/dwav/bld/build-namelist @@ -4,7 +4,7 @@ # build-namelist # # The simplest use of build-namelist is to execute it from the build directory where configure -# was run. +# was run. # # Date Contributor Modification # ------------------------------------------------------------------------------------------- @@ -27,22 +27,22 @@ sub usage { SYNOPSIS build-namelist [options] - Build the dwav namelist + Build the dwav namelist OPTIONS - -help [or -h] Print usage to STDOUT. - -infile "filepath" Specify a file or list of files (comma delimited) - containing namelists to read values from. - -namelist "namelist" Specify namelist settings directly on the commandline by - supplying a string containing FORTRAN namelist syntax, e.g., - -namelist "&dwav_exp taxmode='extend'/" - -print "level" Print level for debugging: - 0 = silent - 1 = regular - 2 = verbose + -help [or -h] Print usage to STDOUT. + -infile "filepath" Specify a file or list of files (comma delimited) + containing namelists to read values from. + -namelist "namelist" Specify namelist settings directly on the commandline by + supplying a string containing FORTRAN namelist syntax, e.g., + -namelist "&dwav_exp taxmode='extend'/" + -print "level" Print level for debugging: + 0 = silent + 1 = regular + 2 = verbose -caseroot CASEROOT directory variable -cimeroot CIMEROOT directory variable -inst_string INST_STRING variable - -user_xml_dir "directory" Directory of where to look for user versions of + -user_xml_dir "directory" Directory of where to look for user versions of namelist XML files (usually your SourceMods/src.dwav directory) (such as namelist_definition_dwav.xml, or namelist_defaults_dwav.xml) @@ -69,7 +69,7 @@ my $cmdline = "@ARGV"; # Command line arguments to script my $cwd = getcwd(); # current working directory my $cfgdir; # absolute pathname of directory that contains this script my $nm = "ProgName::"; # name to use if script dies -if ($ProgDir) { +if ($ProgDir) { $cfgdir = abs_path($ProgDir); } else { $cfgdir = $cwd; @@ -95,7 +95,7 @@ GetOptions( "print=i" => \$opts{'print'}, "caseroot=s" => \$opts{'caseroot'}, "cimeroot=s" => \$opts{'cimeroot'}, - "inst_string=s" => \$opts{'inst_string'}, + "inst_string=s" => \$opts{'inst_string'}, "user_xml_dir=s" => \$opts{'user_xml_dir'}, ) or usage(); @@ -126,9 +126,9 @@ EOF } } -my $CASEROOT = $opts{'caseroot'}; +my $CASEROOT = $opts{'caseroot'}; my $CIMEROOT = $opts{'cimeroot'}; -my $INST_STRING = $opts{'inst_string'}; +my $INST_STRING = $opts{'inst_string'}; if ($print>=2) { print "Setting dwav configuration script directory to $cfgdir$eol"; } @@ -160,20 +160,20 @@ my $perl5lib = "$cimeroot/utils/perl5lib"; # The XML::Lite module is required to parse the XML files. (-f "$perl5lib/XML/Lite.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"XML/Lite.pm\" in directory +** $ProgName - Cannot find perl module \"XML/Lite.pm\" in directory \"$perl5lib\" ** EOF # The Build::Config module provides utilities to access the configuration information # in the config_cache.xml file (-f "$perl5lib/Build/Config.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/Config.pm\" in directory +** $ProgName - Cannot find perl module \"Build/Config.pm\" in directory \"$perl5lib\" ** EOF # The namelist definition file contains entries for all namelist variables that # can be output by build-namelist. The version of the file that is associate with a -# fixed dwav tag is $cfgdir/namelist_files/namelist_definition_dwav.xml. +# fixed dwav tag is $cfgdir/namelist_files/namelist_definition_dwav.xml. my $nl_definition_file = "${cfgdir}/namelist_files/namelist_definition_dwav.xml"; # If user has user namelist definition files @@ -194,10 +194,10 @@ if ($print>=2) { print "Using namelist definition file $nl_definition_file$eol"; # The Build::NamelistDefinition module provides utilities to validate that the output # namelists are consistent with the namelist definition file (-f "$perl5lib/Build/NamelistDefinition.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/NamelistDefinition.pm\" in directory +** $ProgName - Cannot find perl module \"Build/NamelistDefinition.pm\" in directory \"$perl5lib\" ** EOF - + # The namelist defaults file contains default values for most namelist variables # can be output by build-namelist. The version of the file that is associated with a # fixed dwav tag is $cfgdir/namelist_files/namelist_defaults_dwav.xml. @@ -221,14 +221,14 @@ if ($print>=2) { print "Using namelist defaults file $nl_defaults_file$eol"; } # The Build::NamelistDefaults module provides a utility to obtain default values of namelist # variables based on finding a best fit with the attributes specified in the defaults file. (-f "$perl5lib/Build/NamelistDefaults.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/NamelistDefaults.pm\" in directory +** $ProgName - Cannot find perl module \"Build/NamelistDefaults.pm\" in directory \"$perl5lib\" ** EOF # The Build::Namelist module provides utilities to parse input namelists, to query and modify # namelists, and to write output namelists. (-f "$perl5lib/Build/Namelist.pm") or die <<"EOF"; -** $ProgName - Cannot find perl module \"Build/Namelist.pm\" in directory +** $ProgName - Cannot find perl module \"Build/Namelist.pm\" in directory \"$perl5lib\" ** EOF @@ -246,7 +246,7 @@ require Streams::TemplateGeneric; require Config::SetupTools; #----------------------------------------------------------------------------------------------- -# Create a configuration object from the DWAV config_cache.xml file. +# Create a configuration object from the DWAV config_cache.xml file. my $cfg = Build::Config->new($config_cache); # Validate some of the commandline option values. @@ -320,8 +320,8 @@ foreach my $attr (keys %xmlvars) { } my $RUN_TYPE = $xmlvars{'RUN_TYPE'}; -my $DIN_LOC_ROOT = $xmlvars{'DIN_LOC_ROOT'}; -my $WAV_GRID = $xmlvars{'WAV_GRID'}; +my $DIN_LOC_ROOT = $xmlvars{'DIN_LOC_ROOT'}; +my $WAV_GRID = $xmlvars{'WAV_GRID'}; my $DWAV_MODE = $xmlvars{'DWAV_MODE'}; if ($WAV_GRID eq "null") { @@ -346,7 +346,7 @@ $fh_out->open(">>$CASEROOT/Buildconf/dwav.input_data_list") or # Create hash needed to parse namelist_defaults_dwav.xml file my %default_namelist_opts; -$default_namelist_opts{'dwav_mode'} = $DWAV_MODE; +$default_namelist_opts{'dwav_mode'} = $DWAV_MODE; $default_namelist_opts{'wav_grid'} = $WAV_GRID; # Create streams template file(s) - loop over streams @@ -365,7 +365,7 @@ foreach my $stream ( @streams ) { # Set stream specific part of default_namelist_opts hash $default_namelist_opts{'stream'} = $stream; - + my $outstream = "dwav.streams.txt" . ".$stream" . "$INST_STRING"; if ($print>=1) { print " dwav stream is $stream$INST_STRING \n";} @@ -373,7 +373,7 @@ foreach my $stream ( @streams ) { # do nothing - } elsif (-e "$CASEROOT/user_$outstream") { + } elsif (-e "$CASEROOT/user_$outstream") { my $command = "cp -p $CASEROOT/user_$outstream $CASEROOT/Buildconf/dwavconf/$outstream"; system($command) == 0 or die "system $command failed: $? \n"; @@ -391,7 +391,7 @@ foreach my $stream ( @streams ) { $stream_template_opts{'ProgName'} = $ProgName; $stream_template_opts{'ProgDir'} = "$cfgdir"; $stream_template_opts{'cmdline'} = $cmdline; - + $stream_template_opts{'offset'} = 0; $stream_template_opts{'filepath'} = $defaults->get_value( "strm_datdir" , \%default_namelist_opts ); $stream_template_opts{'filenames'} = $defaults->get_value( "strm_datfil" , \%default_namelist_opts ); @@ -401,27 +401,27 @@ foreach my $stream ( @streams ) { $stream_template_opts{'domvarnames'}= $defaults->get_value( "strm_domvar" , \%default_namelist_opts ); $stream_template_opts{'yearfirst'} = $defaults->get_value( "strm_year_start", \%default_namelist_opts ); $stream_template_opts{'yearlast'} = $defaults->get_value( "strm_year_end" , \%default_namelist_opts ); - + $stream_template_opts{'filepath'} = SetupTools::expand_xml_var($stream_template_opts{'filepath'} , \%xmlvars); $stream_template_opts{'filenames'} = SetupTools::expand_xml_var($stream_template_opts{'filenames'} , \%xmlvars); $stream_template_opts{'domainpath'} = SetupTools::expand_xml_var($stream_template_opts{'domainpath'}, \%xmlvars); $stream_template_opts{'domain'} = SetupTools::expand_xml_var($stream_template_opts{'domain'} , \%xmlvars); $stream_template_opts{'yearfirst'} = SetupTools::expand_xml_var($stream_template_opts{'yearfirst'} , \%xmlvars); $stream_template_opts{'yearlast'} = SetupTools::expand_xml_var($stream_template_opts{'yearlast'} , \%xmlvars); - + # Create the streams txt file for this stream (from a generic template) my $stream_template = Streams::TemplateGeneric->new( \%stream_template_opts ); $stream_template->Read( "${CASEROOT}/Buildconf/dwav.template.streams.xml" ); $stream_template->Write( $outstream ); - + # Append to dwav.input_data_list my @filenames = $stream_template->GetDataFilenames( 'domain'); my $i = 0; foreach my $file ( @filenames ) { - $i++; + $i++; print $fh_out "domain${i} = $file\n"; } - + my @filenames = $stream_template->GetDataFilenames( 'data'); my $i = 0; foreach my $file ( @filenames ) { @@ -472,13 +472,13 @@ foreach my $stream ( @streams ) { } $fh_out->close; - + #################################### # namelist group: shr_strdata_nml # #################################### my $datamode = $defaults->get_value( "datamode", \%default_namelist_opts ); -add_default($nl, 'datamode', 'val' => "$datamode"); +add_default($nl, 'datamode', 'val' => "$datamode"); if ($datamode ne 'null') { add_default($nl, 'streams', 'val' => "$ostreams" ); add_default($nl, 'mapalgo', 'val' => "$omapalgo" ); @@ -607,7 +607,7 @@ sub add_default { $val = $defaults->get_value($var, \%opts); # Truncate model_version appropriately - + if ( $var eq "model_version" ) { $val =~ /(URL: https:\/\/[a-zA-Z0-9._-]+\/)([a-zA-Z0-9\/._-]+)(\/bld\/.+)/; $val = $2; @@ -616,7 +616,7 @@ sub add_default { unless ( defined($val) ) { unless ($opts{'nofail'}) { - die "$ProgName - No default value found for $var.\n" . + die "$ProgName - No default value found for $var.\n" . " Are defaults provided? \n"; } else { diff --git a/components/data_comps/dwav/bld/namelist_files/namelist_defaults_dwav.xml b/components/data_comps/dwav/bld/namelist_files/namelist_defaults_dwav.xml index 0e75641fbe7b..f28ddea4b508 100644 --- a/components/data_comps/dwav/bld/namelist_files/namelist_defaults_dwav.xml +++ b/components/data_comps/dwav/bld/namelist_files/namelist_defaults_dwav.xml @@ -11,23 +11,23 @@ variables. Values that depend on the model configuration use attributes to express the dependency. The recognized attributes are: grid.attributes from the config_cache.xml file (with keys converted to upper-case). -strm_year_first is the first year of the stream data that will be used -strm_year_last is the last year of the stream data that will be used -strm_year_align is the model year that will be aligned with stream data for year_first +strm_year_first is the first year of the stream data that will be used +strm_year_last is the last year of the stream data that will be used +strm_year_align is the model year that will be aligned with stream data for year_first For cplhist forcing - the following substitutions will be made below Replace any instance of the following substring indicators with the appropriate values: %y => year from the range yearfirst to yearlast - using in build-namelist $namelist_defaults_opts{'yearfirst'} - using in build-namelist $namelist_defaults_opts{'yearlast'} + using in build-namelist $namelist_defaults_opts{'yearfirst'} + using in build-namelist $namelist_defaults_opts{'yearlast'} obtained from values of -> below %ym => year-month from the range yearfirst to yearlast with all 12 months - using in build-namelist $namelist_defaults_opts{'yearfirst'} - using in build-namelist $namelist_defaults_opts{'yearlast'} + using in build-namelist $namelist_defaults_opts{'yearfirst'} + using in build-namelist $namelist_defaults_opts{'yearlast'} obtained from values of -> below %ymd => year-month-day from the range yearfirst to yearlast with all 12 months - using in build-namelist $namelist_defaults_opts{'yearfirst'} - using in build-namelist $namelist_defaults_opts{'yearlast'} + using in build-namelist $namelist_defaults_opts{'yearfirst'} + using in build-namelist $namelist_defaults_opts{'yearlast'} obtained from values of -> below Replace any instance of $VARNAME with the environment variable obtained from any diff --git a/components/data_comps/dwav/bld/namelist_files/namelist_definition_dwav.xml b/components/data_comps/dwav/bld/namelist_files/namelist_definition_dwav.xml index 5efa4fd7f807..6842bff96315 100644 --- a/components/data_comps/dwav/bld/namelist_files/namelist_definition_dwav.xml +++ b/components/data_comps/dwav/bld/namelist_files/namelist_definition_dwav.xml @@ -12,40 +12,40 @@ - valid values: null,copyall -The wave data is associated with the wave model -and is normally on a different grid than the ocean data. +The wave data is associated with the wave model +and is normally on a different grid than the ocean data. datamode = "null" - null is always a valid option and means no data will be generated. + null is always a valid option and means no data will be generated. Turns off the data model as a provider of data to the coupler. datamode = "copyall" Copies all fields directly from the input data streams Any required fields not found on an input stream will be set to zero. Set by the following xml variables in env_run.xml -DWAV_MODE +DWAV_MODE specifies values for wav mode: copyall,null default value: copyall - spatial gridfile associated with the strdata. grid information will be read from this file and that grid will serve as the target grid -for all input data for this strdata input. +for all input data for this strdata input. - @@ -53,22 +53,22 @@ array (up to 30 elements) of fill algorithms associated with the array of streams. valid options are just copy (ie. no fill), special value, nearest neighbor, nearest neighbor in "i" direction, or nearest neighbor in "j" direction. -valid values: 'copy','spval','nn','nnoni','nnonj' +valid values: 'copy','spval','nn','nnoni','nnonj' default: "nn". -plays no role is fill algorithm at the present time. +plays no role is fill algorithm at the present time. valid values: "nomask,srcmask,dstmask,bothmask" default: "nomask" - array (up to 30 elements) of filenames associated with the array of @@ -78,18 +78,18 @@ and fillmask are ignored. default: unset - array (up to 30 elements) of filenames associated with the array of streams. specifies the weights file to generate after weights are computed on the fly for the fill operation. this allows a user to -save and reuse a set of weights later. +save and reuse a set of weights later. default="unset". - - array (up to 30 elements) of fill algorithms associated with the array of streams. valid options are copy by index, set to special value, nearest neighbor, nearest neighbor in "i" direction, nearest neighbor -in "j" direction, or bilinear. +in "j" direction, or bilinear. valid values: copy,spval,nn,nnoni,nnonj,bilinear default: bilinear - +group="shr_strdata_nml"> array (up to 30 elements) of filenames associated with the array of streams. specifies the weights file to read instead of computing weights on the fly for the mapping (interpolation) operation. if this is set, mapalgo and mapmask are ignored. default="unset". - array (up to 30 elements) of filenames associated with the array of @@ -136,13 +136,13 @@ allows a user to save and reuse a set of weights later. default="unset". - array (up to 30 elements) of time interpolation options associated with the array of -streams. +streams. valid values: lower,upper,nearest,linear,coszen lower = Use lower time-value upper = Use upper time-value @@ -152,13 +152,13 @@ valid values: lower,upper,nearest,linear,coszen default="linear". - array of time axis modes associated with the array of streams for -handling data outside the specified stream time axis. +handling data outside the specified stream time axis. valid options are to cycle the data based on the first, last, and align settings associated with the stream dataset, to extend the first and last valid value indefinitely, or to limit the interpolated data @@ -170,8 +170,8 @@ valid values: cycle,extend,limit default="cycle". - array (up to 30 elements) of delta time ratio limits placed on the @@ -186,11 +186,11 @@ maximum ratio should be about 1.1. the running value of the delta time is computed as data is read and any wraparound or cycling is also included. this input helps trap missing data or errors in cycling. to turn off trapping, set the value to 1.0e30 or something similar. -default=1.5. +default=1.5. - character array (up to 30 elements) of stream input files. this @@ -200,7 +200,7 @@ specified by the stream module. this string consists of a stream_input_filename is a stream text input file and the format and options are described elsewhere. year_align, year_first, and year_last provide information about the time axis of the file and how -to relate the input time axis to the model time axis. +to relate the input time axis to the model time axis. default="null". @@ -208,45 +208,45 @@ default="null". - Namelist filename for data model wav share stream data namelist - DWAV Decomposition strategy 1d = Vector decomposition root = run only on the master task - Master restart file name for dwav model - Stream restart file name for dwav model, needed for branch simulations If TRUE, prognostic is forced to true. -default=false +default=false diff --git a/components/data_comps/dwav/cime_config/buildnml b/components/data_comps/dwav/cime_config/buildnml index e91a42ffc929..dce15a781cb1 100755 --- a/components/data_comps/dwav/cime_config/buildnml +++ b/components/data_comps/dwav/cime_config/buildnml @@ -15,7 +15,7 @@ my $RUNDIR = `./xmlquery RUNDIR -value`; my @dirs = ("${CIMEROOT}/utils/perl5lib"); unshift @INC, @dirs; require Config::SetupTools; -my $sysmod; +my $sysmod; # Verify wav grid is supported my $check_grid = "fail"; @@ -38,10 +38,10 @@ my $inst_counter = 1; while ($inst_counter <= $NINST_WAV) { # ----------------------------------------------------- - # determine instance string + # determine instance string # ----------------------------------------------------- - $inst_string = ""; + $inst_string = ""; if ($NINST_WAV > 1) { $inst_string = `printf _%04d $inst_counter`; @@ -57,9 +57,9 @@ while ($inst_counter <= $NINST_WAV) { # create dwavconf/cesm_namelist # ----------------------------------------------------- - SetupTools::create_namelist_infile("$CASEROOT", - "$CASEROOT/user_nl_dwav${inst_string}", - "$CASEROOT/Buildconf/dwavconf/cesm_namelist"); + SetupTools::create_namelist_infile("$CASEROOT", + "$CASEROOT/user_nl_dwav${inst_string}", + "$CASEROOT/Buildconf/dwavconf/cesm_namelist"); # ----------------------------------------------------- # call build-namelist @@ -71,7 +71,7 @@ while ($inst_counter <= $NINST_WAV) { $sysmod = "$sysmod -cimeroot $CIMEROOT"; $sysmod = "$sysmod -inst_string \"$inst_string\""; $sysmod = "$sysmod -user_xml_dir \"$CASEROOT/SourceMods/src.dwav\""; - + system($sysmod) == 0 or die "ERROR dwav.buildnml: $sysmod failed: $?\n"; if (-d ${RUNDIR}) { @@ -82,7 +82,7 @@ while ($inst_counter <= $NINST_WAV) { system($sysmod) == 0 or die "ERROR dwav.buildnml: $sysmod failed: $?\n"; $sysmod = "cp $CASEROOT/Buildconf/dwavconf/*txt* ${RUNDIR}/ >& /dev/null"; - system($sysmod) == 0; + system($sysmod) == 0; } # ----------------------------------------------------- diff --git a/components/data_comps/dwav/cime_config/config_component.xml b/components/data_comps/dwav/cime_config/config_component.xml index 0c758a2d8f44..4068df99b1fa 100644 --- a/components/data_comps/dwav/cime_config/config_component.xml +++ b/components/data_comps/dwav/cime_config/config_component.xml @@ -1,8 +1,8 @@ - + - + char dwav dwav @@ -11,7 +11,7 @@ Name of wave component - + char null,copyall copyall @@ -37,4 +37,4 @@ ========================================= - + diff --git a/components/data_comps/dwav/cime_config/user_nl_dwav b/components/data_comps/dwav/cime_config/user_nl_dwav index c713fb834e95..51ba47f53de8 100644 --- a/components/data_comps/dwav/cime_config/user_nl_dwav +++ b/components/data_comps/dwav/cime_config/user_nl_dwav @@ -1,15 +1,15 @@ !------------------------------------------------------------------------ ! Users should ONLY USE user_nl_dwav to change namelists variables -! Users should add all user specific namelist changes below in the form of -! namelist_var = new_namelist_value -! Note that any namelist variable from shr_strdata_nml and dwav_nml can -! be modified below using the above syntax +! Users should add all user specific namelist changes below in the form of +! namelist_var = new_namelist_value +! Note that any namelist variable from shr_strdata_nml and dwav_nml can +! be modified below using the above syntax ! User preview_namelists to view (not modify) the output namelist in the ! directory $CASEROOT/CaseDocs ! To modify the contents of a stream txt file, first use preview_namelists ! to obtain the contents of the stream txt files in CaseDocs, and then -! place a copy of the modified stream txt file in $CASEROOT with the string -! user_ prepended. -! As an example, to modify dwav.streams.txt.prescribed, place the modified +! place a copy of the modified stream txt file in $CASEROOT with the string +! user_ prepended. +! As an example, to modify dwav.streams.txt.prescribed, place the modified ! version in $CASEROOT with the name user_dwav.streams.txt.prescribed !------------------------------------------------------------------------ diff --git a/components/data_comps/dwav/dwav_comp_mod.F90 b/components/data_comps/dwav/dwav_comp_mod.F90 index 747196300e77..f78963902763 100644 --- a/components/data_comps/dwav/dwav_comp_mod.F90 +++ b/components/data_comps/dwav/dwav_comp_mod.F90 @@ -52,7 +52,7 @@ module dwav_comp_mod integer(IN) :: logunit ! logging unit number integer :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "lnd_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance ! (ie. "_0001" or "") character(CL) :: wav_mode ! mode @@ -151,7 +151,7 @@ subroutine dwav_comp_init( EClock, cdata, x2w, w2x, NLFilename ) character(*), parameter :: F90 = "('(dwav_comp_init) ',73('='))" character(*), parameter :: F91 = "('(dwav_comp_init) ',73('-'))" character(*), parameter :: subName = "(dwav_comp_init) " - + !------------------------------------------------------------------------------- call t_startf('DWAV_INIT') @@ -228,7 +228,7 @@ subroutine dwav_comp_init( EClock, cdata, x2w, w2x, NLFilename ) call shr_mpi_bcast(decomp,mpicom,'decomp') call shr_mpi_bcast(restfilm,mpicom,'restfilm') call shr_mpi_bcast(restfils,mpicom,'restfils') - + rest_file = trim(restfilm) rest_file_strm = trim(restfils) @@ -270,7 +270,7 @@ subroutine dwav_comp_init( EClock, cdata, x2w, w2x, NLFilename ) wav_present = .true. call seq_timemgr_EClockGetData( EClock, calendar=calendar ) iosystem => shr_pio_getiosys(trim(inst_name)) - + call shr_strdata_pioinit(SDWAV, iosystem, shr_pio_getiotype(trim(inst_name))) call shr_strdata_init(SDWAV,mpicom,compid,name='wav', & @@ -341,10 +341,10 @@ subroutine dwav_comp_init( EClock, cdata, x2w, w2x, NLFilename ) call mct_avect_init(w2x, rlist=seq_flds_w2x_fields, lsize=lsize) call mct_avect_zero(w2x) - + call mct_avect_init(x2w, rlist=seq_flds_x2w_fields, lsize=lsize) call mct_avect_zero(x2w) - + call t_stopf('dwav_initmctavs') !---------------------------------------------------------------------------- @@ -404,7 +404,7 @@ subroutine dwav_comp_init( EClock, cdata, x2w, w2x, NLFilename ) ! end redirection of share output to wav log if (my_task == master_task) write(logunit, F00) 'dwav_comp_init done' - call shr_sys_flush(logunit) + call shr_sys_flush(logunit) call shr_file_setlogunit (shrlogunit) call shr_file_setloglevel(shrloglev) call shr_sys_flush(logunit) @@ -433,8 +433,8 @@ subroutine dwav_comp_run( EClock, cdata, x2w, w2x) type(ESMF_Clock) ,intent(in) :: EClock type(seq_cdata) ,intent(inout) :: cdata - type(mct_aVect) ,intent(inout) :: x2w - type(mct_aVect) ,intent(inout) :: w2x + type(mct_aVect) ,intent(inout) :: x2w + type(mct_aVect) ,intent(inout) :: w2x !EOP @@ -569,7 +569,7 @@ subroutine dwav_comp_run( EClock, cdata, x2w, w2x) write(logunit,F04) trim(myModelName),': model date ', CurrentYMD,CurrentTOD call shr_sys_flush(logunit) end if - + call shr_file_setLogUnit (shrlogunit) call shr_file_setLogLevel(shrloglev) call shr_sys_flush(logunit) @@ -585,7 +585,7 @@ end subroutine dwav_comp_run ! !IROUTINE: dwav_comp_final ! ! !DESCRIPTION: -! finalize method data wav model +! finalize method data wav model ! ! !REVISION HISTORY: ! @@ -608,11 +608,11 @@ subroutine dwav_comp_final() call t_startf('DWAV_FINAL') if (my_task == master_task) then - write(logunit,F91) + write(logunit,F91) write(logunit,F00) trim(myModelName),': end of main integration loop' - write(logunit,F91) + write(logunit,F91) end if - + call t_stopf('DWAV_FINAL') end subroutine dwav_comp_final diff --git a/components/data_comps/dwav/wav_comp_mct.F90 b/components/data_comps/dwav/wav_comp_mct.F90 index 9461a5971ba7..a1614b7bcf08 100644 --- a/components/data_comps/dwav/wav_comp_mct.F90 +++ b/components/data_comps/dwav/wav_comp_mct.F90 @@ -106,7 +106,7 @@ end subroutine wav_run_mct ! finalize method for data wav model ! ! !REVISION HISTORY: -! +! ! !INTERFACE: ------------------------------------------------------------------ ! subroutine wav_final_mct(EClock, cdata, x2w, w2x) diff --git a/components/stub_comps/satm/cime_config/config_component.xml b/components/stub_comps/satm/cime_config/config_component.xml index ae16d1898ed2..2dbb2c188be4 100644 --- a/components/stub_comps/satm/cime_config/config_component.xml +++ b/components/stub_comps/satm/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char satm satm @@ -17,4 +17,4 @@ Stub atm component - + diff --git a/components/stub_comps/satm/cpl/atm_comp_esmf.F90 b/components/stub_comps/satm/cpl/atm_comp_esmf.F90 index a4df1f56e1b6..7dc4aec95a23 100644 --- a/components/stub_comps/satm/cpl/atm_comp_esmf.F90 +++ b/components/stub_comps/satm/cpl/atm_comp_esmf.F90 @@ -162,7 +162,7 @@ subroutine atm_final_esmf(comp, import_state, export_state, EClock, rc) type(ESMF_State) :: export_state type(ESMF_Clock) :: EClock integer, intent(out) :: rc - + rc = ESMF_SUCCESS diff --git a/components/stub_comps/satm/cpl/atm_comp_mct.F90 b/components/stub_comps/satm/cpl/atm_comp_mct.F90 index 3a668466ce6b..ef41815cc2a5 100644 --- a/components/stub_comps/satm/cpl/atm_comp_mct.F90 +++ b/components/stub_comps/satm/cpl/atm_comp_mct.F90 @@ -74,8 +74,8 @@ subroutine atm_run_mct( EClock, cdata, x2d, d2x) type(ESMF_Clock) ,intent(inout) :: EClock type(seq_cdata) ,intent(inout) :: cdata - type(mct_aVect) ,intent(inout) :: x2d - type(mct_aVect) ,intent(inout) :: d2x + type(mct_aVect) ,intent(inout) :: x2d + type(mct_aVect) ,intent(inout) :: d2x !EOP !------------------------------------------------------------------------------- @@ -88,7 +88,7 @@ end subroutine atm_run_mct ! !IROUTINE: atm_final_mct ! ! !DESCRIPTION: -! stub atm model finalize +! stub atm model finalize ! ! !REVISION HISTORY: ! diff --git a/components/stub_comps/sglc/cime_config/config_component.xml b/components/stub_comps/sglc/cime_config/config_component.xml index b860a5f1d738..76f4da12aa48 100644 --- a/components/stub_comps/sglc/cime_config/config_component.xml +++ b/components/stub_comps/sglc/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char sglc sglc @@ -17,4 +17,4 @@ Stub glc component - + diff --git a/components/stub_comps/sglc/cpl/glc_comp_esmf.F90 b/components/stub_comps/sglc/cpl/glc_comp_esmf.F90 index 9d93e1a8c932..5c58235f0626 100644 --- a/components/stub_comps/sglc/cpl/glc_comp_esmf.F90 +++ b/components/stub_comps/sglc/cpl/glc_comp_esmf.F90 @@ -171,7 +171,7 @@ subroutine glc_final_esmf(comp, import_state, export_state, EClock, rc) type(ESMF_State) :: export_state type(ESMF_Clock) :: EClock integer, intent(out) :: rc - + rc = ESMF_SUCCESS diff --git a/components/stub_comps/sglc/cpl/glc_comp_mct.F90 b/components/stub_comps/sglc/cpl/glc_comp_mct.F90 index 21ddac310180..853a7a1545fc 100644 --- a/components/stub_comps/sglc/cpl/glc_comp_mct.F90 +++ b/components/stub_comps/sglc/cpl/glc_comp_mct.F90 @@ -74,8 +74,8 @@ subroutine glc_run_mct( EClock, cdata, x2d, d2x) type(ESMF_Clock) ,intent(inout) :: EClock type(seq_cdata) ,intent(inout) :: cdata - type(mct_aVect) ,intent(inout) :: x2d - type(mct_aVect) ,intent(inout) :: d2x + type(mct_aVect) ,intent(inout) :: x2d + type(mct_aVect) ,intent(inout) :: d2x !EOP !------------------------------------------------------------------------------- @@ -88,7 +88,7 @@ end subroutine glc_run_mct ! !IROUTINE: glc_final_mct ! ! !DESCRIPTION: -! stub glc model finalize +! stub glc model finalize ! ! !REVISION HISTORY: ! @@ -100,8 +100,8 @@ subroutine glc_final_mct( EClock, cdata, x2d, d2x) type(ESMF_Clock) ,intent(inout) :: EClock type(seq_cdata) ,intent(inout) :: cdata - type(mct_aVect) ,intent(inout) :: x2d - type(mct_aVect) ,intent(inout) :: d2x + type(mct_aVect) ,intent(inout) :: x2d + type(mct_aVect) ,intent(inout) :: d2x !EOP !------------------------------------------------------------------------------- diff --git a/components/stub_comps/sice/cime_config/config_component.xml b/components/stub_comps/sice/cime_config/config_component.xml index 872247ff028e..931190fa0d7e 100644 --- a/components/stub_comps/sice/cime_config/config_component.xml +++ b/components/stub_comps/sice/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char sice sice @@ -17,4 +17,4 @@ Stub ice component - + diff --git a/components/stub_comps/sice/cpl/ice_comp_esmf.F90 b/components/stub_comps/sice/cpl/ice_comp_esmf.F90 index b1334bf5c975..9d5b79a840bf 100644 --- a/components/stub_comps/sice/cpl/ice_comp_esmf.F90 +++ b/components/stub_comps/sice/cpl/ice_comp_esmf.F90 @@ -165,7 +165,7 @@ subroutine ice_final_esmf(comp, import_state, export_state, EClock, rc) type(ESMF_State) :: export_state type(ESMF_Clock) :: EClock integer, intent(out) :: rc - + rc = ESMF_SUCCESS diff --git a/components/stub_comps/sice/cpl/ice_comp_mct.F90 b/components/stub_comps/sice/cpl/ice_comp_mct.F90 index 39df6f16ea32..e74de96957ac 100644 --- a/components/stub_comps/sice/cpl/ice_comp_mct.F90 +++ b/components/stub_comps/sice/cpl/ice_comp_mct.F90 @@ -73,8 +73,8 @@ subroutine ice_run_mct( EClock, cdata, x2d, d2x) type(ESMF_Clock) ,intent(inout) :: EClock type(seq_cdata) ,intent(inout) :: cdata - type(mct_aVect) ,intent(inout) :: x2d - type(mct_aVect) ,intent(inout) :: d2x + type(mct_aVect) ,intent(inout) :: x2d + type(mct_aVect) ,intent(inout) :: d2x !EOP !------------------------------------------------------------------------------- @@ -87,7 +87,7 @@ end subroutine ice_run_mct ! !IROUTINE: ice_final_mct ! ! !DESCRIPTION: -! stub ice model finalize +! stub ice model finalize ! ! !REVISION HISTORY: ! diff --git a/components/stub_comps/slnd/cime_config/config_component.xml b/components/stub_comps/slnd/cime_config/config_component.xml index aaf6a1b14316..1a4a2aa2c077 100644 --- a/components/stub_comps/slnd/cime_config/config_component.xml +++ b/components/stub_comps/slnd/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char slnd slnd @@ -17,4 +17,4 @@ Stub lnd component - + diff --git a/components/stub_comps/slnd/cpl/lnd_comp_esmf.F90 b/components/stub_comps/slnd/cpl/lnd_comp_esmf.F90 index cd324ce36a39..e975a9c720fb 100644 --- a/components/stub_comps/slnd/cpl/lnd_comp_esmf.F90 +++ b/components/stub_comps/slnd/cpl/lnd_comp_esmf.F90 @@ -162,7 +162,7 @@ subroutine lnd_final_esmf(comp, import_state, export_state, EClock, rc) type(ESMF_State) :: export_state type(ESMF_Clock) :: EClock integer, intent(out) :: rc - + rc = ESMF_SUCCESS diff --git a/components/stub_comps/slnd/cpl/lnd_comp_mct.F90 b/components/stub_comps/slnd/cpl/lnd_comp_mct.F90 index 5e5dd7dd0aad..b806e47d19db 100644 --- a/components/stub_comps/slnd/cpl/lnd_comp_mct.F90 +++ b/components/stub_comps/slnd/cpl/lnd_comp_mct.F90 @@ -43,7 +43,7 @@ subroutine lnd_init_mct( EClock, cdata, x2d, d2x, NLFilename ) type(ESMF_Clock) , intent(inout) :: EClock type(seq_cdata) , intent(inout) :: cdata type(mct_aVect) , intent(inout) :: x2d, d2x - character(len=*), optional , intent(in) :: NLFilename + character(len=*), optional , intent(in) :: NLFilename !EOP !------------------------------------------------------------------------------- @@ -73,8 +73,8 @@ subroutine lnd_run_mct( EClock, cdata, x2d, d2x) type(ESMF_Clock) ,intent(inout) :: EClock type(seq_cdata) ,intent(inout) :: cdata - type(mct_aVect) ,intent(inout) :: x2d - type(mct_aVect) ,intent(inout) :: d2x + type(mct_aVect) ,intent(inout) :: x2d + type(mct_aVect) ,intent(inout) :: d2x !EOP !------------------------------------------------------------------------------- @@ -87,7 +87,7 @@ end subroutine lnd_run_mct ! !IROUTINE: lnd_final_mct ! ! !DESCRIPTION: -! stub lnd model finalize +! stub lnd model finalize ! ! !REVISION HISTORY: ! @@ -99,10 +99,10 @@ subroutine lnd_final_mct( EClock, cdata, x2d, d2x) ! !INPUT/OUTPUT PARAMETERS: - type(ESMF_Clock) ,intent(inout) :: EClock + type(ESMF_Clock) ,intent(inout) :: EClock type(seq_cdata) ,intent(inout) :: cdata - type(mct_aVect) ,intent(inout) :: x2d - type(mct_aVect) ,intent(inout) :: d2x + type(mct_aVect) ,intent(inout) :: x2d + type(mct_aVect) ,intent(inout) :: d2x !EOP !------------------------------------------------------------------------------- diff --git a/components/stub_comps/socn/cime_config/config_component.xml b/components/stub_comps/socn/cime_config/config_component.xml index 458ce871f16f..c9c8719d85e5 100644 --- a/components/stub_comps/socn/cime_config/config_component.xml +++ b/components/stub_comps/socn/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char socn socn @@ -17,4 +17,4 @@ Stub ocn component - + diff --git a/components/stub_comps/socn/cpl/ocn_comp_esmf.F90 b/components/stub_comps/socn/cpl/ocn_comp_esmf.F90 index ca5916165558..ece7a885ef9b 100644 --- a/components/stub_comps/socn/cpl/ocn_comp_esmf.F90 +++ b/components/stub_comps/socn/cpl/ocn_comp_esmf.F90 @@ -165,7 +165,7 @@ subroutine ocn_final_esmf(comp, import_state, export_state, EClock, rc) type(ESMF_State) :: export_state type(ESMF_Clock) :: EClock integer, intent(out) :: rc - + rc = ESMF_SUCCESS diff --git a/components/stub_comps/socn/cpl/ocn_comp_mct.F90 b/components/stub_comps/socn/cpl/ocn_comp_mct.F90 index 920fb1c199f0..5b96671a3c49 100644 --- a/components/stub_comps/socn/cpl/ocn_comp_mct.F90 +++ b/components/stub_comps/socn/cpl/ocn_comp_mct.F90 @@ -73,8 +73,8 @@ subroutine ocn_run_mct( EClock, cdata, x2d, d2x) type(ESMF_Clock) ,intent(inout) :: EClock type(seq_cdata) ,intent(inout) :: cdata - type(mct_aVect) ,intent(inout) :: x2d - type(mct_aVect) ,intent(inout) :: d2x + type(mct_aVect) ,intent(inout) :: x2d + type(mct_aVect) ,intent(inout) :: d2x !EOP !------------------------------------------------------------------------------- @@ -87,7 +87,7 @@ end subroutine ocn_run_mct ! !IROUTINE: ocn_final_mct ! ! !DESCRIPTION: -! stub ocn model finalize +! stub ocn model finalize ! ! !REVISION HISTORY: ! diff --git a/components/stub_comps/srof/cime_config/config_component.xml b/components/stub_comps/srof/cime_config/config_component.xml index 89dbff7ec063..c2e5258e115f 100644 --- a/components/stub_comps/srof/cime_config/config_component.xml +++ b/components/stub_comps/srof/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char srof srof @@ -17,4 +17,4 @@ Stub river component - + diff --git a/components/stub_comps/srof/cpl/rof_comp_esmf.F90 b/components/stub_comps/srof/cpl/rof_comp_esmf.F90 index a7bdfb9665ba..4bf6f66235d3 100644 --- a/components/stub_comps/srof/cpl/rof_comp_esmf.F90 +++ b/components/stub_comps/srof/cpl/rof_comp_esmf.F90 @@ -171,7 +171,7 @@ subroutine rof_final_esmf(comp, import_state, export_state, EClock, rc) type(ESMF_State) :: export_state type(ESMF_Clock) :: EClock integer, intent(out) :: rc - + rc = ESMF_SUCCESS diff --git a/components/stub_comps/srof/cpl/rof_comp_mct.F90 b/components/stub_comps/srof/cpl/rof_comp_mct.F90 index adf3b7a8b502..07ee34e3eefe 100644 --- a/components/stub_comps/srof/cpl/rof_comp_mct.F90 +++ b/components/stub_comps/srof/cpl/rof_comp_mct.F90 @@ -43,7 +43,7 @@ subroutine rof_init_mct( EClock, cdata, x2r, r2x, NLFilename ) type(ESMF_Clock) , intent(inout) :: EClock type(seq_cdata) , intent(inout) :: cdata type(mct_aVect) , intent(inout) :: x2r, r2x - character(len=*), optional , intent(in) :: NLFilename + character(len=*), optional , intent(in) :: NLFilename !EOP !------------------------------------------------------------------------------- @@ -74,7 +74,7 @@ subroutine rof_run_mct( EClock, cdata, x2r, r2x ) type(ESMF_Clock) ,intent(inout) :: EClock type(seq_cdata) ,intent(inout) :: cdata - type(mct_aVect) ,intent(inout) :: x2r, r2x + type(mct_aVect) ,intent(inout) :: x2r, r2x !EOP !------------------------------------------------------------------------------- @@ -87,7 +87,7 @@ end subroutine rof_run_mct ! !IROUTINE: rof_final_mct ! ! !DESCRIPTION: -! stub rof model finalize +! stub rof model finalize ! ! !REVISION HISTORY: ! @@ -99,7 +99,7 @@ subroutine rof_final_mct( EClock, cdata, x2r, r2x) ! !INPUT/OUTPUT PARAMETERS: - type(ESMF_Clock) ,intent(inout) :: EClock + type(ESMF_Clock) ,intent(inout) :: EClock type(seq_cdata) ,intent(inout) :: cdata type(mct_aVect) ,intent(inout) :: x2r, r2x diff --git a/components/stub_comps/swav/cime_config/config_component.xml b/components/stub_comps/swav/cime_config/config_component.xml index 1a0f75aa942b..a98795ce4348 100644 --- a/components/stub_comps/swav/cime_config/config_component.xml +++ b/components/stub_comps/swav/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char swav swav @@ -17,4 +17,4 @@ Stub wave component - + diff --git a/components/stub_comps/swav/cpl/wav_comp_esmf.F90 b/components/stub_comps/swav/cpl/wav_comp_esmf.F90 index 89f85a811662..f4eebc32ef65 100644 --- a/components/stub_comps/swav/cpl/wav_comp_esmf.F90 +++ b/components/stub_comps/swav/cpl/wav_comp_esmf.F90 @@ -162,7 +162,7 @@ subroutine wav_final_esmf(comp, import_state, export_state, EClock, rc) type(ESMF_State) :: export_state type(ESMF_Clock) :: EClock integer, intent(out) :: rc - + rc = ESMF_SUCCESS diff --git a/components/stub_comps/swav/cpl/wav_comp_mct.F90 b/components/stub_comps/swav/cpl/wav_comp_mct.F90 index fa6e756ae3a7..1fa709a8a3b3 100644 --- a/components/stub_comps/swav/cpl/wav_comp_mct.F90 +++ b/components/stub_comps/swav/cpl/wav_comp_mct.F90 @@ -73,8 +73,8 @@ subroutine wav_run_mct( EClock, cdata, x2d, d2x) type(ESMF_Clock) ,intent(inout) :: EClock type(seq_cdata) ,intent(inout) :: cdata - type(mct_aVect) ,intent(inout) :: x2d - type(mct_aVect) ,intent(inout) :: d2x + type(mct_aVect) ,intent(inout) :: x2d + type(mct_aVect) ,intent(inout) :: d2x !EOP !------------------------------------------------------------------------------- @@ -87,7 +87,7 @@ end subroutine wav_run_mct ! !IROUTINE: wav_final_mct ! ! !DESCRIPTION: -! stub wav model finalize +! stub wav model finalize ! ! !REVISION HISTORY: ! diff --git a/components/xcpl_comps/xatm/cime_config/buildnml b/components/xcpl_comps/xatm/cime_config/buildnml index f959ccde3a05..f4ca20e458d8 100755 --- a/components/xcpl_comps/xatm/cime_config/buildnml +++ b/components/xcpl_comps/xatm/cime_config/buildnml @@ -1,9 +1,9 @@ #! /bin/csh -f set RUNDIR = `./xmlquery RUNDIR -value` -set NINST_ATM = `./xmlquery NINST_ATM -value` -set ATM_NX = `./xmlquery ATM_NX -value` -set ATM_NY = `./xmlquery ATM_NY -value` +set NINST_ATM = `./xmlquery NINST_ATM -value` +set ATM_NX = `./xmlquery ATM_NX -value` +set ATM_NY = `./xmlquery ATM_NY -value` set NX = $ATM_NX set NY = $ATM_NY diff --git a/components/xcpl_comps/xatm/cime_config/config_component.xml b/components/xcpl_comps/xatm/cime_config/config_component.xml index 135c3c45e49d..0fb2b9546316 100644 --- a/components/xcpl_comps/xatm/cime_config/config_component.xml +++ b/components/xcpl_comps/xatm/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char xatm xatm @@ -17,5 +17,5 @@ Dead atm component - + diff --git a/components/xcpl_comps/xatm/cpl/atm_comp_esmf.F90 b/components/xcpl_comps/xatm/cpl/atm_comp_esmf.F90 index 7d260798b05b..dada3de41542 100644 --- a/components/xcpl_comps/xatm/cpl/atm_comp_esmf.F90 +++ b/components/xcpl_comps/xatm/cpl/atm_comp_esmf.F90 @@ -42,13 +42,13 @@ module atm_comp_esmf !--- stdin input stuff --- character(CS) :: str ! cpp defined model name - + !--- other --- integer(IN) :: dbug = 0 ! debug level (higher is more) - + character(CS) :: myModelName = 'atm' ! user defined model name integer(IN) :: ncomp =1 ! component index - integer(IN) :: my_task ! my task in mpi communicator mpicom + integer(IN) :: my_task ! my task in mpi communicator mpicom integer(IN) :: master_task=0 ! task number of master task integer(IN) :: logunit ! logging unit number @@ -117,10 +117,10 @@ subroutine atm_init_esmf(comp, import_state, export_state, EClock, rc) real(R8) :: nextsw_cday ! calendar of next atm shortwave integer(IN), allocatable :: gindex(:) ! global index integer(IN) :: shrlogunit, shrloglev ! original log unit and level - + real(R8), pointer :: gbuf(:,:) ! grid info buffer real(R8), pointer :: buf(:) ! tempoary buffer - + integer(IN) :: nproc_x ! num of i pes (type 3) integer(IN) :: seg_len ! length of segs (type 4) integer(IN) :: nxg ! global dim i-direction @@ -130,7 +130,7 @@ subroutine atm_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: COMPID integer(IN) :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "lnd_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance integer(IN) :: mpicom, mpicom_vm integer(IN) :: lsize integer(IN) :: phase @@ -233,7 +233,7 @@ subroutine atm_init_esmf(comp, import_state, export_state, EClock, rc) write(logunit,F00) call shr_sys_flush(logunit) end if - + !---------------------------- ! Determine communicator groups and sizes !---------------------------- @@ -442,7 +442,7 @@ subroutine atm_run_esmf(comp, import_state, export_state, EClock, rc) ! the bounds are always from /1,1/ to /nflds_d2x, lsize/ locally. !---------------------------- - call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) + call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) if (rc /= ESMF_SUCCESS) call ESMF_Finalize(rc=rc, endflag=ESMF_END_ABORT) do n = 1, ubound(fptr,2)-lbound(fptr,2)+1 @@ -516,7 +516,7 @@ subroutine atm_final_esmf(comp, import_state, export_state, EClock, rc) character(*), parameter :: subName = "(atm_final_esmf) " character(*), parameter :: F00 = "('(atm_final_esmf) ',8a)" character(*), parameter :: F91 = "('(atm_final_esmf) ',73('-'))" - + !------------------------------------------------------------------------------- ! !------------------------------------------------------------------------------- diff --git a/components/xcpl_comps/xglc/cime_config/buildnml b/components/xcpl_comps/xglc/cime_config/buildnml index ae5821120fa1..d488a58be275 100755 --- a/components/xcpl_comps/xglc/cime_config/buildnml +++ b/components/xcpl_comps/xglc/cime_config/buildnml @@ -1,9 +1,9 @@ #! /bin/csh -f set RUNDIR = `./xmlquery RUNDIR -value` -set NINST_GLC = `./xmlquery NINST_GLC -value` -set GLC_NX = `./xmlquery GLC_NX -value` -set GLC_NY = `./xmlquery GLC_NY -value` +set NINST_GLC = `./xmlquery NINST_GLC -value` +set GLC_NX = `./xmlquery GLC_NX -value` +set GLC_NY = `./xmlquery GLC_NY -value` set NX = $GLC_NX set NY = $GLC_NY diff --git a/components/xcpl_comps/xglc/cime_config/config_component.xml b/components/xcpl_comps/xglc/cime_config/config_component.xml index 3329e82eb26b..1211e5842b46 100644 --- a/components/xcpl_comps/xglc/cime_config/config_component.xml +++ b/components/xcpl_comps/xglc/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char xglc xglc @@ -17,4 +17,4 @@ Dead land-ice component - + diff --git a/components/xcpl_comps/xglc/cpl/glc_comp_esmf.F90 b/components/xcpl_comps/xglc/cpl/glc_comp_esmf.F90 index 7713ff94728e..9bbfd675261d 100644 --- a/components/xcpl_comps/xglc/cpl/glc_comp_esmf.F90 +++ b/components/xcpl_comps/xglc/cpl/glc_comp_esmf.F90 @@ -42,13 +42,13 @@ module glc_comp_esmf !--- stdin input stuff --- character(CS) :: str ! cpp defined model name - + !--- other --- integer(IN) :: dbug = 0 ! debug level (higher is more) - + character(CS) :: myModelName = 'glc' ! user defined model name integer(IN) :: ncomp = 5 ! component index - integer(IN) :: my_task ! my task in mpi communicator mpicom + integer(IN) :: my_task ! my task in mpi communicator mpicom integer(IN) :: master_task=0 ! task number of master task integer(IN) :: logunit ! logging unit number @@ -116,10 +116,10 @@ subroutine glc_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: totpe ! total number of pes integer(IN), allocatable :: gindex(:) ! global index integer(IN) :: shrlogunit, shrloglev ! original log unit and level - + real(R8), pointer :: gbuf(:,:) ! grid info buffer real(R8), pointer :: buf(:) ! tempoary buffer - + integer(IN) :: nproc_x ! num of i pes (type 3) integer(IN) :: seg_len ! length of segs (type 4) integer(IN) :: nxg ! global dim i-direction @@ -129,7 +129,7 @@ subroutine glc_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: COMPID integer(IN) :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "lnd_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance integer(IN) :: mpicom, mpicom_vm integer(IN) :: lsize integer(IN) :: phase @@ -232,7 +232,7 @@ subroutine glc_init_esmf(comp, import_state, export_state, EClock, rc) write(logunit,F00) call shr_sys_flush(logunit) end if - + !---------------------------- ! Determine communicator groups and sizes !---------------------------- @@ -448,7 +448,7 @@ subroutine glc_run_esmf(comp, import_state, export_state, EClock, rc) ! the bounds are always from /1,1/ to /nflds_d2x, lsize/ locally. !---------------------------- - call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) + call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) if (rc /= ESMF_SUCCESS) call ESMF_Finalize(rc=rc, endflag=ESMF_END_ABORT) do n = 1, ubound(fptr,2)-lbound(fptr,2)+1 @@ -518,7 +518,7 @@ subroutine glc_final_esmf(comp, import_state, export_state, EClock, rc) character(*), parameter :: subName = "(glc_final_esmf) " character(*), parameter :: F00 = "('(glc_final_esmf) ',8a)" character(*), parameter :: F91 = "('(glc_final_esmf) ',73('-'))" - + !------------------------------------------------------------------------------- ! !------------------------------------------------------------------------------- diff --git a/components/xcpl_comps/xice/cime_config/buildnml b/components/xcpl_comps/xice/cime_config/buildnml index 805c8cad8499..b1e0a032d820 100755 --- a/components/xcpl_comps/xice/cime_config/buildnml +++ b/components/xcpl_comps/xice/cime_config/buildnml @@ -1,9 +1,9 @@ #! /bin/csh -f set RUNDIR = `./xmlquery RUNDIR -value` -set NINST_ICE = `./xmlquery NINST_ICE -value` -set ICE_NX = `./xmlquery ICE_NX -value` -set ICE_NY = `./xmlquery ICE_NY -value` +set NINST_ICE = `./xmlquery NINST_ICE -value` +set ICE_NX = `./xmlquery ICE_NX -value` +set ICE_NY = `./xmlquery ICE_NY -value` cd $RUNDIR diff --git a/components/xcpl_comps/xice/cime_config/config_component.xml b/components/xcpl_comps/xice/cime_config/config_component.xml index 2de6e6144720..155de00bda57 100644 --- a/components/xcpl_comps/xice/cime_config/config_component.xml +++ b/components/xcpl_comps/xice/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char xice xice @@ -17,4 +17,4 @@ Dead ice component - + diff --git a/components/xcpl_comps/xice/cpl/ice_comp_esmf.F90 b/components/xcpl_comps/xice/cpl/ice_comp_esmf.F90 index 87faeb406b6a..e62f8f24dde3 100644 --- a/components/xcpl_comps/xice/cpl/ice_comp_esmf.F90 +++ b/components/xcpl_comps/xice/cpl/ice_comp_esmf.F90 @@ -42,13 +42,13 @@ module ice_comp_esmf !--- stdin input stuff --- character(CS) :: str ! cpp defined model name - + !--- other --- integer(IN) :: dbug = 0 ! debug level (higher is more) - + character(CS) :: myModelName = 'ice' ! user defined model name integer(IN) :: ncomp = 3 ! component index - integer(IN) :: my_task ! my task in mpi communicator mpicom + integer(IN) :: my_task ! my task in mpi communicator mpicom integer(IN) :: master_task=0 ! task number of master task integer(IN) :: logunit ! logging unit number @@ -116,10 +116,10 @@ subroutine ice_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: totpe ! total number of pes integer(IN), allocatable :: gindex(:) ! global index integer(IN) :: shrlogunit, shrloglev ! original log unit and level - + real(R8), pointer :: gbuf(:,:) ! grid info buffer real(R8), pointer :: buf(:) ! tempoary buffer - + integer(IN) :: nproc_x ! num of i pes (type 3) integer(IN) :: seg_len ! length of segs (type 4) integer(IN) :: nxg ! global dim i-direction @@ -129,7 +129,7 @@ subroutine ice_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: COMPID integer(IN) :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "lnd_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance integer(IN) :: mpicom, mpicom_vm integer(IN) :: lsize integer(IN) :: phase @@ -233,7 +233,7 @@ subroutine ice_init_esmf(comp, import_state, export_state, EClock, rc) write(logunit,F00) call shr_sys_flush(logunit) end if - + !---------------------------- ! Determine communicator groups and sizes !---------------------------- @@ -441,7 +441,7 @@ subroutine ice_run_esmf(comp, import_state, export_state, EClock, rc) ! the bounds are always from /1,1/ to /nflds_d2x, lsize/ locally. !---------------------------- - call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) + call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) if (rc /= ESMF_SUCCESS) call ESMF_Finalize(rc=rc, endflag=ESMF_END_ABORT) do n = 1, ubound(fptr,2)-lbound(fptr,2)+1 @@ -514,7 +514,7 @@ subroutine ice_final_esmf(comp, import_state, export_state, EClock, rc) character(*), parameter :: subName = "(ice_final_esmf) " character(*), parameter :: F00 = "('(ice_final_esmf) ',8a)" character(*), parameter :: F91 = "('(ice_final_esmf) ',73('-'))" - + !------------------------------------------------------------------------------- ! !------------------------------------------------------------------------------- diff --git a/components/xcpl_comps/xlnd/cime_config/buildnml b/components/xcpl_comps/xlnd/cime_config/buildnml index 3be1ca0296b9..4836d0dd97fb 100755 --- a/components/xcpl_comps/xlnd/cime_config/buildnml +++ b/components/xcpl_comps/xlnd/cime_config/buildnml @@ -1,9 +1,9 @@ -#! /bin/csh -f +#! /bin/csh -f set RUNDIR = `./xmlquery RUNDIR -value` -set NINST_LND = `./xmlquery NINST_LND -value` -set LND_NX = `./xmlquery LND_NX -value` -set LND_NY = `./xmlquery LND_NY -value` +set NINST_LND = `./xmlquery NINST_LND -value` +set LND_NX = `./xmlquery LND_NX -value` +set LND_NY = `./xmlquery LND_NY -value` cd $RUNDIR set base_filename = "xlnd_in" @@ -26,7 +26,7 @@ while ($inst_counter <= $NINST_LND) set in_filename = ${base_filename}${inst_string} - cat >! ${in_filename} << EOF + cat >! ${in_filename} << EOF $NX ! i-direction global dimension $NY ! j-direction global dimension 11 ! decomp_type 1=1d-by-lat, 2=1d-by-lon, 3=2d, 4=2d evensquare, 11=segmented diff --git a/components/xcpl_comps/xlnd/cime_config/config_component.xml b/components/xcpl_comps/xlnd/cime_config/config_component.xml index bce467cefbbe..39c458a9c6a2 100644 --- a/components/xcpl_comps/xlnd/cime_config/config_component.xml +++ b/components/xcpl_comps/xlnd/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char xlnd xlnd @@ -17,4 +17,4 @@ Dead land component - + diff --git a/components/xcpl_comps/xlnd/cpl/lnd_comp_esmf.F90 b/components/xcpl_comps/xlnd/cpl/lnd_comp_esmf.F90 index 4fcc1fbd2f91..3543f9c69183 100644 --- a/components/xcpl_comps/xlnd/cpl/lnd_comp_esmf.F90 +++ b/components/xcpl_comps/xlnd/cpl/lnd_comp_esmf.F90 @@ -44,13 +44,13 @@ module lnd_comp_esmf !--- stdin input stuff --- character(CS) :: str ! cpp defined model name - + !--- other --- integer(IN) :: dbug = 0 ! debug level (higher is more) - + character(CS) :: myModelName = 'lnd' ! user defined model name integer(IN) :: ncomp = 2 ! component index - integer(IN) :: my_task ! my task in mpi communicator mpicom + integer(IN) :: my_task ! my task in mpi communicator mpicom integer(IN) :: master_task=0 ! task number of master task integer(IN) :: logunit ! logging unit number @@ -118,10 +118,10 @@ subroutine lnd_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: totpe ! total number of pes integer(IN), allocatable :: gindex(:) ! global index - + real(R8), pointer :: gbuf(:,:) ! grid info buffer real(R8), pointer :: buf(:) ! temporary buffer - + integer(IN) :: nproc_x ! num of i pes (type 3) integer(IN) :: seg_len ! length of segs (type 4) integer(IN) :: nxg ! global dim i-direction @@ -133,7 +133,7 @@ subroutine lnd_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: COMPID integer(IN) :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "lnd_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance integer(IN) :: mpicom, mpicom_vm integer(IN) :: lsize type(ESMF_Array) :: dom_a @@ -181,7 +181,7 @@ subroutine lnd_init_esmf(comp, import_state, export_state, EClock, rc) else logUnit = 6 endif - + !---------------------------------------------------------------------------- ! Reset shr logging to my log file !---------------------------------------------------------------------------- @@ -429,7 +429,7 @@ subroutine lnd_run_esmf(comp, import_state, export_state, EClock, rc) call esmfshr_util_ArrayGetField(dom_a, 'lat', blat, rc=rc) if (rc /= ESMF_SUCCESS) call ESMF_Finalize(rc=rc, endflag=ESMF_END_ABORT) - call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) + call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) do n = 1, ubound(fptr,2)-lbound(fptr,2)+1 do nf = 1, ubound(fptr,1)-lbound(fptr,1)+1 @@ -458,7 +458,7 @@ subroutine lnd_run_esmf(comp, import_state, export_state, EClock, rc) write(logunit,F04) trim(myModelName),': model date ', CurrentYMD,CurrentTOD call shr_sys_flush(logunit) end if - + !---------------------------------------------------------------------------- ! Reset shr logging to original values !---------------------------------------------------------------------------- @@ -498,7 +498,7 @@ subroutine lnd_final_esmf(comp, import_state, export_state, EClock, rc) character(*), parameter :: subName = "(lnd_final_esmf) " character(*), parameter :: F00 = "('(lnd_final_esmf) ',8a)" character(*), parameter :: F91 = "('(lnd_final_esmf) ',73('-'))" - + !------------------------------------------------------------------------------- ! !------------------------------------------------------------------------------- @@ -515,9 +515,9 @@ subroutine lnd_final_esmf(comp, import_state, export_state, EClock, rc) call esmfshr_util_StateArrayDestroy(import_state, array_name="x2d", rc=rc) if (my_task == master_task) then - write(logunit,F91) + write(logunit,F91) write(logunit,F00) trim(myModelName),': end of main integration loop' - write(logunit,F91) + write(logunit,F91) end if end subroutine lnd_final_esmf diff --git a/components/xcpl_comps/xocn/cime_config/buildnml b/components/xcpl_comps/xocn/cime_config/buildnml index af835684713c..e5d93f0f5df9 100755 --- a/components/xcpl_comps/xocn/cime_config/buildnml +++ b/components/xcpl_comps/xocn/cime_config/buildnml @@ -1,9 +1,9 @@ #! /bin/csh -f set RUNDIR = `./xmlquery RUNDIR -value` -set NINST_OCN = `./xmlquery NINST_OCN -value` -set OCN_NX = `./xmlquery OCN_NX -value` -set OCN_NY = `./xmlquery OCN_NY -value` +set NINST_OCN = `./xmlquery NINST_OCN -value` +set OCN_NX = `./xmlquery OCN_NX -value` +set OCN_NY = `./xmlquery OCN_NY -value` set NX = $OCN_NX set NY = $OCN_NY diff --git a/components/xcpl_comps/xocn/cime_config/config_component.xml b/components/xcpl_comps/xocn/cime_config/config_component.xml index 22e0291249dc..c0473bbb9550 100644 --- a/components/xcpl_comps/xocn/cime_config/config_component.xml +++ b/components/xcpl_comps/xocn/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char xocn xocn @@ -17,4 +17,4 @@ Dead ocean component - + diff --git a/components/xcpl_comps/xocn/cpl/ocn_comp_esmf.F90 b/components/xcpl_comps/xocn/cpl/ocn_comp_esmf.F90 index f6ed0f2ac865..583ac0c21c4e 100644 --- a/components/xcpl_comps/xocn/cpl/ocn_comp_esmf.F90 +++ b/components/xcpl_comps/xocn/cpl/ocn_comp_esmf.F90 @@ -42,13 +42,13 @@ module ocn_comp_esmf !--- stdin input stuff --- character(CS) :: str ! cpp defined model name - + !--- other --- integer(IN) :: dbug = 0 ! debug level (higher is more) - + character(CS) :: myModelName = 'ocn' ! user defined model name integer(IN) :: ncomp = 4 ! component index - integer(IN) :: my_task ! my task in mpi communicator mpicom + integer(IN) :: my_task ! my task in mpi communicator mpicom integer(IN) :: master_task=0 ! task number of master task integer(IN) :: logunit ! logging unit number @@ -117,10 +117,10 @@ subroutine ocn_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: totpe ! total number of pes integer(IN), allocatable :: gindex(:) ! global index integer(IN) :: shrlogunit, shrloglev ! original log unit and level - + real(R8), pointer :: gbuf(:,:) ! grid info buffer real(R8), pointer :: buf(:) ! tempoary buffer - + integer(IN) :: nproc_x ! num of i pes (type 3) integer(IN) :: seg_len ! length of segs (type 4) integer(IN) :: nxg ! global dim i-direction @@ -130,7 +130,7 @@ subroutine ocn_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: COMPID integer(IN) :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "lnd_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance integer(IN) :: mpicom, mpicom_vm integer(IN) :: lsize integer(IN) :: phase @@ -233,7 +233,7 @@ subroutine ocn_init_esmf(comp, import_state, export_state, EClock, rc) write(logunit,F00) call shr_sys_flush(logunit) end if - + !---------------------------- ! Determine communicator groups and sizes !---------------------------- @@ -441,7 +441,7 @@ subroutine ocn_run_esmf(comp, import_state, export_state, EClock, rc) ! the bounds are always from /1,1/ to /nflds_d2x, lsize/ locally. !---------------------------- - call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) + call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) if (rc /= ESMF_SUCCESS) call ESMF_Finalize(rc=rc, endflag=ESMF_END_ABORT) do n = 1, ubound(fptr,2)-lbound(fptr,2)+1 @@ -510,7 +510,7 @@ subroutine ocn_final_esmf(comp, import_state, export_state, EClock, rc) character(*), parameter :: subName = "(ocn_final_esmf) " character(*), parameter :: F00 = "('(ocn_final_esmf) ',8a)" character(*), parameter :: F91 = "('(ocn_final_esmf) ',73('-'))" - + !------------------------------------------------------------------------------- ! !------------------------------------------------------------------------------- diff --git a/components/xcpl_comps/xrof/cime_config/buildnml b/components/xcpl_comps/xrof/cime_config/buildnml index 82726b788a38..c31e070ed0de 100755 --- a/components/xcpl_comps/xrof/cime_config/buildnml +++ b/components/xcpl_comps/xrof/cime_config/buildnml @@ -1,9 +1,9 @@ #! /bin/csh -f set RUNDIR = `./xmlquery RUNDIR -value` -set NINST_ROF = `./xmlquery NINST_ROF -value` -set ROF_NX = `./xmlquery ROF_NX -value` -set ROF_NY = `./xmlquery ROF_NY -value` +set NINST_ROF = `./xmlquery NINST_ROF -value` +set ROF_NX = `./xmlquery ROF_NX -value` +set ROF_NY = `./xmlquery ROF_NY -value` set XROF_FLOOD_MODE = `./xmlquery XROF_FLOOD_MODE -value` cd $RUNDIR diff --git a/components/xcpl_comps/xrof/cime_config/config_component.xml b/components/xcpl_comps/xrof/cime_config/config_component.xml index 494170eab7c6..e6c7570cc0db 100644 --- a/components/xcpl_comps/xrof/cime_config/config_component.xml +++ b/components/xcpl_comps/xrof/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char xrof xrof @@ -13,7 +13,7 @@ Name of river component - + char ACTIVE,NULL NULL @@ -30,4 +30,4 @@ Dead river component - + diff --git a/components/xcpl_comps/xrof/cpl/rof_comp_esmf.F90 b/components/xcpl_comps/xrof/cpl/rof_comp_esmf.F90 index be10219c5acf..4780d1ffaa16 100644 --- a/components/xcpl_comps/xrof/cpl/rof_comp_esmf.F90 +++ b/components/xcpl_comps/xrof/cpl/rof_comp_esmf.F90 @@ -42,13 +42,13 @@ module rof_comp_esmf !--- stdin input stuff --- character(CS) :: str ! cpp defined model name - + !--- other --- integer(IN) :: dbug = 0 ! debug level (higher is more) - + character(CS) :: myModelName = 'rof' ! user defined model name integer(IN) :: ncomp = 6 ! component index - integer(IN) :: my_task ! my task in mpi communicator mpicom + integer(IN) :: my_task ! my task in mpi communicator mpicom integer(IN) :: master_task=0 ! task number of master task integer(IN) :: logunit ! logging unit number @@ -116,10 +116,10 @@ subroutine rof_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: totpe ! total number of pes integer(IN), allocatable :: gindex(:) ! global index integer(IN) :: shrlogunit, shrloglev ! original log unit and level - + real(R8), pointer :: gbuf(:,:) ! grid info buffer real(R8), pointer :: buf(:) ! tempoary buffer - + integer(IN) :: nproc_x ! num of i pes (type 3) integer(IN) :: seg_len ! length of segs (type 4) integer(IN) :: nxg ! global dim i-direction @@ -130,7 +130,7 @@ subroutine rof_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: COMPID integer(IN) :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "lnd_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance integer(IN) :: mpicom, mpicom_vm integer(IN) :: lsize integer(IN) :: phase @@ -239,7 +239,7 @@ subroutine rof_init_esmf(comp, import_state, export_state, EClock, rc) write(logunit,F00) call shr_sys_flush(logunit) end if - + !---------------------------- ! Determine communicator groups and sizes !---------------------------- @@ -451,7 +451,7 @@ subroutine rof_run_esmf(comp, import_state, export_state, EClock, rc) ! the bounds are always from /1,1/ to /nflds_d2x, lsize/ locally. !---------------------------- - call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) + call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) if (rc /= ESMF_SUCCESS) call ESMF_Finalize(rc=rc, endflag=ESMF_END_ABORT) do n = 1, ubound(fptr,2)-lbound(fptr,2)+1 @@ -521,7 +521,7 @@ subroutine rof_final_esmf(comp, import_state, export_state, EClock, rc) character(*), parameter :: subName = "(rof_final_esmf) " character(*), parameter :: F00 = "('(rof_final_esmf) ',8a)" character(*), parameter :: F91 = "('(rof_final_esmf) ',73('-'))" - + !------------------------------------------------------------------------------- ! !------------------------------------------------------------------------------- diff --git a/components/xcpl_comps/xshare/dead_data_mod.F90 b/components/xcpl_comps/xshare/dead_data_mod.F90 index 8389da76475d..fcdc1bc11883 100644 --- a/components/xcpl_comps/xshare/dead_data_mod.F90 +++ b/components/xcpl_comps/xshare/dead_data_mod.F90 @@ -36,7 +36,7 @@ MODULE dead_data_mod integer(IN) :: dead_grid_aream = 6 ! area from mapping file integer(IN) :: dead_grid_index = 7 ! global index integer(IN) :: dead_grid_pid = 8 ! proc id number - integer(IN) :: dead_grid_total = 8 + integer(IN) :: dead_grid_total = 8 !EOP diff --git a/components/xcpl_comps/xshare/dead_mct_mod.F90 b/components/xcpl_comps/xshare/dead_mct_mod.F90 index 0e31828786ee..654454c682f8 100644 --- a/components/xcpl_comps/xshare/dead_mct_mod.F90 +++ b/components/xcpl_comps/xshare/dead_mct_mod.F90 @@ -20,7 +20,7 @@ module dead_mct_mod use shr_mpi_mod , only : shr_mpi_bcast implicit none private - save + save public :: dead_domain_mct, dead_init_mct, dead_run_mct, dead_final_mct integer, parameter :: master_task=0 @@ -45,16 +45,16 @@ module dead_mct_mod subroutine dead_domain_mct_new( mpicom, gbuf, gsMap, domain ) !------------------------------------------------------------------- - !---arguments--- + !---arguments--- integer(IN) , intent(in) :: mpicom real(R8) , intent(in) :: gbuf(:,:) type(mct_gsMap) , intent(in) :: gsMap - type(mct_ggrid) , intent(out) :: domain + type(mct_ggrid) , intent(out) :: domain !---local variables--- integer(IN) :: my_task ! mpi task within communicator integer(IN) :: lsize ! temporary - integer(IN) :: n ,j,i ! indices + integer(IN) :: n ,j,i ! indices integer(IN) :: ier ! error status real(R8), pointer :: data(:) ! temporary integer(IN), pointer :: idata(:) ! temporary @@ -75,7 +75,7 @@ subroutine dead_domain_mct_new( mpicom, gbuf, gsMap, domain ) ! lsize = mct_gGrid_lsize(domain) if (size(gbuf,dim=1) /= lsize) then - call shr_sys_abort('mct_dead_domain size error') + call shr_sys_abort('mct_dead_domain size error') endif allocate(data(lsize)) allocate(idata(lsize)) @@ -87,43 +87,43 @@ subroutine dead_domain_mct_new( mpicom, gbuf, gsMap, domain ) call mct_gGrid_importIAttr(domain,'GlobGridNum',idata,lsize) ! call mct_aVect_zero(domain%data) - data(:) = -9999.0_R8 ! generic special value - call mct_gGrid_importRAttr(domain,"lat" ,data,lsize) - call mct_gGrid_importRAttr(domain,"lon" ,data,lsize) - call mct_gGrid_importRAttr(domain,"area",data,lsize) - call mct_gGrid_importRAttr(domain,"frac",data,lsize) - - data(:) = 0.0_R8 ! generic special value - call mct_gGrid_importRAttr(domain,"mask" ,data,lsize) - call mct_gGrid_importRAttr(domain,"aream",data,lsize) + data(:) = -9999.0_R8 ! generic special value + call mct_gGrid_importRAttr(domain,"lat" ,data,lsize) + call mct_gGrid_importRAttr(domain,"lon" ,data,lsize) + call mct_gGrid_importRAttr(domain,"area",data,lsize) + call mct_gGrid_importRAttr(domain,"frac",data,lsize) + + data(:) = 0.0_R8 ! generic special value + call mct_gGrid_importRAttr(domain,"mask" ,data,lsize) + call mct_gGrid_importRAttr(domain,"aream",data,lsize) ! ! Fill in correct values for domain components ! do n = 1,lsize - data(n) = gbuf(n,dead_grid_lat) + data(n) = gbuf(n,dead_grid_lat) enddo - call mct_gGrid_importRAttr(domain,"lat",data,lsize) + call mct_gGrid_importRAttr(domain,"lat",data,lsize) do n = 1,lsize - data(n) = gbuf(n,dead_grid_lon) + data(n) = gbuf(n,dead_grid_lon) enddo - call mct_gGrid_importRAttr(domain,"lon",data,lsize) + call mct_gGrid_importRAttr(domain,"lon",data,lsize) do n = 1,lsize data(n) = gbuf(n,dead_grid_area) enddo - call mct_gGrid_importRAttr(domain,"area",data,lsize) - call mct_gGrid_importRAttr(domain,"aream",data,lsize) + call mct_gGrid_importRAttr(domain,"area",data,lsize) + call mct_gGrid_importRAttr(domain,"aream",data,lsize) do n = 1,lsize data(n) = gbuf(n,dead_grid_mask) enddo - call mct_gGrid_importRAttr(domain,"mask" ,data,lsize) + call mct_gGrid_importRAttr(domain,"mask" ,data,lsize) do n = 1,lsize data(n) = gbuf(n,dead_grid_frac) enddo - call mct_gGrid_importRAttr(domain,"frac" ,data,lsize) + call mct_gGrid_importRAttr(domain,"frac" ,data,lsize) deallocate(data) deallocate(idata) @@ -163,7 +163,7 @@ subroutine dead_init_mct( model, flds_d2x, flds_x2d, EClock, cdata, x2d, d2x, NL integer(IN) :: nyg ! global dim j-direction integer(IN) :: decomp_type integer(IN) :: my_task - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance integer(IN) :: phase integer(IN) :: logunit logical :: flood=.false. ! rof flood flag diff --git a/components/xcpl_comps/xshare/dead_mod.F90 b/components/xcpl_comps/xshare/dead_mod.F90 index 3873cfd38000..8b5ded6b3465 100644 --- a/components/xcpl_comps/xshare/dead_mod.F90 +++ b/components/xcpl_comps/xshare/dead_mod.F90 @@ -5,7 +5,7 @@ module dead_mod use shr_file_mod, only: shr_file_getlogunit use shr_sys_mod use dead_data_mod - + implicit none private @@ -36,7 +36,7 @@ subroutine dead_setNewGrid(decomp_type,nxg,nyg,totpe,mype,lsize,gbuf,seg_len,npr ! !INPUT/OUTPUT PARAMETERS: - integer(IN),intent(in) :: decomp_type ! + integer(IN),intent(in) :: decomp_type ! integer(IN),intent(in) :: nxg,nyg ! global grid sizes integer(IN),intent(in) :: totpe ! total number of pes integer(IN),intent(in) :: mype ! local pe number @@ -107,7 +107,7 @@ subroutine dead_setNewGrid(decomp_type,nxg,nyg,totpe,mype,lsize,gbuf,seg_len,npr found = .true. elseif (decomp_type == 3) then ! 2d decomp if (present(nproc_x)) then - if ( nproc_x > 0 ) then + if ( nproc_x > 0 ) then npesx=nproc_x npesy=totpe/npesx if ( npesx*npesy /= totpe) then @@ -127,7 +127,7 @@ subroutine dead_setNewGrid(decomp_type,nxg,nyg,totpe,mype,lsize,gbuf,seg_len,npr endif enddo endif - elseif (decomp_type == 4) then ! 2d evenly divisible square block decomp + elseif (decomp_type == 4) then ! 2d evenly divisible square block decomp hscore = nxg*nyg do nx = 1,totpe ny = totpe/nx @@ -222,7 +222,7 @@ subroutine dead_setNewGrid(decomp_type,nxg,nyg,totpe,mype,lsize,gbuf,seg_len,npr endif - if ( .not.found ) then + if ( .not.found ) then write(logunit,F01) 'ERROR: with decomp nxg,nyg,totpe=',nxg,nyg,totpe call shr_sys_abort(subName//'decomp') endif diff --git a/components/xcpl_comps/xwav/cime_config/buildnml b/components/xcpl_comps/xwav/cime_config/buildnml index 74bdcc5d6b31..f662c229a5aa 100755 --- a/components/xcpl_comps/xwav/cime_config/buildnml +++ b/components/xcpl_comps/xwav/cime_config/buildnml @@ -1,9 +1,9 @@ #! /bin/csh -f set RUNDIR = `./xmlquery RUNDIR -value` -set NINST_WAV = `./xmlquery NINST_WAV -value` -set WAV_NX = `./xmlquery WAV_NX -value` -set WAV_NY = `./xmlquery WAV_NY -value` +set NINST_WAV = `./xmlquery NINST_WAV -value` +set WAV_NX = `./xmlquery WAV_NX -value` +set WAV_NY = `./xmlquery WAV_NY -value` set NX = $WAV_NX set NY = $WAV_NY diff --git a/components/xcpl_comps/xwav/cime_config/config_component.xml b/components/xcpl_comps/xwav/cime_config/config_component.xml index 6261f3269881..2abcc70bfd18 100644 --- a/components/xcpl_comps/xwav/cime_config/config_component.xml +++ b/components/xcpl_comps/xwav/cime_config/config_component.xml @@ -2,9 +2,9 @@ - + - + char xwav xwav @@ -17,4 +17,4 @@ Dead wave component - + diff --git a/components/xcpl_comps/xwav/cpl/wav_comp_esmf.F90 b/components/xcpl_comps/xwav/cpl/wav_comp_esmf.F90 index 12bb9a60d799..09dff485d4b7 100644 --- a/components/xcpl_comps/xwav/cpl/wav_comp_esmf.F90 +++ b/components/xcpl_comps/xwav/cpl/wav_comp_esmf.F90 @@ -42,13 +42,13 @@ module wav_comp_esmf !--- stdin input stuff --- character(CS) :: str ! cpp defined model name - + !--- other --- integer(IN) :: dbug = 0 ! debug level (higher is more) - + character(CS) :: myModelName = 'wav' ! user defined model name integer(IN) :: ncomp = 7 ! component index - integer(IN) :: my_task ! my task in mpi communicator mpicom + integer(IN) :: my_task ! my task in mpi communicator mpicom integer(IN) :: master_task=0 ! task number of master task integer(IN) :: logunit ! logging unit number @@ -116,10 +116,10 @@ subroutine wav_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: totpe ! total number of pes integer(IN), allocatable :: gindex(:) ! global index integer(IN) :: shrlogunit, shrloglev ! original log unit and level - + real(R8), pointer :: gbuf(:,:) ! grid info buffer real(R8), pointer :: buf(:) ! tempoary buffer - + integer(IN) :: nproc_x ! num of i pes (type 3) integer(IN) :: seg_len ! length of segs (type 4) integer(IN) :: nxg ! global dim i-direction @@ -129,7 +129,7 @@ subroutine wav_init_esmf(comp, import_state, export_state, EClock, rc) integer(IN) :: COMPID integer(IN) :: inst_index ! number of current instance (ie. 1) character(len=16) :: inst_name ! fullname of current instance (ie. "lnd_0001") - character(len=16) :: inst_suffix ! char string associated with instance + character(len=16) :: inst_suffix ! char string associated with instance integer(IN) :: mpicom, mpicom_vm integer(IN) :: lsize integer(IN) :: phase @@ -233,7 +233,7 @@ subroutine wav_init_esmf(comp, import_state, export_state, EClock, rc) write(logunit,F00) call shr_sys_flush(logunit) end if - + !---------------------------- ! Determine communicator groups and sizes !---------------------------- @@ -437,7 +437,7 @@ subroutine wav_run_esmf(comp, import_state, export_state, EClock, rc) ! the bounds are always from /1,1/ to /nflds_d2x, lsize/ locally. !---------------------------- - call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) + call ESMF_ArrayGet(d2x_a, localDe=0, farrayPtr=fptr, rc=rc) if (rc /= ESMF_SUCCESS) call ESMF_Finalize(rc=rc, endflag=ESMF_END_ABORT) do n = 1, ubound(fptr,2)-lbound(fptr,2)+1 @@ -506,7 +506,7 @@ subroutine wav_final_esmf(comp, import_state, export_state, EClock, rc) character(*), parameter :: subName = "(wav_final_esmf) " character(*), parameter :: F00 = "('(wav_final_esmf) ',8a)" character(*), parameter :: F91 = "('(wav_final_esmf) ',73('-'))" - + !------------------------------------------------------------------------------- ! !------------------------------------------------------------------------------- diff --git a/doc/README b/doc/README index 1cbe567e834c..b22360d57f34 100644 --- a/doc/README +++ b/doc/README @@ -26,7 +26,7 @@ To generate documentation for a CESM1.3 tag, follow these steps: - cp *.* [path-to-web-server-accessible-directory] example on CGD host: cp -R html /cesmweb/html/models/cesm1.3/cesm/doc/apidocs and corresponding URL: http://www.cesm.ucar.edu/models/cesm1.3/cesm/doc/apidocs/html - + http://www.cesm.ucar.edu/models/cesm1.3/cesm/doc -------------------------------------------------------------------------------- diff --git a/doc/apidocs/Doxyfile b/doc/apidocs/Doxyfile index 358fd3df2ed2..2621f14f061b 100644 --- a/doc/apidocs/Doxyfile +++ b/doc/apidocs/Doxyfile @@ -38,7 +38,7 @@ PROJECT_NAME = "CESM 1.3.x Scripts and Tools" # could be handy for archiving the generated documentation or if some version # control system is used. -PROJECT_NUMBER = +PROJECT_NUMBER = # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer a @@ -763,7 +763,7 @@ INPUT = ./doc_txt/ \ ../../scripts/Tools/cs.submit \ ../../scripts/Tools/st_archive \ ../../scripts/Tools/user_nl_add \ - ../../scripts/Tools/user_nlcreate \ + ../../scripts/Tools/user_nlcreate \ ../../scripts/Tools/xml2env \ ../../scripts/Tools/xmlchange \ ../../scripts/Tools/xmlquery \ @@ -771,7 +771,7 @@ INPUT = ./doc_txt/ \ ../../machines/buildlib.csm_share \ ../../machines/configure \ ../../machines/mkDepends \ - ../../machines/mkSrcFiles + ../../machines/mkSrcFiles # This tag can be used to specify the character encoding of the source files # that doxygen parses. Internally doxygen uses the UTF-8 encoding. Doxygen uses @@ -830,7 +830,7 @@ EXCLUDE_SYMLINKS = NO # Note that the wildcards are matched against the file with absolute path, so to # exclude all test directories for example use the pattern */test/* -EXCLUDE_PATTERNS = *.html *.gif *~ +EXCLUDE_PATTERNS = *.html *.gif *~ # The EXCLUDE_SYMBOLS tag can be used to specify one or more symbol names # (namespaces, classes, functions, etc.) that should be excluded from the @@ -884,7 +884,7 @@ IMAGE_PATH = # code is scanned, but not when the output code is generated. If lines are added # or removed, the anchors will not be placed correctly. -INPUT_FILTER = +INPUT_FILTER = # The FILTER_PATTERNS tag can be used to specify filters on a per file pattern # basis. Doxygen will compare the file name with each pattern and apply the @@ -895,7 +895,7 @@ INPUT_FILTER = #FILTER_PATTERNS = "*.py=./doxypypy_filter.sh" "*.pl=./doxypypy_filter.sh" "*.pm=./doxypypy_filter.sh" "*.no_extension=./doxypypy_filter.sh" #FILTER_PATTERNS = "*.py=./doxypypy_filter.sh" "*.pl=/usr/local/bin/doxygen-filter-perl" "*.pm=/usr/local/bin/doxygen-filter-perl" "*.no_extension=./doxypypy_filter.sh" -#FILTER_PATTERNS = "*.py=./doxypypy_filter.sh" +#FILTER_PATTERNS = "*.py=./doxypypy_filter.sh" #FILTER_PATTERNS += "st_archive=/usr/local/bin/doxygen-filter-perl" #FILTER_PATTERNS += "*.pl=/usr/local/bin/doxygen-filter-perl" #FILTER_PATTERNS += "*.pm=/usr/local/bin/doxygen-filter-perl" diff --git a/doc/apidocs/doc_txt/main.txt b/doc/apidocs/doc_txt/main.txt index 2d1342168aa4..357485a61e89 100644 --- a/doc/apidocs/doc_txt/main.txt +++ b/doc/apidocs/doc_txt/main.txt @@ -20,20 +20,20 @@ \author CESM Software Engineering Group -This is the CESM scripts API documentation for development tags. -It is the responsibility of the programmer to -include accurate code documentation in-line with their code. Here are the general +This is the CESM scripts API documentation for development tags. +It is the responsibility of the programmer to +include accurate code documentation in-line with their code. Here are the general work-flow steps for including Doxygen compartible markup in CESM API script code.
  1. become familiar with the Doxygen markup language and syntax for your script flavor
  2. document your code accurately and concisely
  3. follow the normal CESM workflow for testing and repo check-in
-As new development tags become available, this website will be updated accordingly to -reflect the code. +As new development tags become available, this website will be updated accordingly to +reflect the code. -Please refer to the links below for detailed information -regarding documentation standards for CESM scripts codes to accomodate inclusion in this Doxygen web. +Please refer to the links below for detailed information +regarding documentation standards for CESM scripts codes to accomodate inclusion in this Doxygen web. - \ref python - \ref perl diff --git a/doc/apidocs/doc_txt/perl.txt b/doc/apidocs/doc_txt/perl.txt index 0b0165361a49..3e08ee09c46d 100644 --- a/doc/apidocs/doc_txt/perl.txt +++ b/doc/apidocs/doc_txt/perl.txt @@ -18,7 +18,7 @@ /*! \page perl Perl markup conventions Perl code documentation uses the Doxygen::Filter::Perl module input filter which is -specified in the Doxyfile configuration file. The documentation for the +specified in the Doxyfile configuration file. The documentation for the doxygen perl filter with supported markup is here: - http://search.cpan.org/dist/Doxygen-Filter-Perl/lib/Doxygen/Filter/Perl.pm diff --git a/doc/apidocs/doc_txt/python.txt b/doc/apidocs/doc_txt/python.txt index 8b2233e51076..4a67cd8a4237 100644 --- a/doc/apidocs/doc_txt/python.txt +++ b/doc/apidocs/doc_txt/python.txt @@ -17,7 +17,7 @@ /*! \page python Python markup conventions -Python code documentation uses the doxypypy.py Doxygen input filter which is +Python code documentation uses the doxypypy.py Doxygen input filter which is specified in the Doxyfile configuration file. There are a number of sites available that demonstrate good documentation markup for Python code using the doxypypy.py input filter. They include: diff --git a/doc/apidocs/dox-filter.sh b/doc/apidocs/dox-filter.sh index ae0de1ffaa28..3665ed24012c 100755 --- a/doc/apidocs/dox-filter.sh +++ b/doc/apidocs/dox-filter.sh @@ -64,7 +64,7 @@ # # @section Reference # -#/ /* +#/ /* # (Use #! and #/ with dox-filter.sh to fool Doxygen into # parsing this non-source text file for the documentation set. # Use the above open comment to force termination of parsing diff --git a/doc/apidocs/examples/template.py b/doc/apidocs/examples/template.py index 4dfce8eb426e..c77c2aeb605e 100644 --- a/doc/apidocs/examples/template.py +++ b/doc/apidocs/examples/template.py @@ -1,7 +1,7 @@ #!/usr/bin/env python """template python program to do something useful with example documentation markup. - A Template python program with examples of function calls and associated + A Template python program with examples of function calls and associated documentation markup. Author: diff --git a/doc/modelnl/compsets.html b/doc/modelnl/compsets.html index cbc96a72e5a5..29ca02a0fe14 100644 --- a/doc/modelnl/compsets.html +++ b/doc/modelnl/compsets.html @@ -35,7 +35,7 @@

Search or Browse supported component sets

type="button">