Auto PR - develop → MAPL-v3 - Merge branch 'develop' into feature/zhaobin74/improve-runoff-distribution#3
Open
github-actions[bot] wants to merge 468 commits intorelease/MAPL-v3from
Open
Auto PR - develop → MAPL-v3 - Merge branch 'develop' into feature/zhaobin74/improve-runoff-distribution#3github-actions[bot] wants to merge 468 commits intorelease/MAPL-v3from
github-actions[bot] wants to merge 468 commits intorelease/MAPL-v3from
Conversation
Also matched the long names in the specs file with the original ones in the GridComp
…needed to run the component standalone driver
…offline Add offline choice for landice_gridcomp
…te-cice6-configs update cice6 configs
v11: Updates for GCC 15 and Moist
…clean-ww3-cmake Fixes GEOS-ESM#1069. Clean up WW3 Cmake
…up_and_documentation Add Topography documentation & some cleanup
…ove-runoff-distribution improve runoff distribution
… size of hash to speed-up the code
…-DZ-tunable-dataatm change DZ to be a RC parameter in DataAtmosphere
…k_fix_mkiau v11: Fixed a memory leak in mkIAU.
Increased the initial hash size for speedup
…ge-cice-strength-param
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
14 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
📝 Automatic PR:
develop→release/MAPL-v3Description
Merge branch 'develop' into feature/zhaobin74/improve-runoff-distribution
📁 Modified files
.circleci/config.yml | 8 +-
.github/workflows/push-to-develop.yml | 2 +-
.github/workflows/workflow.yml (new) | 36 +
CMakeLists.txt | 7 +
GEOS_GcmGridComp.F90 | 44 +-
GEOSagcm_GridComp/CMakeLists.txt | 2 +
GEOSagcm_GridComp/GEOS_AgcmGridComp.F90 | 35 +-
.../GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90 | 29 +-
.../GEOSgwd_GridComp/CMakeLists.txt | 21 +-
.../GEOSgwd_GridComp/GEOS_GwdGridComp.F90 | 2386 ++--
.../GEOSgwd_GridComp/GWD_StateSpecs.rc (new) | 96 +
.../GEOSmoist_GridComp/CMakeLists.txt | 26 +-
.../GEOSmoist_GridComp/ConvPar_GF2020.F90 | 17 +-
.../GEOS_MGB2_2M_InterfaceMod.F90 | 1450 +--
.../GEOSmoist_GridComp/GEOS_MoistGridComp.F90 | 25 +-
.../GEOSmoist_GridComp/Process_Library.F90 | 131 +-
.../GEOSmoist_GridComp/WSUB_ExtData.yaml | 2 +-
.../GEOSmoist_GridComp/aer_cloud.F90 | 588 +-
.../GEOSmoist_GridComp/cldmacro.F90 (gone) | 2054 ----
.../GEOSmoist_GridComp/cldwat2m_micro.F90 | 14 +-
.../GEOSmoist_GridComp/micro_mg3_0.F90 | 14 +-
.../GEOSsurface_GridComp/GEOS_SurfaceGridComp.F90 | 191 +-
.../GEOSlake_GridComp/GEOS_LakeGridComp.F90 | 10 +-
.../GEOScatchCN_GridComp/GEOS_CatchCNGridComp.F90 | 6 +-
.../GEOS_CatchCNCLM40GridComp.F90 | 146 +-
.../GEOS_CatchCNCLM45GridComp.F90 | 52 +-
.../GEOScatchCN_GridComp/Shared/catchmentCN.F90 | 8 +-
.../utils/dbg_cnlsm_offline.F90 | 4 +-
.../GEOScatch_GridComp/GEOS_CatchGridComp.F90 | 893 +-
.../GEOScatch_GridComp/catchment.F90 | 9 +-
.../GEOSroute_GridComp/GEOS_RouteGridComp.F90 | 2 +-
.../GEOSvegdyn_GridComp/GEOS_VegdynGridComp.F90 | 2 +-
.../GEOSland_GridComp/Shared/catch_wrap_state.F90 | 115 +-
.../GEOSlandice_GridComp/GEOS_LandIceGridComp.F90 | 485 +-
.../GEOSsaltwater_GridComp/BufferPacking.h | 14 +-
.../GEOS_CICE4ColumnPhysGridComp.F90 | 47 +-
.../GEOS_OpenWaterGridComp.F90 | 61 +-
.../GEOS_SaltWaterGridComp.F90 | 10 +-
.../GEOS_SeaiceInterfaceGridComp.F90 | 46 +-
.../GEOS_SimpleSeaiceGridComp.F90 | 42 +-
.../GEOSsaltwater_GridComp/GetPtr.h | 2 +
.../Shared/GEOS_SurfaceGridComp.rc | 43 +-
.../GEOSsurface_GridComp/Shared/StieglitzSnow.F90 | 47 +-
.../Utils/Raster/makebcs/CMakeLists.txt | 7 +-
.../Utils/Raster/makebcs/CombineRasters.F90 | 22 +-
.../Utils/Raster/makebcs/CubedSphere_GridMod.F90 | 2 +-
.../Utils/Raster/makebcs/EASE_conv.F90 (gone) | 786 --
.../Raster/makebcs/ExtractBCsFromOrig.py (new +x) | 163 +
.../Utils/Raster/makebcs/FillMomGrid.F90 | 3 +-
.../Raster/makebcs/TileFile_ASCII_to_nc4.F90 (new) | 304 +
.../makebcs/TileFile_ASCII_to_nc4.py (new +x) | 38 +
.../Utils/Raster/makebcs/create_README.csh | 97 +-
.../Utils/Raster/makebcs/make_bcs_cube.py | 174 +-
.../Utils/Raster/makebcs/make_bcs_ease.py | 4 +-
.../Utils/Raster/makebcs/make_bcs_latlon.py | 3 +-
.../Utils/Raster/makebcs/make_bcs_questionary.py | 8 +-
.../Utils/Raster/makebcs/make_bcs_shared.py | 130 +-
.../Utils/Raster/makebcs/mkCatchParam.F90 | 293 +-
.../Utils/Raster/makebcs/mkCubeFVRaster.F90 | 2 +-
.../Utils/Raster/makebcs/mkEASETilesParam.F90 | 155 +-
.../Utils/Raster/makebcs/mkLandRaster.F90 | 17 +-
.../Utils/Raster/makebcs/mkLatLonRaster.F90 | 2 +-
.../Utils/Raster/makebcs/mkMITAquaRaster.F90 | 31 +-
.../Utils/Raster/makebcs/mkMOMAquaRaster.F90 | 17 +-
.../Utils/Raster/makebcs/mk_runofftbl.F90 | 7 +-
.../Utils/Raster/makebcs/mod_process_hres_data.F90 | 10929 ++++++++---------
.../Utils/Raster/makebcs/rasterize.F90 | 633 +-
.../Utils/Raster/makebcs/rasterize.H | 62 +-
.../Utils/Raster/makebcs/rmTinyCatchParaMod.F90 | 12260 ++++++++-----------
.../Utils/Raster/preproc/CMakeLists.txt | 2 +-
.../Raster/preproc/topography/.gitignore (new) | 3 +
.../Raster/preproc/topography/CMakeLists.txt (new) | 2 +
.../preproc/topography/README_topo.md (new +x) | 306 +
.../topography/obsolete/generate_topo.sh (new +x) | 90 +
.../topography/utils_topo/CMakeLists.txt (new) | 30 +
.../utils_topo/convert_bin_to_netcdf.F90 (new) | 158 +
.../utils_topo/convert_to_gmao_output.F90 (new) | 296 +
.../utils_topo/generate_scrip_cube.F90 (new) | 1868 +++
.../topography/utils_topo/geompack.F90 (new) | 4089 +++++++
.../topography/utils_topo/make_topo.py (new +x) | 415 +
.../utils_topo/scrip_to_cube_topo.py (new +x) | 159 +
.../utils_topo/scrip_to_restart_topo.py (new +x) | 140 +
.../Utils/mk_restarts/CatchmentRst.F90 | 6 +-
.../Utils/mk_restarts/SaltImpConverter.F90 | 12 +-
.../Utils/mk_restarts/SaltIntSplitter.F90 | 14 +-
.../Utils/mk_restarts/getids.F90 | 215 +-
.../Utils/mk_restarts/mk_CICERestart.F90 | 26 +-
.../Utils/mk_restarts/mk_CatchCNRestarts.F90 | 12 +-
.../Utils/mk_restarts/mk_CatchRestarts.F90 | 4 +-
.../Utils/mk_restarts/mk_GEOSldasRestarts.F90 | 12 +-
.../mk_restarts/mk_LakeLandiceSaltRestarts.F90 | 14 +-
.../GEOSsuperdyn_GridComp/CMakeLists.txt | 2 +
.../GEOS_SuperdynGridComp.F90 | 9 +
GEOSdataatm_GridComp/CMakeLists.txt | 4 +
...CORE_NYF_Data_AtmForcings_ExtData.yaml (new +x) | 27 +
GEOSdataatm_GridComp/GEOS_DataAtmGridComp.F90 | 50 +-
...JRA55-DO_DataAtm_Forcings_ExtData.yaml (new +x) | 130 +
GEOSgigatraj_GridComp/.gitignore (new) | 3 +
GEOSgigatraj_GridComp/CMakeLists.txt (new) | 9 +
GEOSgigatraj_GridComp/GEOS_Giga_InterOp.F90 (new) | 190 +
.../GEOS_GigatrajGridComp.F90 (new) | 1477 +++
GEOSgigatraj_GridComp/Gigatraj_Utils.F90 (new) | 291 +
GEOSmkiau_GridComp/CMakeLists.txt | 90 +-
GEOSmkiau_GridComp/GEOS_mkiauGridComp.F90 | 247 +-
GEOSmkiau_GridComp/pyMKIAU/.gitignore (new) | 12 +
GEOSmkiau_GridComp/pyMKIAU/README.md (new) | 40 +
.../pyMKIAU/interface/interface.c (new) | 31 +
.../pyMKIAU/interface/interface.f90 (new) | 43 +
.../pyMKIAU/interface/interface.h (new) | 40 +
.../pyMKIAU/interface/interface.py (new) | 46 +
.../pyMKIAU/pyMKIAU/init.py (new) | 0
GEOSmkiau_GridComp/pyMKIAU/pyMKIAU/core.py (new) | 74 +
.../pyMKIAU/pyMKIAU/cuda_profiler.py (new) | 76 +
.../pyMKIAU/pyMKIAU/f_py_conversion.py (new) | 219 +
GEOSmkiau_GridComp/pyMKIAU/setup.py (new) | 33 +
GEOSogcm_GridComp/GEOS_OgcmGridComp.F90 | 26 +-
.../CICE_GEOSPlug/CICE_GEOSPlug.F90 | 12 +-
.../CICE_GEOSPlug/cice6_app/1440x1080/ice_in | 26 +-
.../CICE_GEOSPlug/cice6_app/540x458/ice_in | 12 +-
.../CICE_GEOSPlug/cice6_app/72x36/ice_in | 6 +-
GEOSwgcm_GridComp/GEOS_WgcmGridComp.F90 | 4 +
.../GEOS_WaveWatchGridComp.F90 | 16 +-
.../ww3_multi_esmf/CMakeLists.txt | 165 +-
.../ww3_multi_esmf/run_w3adc.sh (gone) | 29 -
124 files changed, 27012 insertions(+), 19671 deletions(-)