Add files via upload #16
Conversation
Beiming new DUST_EMIS for ufs-cmaq54
There was a problem hiding this comment.
OK, seems like most of Wei's changes to update the DUST_EMIS were already here in AQM [feature/cmaq54], but you duplicated many with slight cosmetic changes.
Have question on your change to "my_nrows" and "my_ncols".
Also, @bbakernoaa needs to have a close look here as he put the fengsha dust mods in AQM originally.
src/model/src/DUST_EMIS.F
Outdated
|
|
||
| do r = 1, nrows | ||
| do c = 1, ncols | ||
| do r = 1, my_nrows |
There was a problem hiding this comment.
Why change to "my_nrows" and "my_ncols"? Where are these set?
| @@ -609,7 +609,7 @@ SUBROUTINE INIT_ENV_VARS( JDATE, JTIME ) | |||
| CALL GET_ENV ( NLAYS_DIAG, 'NLAYS_PHOTDIAG', NLAYS_DIAG, VARDEV ) | |||
|
|
|||
| ! Get Desired Wavelengths for Diagnostic Output | |||
| CALL GET_ENV( 'NWAVE_PHOTDIAG', NWAVE, WAVE_ENV, VARDEV ) | |||
| CALL GET_ENV( 'NWAVE_PHOTDIAG', NWAVE, WAVE_ENV, VARDEV ) !this could be wrong, why char before NWAVE, beiming??? | |||
There was a problem hiding this comment.
Its possible, but need to consult with EPA.
There was a problem hiding this comment.
I have sent EPA CMAQ an issue.just check it today, now response yet.
There was a problem hiding this comment.
The only difference for RUNTIME_VARS.F is: Wei set a “cell_num” to be constant as =1. And I set it to be an integer (not limited to 1) I do this because it is a read-in value from the inputs, and should be able to change.
The code has been tested by compile it in Orion. And it works, after changing it to be integer.
This was my assessment too. Also, I think it would be okay to remove the comments with your name, since Git tracks who added which lines. |
| @@ -97,7 +97,7 @@ MODULE RUNTIME_VARS | |||
|
|
|||
| ! this is for MPAS | |||
| LOGICAL :: ncd_64bit_offset = .FALSE. | |||
| INTEGER :: cell_num = 1 !(Wei Li; tested ) | |||
| INTEGER :: cell_num !beiming tang | |||
There was a problem hiding this comment.
@btang1 Note that the cell_num is related to using MPAS in CMAQ.
| @@ -112,8 +112,8 @@ MODULE CENTRALIZED_IO_MODULE | |||
| use get_env_module | |||
| USE UTILIO_DEFN | |||
| #ifdef mpas | |||
| ! use coupler_module !(Wei Li) | |||
| ! use mio_module !(Wei Li) | |||
| ! use coupler_module | |||
There was a problem hiding this comment.
Not sure if necessary to comment out here and below, if such MPAS modules, routines etc are controlled by ifdef macros used to only pass such lines of codes onto the compiler when activated. While it may not matter for compiling if you comment out, we want to leave as much of the code unchanged where possible for future ease of updating and understanding.
| @@ -1388,7 +1388,7 @@ subroutine retrieve_time_dep_gridded_data (jdate, jtime, vname) | |||
| #ifndef mpas | |||
| ! data_jdate = loc_jdate(f_met) | |||
| ! data_jtime = loc_jtime(f_met) | |||
| ! | |||
|
|
|||
| ! if ((cio_grid_var_name(v,1) .ne. 'TSEASFC') .or. TSEASFC_AVAIL) then | |||
| #ifdef twoway | |||
There was a problem hiding this comment.
Similar comment here, as not sure we need to comment out sections that are controlled by the "ifdef twoway" CMAQ macro.
| @@ -929,7 +929,7 @@ subroutine gridded_files_setup | |||
| end if | |||
|
|
|||
| #ifndef mpas | |||
| ! setup initial condition file | |||
| !! setup initial condition file | |||
| ! n_i3d = 0 | |||
There was a problem hiding this comment.
We need to be careful here, as this macro is actually "ifndef" to check if the macro MPAS is NOT defined here. I don't think we want to comment out sections inside the macro definitions as these sections are controlled at compile time, and for example, this section may indeed be needed by CMAQ in our case.
| @@ -1603,9 +1605,9 @@ subroutine retrieve_time_dep_gridded_data (jdate, jtime, vname) | |||
| #ifndef mpas | |||
There was a problem hiding this comment.
Again, this is if MPAS is NOT defined, so need to be careful. I do not think we should comment out all these lines in the ifdef and indef macro sections. Please revisit.
|
|
||
| rlay1hgt = rjacm ( c,r ) / cellhgt | ||
|
|
||
| dust_em( c,r ) = dust_alpha * vflux * rlay1hgt *tfa(c,r) * tfb(c,r) |
There was a problem hiding this comment.
Seems like this may be the only real change?
un-commented all MAPS lines, and changed CMakeList.txt
commented MPAS in CMakeLists.txt
Beiming new DUST_EMIS for ufs-cmaq54
PR Checklist
This PR has been tested on an RDHPCS machine and/or WCOSS2. Please select below:
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