Merge branch 'release/8.2.0' into main

esmf-org · Oct 26, 2021 · 4dac2d0 · 4dac2d0
2 parents e1dc108 + 4b0a60b
commit 4dac2d0
Show file tree

Hide file tree

Showing 79 changed files with 3,695 additions and 207 deletions.
diff --git a/.gitignore b/.gitignore
@@ -488,6 +488,8 @@ AtmOcnTransferGridProto/fields_ocn_init_export.tile3.nc
 AtmOcnTransferGridProto/fields_ocn_init_export.tile4.nc
 AtmOcnTransferGridProto/fields_ocn_init_export.tile5.nc
 AtmOcnTransferGridProto/fields_ocn_init_export.tile6.nc
+AtmOcnTransferGridProto/fort.100
+AtmOcnTransferGridProto/fort.200
 AtmOcnTransferGridProto/ocn.mod
 AtmOcnTransferGridProto/ocn.o
 AtmOcnTransferLocStreamProto/PET0.ESMF_LogFile
@@ -504,6 +506,12 @@ AtmOcnTransferLocStreamProto/esmApp.stdout
 AtmOcnTransferLocStreamProto/field_pmsl_init.nc
 AtmOcnTransferLocStreamProto/ocn.mod
 AtmOcnTransferLocStreamProto/ocn.o
+AtmOcnTransferMeshProto/Atm-MeshIn_corners.vtk
+AtmOcnTransferMeshProto/Atm-MeshOut_corners.vtk
+AtmOcnTransferMeshProto/OCN-MeshIn.vtk
+AtmOcnTransferMeshProto/OCN-MeshOut.vtk
+AtmOcnTransferMeshProto/fort.100
+AtmOcnTransferMeshProto/fort.200
 AtmOcnTransferMeshProto/Atm-MeshIn_corners.2.0.vtk
 AtmOcnTransferMeshProto/Atm-MeshIn_corners.2.1.vtk
 AtmOcnTransferMeshProto/Atm-MeshOut_corners.2.0.vtk
@@ -686,6 +694,52 @@ ExternalDriverAPIProto/field_ocn_import_rsns.nc
 ExternalDriverAPIProto/field_ocn_import_sdhf.nc
 ExternalDriverAPIProto/ocn.mod
 ExternalDriverAPIProto/ocn.o
