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

Update bld files to catch missed mpas-o Registry change #5541

Merged
merged 1 commit into from
Mar 22, 2023
Merged

Update bld files to catch missed mpas-o Registry change #5541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion components/mpas-ocean/bld/build-namelist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,6 +481,7 @@ if ($CONTINUE_RUN eq 'TRUE') {
} else {
add_default($nl, 'config_start_time', 'val'=>"'${RUN_STARTDATE}_${START_TOD}'");
}
add_default($nl, 'config_output_reference_time');

######################
# Namelist group: io #
Expand Down Expand Up @@ -672,7 +673,7 @@ if ($ocn_wave eq 'true' ) {
}

#################################
# Namelist group: wave coupling #
# Namelist group: wave_coupling #
#################################

if ($ocn_wave eq 'true' ) {
Expand Down
3 changes: 2 additions & 1 deletion components/mpas-ocean/bld/build-namelist-section
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ if ($CONTINUE_RUN eq 'TRUE') {
} else {
add_default($nl, 'config_start_time', 'val'=>"'${RUN_STARTDATE}_${START_TOD}'");
}
add_default($nl, 'config_output_reference_time');

######################
# Namelist group: io #
Expand Down Expand Up @@ -208,8 +209,8 @@ add_default($nl, 'config_cvmix_kpp_use_active_wave');
# Namelist group: wave_coupling #
#################################

add_default($nl, 'config_n_stokes_drift_wavenumber_partitions');
add_default($nl, 'config_use_active_wave');
add_default($nl, 'config_n_stokes_drift_wavenumber_partitions');

########################
# Namelist group: gotm #
Expand Down
6 changes: 3 additions & 3 deletions components/mpas-ocean/bld/namelist_files/namelist_defaults_mpaso.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
<config_run_duration>'0010_00:00:00'</config_run_duration>
<config_calendar_type CALENDAR="NO_LEAP">'noleap'</config_calendar_type>
<config_calendar_type>'gregorian'</config_calendar_type>
<config_output_reference_time>'0001-01-01_00:00:00'</config_output_reference_time>

<!-- io -->
<config_write_output_on_startup>.false.</config_write_output_on_startup>
Expand Down Expand Up @@ -257,12 +258,11 @@
<config_cvmix_kpp_use_enhanced_diff>.true.</config_cvmix_kpp_use_enhanced_diff>
<config_cvmix_kpp_nonlocal_with_implicit_mix>.false.</config_cvmix_kpp_nonlocal_with_implicit_mix>
<config_cvmix_kpp_use_theory_wave>.false.</config_cvmix_kpp_use_theory_wave>
<config_cvmix_kpp_use_active_wave>.false.</config_cvmix_kpp_use_active_wave>
<config_cvmix_kpp_langmuir_mixing_opt>'NONE'</config_cvmix_kpp_langmuir_mixing_opt>
<config_cvmix_kpp_langmuir_entrainment_opt>'NONE'</config_cvmix_kpp_langmuir_entrainment_opt>
<config_cvmix_kpp_use_active_wave>.false.</config_cvmix_kpp_use_active_wave>


<!-- wave coupling-->
<!-- wave_coupling -->
<config_use_active_wave>.false.</config_use_active_wave>
<config_n_stokes_drift_wavenumber_partitions>6</config_n_stokes_drift_wavenumber_partitions>

Expand Down
34 changes: 21 additions & 13 deletions components/mpas-ocean/bld/namelist_files/namelist_definition_mpaso.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,14 @@ Valid values: 'gregorian', 'noleap'
Default: Defined in namelist_defaults.xml
</entry>

<entry id="config_output_reference_time" type="char*1024"
category="time_management" group="time_management">
Reference time used in the units attribute of Time in output files.

Valid values: 'YYYY-MM-DD_HH:MM:SS'
Default: Defined in namelist_defaults.xml
</entry>


<!-- io -->

Expand Down Expand Up @@ -1070,14 +1078,6 @@ Valid values: .true. or .false.
Default: Defined in namelist_defaults.xml
</entry>

<entry id="config_cvmix_kpp_use_active_wave" type="logical"
category="cvmix" group="cvmix">
Flag for use of active WAVEWATCH III coupling to calculate the Langmuir number and enhancement factor

Valid values: .true. or .false.
Default: Defined in namelist_defaults.xml
</entry>

<entry id="config_cvmix_kpp_langmuir_mixing_opt" type="char*1024"
category="cvmix" group="cvmix">
Option of Langmuir enhanced mixing parameterization
Expand All @@ -1094,22 +1094,30 @@ Valid values: NONE, LWF16, LF17, RWHGK16
Default: Defined in namelist_defaults.xml
</entry>

<entry id="config_cvmix_kpp_use_active_wave" type="logical"
category="cvmix" group="cvmix">
Flag for Langmuir enchancement factor using prognostic waves. Requires config_use_active_wave = .true.

Valid values: .true. or .false.
Default: Defined in namelist_defaults.xml
</entry>


<!-- wave coupling -->
<!-- wave_coupling -->

<entry id="config_use_active_wave" type="logical"
category="wave_coupling" group="wave_coupling">
Flag for using prognostic waves
Flag for using prognostic waves. Controls the allocation of wave arrays and computation of Stokes drift profiles.

Valid values:
Valid values: .true. or .false.
Default: Defined in namelist_defaults.xml
</entry>

<entry id="config_n_stokes_drift_wavenumber_partitions" type="integer"
category="wave_coupling" group="wave_coupling">
Number of wavenumbers used to reconstruct Stokes drift profile
Number of wavenumber partitions to be used in reconstructing wave-induced Stokes drift profile

Valid values: 3, 4, and 6
Valid values: 3,4,6
Default: Defined in namelist_defaults.xml
</entry>

Expand Down