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

Fix in configuration #17

Merged
merged 1 commit into from
Jul 22, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion data/geos5/1440x1080/INPUT/diag_table
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CM2.1p1
1 1 1 0 0 0
1900 1 1 0 0 0
#output files
#"atmos_daily", 24, "hours", 1, "days", "time",
#"atmos_8xdaily", 3, "hours", 1, "days", "time",
Expand Down
16 changes: 6 additions & 10 deletions data/geos5/1440x1080/INPUT/input.nml
Original file line number Diff line number Diff line change
Expand Up @@ -342,18 +342,18 @@
use_this_module=.true.
debug_this_module=.false.
river_insertion_thickness=40.0
river_diffusion_thickness=40.0
river_diffusivity=5.e-2
river_diffuse_salt=.true.
river_diffuse_temp=.true.
river_diffusion_thickness=0.0
river_diffusivity=0.0
river_diffuse_salt=.false.
river_diffuse_temp=.false.
/

&ocean_riverspread_nml
use_this_module=.true.
debug_this_module=.false
riverspread_diffusion=.true.
riverspread_diffusion_passes=500
vel_micom_smooth=2.0
riverspread_diffusion_passes=2
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is this being ported from S2S v3?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes.

vel_micom_smooth=0.2
/

&ocean_rough_nml
Expand Down Expand Up @@ -569,10 +569,6 @@
/

&ocean_vert_kpp_mom4p1_nml
use_this_module=.true.
/

&ocean_vert_kpp_nml
use_this_module=.true.
diff_cbt_iw=0.0
visc_cbu_iw=0.0
Expand Down
2 changes: 1 addition & 1 deletion data/geos5/360x200/INPUT/diag_table
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CM2.1p1
1 1 1 0 0 0
1900 1 1 0 0 0
#output files
#"atmos_daily", 24, "hours", 1, "days", "time",
#"atmos_8xdaily", 3, "hours", 1, "days", "time",
Expand Down
2 changes: 1 addition & 1 deletion data/geos5/720x410/INPUT/diag_table
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CM2.1p1
1 1 1 0 0 0
1900 1 1 0 0 0
#output files
#"atmos_daily", 24, "hours", 1, "days", "time",
#"atmos_8xdaily", 3, "hours", 1, "days", "time",
Expand Down
2 changes: 1 addition & 1 deletion data/geos5/INPUT/diag_table
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
CM2.1p1
1 1 1 0 0 0
1900 1 1 0 0 0
#output files
#"atmos_daily", 24, "hours", 1, "days", "time",
#"atmos_8xdaily", 3, "hours", 1, "days", "time",
Expand Down