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.

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

Merge latest master into feature-hamocc_beyond-CMIP6 branch #232

Merged
Changes from 1 commit
Commits
Show all changes
42 commits
Select commit Hold shift + click to select a range
3e4eb0f
Dynamic mapping of pore water tracers to ocean tracers (#192)
jmaerz Sep 8, 2022
53d31b1
Added initial support for NUOPC driver.
matsbn Sep 14, 2022
88d6208
Lon-lat variable sediment porosity (#189)
jmaerz Sep 15, 2022
1178bb3
Added wave forcing fields.
matsbn Sep 15, 2022
1c581b5
Renamed folder for MCT driver.
matsbn Sep 15, 2022
a198394
Moved MCT specific file from drivers/cpl_share/ to drivers/mct/.
matsbn Sep 15, 2022
49821fd
Rename drivers/mct/mod_swtfrz.F to drivers/mct/mod_swtfrz.F90.
matsbn Sep 15, 2022
8b6c43c
Rewrite to drivers/mct/mod_swtfrz.F90 to free format Fortran.
matsbn Sep 15, 2022
997104a
Merge remote-tracking branch 'upstream/master' into feature-nuopc
matsbn Sep 27, 2022
e37d846
Remove redundant definition of kOBL.
TomasTorsvik Aug 5, 2022
83d9237
Redefine kOBL, cast as integer
TomasTorsvik Sep 27, 2022
c863a47
Fixing variable sediment porosity - field initialization in case of `…
jmaerz Sep 27, 2022
ac7aac4
This is the first commit of MKS units. All variables in the subroutin…
milicak Oct 3, 2022
2a80c23
Hamocc hybrid coord2 (#179)
TomasTorsvik Oct 3, 2022
a0c5421
Merge pull request #199 from matsbn/feature-nuopc
matsbn Oct 3, 2022
e2093c3
BLOM CIME cpp updates to run in NorESM
milicak Oct 10, 2022
2ce0f84
bug fixes for the CGS MKS conversion
milicak Oct 10, 2022
2396a0f
cesm thermal forcing bug fixes for reproducibility
milicak Oct 10, 2022
30457c3
BLOM MKS update to export winds into the CESM using proper units.
milicak Oct 17, 2022
6753060
input values in ocn_in case is updated for mks setup
milicak Oct 17, 2022
d10893c
default cgsmks value changed
milicak Oct 21, 2022
cc7e9d7
Initialize some variables in the k-epsilon model.
matsbn Nov 4, 2022
613b8bc
Fix porosity read (#201)
jmaerz Nov 9, 2022
a6d1c88
Correct unit of diagnostic variable dp_trc.
matsbn Nov 20, 2022
e291c3b
Made conservation and checksum diagnostics selectable by namelist opt…
matsbn Nov 21, 2022
8385d62
Merge pull request #205 from matsbn/feature-r13fixes
matsbn Nov 21, 2022
98ade59
pCO2, Piston velocity and solubility output (#202)
jmaerz Nov 22, 2022
81f6c58
Bugfix pnetcdf (#208)
TomasTorsvik Nov 25, 2022
8f5acc1
fixed units and renamed calcium burial to CaCO3 burial (#212)
jmaerz Dec 2, 2022
fa7aecd
- Made the "fuk95" configuration work with MKS units.
matsbn Dec 8, 2022
d6466f6
Correct unit conversion of mixed layer depth to pressure.
matsbn Dec 8, 2022
b2d2df5
Updated NorESM coupling scripts for the use of MKS units.
matsbn Dec 9, 2022
7d90240
Merge pull request #217 from matsbn/SI_units
milicak Dec 9, 2022
9c489bd
Merge remote-tracking branch 'upstream/master' into SI_units
matsbn Dec 9, 2022
c66c58b
Fixed check of unit system when building as NorESM component.
matsbn Dec 10, 2022
ae20b35
Merge pull request #218 from matsbn/SI_units
matsbn Dec 12, 2022
0802d11
Add option for surface pH output (#221)
JorgSchwinger Jan 6, 2023
440de2d
Remove unused parameters in wrt* subroutine calls in ncout_hamocc.F90
JorgSchwinger Jan 9, 2023
56d7d9b
Import get_bgc_namelist only in subroutine where it is needed. (#225)
TomasTorsvik Jan 25, 2023
d99b608
Merge pull request #219 from NorESMhub/SI_units
milicak Jan 27, 2023
bec98f0
fix missing ' (#228)
jmaerz Jan 27, 2023
ace51d4
merging master into clone of feature-hamocc_beyond-CMIP6 branch to br…
jmaerz Jan 27, 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
10 changes: 10 additions & 0 deletions cime_config/buildcpp
Original file line number Diff line number Diff line change
@@ -87,6 +87,7 @@ def buildcpp(case):
hamocc_sedbypass = case.get_value("HAMOCC_SEDBYPASS")
hamocc_ciso = case.get_value("HAMOCC_CISO")
hamocc_vsls = case.get_value("HAMOCC_VSLS")
cgsmks = case.get_value("BLOM_UNIT")

expect(blom_vcoord != "cntiso_hybrid" or not turbclo, "BLOM_VCOORD == {} and BLOM_TURBULENT_CLOSURE == {} is not a valid combination".format(blom_vcoord, turbclo))

@@ -146,6 +147,15 @@ def buildcpp(case):
else:
expect(False, "tracer module {} is not recognized".format(module))

if cgsmks:
for option in cgsmks.split():
if option == "cgs":
blom_cppdefs = blom_cppdefs + " -DCGS"
elif option == "mks":
blom_cppdefs = blom_cppdefs + " -DMKS"
else:
expect(False, "SI_UNIT module {} is not recognized".format(option))

blom_cppdefs = "-DMPI" + blom_cppdefs

# update the xml variable BLOM_CPPDEFS with the above definition
9 changes: 9 additions & 0 deletions cime_config/config_component.xml
Original file line number Diff line number Diff line change
@@ -218,6 +218,15 @@
<desc>Optional turbulent closure. Valid values one of: twoeq oneeq. Additional values: advection isodif</desc>
</entry>

<entry id="BLOM_UNIT">
<type>char</type>
<valid_values></valid_values>
<default_value>cgs</default_value>
<group>build_component_blom</group>
<file>env_build.xml</file>
<desc>BLOM UNIT values. Valid values one of: cgs mks. </desc>
</entry>

<description>
<desc compset="_BLOM" >BLOM default:</desc>
<desc compset="_BLOM%ECO">BLOM/Ecosystem:</desc>