From 6dee43f1f0fc3cce405c39bf95eafc4a24bedf35 Mon Sep 17 00:00:00 2001 From: zmoon Date: Mon, 25 Nov 2024 12:06:13 -0600 Subject: [PATCH 1/3] Update HEMCO to 3.10.0 release previous was 3.6.2 (PR #36) although the recent PR (#56) mistakenly reverted it to 3.4.0 (PR #9) (my bad) --- HEMCO | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/HEMCO b/HEMCO index 4a66bae..deaa192 160000 --- a/HEMCO +++ b/HEMCO @@ -1 +1 @@ -Subproject commit 4a66bae48f33e6dc22cda5ec9d4633192dee2f73 +Subproject commit deaa1923f3d3e06e264c4ccbe0e3b7dc32edcc20 From f9ef39cde15f375223a2c4e885daac2dde5dd01c Mon Sep 17 00:00:00 2001 From: zmoon Date: Mon, 25 Nov 2024 12:12:25 -0600 Subject: [PATCH 2/3] Add TSOIL1 for the new soil NOx extension option --- src/nuopc/cap.F90 | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/src/nuopc/cap.F90 b/src/nuopc/cap.F90 index a79d58b..bdf98ca 100644 --- a/src/nuopc/cap.F90 +++ b/src/nuopc/cap.F90 @@ -1710,7 +1710,7 @@ subroutine hco_ext_set_fields ( HcoState, ExtState, RC ) end if end if - !%%%%% Air and skin temperature %%%%% + !%%%%% Air temperature %%%%% if ( ExtState%T2M%DoUse ) then Name = 'T2M' call ExtDat_Set( HcoState, ExtState%T2M, & @@ -1724,6 +1724,7 @@ subroutine hco_ext_set_fields ( HcoState, ExtState, RC ) end if end if + !%%%%% Skin temperature %%%%% if ( ExtState%TSKIN%DoUse ) then Name = 'TS' call ExtDat_Set( HcoState, ExtState%TSKIN, & @@ -1737,6 +1738,20 @@ subroutine hco_ext_set_fields ( HcoState, ExtState, RC ) end if end if + !%%%%% Soil temperature %%%%% + IF ( ExtState%TSOIL1%DoUse ) THEN + Name = 'TSOIL1' + CALL ExtDat_Set( HcoState, ExtState%TSOIL1, & + trim( Name ), RC, FIRST=FIRST ) + if ( RC /= HCO_SUCCESS ) then + ErrMsg = 'Could not find quantity "' // trim( Name ) // & + '" for the HEMCO standalone simulation!' + call HCO_Error( HcoConfig%Err, ErrMsg, RC, ThisLoc ) + call HCO_Leave( HcoState%Config%Err, RC ) + return + end if + end if + !%%%%% Soil moisture %%%%% if ( ExtState%GWETROOT%DoUse ) then Name = 'GWETROOT' From b48a8f4d46cf45f94e5c70f8615bfab047ee0983 Mon Sep 17 00:00:00 2001 From: zmoon Date: Mon, 25 Nov 2024 12:19:24 -0600 Subject: [PATCH 3/3] Increase DUM length this was done to support reading YEDGE for global grid run/HEMCO_sa_Grid.025x03125.rc --- src/nuopc/cap.F90 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nuopc/cap.F90 b/src/nuopc/cap.F90 index bdf98ca..cbbcb55 100644 --- a/src/nuopc/cap.F90 +++ b/src/nuopc/cap.F90 @@ -944,7 +944,8 @@ subroutine hco_set_grid( HcoState, RC ) character(len=255) :: LOC character(len= 1) :: COL character(len=255) :: MyGridFile, ThisLoc - character(len=4095) :: DUM, ErrMsg, Msg + character(len=5500) :: DUM + character(len=255) :: ErrMsg, Msg !================================================================= ! SET_GRID begins here