From e366b9d5cf31d4bc407e53defc1513708892a183 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Fri, 12 Jan 2024 11:11:00 -0500 Subject: [PATCH 1/3] remove unnecessary and incorrect bc check --- .../Utils/mk_restarts/mk_catchANDcnRestarts.F90 | 7 ------- 1 file changed, 7 deletions(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_catchANDcnRestarts.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_catchANDcnRestarts.F90 index 2e202a45b..80d0101f4 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_catchANDcnRestarts.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_catchANDcnRestarts.F90 @@ -111,13 +111,6 @@ subroutine process_cmd() nxt = nxt + 1 call getarg(nxt,arg) end do - if (index(model, 'catchcn') /=0 ) then - if((INDEX(out_bcsdir, 'NL') == 0).AND.(INDEX(out_bcsdir, 'OutData') == 0)) then - print *,'Land BCs in : ',trim(out_bcsdir) - print *,'do not support ',trim (model) - stop - endif - endif out_file = out_dir //'/'//out_rstfile end subroutine From f0a615f50220c12e59307ff9df4ca46c0ddfaa35 Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang Date: Fri, 12 Jan 2024 13:12:25 -0500 Subject: [PATCH 2/3] re-instate bc check --- .../Utils/mk_restarts/mk_catchANDcnRestarts.F90 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_catchANDcnRestarts.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_catchANDcnRestarts.F90 index 80d0101f4..162f38c9e 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_catchANDcnRestarts.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_catchANDcnRestarts.F90 @@ -111,6 +111,13 @@ subroutine process_cmd() nxt = nxt + 1 call getarg(nxt,arg) end do + if (index(model, 'catchcn') /=0 ) then + if((INDEX(out_bcsdir, '/ICA/') /== 0) .or. (INDEX(out_bcsdir, '/GM4/') /= 0)) then + print *,'Land BCs in : ',trim(out_bcsdir) + print *,'do not support ',trim (model) + stop + endif + endif out_file = out_dir //'/'//out_rstfile end subroutine From 7ae35c59e5655ac5b7a64ea23d8e0dbbcee2509e Mon Sep 17 00:00:00 2001 From: Weiyuan Jiang <52509753+weiyuan-jiang@users.noreply.github.com> Date: Wed, 17 Jan 2024 10:42:07 -0500 Subject: [PATCH 3/3] Update mk_catchANDcnRestarts.F90 --- .../Utils/mk_restarts/mk_catchANDcnRestarts.F90 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_catchANDcnRestarts.F90 b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_catchANDcnRestarts.F90 index 162f38c9e..117b54731 100644 --- a/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_catchANDcnRestarts.F90 +++ b/GEOSagcm_GridComp/GEOSphysics_GridComp/GEOSsurface_GridComp/Utils/mk_restarts/mk_catchANDcnRestarts.F90 @@ -112,7 +112,7 @@ subroutine process_cmd() call getarg(nxt,arg) end do if (index(model, 'catchcn') /=0 ) then - if((INDEX(out_bcsdir, '/ICA/') /== 0) .or. (INDEX(out_bcsdir, '/GM4/') /= 0)) then + if((INDEX(out_bcsdir, '/ICA/') /= 0) .or. (INDEX(out_bcsdir, '/GM4/') /= 0)) then print *,'Land BCs in : ',trim(out_bcsdir) print *,'do not support ',trim (model) stop