From f5af36958e164290202423d09a3b5508c7ddcedd Mon Sep 17 00:00:00 2001 From: Raffaele Montuoro Date: Mon, 28 Oct 2019 21:10:46 +0000 Subject: [PATCH 1/7] Use proper LD variable when linking NEMS application. --- src/GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GNUmakefile b/src/GNUmakefile index 4032717d..ee7488a9 100644 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -208,7 +208,7 @@ endif nems: nems_libs $(OBJS) $(COBJS) $(MAIN) ./conf/configure.nems echo libgocart is $(LIBGOCART) echo extlibs is $(EXTLIBS) - $(FC) $(SMP) -o $(TARGET) $(MAIN) $(OBJS) $(COBJS) $(LIBS_NEMS) $(EXTLIBS) $(LIBGOCART) $(EXTRA_LINK_FLAGS) + $(LD) -o $(TARGET) $(MAIN) $(OBJS) $(COBJS) $(LIBS_NEMS) $(EXTLIBS) $(LIBGOCART) $(EXTRA_LINK_FLAGS) @echo "$(TARGET) is created." conf/configure.nems: From ac1de46c5a3a1ad49a0727e4883d2985582f814a Mon Sep 17 00:00:00 2001 From: Raffaele Montuoro Date: Tue, 21 Apr 2020 23:05:29 +0000 Subject: [PATCH 2/7] Additional change to sync up with NOAA-EMC 'develop' branch. --- src/GNUmakefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/GNUmakefile b/src/GNUmakefile index 4465bc4d..78637cc3 100644 --- a/src/GNUmakefile +++ b/src/GNUmakefile @@ -212,7 +212,7 @@ endif nems: nems_libs $(OBJS) $(COBJS) $(MAIN) ./conf/configure.nems echo libgocart is $(LIBGOCART) echo extlibs is $(EXTLIBS) - $(LD) -o $(TARGET) $(MAIN) $(OBJS) $(COBJS) $(LIBS_NEMS) $(EXTLIBS) $(LIBGOCART) $(EXTRA_LINK_FLAGS) + $(FC) $(SMP) -o $(TARGET) $(MAIN) $(OBJS) $(COBJS) $(LIBS_NEMS) $(EXTLIBS) $(LIBGOCART) $(EXTRA_LINK_FLAGS) @echo "$(TARGET) is created." conf/configure.nems: From 0c24edd585ace5baa4eeab965ca84b6d48b27f59 Mon Sep 17 00:00:00 2001 From: Raffaele Montuoro Date: Tue, 10 Nov 2020 15:46:17 -0600 Subject: [PATCH 3/7] Add lake and ocean fraction entries to the NUOPC Field Dictionary. --- src/module_EARTH_GRID_COMP.F90 | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/src/module_EARTH_GRID_COMP.F90 b/src/module_EARTH_GRID_COMP.F90 index 5bca3d32..b9797215 100644 --- a/src/module_EARTH_GRID_COMP.F90 +++ b/src/module_EARTH_GRID_COMP.F90 @@ -1000,6 +1000,28 @@ SUBROUTINE EARTH_REGISTER(EARTH_GRID_COMP,RC_REG) file=__FILE__)) & return ! bail out endif + if (.not. NUOPC_FieldDictionaryHasEntry( & + "lake_fraction")) then + call NUOPC_FieldDictionaryAddEntry( & + standardName="lake_fraction", & + canonicalUnits="1", & + rc=rc) + if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, & + line=__LINE__, & + file=__FILE__)) & + return ! bail out + endif + if (.not. NUOPC_FieldDictionaryHasEntry( & + "ocean_fraction")) then + call NUOPC_FieldDictionaryAddEntry( & + standardName="ocean_fraction", & + canonicalUnits="1", & + rc=rc) + if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, & + line=__LINE__, & + file=__FILE__)) & + return ! bail out + endif if (.not. NUOPC_FieldDictionaryHasEntry( & "mean_sw_pen_to_ocn")) then call NUOPC_FieldDictionaryAddEntry( & From f244459e865baab1605cbaeb257d0a2b3bbf160e Mon Sep 17 00:00:00 2001 From: Raffaele Montuoro Date: Thu, 14 Jan 2021 13:18:46 -0600 Subject: [PATCH 4/7] Add entries for instantaneous 3D non-convective liquid and ice precipitation fluxes to the NUOPC Field Dictionary. --- src/module_EARTH_GRID_COMP.F90 | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/src/module_EARTH_GRID_COMP.F90 b/src/module_EARTH_GRID_COMP.F90 index b9797215..5342cdb0 100644 --- a/src/module_EARTH_GRID_COMP.F90 +++ b/src/module_EARTH_GRID_COMP.F90 @@ -3262,6 +3262,30 @@ SUBROUTINE EARTH_REGISTER(EARTH_GRID_COMP,RC_REG) return ! bail out endif + if (.not.NUOPC_FieldDictionaryHasEntry( & + "inst_ice_nonconv_tendency_levels")) then + call NUOPC_FieldDictionaryAddEntry( & + standardName="inst_ice_nonconv_tendency_levels", & + canonicalUnits="kg m-2 s-1", & + rc=rc) + if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, & + line=__LINE__, & + file=__FILE__)) & + return ! bail out + endif + + if (.not.NUOPC_FieldDictionaryHasEntry( & + "inst_liq_nonconv_tendency_levels")) then + call NUOPC_FieldDictionaryAddEntry( & + standardName="inst_liq_nonconv_tendency_levels", & + canonicalUnits="kg m-2 s-1", & + rc=rc) + if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, & + line=__LINE__, & + file=__FILE__)) & + return ! bail out + endif + if (.not.NUOPC_FieldDictionaryHasEntry( & "inst_friction_velocity")) then call NUOPC_FieldDictionaryAddEntry( & From 1848983e17aa5c1cb48d0f334f1d41d83b4a4be9 Mon Sep 17 00:00:00 2001 From: Raffaele Montuoro Date: Thu, 14 Jan 2021 13:22:17 -0600 Subject: [PATCH 5/7] Add instantaneous normalized soil wetness entry to the NUOPC Field Dictionary. --- src/module_EARTH_GRID_COMP.F90 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/module_EARTH_GRID_COMP.F90 b/src/module_EARTH_GRID_COMP.F90 index 5342cdb0..8f1b70ca 100644 --- a/src/module_EARTH_GRID_COMP.F90 +++ b/src/module_EARTH_GRID_COMP.F90 @@ -3322,6 +3322,18 @@ SUBROUTINE EARTH_REGISTER(EARTH_GRID_COMP,RC_REG) return ! bail out endif + if (.not.NUOPC_FieldDictionaryHasEntry( & + "inst_surface_soil_wetness")) then + call NUOPC_FieldDictionaryAddEntry( & + standardName="inst_surface_soil_wetness", & + canonicalUnits="1", & + rc=rc) + if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, & + line=__LINE__, & + file=__FILE__)) & + return ! bail out + endif + if (.not.NUOPC_FieldDictionaryHasEntry( & "inst_up_sensi_heat_flx")) then call NUOPC_FieldDictionaryAddEntry( & From b3c9499e72a0b5c23a92fec2929f51f9d13ab384 Mon Sep 17 00:00:00 2001 From: Raffaele Montuoro Date: Sat, 30 Jan 2021 18:46:15 -0600 Subject: [PATCH 6/7] Add instantaneous cloud fraction on model levels to the NUOPC Field Dictionary. --- src/module_EARTH_GRID_COMP.F90 | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/src/module_EARTH_GRID_COMP.F90 b/src/module_EARTH_GRID_COMP.F90 index 8f1b70ca..0e93c3ca 100644 --- a/src/module_EARTH_GRID_COMP.F90 +++ b/src/module_EARTH_GRID_COMP.F90 @@ -3382,6 +3382,18 @@ SUBROUTINE EARTH_REGISTER(EARTH_GRID_COMP,RC_REG) return ! bail out endif + if (.not.NUOPC_FieldDictionaryHasEntry( & + "inst_cloud_frac_levels")) then + call NUOPC_FieldDictionaryAddEntry( & + standardName="inst_cloud_frac_levels", & + canonicalUnits="1", & + rc=rc) + if (ESMF_LogFoundError(rcToCheck=rc, msg=ESMF_LOGERR_PASSTHRU, & + line=__LINE__, & + file=__FILE__)) & + return ! bail out + endif + ! Dummy fields if (.not. NUOPC_FieldDictionaryHasEntry( & From db79b934323040a2e6027d4d6488dba39a86d80c Mon Sep 17 00:00:00 2001 From: Raffaele Montuoro Date: Fri, 21 May 2021 13:31:27 +0000 Subject: [PATCH 7/7] Replace GSDCHEM with GOCART. --- src/module_EARTH_GRID_COMP.F90 | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/module_EARTH_GRID_COMP.F90 b/src/module_EARTH_GRID_COMP.F90 index a14a36a7..8bd50c1c 100644 --- a/src/module_EARTH_GRID_COMP.F90 +++ b/src/module_EARTH_GRID_COMP.F90 @@ -84,9 +84,9 @@ MODULE module_EARTH_GRID_COMP #ifdef FRONT_IPE use FRONT_IPE, only: IPE_SS => SetServices #endif - ! - Handle build time GSDCHEM options: -#ifdef FRONT_GSDCHEM - use FRONT_GSDCHEM, only: GSDCHEM_SS => SetServices + ! - Handle build time GOCART options: +#ifdef FRONT_GOCART + use FRONT_GOCART, only: GOCART_SS => SetServices #endif ! - Mediator #ifdef FRONT_CMEPS @@ -420,9 +420,9 @@ subroutine SetModelServices(driver, rc) found_comp = .true. end if #endif -#ifdef FRONT_GSDCHEM - if (trim(model) == "gsdchem") then - call NUOPC_DriverAddComp(driver, trim(prefix), GSDCHEM_SS, & +#ifdef FRONT_GOCART + if (trim(model) == "gocart") then + call NUOPC_DriverAddComp(driver, trim(prefix), GOCART_SS, & petList=petList, comp=comp, rc=rc) if (ChkErr(rc,__LINE__,u_FILE_u)) return found_comp = .true.