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 | adcroft | 1.1.4.1 | C $Header: /u/gcmpack/MITgcm/verification/aim.5l_cs/code/mom_vi_hfacz_diss.F,v 1.1 2002/01/09 00:28:56 jmc Exp $ |
| 2 | C $Name: checkpoint43a-release1mods $ | ||
| 3 | jmc | 1.1 | |
| 4 | #include "CPP_OPTIONS.h" | ||
| 5 | |||
| 6 | SUBROUTINE MOM_VI_HFACZ_DISS( | ||
| 7 | I bi,bj,k, | ||
| 8 | O hFacZ,r_hFacZ, | ||
| 9 | I myThid) | ||
| 10 | IMPLICIT NONE | ||
| 11 | C | ||
| 12 | C Compute hFactor (and reciprol) at the corner (Z-point) | ||
| 13 | C used for vorticity,divergence form of viscous term | ||
| 14 | C (also in Shap_S2 formulation) | ||
| 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 | _RS hFacZOpen | ||
| 26 | INTEGER myThid | ||
| 27 | |||
| 28 | C == Local variables == | ||
| 29 | INTEGER I,J | ||
| 30 | |||
| 31 | C-- Calculate open water fraction at vorticity points | ||
| 32 | |||
| 33 | DO i=1-Olx,sNx+Olx | ||
| 34 | hFacZ(i,1-Oly)=0. | ||
| 35 | r_hFacZ(i,1-Oly)=0. | ||
| 36 | ENDDO | ||
| 37 | |||
| 38 | DO j=2-Oly,sNy+Oly | ||
| 39 | hFacZ(1-Olx,j)=0. | ||
| 40 | r_hFacZ(1-Olx,j)=0. | ||
| 41 | DO i=2-Olx,sNx+Olx | ||
| 42 | hFacZOpen=MIN(_hFacW(i,j,k,bi,bj) | ||
| 43 | & + _hFacW(i,j-1,k,bi,bj) | ||
| 44 | & , _hFacS(i,j,k,bi,bj) | ||
| 45 | & + _hFacS(i-1,j,k,bi,bj) | ||
| 46 | & ) | ||
| 47 | hFacZ(i,j)=0.5*hFacZOpen | ||
| 48 | IF (hFacZ(i,j).EQ.0.) THEN | ||
| 49 | r_hFacZ(i,j)=0. | ||
| 50 | ELSE | ||
| 51 | r_hFacZ(i,j)=1./hFacZ(i,j) | ||
| 52 | ENDIF | ||
| 53 | ENDDO | ||
| 54 | ENDDO | ||
| 55 | |||
| 56 | RETURN | ||
| 57 | END |
| ViewVC Help | |
| Powered by ViewVC 1.1.22 |