From d5d72753c5a1d91d706f17b924f133fe05654d94 Mon Sep 17 00:00:00 2001 From: Lizzie Lundgren Date: Tue, 9 Jun 2020 16:22:53 -0400 Subject: [PATCH] Updates to conservatively regrid vectorized winds This returns GCHPctm to using vectorized winds as has been traditionally done in all past versions of GCHP. We briefly switched to regridding lat/lon winds due to a misconception that MAPL 2.0 could not do conservative regridding of vectors. Updates are now in MAPL to let the regridding proceed. Signed-off-by: Lizzie Lundgren --- .../GCHPctmEnv_GridComp/GCHPctmEnv_GridCompMod.F90 | 8 ++++---- src/GCHP_GridComp/GEOSChem_GridComp/geos-chem | 2 +- src/GCHP_GridComp/HEMCO_GridComp/HEMCO | 2 +- src/MAPL | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/GCHP_GridComp/GCHPctmEnv_GridComp/GCHPctmEnv_GridCompMod.F90 b/src/GCHP_GridComp/GCHPctmEnv_GridComp/GCHPctmEnv_GridCompMod.F90 index b0e726757..4d2d34ca7 100755 --- a/src/GCHP_GridComp/GCHPctmEnv_GridComp/GCHPctmEnv_GridCompMod.F90 +++ b/src/GCHP_GridComp/GCHPctmEnv_GridComp/GCHPctmEnv_GridCompMod.F90 @@ -181,7 +181,7 @@ subroutine SetServices ( GC, RC ) ! _VERIFY(STATUS) call MAPL_AddImportSpec ( gc, & - SHORT_NAME = 'ULL', & + SHORT_NAME = 'UA', & LONG_NAME = 'eastward_wind_on_A-Grid', & UNITS = 'm s-1', & STAGGERING = MAPL_AGrid, & @@ -191,7 +191,7 @@ subroutine SetServices ( GC, RC ) _VERIFY(STATUS) call MAPL_AddImportSpec ( gc, & - SHORT_NAME = 'VLL', & + SHORT_NAME = 'VA', & LONG_NAME = 'northward_wind_on_A-Grid', & UNITS = 'm s-1', & STAGGERING = MAPL_AGrid, & @@ -567,9 +567,9 @@ subroutine Run ( GC, IMPORT, EXPORT, CLOCK, RC ) _VERIFY(STATUS) call MAPL_GetPointer ( IMPORT, PS1, 'PS2', RC=STATUS ) _VERIFY(STATUS) - call MAPL_GetPointer ( IMPORT, UA, 'ULL', RC=STATUS ) + call MAPL_GetPointer ( IMPORT, UA, 'UA', RC=STATUS ) _VERIFY(STATUS) - call MAPL_GetPointer ( IMPORT, VA, 'VLL', RC=STATUS ) + call MAPL_GetPointer ( IMPORT, VA, 'VA', RC=STATUS ) _VERIFY(STATUS) call MAPL_GetPointer ( IMPORT, SPHU0, 'SPHU1', RC=STATUS ) _VERIFY(STATUS) diff --git a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem index 7f56c53ac..4e3d671dd 160000 --- a/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem +++ b/src/GCHP_GridComp/GEOSChem_GridComp/geos-chem @@ -1 +1 @@ -Subproject commit 7f56c53acf9057d319b96e113ae3769bdbae9bb3 +Subproject commit 4e3d671dd0436d6dce9f9119868607a7f1998390 diff --git a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO index 3d405d5f5..23693aee0 160000 --- a/src/GCHP_GridComp/HEMCO_GridComp/HEMCO +++ b/src/GCHP_GridComp/HEMCO_GridComp/HEMCO @@ -1 +1 @@ -Subproject commit 3d405d5f5095afb2ecb503a1144032772ed91cb1 +Subproject commit 23693aee0ceb8435e058da05df08dd07f5f76f09 diff --git a/src/MAPL b/src/MAPL index 26f9a9222..d3809e45d 160000 --- a/src/MAPL +++ b/src/MAPL @@ -1 +1 @@ -Subproject commit 26f9a92224523a43f679ca06ca7cf96bc67c0ec7 +Subproject commit d3809e45d63339561b021200a65060c719c1f1bb