Merge pull request #974 from GEOS-ESM/bugfix/rreichle/remove_WET1_fil…

…ling remove filling of WET1 (a.k.a. GWETTOP) with 1s over non-land
GEOS-ESM · Sep 13, 2024 · ef37b0e · ef37b0e
2 parents d1223b0 + ac710d7
commit ef37b0e
Show file tree

Hide file tree

Showing 2 changed files with 485 additions and 451 deletions.
diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOS_PhysicsGridComp.F90
@@ -1170,7 +1170,7 @@ subroutine SetServices ( GC, RC )
         VERIFY_(STATUS)
      ENDIF
 
-     IF (DO_OBIO /= 0) THEN 
+     IF (DO_OBIO /= 0) THEN
         call MAPL_AddConnectivity ( GC,                               &
              SHORT_NAME  = (/'DROBIO', 'DFOBIO'/),                    &
              SRC_ID      = RAD,                                       &
@@ -1245,7 +1245,7 @@ subroutine SetServices ( GC, RC )
 
      call MAPL_AddConnectivity ( GC,                              &
         SHORT_NAME  = (/ 'LWI      ', 'FRLAND   ', 'FRLANDICE',   &
-                         'FROCEAN  ', 'FRLAKE   ', 'WET1     ',   &
+                         'FROCEAN  ', 'FRLAKE   ',                &
                          'GRN      ', 'USTAR    ', 'U10M     ',   &
                          'V10M     ', 'SH       ', 'Z0H      ',   &
                          'LAI      ', 'TSOIL1   ', 'FRACI    ',   &
@@ -1262,6 +1262,18 @@ subroutine SetServices ( GC, RC )
                                                        RC=STATUS  )
      VERIFY_(STATUS)
 
+     ! NOTE: GOCART's dust code expects WET1 to have all the cells with MAPL_UNDEF
+     !       (aka not land) to be replaced with 1.0. We want WET1 to have
+     !       MAPL_UNDEF over non-land points, so we need a separate export to pass
+     !       to GOCART which is WET1 with all non-land points set to 1.0.
+     call MAPL_AddConnectivity ( GC,                              &
+        SRC_NAME  = [ 'WET1_FOR_CHEM' ],                          &
+        SRC_ID      = SURF,                                       &
+        DST_NAME  = [ 'WET1' ],                                   &
+        DST_ID      = CHEM,                                       &
+                                                       RC=STATUS  )
+     VERIFY_(STATUS)
+
      if (DO_CO2CNNEE == 1) then
         call MAPL_AddConnectivity ( GC,                           &
              SHORT_NAME  = (/'CNNEE'/),                           &
@@ -1432,7 +1444,7 @@ subroutine SetServices ( GC, RC )
           CHILD      = TURBL,                           &
           RC=STATUS  )
        VERIFY_(STATUS)
-     endif 
+     endif
 
      call MAPL_TerminateImport    ( GC,        &
           SHORT_NAME = (/'TR ','TRG','DTG' /), &
@@ -1981,10 +1993,10 @@ subroutine Initialize ( GC, IMPORT, EXPORT, CLOCK, RC )
 ! The original 3D increments:
 
     call Initialize_IncBundle_init(GC, GIM(MOIST), EXPORT, MTRIinc, __RC__)
-  
+
 #ifdef PRINT_STATES
     call ESMF_StateGet(EXPORT, 'MTRI', iBUNDLE, rc=STATUS)
-    VERIFY_(STATUS)                           
+    VERIFY_(STATUS)
 
     call WRITE_PARALLEL ( trim(Iam)//": MTRI - Convective Transport and Scavenging 3D Tendency Bundle" )
     if ( MAPL_am_I_root() ) call ESMF_FieldBundlePrint ( iBUNDLE, rc=STATUS )
@@ -1996,7 +2008,7 @@ subroutine Initialize ( GC, IMPORT, EXPORT, CLOCK, RC )
 
 #ifdef PRINT_STATES
     call ESMF_StateGet(EXPORT, 'MCHEMTRI', iBUNDLE, rc=STATUS)
-    VERIFY_(STATUS)                           
+    VERIFY_(STATUS)
 
     call WRITE_PARALLEL ( trim(Iam)//": MCHEMTRI - Convective Transport and Scavenging 2D Tendency Bundle" )
     if ( MAPL_am_I_root() ) call ESMF_FieldBundlePrint ( iBUNDLE, rc=STATUS )