Merge EMC dev/emc to GFDL dev/emc

README.md

@@ -1,6 +1,5 @@
-# GFDL_atmos_cubed_sphere
-
 This is for the FV3 dynamical core and the GFDL Microphysics for use by NCEP/EMC within GFS.
+The source in this branch reflects the codebase delivered to NCEP/EMC for use in GFS.  Updates will be forthcoming.
 
 # Where to find information
 

makefile

@@ -23,7 +23,7 @@ endif
 
 LIBRARY  = libfv3core.a
 
-FFLAGS   += -I$(FMS_DIR) -I../gfsphysics -I../ipd -I../io -I../namphysics
+FFLAGS   += -I$(FMS_DIR) -I../gfsphysics -I../ipd -I../io -I.
 
 SRCS_f   =
 

model/a2b_edge.F90

@@ -114,7 +114,7 @@ subroutine a2b_ord4(qin, qout, gridstruct, npx, npy, is, ie, js, je, ng, replace
 
 ! Corners:
 ! 3-way extrapolation
-    if (gridstruct%nested .or. gridstruct%regional) then
+    if (gridstruct%bounded_domain) then
 
     do j=js-2,je+2
        do i=is,ie+1
@@ -201,7 +201,7 @@ subroutine a2b_ord4(qin, qout, gridstruct, npx, npy, is, ie, js, je, ng, replace
 ! Y-Interior:
 !------------
 
-    if (gridstruct%nested .or. gridstruct%regional) then
+    if (gridstruct%bounded_domain) then
 
 
     do j=js,je+1
@@ -257,7 +257,7 @@ subroutine a2b_ord4(qin, qout, gridstruct, npx, npy, is, ie, js, je, ng, replace
     end if
 !--------------------------------------
 
-    if (gridstruct%nested .or. gridstruct%regional) then
+    if (gridstruct%bounded_domain) then
 
     do j=js, je+1
        do i=is,ie+1
@@ -463,7 +463,7 @@ subroutine a2b_ord4(qin, qout, gridstruct, npx, npy, is, ie, js, je, ng, replace
 !------------
 ! X-Interior:
 !------------
-    if (gridstruct%nested .or. gridstruct%regional) then
+    if (gridstruct%bounded_domain) then
 
     do j=js-2,je+2
        do i=is, ie+1
@@ -534,7 +534,7 @@ subroutine a2b_ord4(qin, qout, gridstruct, npx, npy, is, ie, js, je, ng, replace
 !------------
 ! Y-Interior:
 !------------
-    if (gridstruct%nested .or. gridstruct%regional) then
+    if (gridstruct%bounded_domain) then
 
     do j=js,je+1
        do i=is-2, ie+2
@@ -602,7 +602,7 @@ subroutine a2b_ord4(qin, qout, gridstruct, npx, npy, is, ie, js, je, ng, replace
 
  end if
 
- if (gridstruct%nested .or. gridstruct%regional) then
+ if (gridstruct%bounded_domain) then
 
     do j=js,je+1
        do i=is,ie+1
@@ -722,7 +722,7 @@ subroutine a2b_ord2(qin, qout, gridstruct, npx, npy, is, ie, js, je, ng, replace
 
     if (gridstruct%grid_type < 3) then
 
-       if (gridstruct%nested .or. gridstruct%regional) then
+       if (gridstruct%bounded_domain) then
 
           do j=js-2,je+1+2
              do i=is-2,ie+1+2