Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add option to use data (prescribed) ice-shelf melt fluxes in MPAS-Ocean #45

Closed
wants to merge 43 commits into from
Closed

Add option to use data (prescribed) ice-shelf melt fluxes in MPAS-Ocean #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
43 commits
Select commit Hold shift + click to select a range
56e094e
Adding in EvaluateSupplStatus() routine in land biogeochemistry.
rgknox Oct 27, 2021
937883a
Fixed location of supplement status definition in lnd biogeochem allo…
rgknox Oct 27, 2021
2855345
Updating machine config for eddi
rgknox Oct 27, 2021
417571b
Updated machine settings for eddi.lbl.gov
rgknox Nov 3, 2021
7288e3b
Turned off defining CWD history variables when fates is on
rgknox Nov 6, 2021
0f99448
updates to fates nutrient uptake
rgknox Nov 24, 2021
444c598
Compatabiltiy update to fates api
rgknox Jan 1, 2022
b2d23df
Reverting changes to phosphorusstateupdate3
rgknox Jan 20, 2022
df843c3
Minor bug fix while bringing FATES CNP up to api 21, temp fix to meml…
rgknox Feb 8, 2022
f52de8d
Reverting default setting for fates nocomp
rgknox Feb 24, 2022
57dea9e
inserted a call to fates history updates
rgknox Apr 1, 2022
d0a60be
Light modifications to allow scaling of ET based BNF when fates is on…
rgknox May 6, 2022
a04f19f
Fixed parameter constant
rgknox May 6, 2022
99b1ea6
Added updates to gnu-eddi compilers and fixed some fpe errors in CH4Mod
rgknox Jul 29, 2022
2f84049
Adding canopy layer history diagnostics for fates
rgknox Aug 3, 2022
faa1898
Added a hard-coded testing parameter to scale total ecosystem fixatio…
rgknox Sep 23, 2022
1863ac7
indent fix on eddi machine file
rgknox Sep 23, 2022
2d0283c
Reverted the hard-coded scalara test_mult on free-living fixer rates …
rgknox Oct 19, 2022
8d3edda
Updating free fixation to allow FATES to participate in NPP hypothesis.
rgknox Nov 8, 2022
4af742e
updates to fates-elm nutrient coupling
rgknox Nov 15, 2022
f5206ea
machine file update for lbnl, testdef for fates and setting a test mu…
rgknox Dec 12, 2022
adee947
changes associated with fates nutrient coupling
rgknox Jan 2, 2023
da1980e
reverting memleak tolerance on chrysalis, for some reason it got chan…
rgknox Jan 6, 2023
22cc745
Rest test multiplier to 1 in N fixation, changed fix/deposition in fa…
rgknox Mar 27, 2023
f137716
fates nutrient coupling, cleaning and reverting some changes
rgknox Mar 27, 2023
ccec3a9
Correction for thin ice/snow treatment of enthalpy and other tracers
njeffery Apr 12, 2023
1b019be
Merge branch 'master' into rgknox/lnd/spinup-np-tweaks
rgknox Apr 14, 2023
a51a442
Merge branch 'master' into rgknox/lnd/spinup-np-tweaks
rgknox Apr 14, 2023
ac31234
Removed redundant declarations
rgknox Apr 18, 2023
03ee01d
Merge branch 'rgknox/lnd/spinup-np-tweaks' of github.com:rgknox/E3SM …
rgknox Apr 18, 2023
0e6777d
Remove snow when ice vanishes
njeffery Apr 24, 2023
36ad7a1
Changing SOwISC12to60E2r4 ocn domain file to masked version
darincomeau May 8, 2023
2d96eb2
Fix array allocation error in betr
jinyuntang May 9, 2023
fed770a
Merge branch 'jinyuntang/lnd/betr_SMS_D.fix' (PR #5676)
bishtgautam May 15, 2023
a0487df
Merge branch 'njeffery/seaice/thin-ice-enthalpy-constant' (PR #5630)
jonbob May 16, 2023
28feac5
Merge branch 'rgknox/lnd/spinup-np-tweaks-v2' (PR #5604)
bishtgautam May 16, 2023
8f8bcfa
Merge branch 'darincomeau/grids/fix-wisc-ocn-domain' (PR #5669)
jonbob May 17, 2023
5c3f473
Remove trailing whitespace
xylar Jan 29, 2023
9c5545e
Add option to use data (prescribed) melt fluxes
xylar Jan 29, 2023
7b4f981
Add data ISMF capability for E3SM runs
xylar Mar 30, 2023
2ed6bfe
Switch compset names ISMF --> PISMF
xylar Apr 3, 2023
5b75b8f
Add DISMF compsets
xylar Apr 3, 2023
9dd592e
Add E3SM tests for DISMF
xylar May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions cime_config/allactive/config_compsets.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,17 +299,17 @@

<compset>
<alias>CRYO1850</alias>
<lname>1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
<lname>1850SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>CRYO1850-4xCO2</alias>
<lname>1850SOI_EAM%CMIP6-4xCO2_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
<lname>1850SOI_EAM%CMIP6-4xCO2_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
<alias>CRYO1950</alias>
<lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBISMF_MOSART_SGLC_SWAV</lname>
<lname>1950SOI_EAM%CMIP6_ELM%SPBC_MPASSI%DIB_MPASO%IBPISMF_MOSART_SGLC_SWAV</lname>
</compset>

<compset>
Expand Down
2 changes: 1 addition & 1 deletion cime_config/config_grids.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2692,7 +2692,7 @@
<domain name="SOwISC12to60E2r4">
<nx>569915</nx>
<ny>1</ny>
<file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.SOwISC12to60E2r4-nomask.210119.nc</file>
<file grid="ice|ocn">$DIN_LOC_ROOT/share/domains/domain.ocn.SOwISC12to60E2r4.210119.nc</file>
<desc>SOwISC12to60E2r4 is a MPAS ice/ocean grid with enhanced resolution of 12km in the Southern Ocean around Antarctica. The high resolution regions smoothly transition to the background resolution of the standard low resolution 60to30km grid:</desc>
</domain>

Expand Down
4 changes: 2 additions & 2 deletions cime_config/machines/cmake_macros/gnu_eddi.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ if (COMP_NAME STREQUAL gptl)
endif()
set(NETCDF_PATH "$ENV{NETCDF_HOME}")
if (NOT DEBUG)
string(APPEND FFLAGS " -fno-unsafe-math-optimizations")
string(APPEND FFLAGS " -fno-unsafe-math-optimizations -fallow-argument-mismatch -fallow-invalid-boz")
endif()
if (DEBUG)
string(APPEND FFLAGS " -g -fbacktrace -fbounds-check -ffpe-trap=invalid,zero,overflow")
string(APPEND FFLAGS " -g -fbacktrace -fbounds-check -ffpe-trap=invalid,zero,overflow -fallow-argument-mismatch -fallow-invalid-boz -Wall")
endif()
string(APPEND SLIBS " -L$ENV{NETCDF_HOME}/lib/ -lnetcdff -lnetcdf -lcurl -llapack -lblas")
if (MPILIB STREQUAL mpi-serial)
Expand Down
19 changes: 11 additions & 8 deletions cime_config/machines/config_machines.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4319,31 +4319,34 @@
<DESC>small developer workhorse at lbl climate sciences</DESC>
<OS>LINUX</OS>
<COMPILERS>gnu</COMPILERS>
<MPILIBS>mpi-serial</MPILIBS>
<MPILIBS>openmpi</MPILIBS>
<PROJECT>ngeet</PROJECT>
<CIME_OUTPUT_ROOT>/raid1/lbleco/e3sm/</CIME_OUTPUT_ROOT>
<DIN_LOC_ROOT>/raid1/lbleco/cesm/cesm_input_datasets/</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/raid1/lbleco/cesm/cesm_input_datasets/atm/datm7/</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>/raid1/lbleco/acme/cesm_archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>/raid1/lbleco/acme/cesm_baselines/$COMPILER</BASELINE_ROOT>
<DIN_LOC_ROOT>/home/rgknox/Models/InputDatasets/cesm_input_data/</DIN_LOC_ROOT>
<DIN_LOC_ROOT_CLMFORC>/home/rgknox/Models/InputDatasets/cesm_input_data/atm/datm7/</DIN_LOC_ROOT_CLMFORC>
<DOUT_S_ROOT>/home/rgknox/Models//cesm_archive/$CASE</DOUT_S_ROOT>
<BASELINE_ROOT>/home/rgknox/Models//cesm_baselines/$COMPILER</BASELINE_ROOT>
<CCSM_CPRNC>/raid1/lbleco/cesm/cesm_tools/cprnc/cprnc</CCSM_CPRNC>
<GMAKE_J>1</GMAKE_J>
<BATCH_SYSTEM>none</BATCH_SYSTEM>
<SUPPORTED_BY>rgknox at lbl gov</SUPPORTED_BY>
<MAX_TASKS_PER_NODE>4</MAX_TASKS_PER_NODE>
<MAX_MPITASKS_PER_NODE>4</MAX_MPITASKS_PER_NODE>
<MAX_TASKS_PER_NODE>16</MAX_TASKS_PER_NODE>
<MAX_MPITASKS_PER_NODE>16</MAX_MPITASKS_PER_NODE>
<PROJECT_REQUIRED>FALSE</PROJECT_REQUIRED>
<mpirun mpilib="mpi-serial">
<executable/>
</mpirun>
<mpirun mpilib="default">
<mpirun mpilib="openmpi">
<executable>mpirun</executable>
<arguments>
<arg name="num_tasks">-np {{ total_tasks }}</arg>
<arg name="tasks_per_node"> -npernode $MAX_MPITASKS_PER_NODE</arg>
</arguments>
</mpirun>
<module_system type="none"/>
<environment_variables compiler="gnu" >
<env name="CMAKE_ROOT">/usr/local/share/cmake-3.21/</env>
</environment_variables>
</machine>

<machine MACH="summit">
Expand Down
8 changes: 5 additions & 3 deletions cime_config/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,16 +207,18 @@

"e3sm_ocnice_stealth_features" : {
"tests" : (
"SMS_D_Ld1.T62_oQU240wLI.GMPAS-IAF-ISMF.mpaso-impl_top_drag",
"SMS_D_Ld1.T62_oQU240wLI.GMPAS-IAF-PISMF.mpaso-impl_top_drag",
"SMS_D_Ld1.T62_oQU240.GMPAS-IAF.mpaso-harmonic_mean_drag",
)
},

"e3sm_ocnice_extra_coverage" : {
"inherit" : ("e3sm_ocnice_stealth_features"),
"tests" : (
"ERS_P480_Ld5.T62_ECwISC30to60E2r1.GMPAS-DIB-IAF-ISMF",
"PEM_P480_Ld5.T62_ECwISC30to60E2r1.GMPAS-DIB-IAF-ISMF",
"ERS_P480_Ld5.T62_ECwISC30to60E2r1.GMPAS-DIB-IAF-PISMF",
"PEM_P480_Ld5.T62_ECwISC30to60E2r1.GMPAS-DIB-IAF-PISMF",
"ERS_P480_Ld5.T62_ECwISC30to60E2r1.GMPAS-DIB-IAF-DISMF",
"PEM_P480_Ld5.T62_ECwISC30to60E2r1.GMPAS-DIB-IAF-DISMF",
"SMS.ne30_oECv3_gis.IGELM_MLI.elm-extrasnowlayers",
)
},
Expand Down
Loading