+ExternalDriverAPIProto/field_atm_export_pmsl.nc
+ExternalDriverAPIProto/field_atm_export_rsnl.nc
+ExternalDriverAPIProto/field_atm_export_rsns.nc
+ExternalDriverAPIProto/field_atm_export_sdhf.nc
+ExternalDriverAPIProto/field_atm_import_precip.nc
+ExternalDriverAPIProto/field_atm_import_sst.nc
+ExternalDriverAPIProto/field_externalExportState_init_precipitation_flux.nc
+ExternalDriverAPIProto/field_externalExportState_precipitation_flux.nc
+ExternalDriverAPIProto/field_externalImportState_init_surface_net_downward_shortwave_flux.nc
+ExternalDriverAPIProto/field_externalImportState_surface_net_downward_shortwave_flux.nc
+ExternalDriverAPIWeakCplDAProto/PET0.ESMF_LogFile
+ExternalDriverAPIWeakCplDAProto/PET1.ESMF_LogFile
+ExternalDriverAPIWeakCplDAProto/PET2.ESMF_LogFile
+ExternalDriverAPIWeakCplDAProto/PET3.ESMF_LogFile
+ExternalDriverAPIWeakCplDAProto/atm.mod
+ExternalDriverAPIWeakCplDAProto/atm.o
+ExternalDriverAPIWeakCplDAProto/atmDA.o
+ExternalDriverAPIWeakCplDAProto/atmda.mod
+ExternalDriverAPIWeakCplDAProto/esm.mod
+ExternalDriverAPIWeakCplDAProto/esm.o
+ExternalDriverAPIWeakCplDAProto/externalApp
+ExternalDriverAPIWeakCplDAProto/externalApp.o
+ExternalDriverAPIWeakCplDAProto/externalApp.stdout
+ExternalDriverAPIWeakCplDAProto/field_atm_export_pmsl.nc
+ExternalDriverAPIWeakCplDAProto/field_atm_export_rsnl.nc
+ExternalDriverAPIWeakCplDAProto/field_atm_export_rsns.nc
+ExternalDriverAPIWeakCplDAProto/field_atm_export_sdhf.nc
+ExternalDriverAPIWeakCplDAProto/field_atm_import_precip.nc
+ExternalDriverAPIWeakCplDAProto/field_atm_import_sst.nc
+ExternalDriverAPIWeakCplDAProto/field_fmNuopcTop_init_sea_surface_temperature.nc
+ExternalDriverAPIWeakCplDAProto/field_fmNuopcTop_init_surface_net_downward_shortwave_flux.nc
+ExternalDriverAPIWeakCplDAProto/field_fmNuopcTop_sea_surface_temperature.nc
+ExternalDriverAPIWeakCplDAProto/field_fmNuopcTop_surface_net_downward_shortwave_flux.nc
+ExternalDriverAPIWeakCplDAProto/field_ocn_export_sst.nc
+ExternalDriverAPIWeakCplDAProto/field_ocn_import_pmsl.nc
+ExternalDriverAPIWeakCplDAProto/field_ocn_import_rsnl.nc
+ExternalDriverAPIWeakCplDAProto/field_ocn_import_rsns.nc
+ExternalDriverAPIWeakCplDAProto/field_ocn_import_sdhf.nc
+ExternalDriverAPIWeakCplDAProto/field_toNuopcTop_init_precipitation_flux.nc
+ExternalDriverAPIWeakCplDAProto/field_toNuopcTop_precipitation_flux.nc
+ExternalDriverAPIWeakCplDAProto/nuopc_da.mod
+ExternalDriverAPIWeakCplDAProto/nuopc_da.o
+ExternalDriverAPIWeakCplDAProto/ocn.mod
+ExternalDriverAPIWeakCplDAProto/ocn.o
+ExternalDriverAPIWeakCplDAProto/ocnDA.o
+ExternalDriverAPIWeakCplDAProto/ocnda.mod
 GenericMediatorProto/PET0.ESMF_LogFile
 GenericMediatorProto/PET1.ESMF_LogFile
 GenericMediatorProto/PET2.ESMF_LogFile
@@ -802,6 +856,17 @@ SingleModelOpenMPProto/mainApp.o
 SingleModelOpenMPProto/mainApp.stdout
 SingleModelOpenMPProto/model.mod
 SingleModelOpenMPProto/model.o
+SingleModelOpenMPUnawareProto/PET0.ESMF_LogFile
+SingleModelOpenMPUnawareProto/PET1.ESMF_LogFile
+SingleModelOpenMPUnawareProto/PET2.ESMF_LogFile
+SingleModelOpenMPUnawareProto/PET3.ESMF_LogFile
+SingleModelOpenMPUnawareProto/driver.mod
+SingleModelOpenMPUnawareProto/driver.o
+SingleModelOpenMPUnawareProto/mainApp
+SingleModelOpenMPUnawareProto/mainApp.o
+SingleModelOpenMPUnawareProto/mainApp.stdout
+SingleModelOpenMPUnawareProto/model.mod
+SingleModelOpenMPUnawareProto/model.o
 SingleModelProto/PET0.ESMF_LogFile
 SingleModelProto/PET1.ESMF_LogFile
 SingleModelProto/PET2.ESMF_LogFile

diff --git a/AsyncIOBlockingProto/Makefile b/AsyncIOBlockingProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit asyncIOApp.F90 asyncIODriver.F90 model.F90 io.F90 &
 
 run:
-	mpirun -np 4 ./asyncIOApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./asyncIOApp
diff --git a/AsyncIONonblockingProto/Makefile b/AsyncIONonblockingProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit asyncIOApp.F90 asyncIODriver.F90 model.F90 io.F90 conn.F90 &
 
 run:
