From 62d6582ff18b9a09dbc4ec32bba7a40e8419b032 Mon Sep 17 00:00:00 2001 From: Jinyun Tang Date: Wed, 2 Aug 2017 16:51:51 -0700 Subject: [PATCH 1/3] change the namelist reader for betr Now namelist of betr is read per processor rather than per column. This is an attempt to fix the runtime failure with ibm compiler. No change to ALM is involved. --- components/clm/src/external_models/sbetr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/clm/src/external_models/sbetr b/components/clm/src/external_models/sbetr index 62740758a108..8faca73a2bdb 160000 --- a/components/clm/src/external_models/sbetr +++ b/components/clm/src/external_models/sbetr @@ -1 +1 @@ -Subproject commit 62740758a1085c522b891ced3ac5a43216a67e7b +Subproject commit 8faca73a2bdba49ab2835ea2672d1d07a937486f From 8af35023442cd0b36dee5aaeeebfe2aac4703c7b Mon Sep 17 00:00:00 2001 From: Jinyun Tang Date: Wed, 2 Aug 2017 22:33:28 -0700 Subject: [PATCH 2/3] change calling method of endrun in betr Now msg is defined before calling endrun in order to avoid building failure with pgi compiler. No changes of ALM are involved. --- components/clm/src/external_models/sbetr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/clm/src/external_models/sbetr b/components/clm/src/external_models/sbetr index 8faca73a2bdb..9b5b814b4d35 160000 --- a/components/clm/src/external_models/sbetr +++ b/components/clm/src/external_models/sbetr @@ -1 +1 @@ -Subproject commit 8faca73a2bdba49ab2835ea2672d1d07a937486f +Subproject commit 9b5b814b4d351f18afd786684fa2a3e871e77d98 From f21ef4fb27f60835a74719f84247dc8fe14fc40a Mon Sep 17 00:00:00 2001 From: Jinyun Tang Date: Tue, 8 Aug 2017 10:31:29 -0700 Subject: [PATCH 3/3] bug fix for ibm and pgi compiler Now betr no longer reads in namelist from string, which seems to fix the failure from ibm and pgi comiplers. No changes to ALM are involved. --- components/clm/src/external_models/sbetr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/clm/src/external_models/sbetr b/components/clm/src/external_models/sbetr index 9b5b814b4d35..0bec951eef22 160000 --- a/components/clm/src/external_models/sbetr +++ b/components/clm/src/external_models/sbetr @@ -1 +1 @@ -Subproject commit 9b5b814b4d351f18afd786684fa2a3e871e77d98 +Subproject commit 0bec951eef22abbb936373373e7c4072f5ba3633