Remove commented-out ESMF coordinate extraction block from cece_cap.F90

Copilot · web-flow · commit a4ded74d7f54 · 2026-06-11T21:24:05.000Z
Apply PR #34 changes across all three files and remove the large commented-out block of the previous ESMF-coordinate extraction logic from src/cece_cap.F90 as requested in review comment r3399235184.
diff --git a/src/cece_cap.F90 b/src/cece_cap.F90
@@ -643,48 +643,37 @@ subroutine CECE_InitializeRealize(comp, importState, exportState, clock, rc)
           g_start_time_seconds = real(yy*365*24*3600 + mm*30*24*3600 + dd*24*3600 + &
                                       h*3600 + m*60 + s, c_double)
 
-          ! Extract coordinates from ESMF grid and call enhanced writer initialization
+
+          ! Build 1-D cell-center coordinates directly from configured YAML grid bounds.
+          ! This keeps standalone NetCDF output lon/lat metadata consistent with the
+          ! configured CECE output grid and avoids falling back to the legacy writer,
+          ! which hard-codes global -180..180 / -90..90 coordinates.
           block
-            real(ESMF_KIND_R8), pointer :: grid_lon(:,:), grid_lat(:,:)
             real(c_double), allocatable :: lon_coords(:), lat_coords(:)
+            real(c_double) :: dlon, dlat
             integer :: i
 
-            ! Get coordinates from ESMF grid (2D arrays)
-            call ESMF_GridGetCoord(grid, coordDim=1, localDE=0, staggerloc=ESMF_STAGGERLOC_CENTER, &
-                                  farrayptr=grid_lon, rc=rc)
-            if (rc /= ESMF_SUCCESS) then
-              write(*,'(A,I0)') "WARNING: [CECE] Failed to get longitude coordinates: rc=", rc
-              ! Fall back to legacy initialization
-              call cece_core_writer_initialize(g_cece_data_ptr, int(nx, c_int), int(ny, c_int), &
-                                              int(nz, c_int), start_time_str, int(len_trim(start_time_str), c_int), c_rc)
-            else
-              call ESMF_GridGetCoord(grid, coordDim=2, localDE=0, staggerloc=ESMF_STAGGERLOC_CENTER, &
-                                    farrayptr=grid_lat, rc=rc)
-              if (rc /= ESMF_SUCCESS) then
-                write(*,'(A,I0)') "WARNING: [CECE] Failed to get latitude coordinates: rc=", rc
-                ! Fall back to legacy initialization
-                call cece_core_writer_initialize(g_cece_data_ptr, int(nx, c_int), int(ny, c_int), &
-                                                int(nz, c_int), start_time_str, int(len_trim(start_time_str), c_int), c_rc)
-              else
-                ! Extract 1D coordinate arrays from 2D ESMF grid coordinates
-                allocate(lon_coords(nx), lat_coords(ny))
-                do i = 1, nx
-                  lon_coords(i) = real(grid_lon(i,1), c_double)  ! First row, all columns
-                end do
-                do i = 1, ny
-                  lat_coords(i) = real(grid_lat(1,i), c_double)  ! First column, all rows
-                end do
-
-                write(*,'(A,2F10.3)') "INFO: [CECE] Grid longitude range: ", lon_coords(1), lon_coords(nx)
-                write(*,'(A,2F10.3)') "INFO: [CECE] Grid latitude range: ", lat_coords(1), lat_coords(ny)
-
-                ! Call enhanced writer initialization with coordinates
-                call cece_core_writer_initialize_with_coords(g_cece_data_ptr, int(nx, c_int), int(ny, c_int), &
-                                                           int(nz, c_int), lon_coords, lat_coords, &
-                                                           start_time_str, int(len_trim(start_time_str), c_int), c_rc)
-                deallocate(lon_coords, lat_coords)
-              end if
-            end if
+            allocate(lon_coords(nx), lat_coords(ny))
+
+            dlon = real(lon_max - lon_min, c_double) / real(nx, c_double)
+            dlat = real(lat_max - lat_min, c_double) / real(ny, c_double)
+
+            do i = 1, nx
+              lon_coords(i) = real(lon_min, c_double) + dlon * (real(i, c_double) - 0.5_c_double)
+            end do
+
+            do i = 1, ny
+              lat_coords(i) = real(lat_min, c_double) + dlat * (real(i, c_double) - 0.5_c_double)
+            end do
+
+            write(*,'(A,2F12.5)') "INFO: [CECE] Writer longitude range: ", lon_coords(1), lon_coords(nx)
+            write(*,'(A,2F12.5)') "INFO: [CECE] Writer latitude range: ", lat_coords(1), lat_coords(ny)
+
+            call cece_core_writer_initialize_with_coords(g_cece_data_ptr, int(nx, c_int), int(ny, c_int), &
+                                                         int(nz, c_int), lon_coords, lat_coords, &
+                                                         start_time_str, int(len_trim(start_time_str), c_int), c_rc)
+
+            deallocate(lon_coords, lat_coords)
           end block
 
           rc = int(c_rc)
