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

Jump to bottom

Fix edit conflict in phys/module_surface_driver.F #1144

Merged
merged 1 commit into from
Mar 23, 2020
Merged

Fix edit conflict in phys/module_surface_driver.F #1144

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
5 changes: 0 additions & 5 deletions phys/module_surface_driver.F
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3182,13 +3182,8 @@ SUBROUTINE surface_driver( &
ims,ime, jms,jme, kms,kme, &
i_start(ij),i_end(ij), j_start(ij),j_end(ij), kts,kte )

<<<<<<< HEAD
END IF
END IF
=======
ENDIF
ENDIF
>>>>>>> origin/master

call seaice_noah( SEAICE_ALBEDO_OPT, SEAICE_ALBEDO_DEFAULT, SEAICE_THICKNESS_OPT, &
& SEAICE_THICKNESS_DEFAULT, SEAICE_SNOWDEPTH_OPT, &
Expand Down