Skip to content

Commit

Permalink
merge latest main and resolve conflicts in mom_cap.
Browse files Browse the repository at this point in the history
  • Loading branch information
alperaltuntas committed Feb 9, 2024
2 parents 8f73fb2 + 0de5c14 commit 5578478
Show file tree
Hide file tree
Showing 11 changed files with 346 additions and 229 deletions.
11 changes: 9 additions & 2 deletions .readthedocs.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,14 @@
# Read the Docs configuration file for Sphinx projects
# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details

# Required
version: 2

build:
os: ubuntu-22.04
tools:
python: "3.11"

# Extra formats
# PDF generation is failing for now; disabled on 2020-12-02
#formats:
Expand All @@ -10,7 +19,5 @@ sphinx:
configuration: docs/conf.py

python:
# make sure we're using Python 3
version: 3
install:
- requirements: docs/requirements.txt
8 changes: 8 additions & 0 deletions config_src/drivers/FMS_cap/ocean_model_MOM.F90
Original file line number Diff line number Diff line change
Expand Up @@ -1201,6 +1201,14 @@ subroutine ocean_model_get_UV_surf(OS, Ocean, name, array2D, isc, jsc)
array2D(i,j) = G%mask2dBu(I+i0,J+j0) * &
0.5*(sfc_state%v(i+i0,J+j0)+sfc_state%v(i+i0+1,J+j0))
enddo ; enddo
case('uc')
do j=jsc_bnd,jec_bnd ; do i=isc_bnd,iec_bnd
array2D(i,j) = G%mask2dCu(I+i0,J+j0) * sfc_state%u(I+i0,j+j0)
enddo ; enddo
case('vc')
do j=jsc_bnd,jec_bnd ; do i=isc_bnd,iec_bnd
array2D(i,j) = G%mask2dCv(I+i0,J+j0) * sfc_state%v(i+i0,J+j0)
enddo ; enddo
case default
call MOM_error(FATAL,'ocean_model_get_UV_surf: unknown argument name='//name)
end select
Expand Down
283 changes: 194 additions & 89 deletions config_src/drivers/nuopc_cap/mom_cap.F90

Large diffs are not rendered by default.

Loading

0 comments on commit 5578478

Please sign in to comment.