From d8e56531c6b103c40bf847734d1a44922e3911a5 Mon Sep 17 00:00:00 2001 From: "Linlin.Pan" Date: Fri, 1 Nov 2019 06:27:31 +0000 Subject: [PATCH] modified for coupling, removing: if(cplflx)then write(*,*)'Fatal error: CCPP not been tested with cplflx=true!' stop endif --- physics/GFS_PBL_generic.F90 | 4 ---- physics/GFS_surface_generic.F90 | 4 ---- physics/sfc_sice.f | 4 ---- 3 files changed, 12 deletions(-) diff --git a/physics/GFS_PBL_generic.F90 b/physics/GFS_PBL_generic.F90 index 49401d6ae..ec6134ed5 100644 --- a/physics/GFS_PBL_generic.F90 +++ b/physics/GFS_PBL_generic.F90 @@ -463,10 +463,6 @@ subroutine GFS_PBL_generic_post_run (im, levs, nvdiff, ntrac, dkt_cpl(1:im,1:levs-1) = dkt(1:im,1:levs-1) endif - if(cplflx)then - write(*,*)'Fatal error: CCPP is not ready for cplflx=true!!' - stop - endif ! --- ... coupling insertion diff --git a/physics/GFS_surface_generic.F90 b/physics/GFS_surface_generic.F90 index 0b1e43e5c..d8520c333 100644 --- a/physics/GFS_surface_generic.F90 +++ b/physics/GFS_surface_generic.F90 @@ -184,10 +184,6 @@ subroutine GFS_surface_generic_pre_run (im, levs, vfrac, islmsk, isot, ivegsrc, ! + max(zero, min(Tbd%phy_f2d(i,Model%num_p2d), 30.0)), one) end do - if(cplflx)then - write(*,*)'Fatal error: CCPP is not ready for cplflx=true!!' - stop - endif if (cplflx) then do i=1,im diff --git a/physics/sfc_sice.f b/physics/sfc_sice.f index 9471792fa..750a6d795 100644 --- a/physics/sfc_sice.f +++ b/physics/sfc_sice.f @@ -205,10 +205,6 @@ subroutine sfc_sice_run & errmsg = '' errflg = 0 - if(cplflx)then - write(*,*)'Fatal error: CCPP not been tested with cplflx=true!' - stop - endif if (cplflx) then where (flag_cice)