From 50d683bbb1547c9f7e85fa47d542a67aa94b0489 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Mon, 9 Mar 2020 14:34:12 +0000 Subject: [PATCH 1/2] fix omp error in dycore and atmos_model.F90 --- .gitmodules | 4 ++-- atmos_cubed_sphere | 2 +- atmos_model.F90 | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.gitmodules b/.gitmodules index d253f6966..db1852125 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere - branch = dev/emc + url = https://github.com/NOAA-PSD/GFDL_atmos_cubed_sphere + branch = skeb_sar [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index db3acfbec..feaf6520b 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit db3acfbec2ca00d1795b72b7ebf0b1e308506ced +Subproject commit feaf6520b1b455b6a6af5d71e8377b4d409bacef diff --git a/atmos_model.F90 b/atmos_model.F90 index a0204da0a..987608232 100644 --- a/atmos_model.F90 +++ b/atmos_model.F90 @@ -1672,7 +1672,7 @@ subroutine assign_importdata(rc) if (trim(impfield_name) == trim(fldname)) then findex = QueryFieldList(ImportFieldsList,fldname) if (importFieldsValid(findex) .and. IPD_control%cplwav2atm) then -!$omp parallel do default(shared) private(i,j,nb,ix) +!$omp parallel do default(shared) private(i,j,nb,ix,tem) do j=jsc,jec do i=isc,iec nb = Atm_block%blkno(i,j) From 74c2bfe71bbf141f8b0a911f48551d850d63ca92 Mon Sep 17 00:00:00 2001 From: Dusan Jovic Date: Wed, 11 Mar 2020 19:12:23 +0000 Subject: [PATCH 2/2] Update atmos_cubed_sphere submodule --- .gitmodules | 4 ++-- atmos_cubed_sphere | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index db1852125..d253f6966 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,7 @@ [submodule "atmos_cubed_sphere"] path = atmos_cubed_sphere - url = https://github.com/NOAA-PSD/GFDL_atmos_cubed_sphere - branch = skeb_sar + url = https://github.com/NOAA-EMC/GFDL_atmos_cubed_sphere + branch = dev/emc [submodule "ccpp/framework"] path = ccpp/framework url = https://github.com/NCAR/ccpp-framework diff --git a/atmos_cubed_sphere b/atmos_cubed_sphere index feaf6520b..371a29afb 160000 --- a/atmos_cubed_sphere +++ b/atmos_cubed_sphere @@ -1 +1 @@ -Subproject commit feaf6520b1b455b6a6af5d71e8377b4d409bacef +Subproject commit 371a29afbf813357dd93647cac0cbcd44db2ab20