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

Bugfix/vertical regridding #235

Closed
wants to merge 30 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
30 commits
Select commit Hold shift + click to select a range
8415b03
fix COLLAPSE, change ModelLev_Check, remove INFLATE and GEOS4
nicholasbalasus Aug 10, 2023
8b17007
only us COLLAPSE if going from 72->47 or 102->74
nicholasbalasus Aug 10, 2023
9832a3d
remove NC calls
nicholasbalasus Aug 10, 2023
29a2284
add check that ModelLev_Interpolate should have been called
nicholasbalasus Aug 10, 2023
56b0a3f
add ENDIF
nicholasbalasus Aug 10, 2023
cf84735
remove INFLATE
nicholasbalasus Aug 10, 2023
d1cf1a7
syntax fix
nicholasbalasus Aug 10, 2023
31cfa89
another minor fix
nicholasbalasus Aug 10, 2023
c371cb3
default False IsModelLevel
nicholasbalasus Aug 10, 2023
af45fa5
trying another fix for IsModelLevel
nicholasbalasus Aug 10, 2023
a63210f
print to debuug
nicholasbalasus Aug 10, 2023
1cf516c
try to print again
nicholasbalasus Aug 10, 2023
86a3c4a
another try at printing
nicholasbalasus Aug 10, 2023
fa8b181
finally fixed out ALLOCATE error
nicholasbalasus Aug 10, 2023
786a952
add nout back in
nicholasbalasus Aug 10, 2023
bfbcd03
update comments, only handle 22 and 5 met
nicholasbalasus Aug 12, 2023
80c56ff
fix for error writing
nicholasbalasus Aug 12, 2023
c0a771b
error handling in hco_interp_mod.F90
nicholasbalasus Aug 12, 2023
a063876
more RC fixes
nicholasbalasus Aug 12, 2023
c9cce09
bugfix in DO loop from Todd's comment
nicholasbalasus Aug 24, 2023
f1307ad
add INFLATE behavior back in
nicholasbalasus Aug 24, 2023
420cabc
move ENDIF
nicholasbalasus Aug 24, 2023
29e4efa
another forgotten ENDIF
nicholasbalasus Aug 24, 2023
2a58a42
declare I
nicholasbalasus Aug 24, 2023
e320084
further ENDIF fixes
nicholasbalasus Aug 24, 2023
d1ddd10
add some messages when HEMCO is verbose
nicholasbalasus Aug 25, 2023
3b99a63
update CHANGELOG.md and address Bob's comments
nicholasbalasus Aug 28, 2023
83a8f00
handle AEIC files
nicholasbalasus Aug 29, 2023
718d342
syntax fix
nicholasbalasus Aug 29, 2023
6a98410
update comments
nicholasbalasus Aug 29, 2023
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
Prev Previous commit
Next Next commit
add check that ModelLev_Interpolate should have been called
nicholasbalasus committed Aug 10, 2023
commit 29a228484bfa0a42adbe5be150c268015057093b
11 changes: 11 additions & 0 deletions src/Core/hco_interp_mod.F90
Original file line number Diff line number Diff line change
@@ -629,6 +629,17 @@ SUBROUTINE ModelLev_Interpolate( HcoState, REGR_4D, Lct, RC )
nlev = SIZE(REGR_4D,3)
nt = SIZE(REGR_4D,4)

! Check to make sure ModelLev_Interpolate should have been called
IF ( ( ( nlev == nz ) .OR. ( nlev == nz+1 ) ) .OR. &
( ( nz == 47 ) .AND. ( ( nlev == 72 ) .OR. ( nlev == 73 ) ) ) .OR. &
( ( nz == 74 ) .AND. ( ( nlev == 102 ) .OR. ( nlev == 103 ) ) ) ) THEN
! do nothing
ELSE
WRITE(MSG,*) 'ModelLev_Interpolate was called but MESSy should have been used: ',TRIM(Lct%Dct%cName)
CALL HCO_ERROR( MSG, RC )
RETURN
ENDIF

! Vertical interpolation done?
DONE = .FALSE.