Fixes to the the merge with MAPS 8.1 #8
Closed
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
1.removed congif_frac_seaice from the lsm driver call as unneeded. 2. added config_lsm_scheme to the sea ice driver needed for addition of RUC lsm to sea ice driver.
is a separate seaice driver. Also, 2-m diagnostics for RUC LSM is moved to the seaice driver to be consistent with the 8.1 MPAS.
jderrico-noaa
requested review from
AndersJensen-NOAA,
joeolson42,
haiqinli and
mdtoyNOAA
AndersJensen-NOAA
requested changes
Apr 30, 2024
| @@ -1706,6 +1709,7 @@ subroutine sfctmp (spp_lsm,rstochcol,fieldcol_sf, & | |||
| endif | |||
|
|
|||
| if(seaice .lt. 0.5) then | |||
| if(doseaice) goto 119 | |||
There was a problem hiding this comment.
Can you get rid of this goto?
| else | ||
| !----- snow on ice | ||
| if (.not. doseaice) goto 119 |
There was a problem hiding this comment.
Can you get rid of this goto?
There was a problem hiding this comment.
And others below.
module_sf_ruclsm.F
joeolson42
reviewed
Apr 30, 2024
There was a problem hiding this comment.
how did this get removed? Is it intended? I suppose it doesn't matter with Anders' submodule...
There was a problem hiding this comment.
@AndersJensen-NOAA does this matter?
joeolson42
approved these changes
Apr 30, 2024
|
@jderrico-noaa @joeolson42 @tanyasmirnova This PR compiles and runs for a 3-km CONUS case (I just ran a short 3-h test). This can be merged. Note that we won't be using the deleted version of the microphysics, but it probably should be committed back so that our version of MPAS stays in line with the other versions out there. |
|
@tanyasmirnova can you restore the deleted microphysics? After that I'll merge this! |
|
Janet,
I found a problem with soil moisture in this PR. I am looking at this
today, and hopefully will fix the problem towards the end of the day.
I can also restore the MP Thompson in physics_wrf.
Thanks,
Tanya
…On Thu, May 2, 2024 at 9:52 AM Janet Derrico ***@***.***> wrote:
@tanyasmirnova <https://github.com/tanyasmirnova> can you restore the
deleted microphysics? After that I'll merge this!
—
Reply to this email directly, view it on GitHub
<#8 (comment)>,
or unsubscribe
<https://github.com/notifications/unsubscribe-auth/AJHANACDXBKEMYV2GAUJTK3ZAJOKLAVCNFSM6AAAAABG3PNICCVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDAOJQHA3DKNJQGM>
.
You are receiving this because you were mentioned.Message ID:
***@***.***>
|
|
Janet and All,
First, about module_mp_thompson.F - it gets deleted automatically when the
Thompson submodule is checked out.
I haven't deleted it myself.
Second, at this point I think I want to give up on PR#8. I'll try to
explain briefly.
I noticed that after the second call to RUC LSM from driver_seaice, soil
moisture on land got corrupted. I am not quite sure why, but maybe the
reason is that the names of variables for land and ice are the same (in
RRFS the names are *_land and *_ice). When we get from MPAS a variable from
the driver_seaice, it should update only sea-ice points, but it appears
that land points are also modified or corrupted.
When I removed soil moisture from updated variables in driver_seaice,
then it looked good.
However, there are several other variables that are updated for sea ice
points, and cannot be removed. And now I am not sure they are not corrupted
over land.
Also, in the MPAS 8.1, 2-m diagnostics is called out of driver_seaice which
is called after driver_lsm, and I have suspicions that over the land it
will not be correct.
Because we have limited time for figuring all this out, I think we should
go with a simple solution #2: keep one call to RUC LSM from driver_lsm, and
also keep RUC 2-m diagnostics in driver_lsm. In this case we do not need to
call dirver_seaice from mpas_atmphys_driver.F with RUC LSM, and should add
IF around driver_seaice call.
This solution has less changes to the code, but most likely will not be
accepted by Laura Fowler.
I am running a test now with Solution #2. I will see the results tomorrow
morning. If I see more reasonable differences between 8.1 and 8.0 code, I
will make a new PR.
Let me know what you think about this.
Thank you,
Tanya
On Thu, May 2, 2024 at 9:56 AM Tanya Smirnova - NOAA Affiliate <
***@***.***> wrote:
… Janet,
I found a problem with soil moisture in this PR. I am looking at this
today, and hopefully will fix the problem towards the end of the day.
I can also restore the MP Thompson in physics_wrf.
Thanks,
Tanya
On Thu, May 2, 2024 at 9:52 AM Janet Derrico ***@***.***>
wrote:
> @tanyasmirnova <https://github.com/tanyasmirnova> can you restore the
> deleted microphysics? After that I'll merge this!
>
> —
> Reply to this email directly, view it on GitHub
> <#8 (comment)>,
> or unsubscribe
> <https://github.com/notifications/unsubscribe-auth/AJHANACDXBKEMYV2GAUJTK3ZAJOKLAVCNFSM6AAAAABG3PNICCVHI2DSMVQWIX3LMV43OSLTON2WKQ3PNVWWK3TUHMZDAOJQHA3DKNJQGM>
> .
> You are receiving this because you were mentioned.Message ID:
> ***@***.***>
>
|
|
@jderrico-noaa @AndersJensen-NOAA |
|
PR for solution 2 is submitted: #9 |
jderrico-noaa
referenced
this pull request
in jderrico-noaa/MPAS-Model
May 13, 2024
… microphysics features (#2) * Add microphysics submodule and updated graupel lookup table support (#1) * microphysics Makefiles for submodule * Add submodule support for microphysics * Fix bug in Makefile directory path * Thompson table updates for two-moment graupel * Add aerosol aware microphysics capability (#2) * Add microphysics aerosol information to initialization * Link microphysics aerosol tables for runtime * Update submodule * Fix link to microphysics aerosol tables * Add water- and ice-friendly aerosols to model for transport (#3) * Update pointer for microphysics * Update pointer to microphysics submodule * Add microphysics aerosol information to LBCs * Add aerosol-aware microphysics to LBCs (#4) * Add microphysics aerosol information to LBCs * Support for water- and ice-friendly aerosols in LBCs * Add documentation to subroutine init_microphysics_aerosols_lbc * Time interpolation for microphysics aerosols ICs * Add time interpolation for microphysics aerosols to LBCs * Aerosol time interpolation (#5) * Add microphysics aerosol information to LBCs * Time interpolation for microphysics aerosols ICs * Add time interpolation for microphysics aerosols to LBCs * Nc microphysics (#6) * Updates for aerosol aware * Add support for nc microphysics * Add nc to interface * point to develop branch of Thompson submodule * Import nwfa and nifa into microphysics (#7) * Add microphysics submodule makefile (#8) * Import nwfa and nifa into microphysics * Add makefile support for microphysics submodule * Update location for microphysics submodule * remove GSL_cloud_physics directory * Point to microphysics submodule * Point to microphysics submodule * Remove old submodule * Bug fix in Makefile to deal with old version of microphysics
joeolson42
pushed a commit
to joeolson42/MPAS-Model
that referenced
this pull request
May 16, 2024
Radiation NSSLmp fix
joeolson42
pushed a commit
to joeolson42/MPAS-Model
that referenced
this pull request
Aug 27, 2024
Fix merge conflicts with v8.2
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The title above should be a 1 line short summary of the pull request (i.e. what the project the PR represents is intended to do).
Fixes to the the merge with MAPS 8.1
Enter a description of this PR. This should include why this PR was created, and what it does.
The 8.,1 version of MPAS has a new driver for sea ice which was using only Noah sea ice model. To fix the merge RUC ice model had to be added to the driver_seaice.
Testing and relations to other Pull Requests should be added as subsequent comments.
The fixes are tested for the 24 feb 2023 case on jet: /mnt/lfs4/BMC/wrfruc/smirnova/MPAS_conus13_20230224_mpasGSL
See the below examples for more information.
MPAS-Dev/MPAS#930
MPAS-Dev/MPAS#931