Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Add files via upload #17

Merged

Conversation

btang1
Copy link
Collaborator

@btang1 btang1 commented Aug 8, 2023

PR Checklist

  • This PR has been tested on an RDHPCS machine and/or WCOSS2. Please select below:

    • RDHPCS.
    • WCOSS2.
  • This PR has been tested with the ufs-srweather-app workflow online-cmaq branch.

  • New or updated input data is required by this PR.

  • Baselines are expected to change.

Description

Issue(s) addressed

Dependencies

@bbakernoaa bbakernoaa added the bug Something isn't working label Aug 18, 2023
src/model/src/ASX_DATA_MOD.F Show resolved Hide resolved
src/model/src/AERO_PHOTDATA.F Show resolved Hide resolved
src/model/src/ASX_DATA_MOD.F Show resolved Hide resolved
Copy link
Member

@drnimbusrain drnimbusrain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@btang1 Need to revert and bring back all my canopy changes in the updated ASX_DATA_MOD.F here.

src/model/src/ASX_DATA_MOD.F Show resolved Hide resolved
src/model/src/ASX_DATA_MOD.F Show resolved Hide resolved
src/model/src/ASX_DATA_MOD.F Show resolved Hide resolved
@btang1
Copy link
Collaborator Author

btang1 commented Aug 26, 2023

I update ASX_DATA_MOD and Vdiffaxmx

src/model/src/o3totcol.f Outdated Show resolved Hide resolved
@@ -837,7 +838,7 @@ subroutine get_dust_emis( jdate, jtime, tstep, rjacm, cellhgt,

rlay1hgt = rjacm ( c,r ) / cellhgt

dust_em( c,r ) = dust_alpha * vflux * rlay1hgt *tfa(c,r) * tfb(c,r)
dust_em( c,r ) = dust_alpha * vflux * rlay1hgt! *tfa(c,r) * tfb(c,r)

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"*tfa(c,r) * tfb(c,r) " removed. Are you sure?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

because tfa and tfb not calculated in the code, so not able to call them here

@ytangnoaa
Copy link

Could you fill the following items?

Description
Issue(s) addressed

Have you tested running these changes or just compiled it on Orion?

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This file has many changes brought by CMAQ 5.4+. It is better to highlight the key changes.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sure! let me work on it

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

compiled vdiffacmx, it compiled without error after I turn off a 'end do' sentence.

comment a 'end do', after that, code compiled successfully
turn on according changed codes in local src/ folder
@btang1
Copy link
Collaborator Author

btang1 commented Sep 1, 2023

Could you fill the following items?

Description Issue(s) addressed

Have you tested running these changes or just compiled it on Orion?

all codes I changed have successfully compiled in Orion. I have not run CMAQ online yet. Only compile without error.

Copy link
Member

@drnimbusrain drnimbusrain left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems we could approve for now, but there are a lot of changes to vdiffacmx.F, as expected. However, seems you have added pieces to the old CMAQv5.2.1, rather than remove pieces from CMAQv5.4 version. I may be OK with either approach, but careful checking may be needed to evaluate if it makes sense. Also there are numerous places that the bi-directional NH3 dep is removed, and wonder why? Please elaborate.

END DO

DO V = 1, N_SPC_DEPV
DDEP( V,C,R ) = DDBF( V )
END DO

IF ( ABFLUX ) THEN
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@btang1 Why is this removed?

C --------- END of HET HONO RX ----------

ELSE
S = DV2DF( V )
CONC( S,1 ) = POL( V ) + ( CONC( S,1 ) - POL( V ) ) * EFAC2( V )
DDBF( V ) = DDBF( V ) + THBAR * DD_FAC( V ) * CONC( S,1 )
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why is this removed?


IF ( ABFLUX .AND. V .EQ. NH3_HIT ) THEN
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why removed?

@ytangnoaa ytangnoaa merged commit 8067154 into noaa-oar-arl:feature/cmaq54 Sep 1, 2023
@btang1
Copy link
Collaborator Author

btang1 commented Sep 1, 2023 via email

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants