Merge branch 'feature/mathomp4/fms-baselibs' into HEAD

# Conflicts: # model/fv_arrays.F90 # model/lin_cloud_microphys.F90
GEOS-ESM · May 17, 2024 · 7a240a2 · 7a240a2
2 parents 78422d7 + 6e17393
commit 7a240a2
Show file tree

Hide file tree

Showing 9 changed files with 653 additions and 644 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -87,6 +87,9 @@ ecbuild_info("Building FV dynamics dual hydrostatic/non-hydrostatic")
 ecbuild_info("This sets MOIST_CAPPA and USE_COND preprocessor variables")
 target_compile_definitions (${this} PRIVATE MOIST_CAPPA USE_COND)
 
+ecbuild_info("This sets the INTERNAL_FILE_NML preprocessor variable")
+target_compile_definitions (${this} PRIVATE INTERNAL_FILE_NML)
+
 esma_add_subdirectories(
   model/mapz-driver
   model/tp-core-driver)
diff --git a/model/boundary.F90 b/model/boundary.F90
@@ -631,13 +631,13 @@ subroutine nested_grid_BC_mpp(var_nest, var_coarse, nest_domain, ind, wt, istag,
    end if
 
    call mpp_get_C2F_index(nest_domain, isw_f, iew_f, jsw_f, jew_f, isw_c, iew_c, jsw_c, jew_c, &
-        WEST,  position=position)
+        WEST, nest_level=0, position=position)
    call mpp_get_C2F_index(nest_domain, ise_f, iee_f, jse_f, jee_f, ise_c, iee_c, jse_c, jee_c, &
-        EAST,  position=position)
+        EAST, nest_level=0, position=position)
    call mpp_get_C2F_index(nest_domain, iss_f, ies_f, jss_f, jes_f, iss_c, ies_c, jss_c, jes_c, &
-        SOUTH,  position=position)
+        SOUTH, nest_level=0, position=position)
    call mpp_get_C2F_index(nest_domain, isn_f, ien_f, jsn_f, jen_f, isn_c, ien_c, jsn_c, jen_c, &
-        NORTH,  position=position)
+        NORTH, nest_level=0, position=position)
 
    if( iew_c .GE. isw_c .AND. jew_c .GE. jsw_c ) then
       allocate(wbuffer(isw_c:iew_c, jsw_c:jew_c,npz))
@@ -669,7 +669,7 @@ subroutine nested_grid_BC_mpp(var_nest, var_coarse, nest_domain, ind, wt, istag,
 
 
        call timing_on ('COMM_TOTAL')
-   call mpp_update_nest_fine(var_coarse, nest_domain, wbuffer, sbuffer, ebuffer, nbuffer,  position=position)
+   call mpp_update_nest_fine(var_coarse, nest_domain, wbuffer, sbuffer, ebuffer, nbuffer, nest_level=0,  position=position)
        call timing_off('COMM_TOTAL')
 
    if (process) then
@@ -820,7 +820,7 @@ subroutine nested_grid_BC_mpp_send(var_coarse, nest_domain, istag, jstag)
 
 
        call timing_on ('COMM_TOTAL')
-   call mpp_update_nest_fine(var_coarse, nest_domain, wbuffer, sbuffer, ebuffer, nbuffer,  position=position)
+   call mpp_update_nest_fine(var_coarse, nest_domain, wbuffer, sbuffer, ebuffer, nbuffer,  nest_level=0, position=position)
        call timing_off('COMM_TOTAL')
 
 
@@ -884,13 +884,13 @@ subroutine nested_grid_BC_2D_mpp(var_nest, var_coarse, nest_domain, ind, wt, ist
    end if
 
    call mpp_get_C2F_index(nest_domain, isw_f, iew_f, jsw_f, jew_f, isw_c, iew_c, jsw_c, jew_c, &
-        WEST,  position=position)
+        WEST, nest_level=0,  position=position)
    call mpp_get_C2F_index(nest_domain, ise_f, iee_f, jse_f, jee_f, ise_c, iee_c, jse_c, jee_c, &
-        EAST,  position=position)
+        EAST,  nest_level=0, position=position)
    call mpp_get_C2F_index(nest_domain, iss_f, ies_f, jss_f, jes_f, iss_c, ies_c, jss_c, jes_c, &
-        SOUTH,  position=position)
+        SOUTH,  nest_level=0, position=position)
    call mpp_get_C2F_index(nest_domain, isn_f, ien_f, jsn_f, jen_f, isn_c, ien_c, jsn_c, jen_c, &
-        NORTH,  position=position)
+        NORTH,  nest_level=0, position=position)
 
    if( iew_c .GE. isw_c .AND. jew_c .GE. jsw_c ) then
       allocate(wbuffer(isw_c:iew_c, jsw_c:jew_c))
@@ -921,7 +921,7 @@ subroutine nested_grid_BC_2D_mpp(var_nest, var_coarse, nest_domain, ind, wt, ist
    nbuffer = 0
 
        call timing_on ('COMM_TOTAL')
-   call mpp_update_nest_fine(var_coarse, nest_domain, wbuffer, sbuffer, ebuffer, nbuffer,  position=position)
+   call mpp_update_nest_fine(var_coarse, nest_domain, wbuffer, sbuffer, ebuffer, nbuffer,  nest_level=0, position=position)
        call timing_off('COMM_TOTAL')
 
    if (process) then
@@ -1330,7 +1330,7 @@ subroutine nested_grid_BC_send(var_coarse, nest_domain, istag, jstag)
    end if
 
        call timing_on ('COMM_TOTAL')
-   call mpp_update_nest_fine(var_coarse, nest_domain, wbuffer, sbuffer, ebuffer, nbuffer,  position=position)
+   call mpp_update_nest_fine(var_coarse, nest_domain, wbuffer, sbuffer, ebuffer, nbuffer,  nest_level=0, position=position)
        call timing_off('COMM_TOTAL')
 
  end subroutine nested_grid_BC_send
@@ -1369,13 +1369,13 @@ subroutine nested_grid_BC_recv(nest_domain, istag, jstag, npz, &
    if (.not. allocated(nest_BC_buffers%west_t1) ) then
 
       call mpp_get_C2F_index(nest_domain, isw_f, iew_f, jsw_f, jew_f, isw_c, iew_c, jsw_c, jew_c, &
-           WEST,  position=position)
+           WEST,  nest_level=0, position=position)
       call mpp_get_C2F_index(nest_domain, ise_f, iee_f, jse_f, jee_f, ise_c, iee_c, jse_c, jee_c, &
-           EAST,  position=position)
+           EAST,  nest_level=0, position=position)
       call mpp_get_C2F_index(nest_domain, iss_f, ies_f, jss_f, jes_f, iss_c, ies_c, jss_c, jes_c, &
-           SOUTH,  position=position)
+           SOUTH,  nest_level=0, position=position)
       call mpp_get_C2F_index(nest_domain, isn_f, ien_f, jsn_f, jen_f, isn_c, ien_c, jsn_c, jen_c, &
-           NORTH,  position=position)
+           NORTH,  nest_level=0, position=position)
 
       if( iew_c .GE. isw_c .AND. jew_c .GE. jsw_c ) then
          If (.not. allocated(nest_BC_buffers%west_t1)) allocate(nest_BC_buffers%west_t1(isw_c:iew_c, jsw_c:jew_c,npz))
@@ -1437,7 +1437,7 @@ subroutine nested_grid_BC_recv(nest_domain, istag, jstag, npz, &
    endif
 
        call timing_on ('COMM_TOTAL')
-   call mpp_update_nest_fine(var_coarse_dummy, nest_domain, nest_BC_buffers%west_t1, nest_BC_buffers%south_t1, nest_BC_buffers%east_t1, nest_BC_buffers%north_t1,  position=position)
+   call mpp_update_nest_fine(var_coarse_dummy, nest_domain, nest_BC_buffers%west_t1, nest_BC_buffers%south_t1, nest_BC_buffers%east_t1, nest_BC_buffers%north_t1,  nest_level=0, position=position)
        call timing_off('COMM_TOTAL')
 
  end subroutine nested_grid_BC_recv
@@ -1871,7 +1871,7 @@ subroutine update_coarse_grid_mpp(var_coarse, var_nest, nest_domain, ind_update,
       position = CENTER
    end if
 
-   call mpp_get_F2C_index(nest_domain, is_c, ie_c, js_c, je_c, is_f, ie_f, js_f, je_f, position=position)
+   call mpp_get_F2C_index(nest_domain, is_c, ie_c, js_c, je_c, is_f, ie_f, js_f, je_f, nest_level=0, position=position)
    if (ie_f > is_f .and. je_f > js_f) then
       allocate(nest_dat (is_f:ie_f, js_f:je_f,npz))
    else
@@ -1950,7 +1950,7 @@ subroutine update_coarse_grid_mpp(var_coarse, var_nest, nest_domain, ind_update,
    endif
 
       call timing_on('COMM_TOTAL')
-   call mpp_update_nest_coarse(var_nest_send, nest_domain, nest_dat, position=position)
+   call mpp_update_nest_coarse(var_nest_send, nest_domain, nest_dat, nest_level=0, position=position)
       call timing_off('COMM_TOTAL')
 
    s = r/2 !rounds down (since r > 0)