add -w format to nccmp command

* allows comparison between netcdf4 and netcdf classic as identical
ufs-community · Feb 10, 2023 · 34ba07e · 34ba07e
1 parent 61ed23e
commit 34ba07e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/reg_tests/cpld_gridgen/rt.sh b/reg_tests/cpld_gridgen/rt.sh
@@ -56,7 +56,7 @@ check_results() {
 		echo "....MISSING file" | tee -a $PATHRT/$REGRESSIONTEST_LOG
 		test_status=FAIL
 	    else
-		$NCCMP -dmfqS $(basename ${file}) $file >>${PATHRT}/nccmp_${TEST_NAME}.log 2>&1 && d=$? || d=$?
+		$NCCMP -dmfqS -w format $(basename ${file}) $file >>${PATHRT}/nccmp_${TEST_NAME}.log 2>&1 && d=$? || d=$?
 		if [[ $d -ne 0 ]]; then
 		    echo "....NOT OK" | tee -a $PATHRT/$REGRESSIONTEST_LOG
 		    test_status=FAIL

diff --git a/sorc/cpld_gridgen.fd/gen_fixgrid.F90 b/sorc/cpld_gridgen.fd/gen_fixgrid.F90
@@ -462,11 +462,10 @@ program gen_fixgrid
   logmsg = 'creating weight file '//trim(fwgt)
   print '(a)',trim(logmsg)
 
-  call ESMF_RegridWeightGen(srcFile=trim(fsrc),dstFile=trim(fdst), &
-       weightFile=trim(fwgt), regridmethod=method,                 &
-       unmappedaction=ESMF_UNMAPPEDACTION_IGNORE,                  &
-       ignoreDegenerate=.true., netcdf4fileFlag=.true.,              &
-       tileFilePath=trim(fv3dir)//'/'//trim(atmres)//'/', rc=rc)
+  call ESMF_RegridWeightGen(srcFile=trim(fsrc),dstFile=trim(fdst),         &
+       weightFile=trim(fwgt), regridmethod=method,                         &
+       unmappedaction=ESMF_UNMAPPEDACTION_IGNORE, ignoreDegenerate=.true., &
+       netcdf4fileFlag=.true., tileFilePath=trim(fv3dir)//'/'//trim(atmres)//'/', rc=rc)
   if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
        line=__LINE__, file=__FILE__)) call ESMF_Finalize(endflag=ESMF_END_ABORT)
 
@@ -492,8 +491,7 @@ program gen_fixgrid
 
         call ESMF_RegridWeightGen(srcFile=trim(fsrc),dstFile=trim(fdst), &
              weightFile=trim(fwgt), regridmethod=method,                 &
-             ignoreDegenerate=.true.,                                    &
-             unmappedaction=ESMF_UNMAPPEDACTION_IGNORE, rc=rc)
+             ignoreDegenerate=.true., unmappedaction=ESMF_UNMAPPEDACTION_IGNORE, rc=rc)
         if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
              line=__LINE__, file=__FILE__)) call ESMF_Finalize(endflag=ESMF_END_ABORT)
      else