Parent Directory
| 
Revision Log
| 
Revision Graph
Merging changes on MAIN between checkpoint43 and checkpoint43a-release1mods
Command: cvs -q update -jcheckpoint43 -jcheckpoint43a-release1mods -d -P
These changes are most of the changes between c43 and c44 except those
that occured after "12:45 11 Jan 2002". As far as I can tell it is
checkpoint43 with the following mods:
o fix bug in mom_vi_del2uv
o select when filters are applied ; add options to zonal_filter (data.zonfilt) o gmredi: fix Pb in the adiabatic form ; add options (.e.g. Bolus advection)
o update AIM experiments (NCEP input files)
o improve and extend diagnostics (Monitor, TimeAve with NonLin-FrSurf)
o added some stuff for AD
o Jamar wet-points
This update does not contain the following mods that are in checkpoint44
o bug fix in pkg/generic_advdiff/
- thread related bug, bi,bj arguments in vertical advection routines
o some changes to pkg/autodiff, pkg/cost, pkg/exf, pkg/ecco,
verification/carbon and model/src/ related to adjoint
o some new Matlab scripts for diagnosing model density
- utils/matlab/dens_poly3.m and ini_poly3.m
The list of exclusions is accurate based on a "cvs diff". The list of
inclusions is based on the record in doc/tag-index which may not be complete.
| 1 | C $Header: /u/gcmpack/MITgcm/verification/aim.5l_cs/code/mom_vi_mask_vort3.F,v 1.1 2002/01/09 00:28:56 jmc Exp $ |
| 2 | C $Name: checkpoint43a-release1mods $ |
| 3 | |
| 4 | #include "CPP_OPTIONS.h" |
| 5 | |
| 6 | SUBROUTINE MOM_VI_MASK_VORT3( |
| 7 | I bi,bj,k, |
| 8 | O hFacZ,r_hFacZ, |
| 9 | U vort3, |
| 10 | I myThid) |
| 11 | IMPLICIT NONE |
| 12 | C |
| 13 | C Compute hFactor and recip_hFactor at the corner (Z-point) |
| 14 | C and set vort3 to zero where hFac = 0 (apply a mask) |
| 15 | C |
| 16 | |
| 17 | C == Global variables == |
| 18 | #include "SIZE.h" |
| 19 | #include "GRID.h" |
| 20 | |
| 21 | C == Routine arguments == |
| 22 | INTEGER bi,bj,k |
| 23 | _RS hFacZ(1-OLx:sNx+OLx,1-OLy:sNy+OLy) |
| 24 | _RS r_hFacZ(1-OLx:sNx+OLx,1-OLy:sNy+OLy) |
| 25 | _RL vort3(1-OLx:sNx+OLx,1-OLy:sNy+OLy) |
| 26 | _RS hFacZOpen |
| 27 | INTEGER myThid |
| 28 | |
| 29 | C == Local variables == |
| 30 | INTEGER I,J |
| 31 | |
| 32 | C-- Calculate open water fraction at vorticity points |
| 33 | |
| 34 | c DO i=1-Olx,sNx+Olx |
| 35 | c hFacZ(i,1-Oly)=0. |
| 36 | c r_hFacZ(i,1-Oly)=0. |
| 37 | c ENDDO |
| 38 | |
| 39 | DO j=2-Oly,sNy+Oly |
| 40 | c hFacZ(1-Olx,j)=0. |
| 41 | c r_hFacZ(1-Olx,j)=0. |
| 42 | DO i=2-Olx,sNx+Olx |
| 43 | hFacZOpen=min(_hFacW(i,j,k,bi,bj), |
| 44 | & _hFacW(i,j-1,k,bi,bj)) |
| 45 | hFacZOpen=min(_hFacS(i,j,k,bi,bj),hFacZOpen) |
| 46 | hFacZOpen=min(_hFacS(i-1,j,k,bi,bj),hFacZOpen) |
| 47 | hFacZ(i,j)=hFacZOpen |
| 48 | IF (hFacZ(i,j).EQ.0.) THEN |
| 49 | r_hFacZ(i,j)=0. |
| 50 | vort3(i,j)=0. |
| 51 | ELSE |
| 52 | r_hFacZ(i,j)=1./hFacZ(i,j) |
| 53 | ENDIF |
| 54 | ENDDO |
| 55 | ENDDO |
| 56 | |
| 57 | RETURN |
| 58 | END |
| ViewVC Help | |
| Powered by ViewVC 1.1.22 |