-	mpirun -np 4 ./asyncIOApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./asyncIOApp
diff --git a/AtmOcnConOptsProto/Makefile b/AtmOcnConOptsProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnConProto/Makefile b/AtmOcnConProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 conn.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnCplListProto/Makefile b/AtmOcnCplListProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnCplListProto/esm.F90 b/AtmOcnCplListProto/esm.F90
@@ -267,8 +267,13 @@ subroutine ModifyCplLists(driver, rc)
             .or. trim(cplList(j))=="air_pressure_at_sea_level") then
             tempString = trim(cplList(j))//":REMAPMETHOD=redist"
           else
+#ifdef ESMF_NETCDF
             tempString = trim(cplList(j))//":REMAPMETHOD=bilinear"//&
             ":SrcTermProcessing=1:DUMPWEIGHTS=true:TermOrder=SrcSeq"
+#else
+            tempString = trim(cplList(j))//":REMAPMETHOD=bilinear"//&
+            ":SrcTermProcessing=1:TermOrder=SrcSeq"
+#endif
           endif
           cplList(j) = trim(tempString)
           write (msg,*) "Modified: "//trim(cplList(j))

diff --git a/AtmOcnCplSetProto/Makefile b/AtmOcnCplSetProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnFDSynoProto/Makefile b/AtmOcnFDSynoProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnIceSimpleImplicitProto/Makefile b/AtmOcnIceSimpleImplicitProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 ice.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnImplicitProto/Makefile b/AtmOcnImplicitProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnLndProto/Makefile b/AtmOcnLndProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 lnd.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnLogNoneProto/Makefile b/AtmOcnLogNoneProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnMedIngestFromConfigProto/Makefile b/AtmOcnMedIngestFromConfigProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 med.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnMedIngestFromInternalProto/Makefile b/AtmOcnMedIngestFromInternalProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 med.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnMedIngestFromInternalProto/esm.F90 b/AtmOcnMedIngestFromInternalProto/esm.F90
@@ -94,8 +94,8 @@ subroutine SetModelServices(driver, rc)
 
     ! set up free format driver attributes
     attrFF = NUOPC_FreeFormatCreate(stringList=(/ &
-      "Verbosity = 1",    &
-      "Profiling = 0" /), &
+      "Verbosity = high",    &
+      "Profiling = 0   " /), &
       rc=rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
       line=__LINE__, &
@@ -273,10 +273,16 @@ subroutine SetRunSequence(driver, rc)
       "   MED         ",    &
       "   MED -> ATM  ",    &
       "   MED -> OCN  ",    &
-      "   ATM         ",    &
-      "   OCN         ",    &
-      "   ATM -> MED  ",    &
+      "   @@3600      ",    &
+      "    ATM        ",    &
+      "    OCN        ",    &
+      "    @1800      ",    &
+      "    ATM -> MED ",    &
+      "    @          ",    &
+      "   @@          ",    &
+      "   @@3600      ",    &
       "   OCN -> MED  ",    &
+      "   @@          ",    &
       "   MED         ",    &
       " @             " /), &
       rc=rc)
@@ -298,7 +304,7 @@ subroutine SetRunSequence(driver, rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &
       line=__LINE__, file=trim(name)//":"//__FILE__)) return  ! bail out
 
-#if 0
+#if 1
     ! Diagnostic output
     call NUOPC_DriverPrint(driver, orderflag=.true., rc=rc)
     if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, &

diff --git a/AtmOcnMedPetListProto/Makefile b/AtmOcnMedPetListProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 med.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnMedPetListTimescalesProto/Makefile b/AtmOcnMedPetListTimescalesProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 med.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnMedPetListTimescalesSplitFastProto/Makefile b/AtmOcnMedPetListTimescalesSplitFastProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 med.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnMedProto/Makefile b/AtmOcnMedProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 med.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnMirrorFieldsProto/Makefile b/AtmOcnMirrorFieldsProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp
diff --git a/AtmOcnPetListProto/Makefile b/AtmOcnPetListProto/Makefile
@@ -70,4 +70,4 @@ edit:
 	nedit esmApp.F90 esm.F90 atm.F90 ocn.F90 &
 
 run:
-	mpirun -np 4 ./esmApp
+	$(ESMF_INTERNAL_MPIRUN) -np 4 ./esmApp