ufs-community · junwang-noaa · Jul 14, 2021 · May 27, 2021 · May 27, 2021 · May 28, 2021
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,7 @@
 [submodule "FV3"]
   path = FV3
-  url = https://github.com/NOAA-EMC/fv3atm
-  branch = develop
+  url = https://github.com/SMoorthi-emc/fv3atm
+  branch = SM_May182021
 [submodule "NEMS"]
   path = NEMS
   url = https://github.com/NOAA-EMC/NEMS

diff --git a/FV3 b/FV3
diff --git a/WW3 b/WW3
diff --git a/tests/compile.sh b/tests/compile.sh
@@ -54,6 +54,7 @@ BUILD_JOBS=${BUILD_JOBS:-8}
 
 hostname
 
+module purge
 set +x
 if [[ $MACHINE_ID == macosx.* ]] || [[ $MACHINE_ID == linux.* ]]; then
   source $PATHTR/modulefiles/ufs_${MACHINE_ID}

diff --git a/tests/parm/c96_HAFS_v0_hwrf.nml.IN b/tests/parm/c96_HAFS_v0_hwrf.nml.IN
@@ -116,7 +116,6 @@
   nst_anl        = .true.
   use_ufo        = .true.
   pre_rad        = .false.
-  ncld           = 5
   imp_physics    = @[IMP_PHYSICS]
   spec_adv       = .true.        ! HWRF F-A
   RHGRD          = 0.98          ! HWRF F-A

diff --git a/tests/parm/control.nml.IN b/tests/parm/control.nml.IN
@@ -107,6 +107,96 @@ deflate_level=1
 /
 
 &gfs_physics_nml
+<<<<<<< HEAD
+       fhzero         = 6.
+       ldiag3d        = .false.
+       fhcyc          = 24.
+       nst_anl        = .true.
+       use_ufo        = .true.
+       pre_rad        = .false.
+       imp_physics    = 99
+       pdfcld         = .false.
+       fhswr          = 3600.
+       fhlwr          = 3600.
+       ialb           = 1
+       iems           = 1
+       IAER           = 111
+       ico2           = 2
+       isubc_sw       = 2
+       isubc_lw       = 2
+       isol           = 2
+       lwhtr          = .true.
+       swhtr          = .true.
+       cnvgwd         = .true.
+       shal_cnv       = .true.
+       cal_pre        = .true.
+       redrag         = .true.
+       dspheat        = .true.
+       hybedmf        = @[HYBEDMF]
+       satmedmf       = @[SATMEDMF]
+       lheatstrg      = @[LHEATSTRG]
+       random_clds    = .true.
+       trans_trac     = .false.
+       cnvcld         = .true.
+       imfshalcnv     = 2
+       imfdeepcnv     = 2
+       isatmedmf      = @[ISATMEDMF]
+       cdmbgwd        = 3.5,0.25
+       prslrd0        = 0.
+       ivegsrc        = 1
+       isot           = 1
+       lsm            = 1
+       iopt_dveg      = 2
+       iopt_crs       = 1
+       iopt_btr       = 1
+       iopt_run       = 1
+       iopt_sfc       = 1
+       iopt_frz       = 1
+       iopt_inf       = 1
+       iopt_rad       = 1
+       iopt_alb       = 2
+       iopt_snf       = 4
+       iopt_tbot      = 2
+       iopt_stc       = 1
+       debug          = .false.
+       oz_phys        = @[OZ_PHYS_OLD]
+       oz_phys_2015   = @[OZ_PHYS_NEW]
+       h2o_phys       = @[H2O_PHYS]
+       nstf_name      = @[NSTF_NAME]
+       cplflx         = @[CPLFLX]
+       cplwav         = @[CPLWAV]
+       cplwav2atm     = @[CPLWAV2ATM]
+       iau_delthrs    = 6
+       iaufhrs        = 30
+       iau_inc_files  = @[IAU_INC_FILES]
+       iau_drymassfixer = @[IAU_DRYMASSFIXER]
+       do_sppt        = @[DO_SPPT]
+       do_shum        = @[DO_SHUM]
+       do_skeb        = @[DO_SKEB]
+       lndp_type      = @[LNDP_TYPE]
+       n_var_lndp     = @[N_VAR_LNDP]
+       do_ca          = .false.
+       ca_sgs         = .false.
+       nca            = 1
+       ncells         = 5
+       nlives         = 30
+       nseed          = 1000000
+       nfracseed      = 0.5
+       nthresh        = 0.
+       ca_trigger     = .true.	
+       ca_entr	      = .false.
+       ca_closure     = .false.
+       ca_global      = .false.
+       nca_g          = 1
+       ncells_g       = 1
+       nlives_g       = 100
+       nseed_g        = 100
+       ca_smooth      = .false.
+       nspinup        = 100
+       iseed_ca       = 1
+       nsmooth        = 1
+       ca_amplitude   = 0.5
+=======
   fhzero       = 6
   h2o_phys     = .true.
   ldiag3d      = .false.
@@ -230,6 +320,7 @@ deflate_level=1
   icloud_f = 1
   mp_time = 150.
   reiflag = 2
+>>>>>>> upstream/develop
 /
 
 &interpolator_nml

