eCLM-ParFlow coupling #17
Merged
Conversation
This file contains 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
Changes were based from TSMP's CLM3.5 patches: https://github.com/HPSCTerrSys/TSMP/tree/master/bldsva/intf_oas3/clm3_5/pfile
Starting OASIS3-MCT v5.0, `var_noshape` can be removed.
kvrigor
added a commit
that referenced
this pull request
Oct 9, 2022
kvrigor
added a commit
that referenced
this pull request
Oct 11, 2022
Model developments by @s-poll : * 9f00031 introduce precompiler COUP_OAS_ICON and COUP_OAS_PFL * 59702f3 Oasis define for ICON () * a98d2cd Oasis snd/rcv for ICON (CLM3 vars) * 1641475 consistent coupler precompiler naming * f3c0cad include oas_receive_icon in eclm time stepping * f7be360 renaming of coupled ICON-ECLM vars in oas_defineMod * 27d984d Update snd/rcv fields from ICON * ed1af99 Implementation of coupled variable t_sf. * 47c2068 Couple rain_rate and snow_rate in seperate variables. * 60850cf Restructure oasis_def_var. * a42a3eb Inclusion of urban landunit. Merges and bugfixes by @kvrigor : * d79df54 Merge clm5nl-gen v0.6 (#16) * 8ffe78f Merge eCLM-ParFlow coupling (#17) * dfb6e69 Added compile definition COUP_OAS_PFL for ParFlow * 0263ae8 Removed `use_parflow_soilwater()` in `BalanceCheckMod.F90` and `TotalWaterAndHeatMod.F90` * 9ea5952 Fixed missing `psit` calculation when not coupled with ParFlow
kvrigor
added a commit
that referenced
this pull request
Oct 19, 2022
Model developments by @s-poll : * 9f00031 introduce precompiler COUP_OAS_ICON and COUP_OAS_PFL * 59702f3 Oasis define for ICON () * a98d2cd Oasis snd/rcv for ICON (CLM3 vars) * 1641475 consistent coupler precompiler naming * f3c0cad include oas_receive_icon in eclm time stepping * f7be360 renaming of coupled ICON-ECLM vars in oas_defineMod * 27d984d Update snd/rcv fields from ICON * ed1af99 Implementation of coupled variable t_sf. * 47c2068 Couple rain_rate and snow_rate in seperate variables. * 60850cf Restructure oasis_def_var. * a42a3eb Inclusion of urban landunit. Merges and bugfixes by @kvrigor : * d79df54 Merge clm5nl-gen v0.6 (#16) * 8ffe78f Merge eCLM-ParFlow coupling (#17) * dfb6e69 Added compile definition COUP_OAS_PFL for ParFlow * 0263ae8 Removed `use_parflow_soilwater()` in `BalanceCheckMod.F90` and `TotalWaterAndHeatMod.F90` * 9ea5952 Fixed missing `psit` calculation when not coupled with ParFlow Co-authored-by: Stefan Poll <spoll@users.noreply.github.com>
kvrigor
added a commit
that referenced
this pull request
Jan 19, 2023
* clm5nl-gen v0.6 (#16) Commit summary: * 437789c Bumped clm5nl-gen version to 0.6 * b356751 Wrapped lines based on max column width * 0b3e1b5 Automatically set user-specified namelist parameters * bb5caa2 Made reading/writing/checking valid namelist parameters more convenient * 13286e7 Fixed __contains__ and __str__ in NamelistGroupMixin * 7ef720d Removed <nl>.user_nl and introduced <nl>.general_options * eCLM-ParFlow coupling (#17) Commit summary: * 9291924 Integrated ParFlow psi into eCLM processes (preliminary changes) * 9870b27 Removed optional argument `var_noshape` in oasis_def_var * b208107 Removed optional argument var_noshape in oasis_def_var * 1a6fbe1 Received soil liquid from ParFlow * 07aa9de Added new soilwater_movement_method = coupled_parflow * f6ae4d7 Temporarily bypass water and soil energy balance errors * 506f160 Moved ParFlow subsurface flux calculations into a subroutine (ParFlowDrainage) * b5094cc Converted ET fluxes [mm/s] to ParFlow flux units [1/hr] * be01317 Ignore balance errors when use_parflow_soilwater=TRUE * 602722c Merge branch 'master' into devel-parflow * eCLM-ICON coupling (#18) Model developments by @s-poll : * 9f00031 introduce precompiler COUP_OAS_ICON and COUP_OAS_PFL * 59702f3 Oasis define for ICON () * a98d2cd Oasis snd/rcv for ICON (CLM3 vars) * 1641475 consistent coupler precompiler naming * f3c0cad include oas_receive_icon in eclm time stepping * f7be360 renaming of coupled ICON-ECLM vars in oas_defineMod * 27d984d Update snd/rcv fields from ICON * ed1af99 Implementation of coupled variable t_sf. * 47c2068 Couple rain_rate and snow_rate in seperate variables. * 60850cf Restructure oasis_def_var. * a42a3eb Inclusion of urban landunit. Merges and bugfixes by @kvrigor : * d79df54 Merge clm5nl-gen v0.6 (#16) * 8ffe78f Merge eCLM-ParFlow coupling (#17) * dfb6e69 Added compile definition COUP_OAS_PFL for ParFlow * 0263ae8 Removed `use_parflow_soilwater()` in `BalanceCheckMod.F90` and `TotalWaterAndHeatMod.F90` * 9ea5952 Fixed missing `psit` calculation when not coupled with ParFlow Co-authored-by: Stefan Poll <spoll@users.noreply.github.com>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
No description provided.