diff --git a/src/io/cece_standalone_writer.cpp b/src/io/cece_standalone_writer.cpp
@@ -104,6 +104,11 @@ int CeceStandaloneWriter::Initialize(const std::string& start_time_iso8601, int
     ny_ = ny;
     nz_ = nz;
 
+    // Legacy dimensions-only initialization: clear any prior coordinate state.
+    lon_coords_.clear();
+    lat_coords_.clear();
+    use_custom_coords_ = false;
+
     CECE_LOG_INFO("[CECE] Initializing standalone writer with start time: " + start_time_iso8601);
 
     // Create output directory if it doesn't exist
@@ -125,6 +130,11 @@ int CeceStandaloneWriter::InitializeWithCoords(const std::string& start_time_iso
                                                const std::vector<double>& lat_coords) {
     if (!config_.enabled) return 0;
 
+    if (static_cast<int>(lon_coords.size()) != nx || static_cast<int>(lat_coords.size()) != ny) {
+        CECE_LOG_ERROR("[CECE] Coordinate array sizes do not match writer dimensions");
+        return -1;
+    }
+
     start_time_iso8601_ = start_time_iso8601;
     nx_ = nx;
     ny_ = ny;
@@ -251,7 +261,8 @@ int CeceStandaloneWriter::WriteTimeStep(const std::unordered_map<std::string, Du
 
         // Write coordinate arrays
         if (use_custom_coords_) {
-            // Use coordinates provided from ESMF grid
+            // -- Use coordinates provided from ESMF grid
+	    // ++ Use coordinates provided by the cap from the configured output grid.
             check_nc(nc_put_var_double(ncid, var_lon, lon_coords_.data()), "put_var lon");
             check_nc(nc_put_var_double(ncid, var_lat, lat_coords_.data()), "put_var lat");
         } else {
diff --git a/src/io/tide/streams/dshr_strdata_mod.F90 b/src/io/tide/streams/dshr_strdata_mod.F90
@@ -683,6 +683,9 @@ subroutine shr_strdata_init(sdat, model_clock, stream_name, rc)
              ! single point stream data, no action required.
           else if (trim(sdat%stream(ns)%mapalgo) == 'passthrough') then
              ! Data is already on the model grid - skip regridding entirely.
+             ! passthrough does not interpolate, remap, or realign longitude.
+             ! It is only valid when source and destination grids match in size,
+             ! coordinate convention, and index order.
              ! A size check against the destination field is performed at first read.
           else
              call shr_sys_abort('ERROR: map algo '//trim(sdat%stream(ns)%mapalgo)//' is not supported')
@@ -1978,17 +1981,27 @@ subroutine shr_strdata_readstrm(sdat, per_stream, stream, fldbun_data, &
           if (chkerr(rc,__LINE__,u_FILE_u)) return
 
           if (trim(stream%mapalgo) == 'passthrough') then
-             ! No regridding: directly copy data and validate matching sizes.
+              ! No regridding: directly copy data only when source and destination
+              ! grids are already identical in size, coordinate convention, and
+              ! index order. This branch does not interpolate, remap, or roll longitude.
              block
                real(r8), pointer :: dst_ptr(:) => null()
+
                call dshr_field_getfldptr(field_dst, fldptr1=dst_ptr, rc=rc)
                if (chkerr(rc,__LINE__,u_FILE_u)) return
+
                if (size(dataptr1d) /= size(dst_ptr)) then
                   write(errmsg,'(a,i0,a,i0,a)') &
                        'ERROR: passthrough mapalgo: stream size (', size(dataptr1d), &
                        ') does not match model grid size (', size(dst_ptr), ')'
                   call shr_sys_abort(trim(errmsg))
                end if
+
+               ! NOTE: passthrough intentionally does not perform coordinate
+               ! convention conversion. If source and destination grids differ
+               ! by 0..360 vs -180..180, use a real regridding mapalgo such as
+               ! nearest, bilinear, or conservative remapping, or preprocess the
+               ! input so it matches the destination grid.
                dst_ptr(:) = dataptr1d(:)
              end block
           else if (trim(stream%mapalgo) == 'none') then