diff --git a/tests/parm/control_ca.nml.IN b/tests/parm/control_ca.nml.IN
@@ -113,7 +113,6 @@ deflate_level=1
   fhcyc        = @[FHCYC]
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/control_flake.nml.IN b/tests/parm/control_flake.nml.IN
@@ -113,7 +113,6 @@ deflate_level=1
   fhcyc        = 24
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/control_gdas.nml.IN b/tests/parm/control_gdas.nml.IN
@@ -135,7 +135,6 @@ deflate_level=1
   fhcyc        = 1
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/control_noahmp.nml.IN b/tests/parm/control_noahmp.nml.IN
@@ -113,7 +113,6 @@ deflate_level=1
   fhcyc        = @[FHCYC]
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/control_rrtmgp.nml.IN b/tests/parm/control_rrtmgp.nml.IN
@@ -113,7 +113,6 @@ deflate_level=1
   fhcyc        = 24
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/control_ugwpv1.nml.IN b/tests/parm/control_ugwpv1.nml.IN
@@ -113,7 +113,6 @@ deflate_level=1
   fhcyc        = 24
   use_ufo      = .true.
   pre_rad      = .false.
-  ncld         = 5
   imp_physics  = 11
   pdfcld       = .false.
   fhswr        = 3600.

diff --git a/tests/parm/cpt.nml.IN b/tests/parm/cpt.nml.IN
@@ -124,7 +124,6 @@
        use_ufo        = .true.
        pre_rad        = .false.
        crtrh          = 0.93,0.90,0.95
-       ncld           = 2
        imp_physics    = 10
        pdfcld         = .false.
        fhswr          = 3600.

diff --git a/tests/parm/csawmg3shoc127.nml.IN b/tests/parm/csawmg3shoc127.nml.IN
@@ -125,7 +125,6 @@
        use_ufo        = .true.
        pre_rad        = .false.
        crtrh          = 0.98,0.98,0.90
-       ncld           = 2
        imp_physics    = 10
        pdfcld         = .false.
        fhswr          = 3600.

diff --git a/tests/parm/csawmgshoc.nml.IN b/tests/parm/csawmgshoc.nml.IN
@@ -124,7 +124,6 @@
        use_ufo        = .true.
        pre_rad        = .false.
        crtrh          = 1.00,1.00,0.95
-       ncld           = 2
        imp_physics    = 10
        pdfcld         = .false.
        fhswr          = 3600.

diff --git a/tests/parm/esg_HAFS_v0_hwrf.nml.IN b/tests/parm/esg_HAFS_v0_hwrf.nml.IN
@@ -125,7 +125,6 @@
   nst_anl        = .true.
   use_ufo        = .true.
   pre_rad        = .false.
-  ncld           = 5
   imp_physics    = @[IMP_PHYSICS]
   spec_adv       = .true.        ! HWRF F-A
   RHGRD          = 0.98          ! HWRF F-A
+3 −3		.gitmodules
+82 −69		atmos_model.F90
+77 −74		ccpp/data/GFS_typedefs.F90
+23 −43		ccpp/data/GFS_typedefs.meta
+11,031 −0		ccpp/data/GFS_typedefs.meta_Jun07
+1 −1		ccpp/framework
+1 −1		ccpp/physics
+0 −1		ccpp/suites/suite_FV3_GFS_cpld_rasmgshoc.xml
+0 −1		ccpp/suites/suite_FV3_GFS_cpld_rasmgshocnsst.xml
+91 −0		ccpp/suites/suite_FV3_GFS_cpld_rasmgshocnsst_flake.xml
+0 −1		ccpp/suites/suite_FV3_GFS_cpldnst_rasmgshoc.xml
+0 −1		ccpp/suites/suite_FV3_GFS_rasmgshoc.xml
+0 −1		ccpp/suites/suite_FV3_GFS_v15_ras.xml
+0 −1		ccpp/suites/suite_FV3_GFS_v15_rasmgshoc.xml
+0 −1		ccpp/suites/suite_FV3_GFS_v15plusras.xml
+0 −1		ccpp/suites/suite_FV3_GFS_v16_ras.xml
+94 −0		ccpp/suites/suite_FV3_GFS_v17_cpldnsstras.xml
+95 −0		ccpp/suites/suite_FV3_GFS_v17_cpldnsstras_flake.xml
+91 −0		ccpp/suites/suite_FV3_GFS_v17_cpldnsstrasnoshal.xml
+95 −0		ccpp/suites/suite_FV3_GFS_v17_cpldnsstsas.xml
+93 −0		ccpp/suites/suite_FV3_GFS_v17_ras.xml
+94 −0		ccpp/suites/suite_FV3_GFS_v17_ras_flake.xml
+94 −0		ccpp/suites/suite_FV3_GFS_v17_sas.xml
+259 −182		io/FV3GFS_io.F90
+2,511 −0		io/post_gfs.F90_mine
+2,473 −0		io/post_gfs.F90_v16
+0 −9		manual/impl/switch.tex
+1 −2		manual/sys/optim.tex
+2 −23		model/bin/make_makefile.sh
+0 −18		model/bin/w3_new
+0 −2		model/ftn/w3initmd.ftn
+0 −10		model/ftn/w3iogomd.ftn
+0 −9		model/ftn/w3pro1md.ftn
+0 −8		model/ftn/w3pro2md.ftn
+0 −7		model/ftn/w3pro3md.ftn
+0 −2		model/ftn/w3profsmd.ftn
+0 −2		model/ftn/w3profsmd_pdlib.ftn
+0 −21		model/ftn/w3uno2md.ftn
+0 −21		model/ftn/w3uqckmd.ftn
+0 −45		model/ftn/ww3_shel.ftn