PR Feature 757_142rc com a Release/1.4.3 rc_merge

Makefile

@@ -681,6 +681,86 @@ intel:   # BUILDTARGET Intel oneAPI Fortran, C, and C++ compiler suite
 	"OPENMP = $(OPENMP)" \
 	"CPPFLAGS = $(MODEL_FORMULATION) -D_MPI" )
 
+intel-xd2000:
+	( $(MAKE) all \
+        "FC_PARALLEL = ftn" \
+        "CC_PARALLEL = cc" \
+        "CXX_PARALLEL = CC" \
+        "FC_SERIAL = ftn" \
+        "CC_SERIAL = cc" \
+        "CXX_SERIAL = CC" \
+        "FFLAGS_PROMOTION = -real-size 64" \
+        "FFLAGS_OPT = -O3 -convert big_endian -FR -march=core-avx2 -mtune=core-avx2" \
+        "CFLAGS_OPT = -O3 -std=gnu90" \
+        "CXXFLAGS_OPT = -O3" \
+        "LDFLAGS_OPT = -O3" \
+        "FFLAGS_DEBUG = -g -convert big_endian -FR -CU -CB -check all -fpe0 -traceback" \
+        "CFLAGS_DEBUG = -g -traceback" \
+        "CXXFLAGS_DEBUG = -g -traceback" \
+        "LDFLAGS_DEBUG = -g -fpe0 -traceback" \
+        "FFLAGS_OMP = -qopenmp" \
+        "CFLAGS_OMP = -qopenmp" \
+        "CORE = $(CORE)" \
+        "DEBUG = $(DEBUG)" \
+        "USE_PAPI = $(USE_PAPI)" \
+        "OPENMP = $(OPENMP)" \
+        "CPPFLAGS = $(MODEL_FORMULATION) -D_MPI -DUNDERSCORE" )
+
+intel2-xd2000:
+	( $(MAKE) all \
+        "FC_PARALLEL = ftn" \
+        "CC_PARALLEL = cc" \
+        "CXX_PARALLEL = CC" \
+        "FC_SERIAL = ftn" \
+        "CC_SERIAL = cc" \
+        "CXX_SERIAL = CC" \
+        "FFLAGS_PROMOTION = -real-size 64" \
+        "FFLAGS_OPT = -O2 -convert big_endian -FR -march=core-avx2 -mtune=core-avx2" \
+        "CFLAGS_OPT = -O2 -std=gnu90" \
+        "CXXFLAGS_OPT = -O2" \
+        "LDFLAGS_OPT = -O2" \
+        "FFLAGS_DEBUG = -g -convert big_endian -FR -CU -CB -check all -fpe0 -traceback" \
+        "CFLAGS_DEBUG = -g -traceback" \
+        "CXXFLAGS_DEBUG = -g -traceback" \
+        "LDFLAGS_DEBUG = -g -fpe0 -traceback" \
+        "FFLAGS_OMP = -qopenmp" \
+        "CFLAGS_OMP = -qopenmp" \
+        "CORE = $(CORE)" \
+        "DEBUG = $(DEBUG)" \
+        "USE_PAPI = $(USE_PAPI)" \
+        "OPENMP = $(OPENMP)" \
+        "CPPFLAGS = $(MODEL_FORMULATION) -D_MPI -DUNDERSCORE" )
+
+gfortran-xd2000:   # BUILDTARGET GNU Fortran, C, and C++ compilers
+	( $(MAKE) all \
+	"FC_PARALLEL = ftn" \
+	"CC_PARALLEL = cc" \
+	"CXX_PARALLEL = CC" \
+	"FC_SERIAL = ftn" \
+	"CC_SERIAL = cc" \
+	"CXX_SERIAL = CC" \
+	"FFLAGS_PROMOTION = -fdefault-real-8 -fdefault-double-8" \
+	"FFLAGS_OPT = -O3 -ffree-line-length-none -fconvert=big-endian -ffree-form -fallow-argument-mismatch" \
+	"CFLAGS_OPT = -O3" \
+	"CXXFLAGS_OPT = -O3" \
+	"LDFLAGS_OPT = -O3" \
+	"FFLAGS_DEBUG = -g -ffree-line-length-none -fconvert=big-endian -ffree-form -fallow-argument-mismatch -fcheck=all -fbacktrace -ffpe-trap=invalid,zero,overflow" \
+	"CFLAGS_DEBUG = -g" \
+	"CXXFLAGS_DEBUG = -g" \
+	"LDFLAGS_DEBUG = -g" \
+	"FFLAGS_OMP = -fopenmp" \
+	"CFLAGS_OMP = -fopenmp" \
+	"FFLAGS_ACC =" \
+	"CFLAGS_ACC =" \
+	"PICFLAG = -fPIC" \
+	"BUILD_TARGET = $(@)" \
+	"CORE = $(CORE)" \
+	"DEBUG = $(DEBUG)" \
+	"USE_PAPI = $(USE_PAPI)" \
+	"OPENMP = $(OPENMP)" \
+	"OPENACC = $(OPENACC)" \
+	"CPPFLAGS = $(MODEL_FORMULATION) -D_MPI" )
+
 CPPINCLUDES =
 FCINCLUDES =
 LIBS =
@@ -690,6 +770,9 @@ ifneq "$(PIO)" ""
 # Regardless of PIO library version, look for a lib subdirectory of PIO path
 # NB: PIO_LIB is used later, so we don't just set LIBS directly
 #
+#ifneq ($(wildcard $(PIO)/lib64), )
+#	PIO_LIB = $(PIO)/lib64
+#else
 ifneq ($(wildcard $(PIO)/lib), )
 	PIO_LIB = $(PIO)/lib
 else
@@ -1425,4 +1508,3 @@ errmsg:
 ifdef CORE
 	exit 1
 endif
-

README.md

@@ -1,4 +1,4 @@
-# MONAN-v1.4.2-rc
+# MONAN-v1.4.3-rc
 
 ## Model for Ocean-laNd-Atmosphere predictioN
 
@@ -9,6 +9,7 @@ The MONAN Model is managed by a scientific committee appointed by INPE's directo
 
 History
 ====
+- Version 1.4.3-rc (Release Candidate) - This development contains further configuration for the pre-operational MONAN global 10km uniform resolution, adapted to run on the new CRAY supercomputer. It contains new tuning for the GF scheme and sets WSM6 as the default cloud microphysics parameterization. For this configuration, the namelist.atmosphere should be set to config_physics_suite = 'mesoscale_reference_monan'.
 - Version 1.4.2-rc (Release Candidate) - Speed up by about 7%. Cleanup to become the initial version of the C3P Community Cloud-Convection Parameterization. Joint development between INPE and NOAA/GSL. Removed files not needed anymore. Adding effects of PCW (Neelin et al. 2009) and vertical shear of horizontal wind on the entrainment rate. This should improve model simulations of MCSs. Additional trigger function based on Xie et al 2019. Additional comments and references. 
 - Version 1.4.1-rc (Release Candidate) - Terrain height (ter, calculated previously in the pre processing with init_atmosphere_model) included in the Registry.xml's input section so that can be read from 'init' file and post processed. kubota relhum evalute modification on mpas_isobaric_diagnostics.F.
 - Version 1.4.0-rc (Release Candidate) - Changing the number of isobaric levels from 22 to 18. 

VERSION.txt

@@ -1 +1 @@
-1.4.2-rc
+1.4.3-rc

namelist_monan/GF_ConvPar_nml

@@ -4,7 +4,7 @@
 
   closure_choice    = 10,10,3,              != closure for the mass flux at the cloud base
 
-  cum_entr_rate   = 8.e-4, 13.e-4, 20.e-4, != initial gross entrainment rate for 
+  cum_entr_rate   = -999., 13.e-4, 20.e-4, != initial gross entrainment rate for 
                                             != deep, shallow, congestus
 
   cum_fr_min_entr = 0.01,0.1,0.1,            != fraction of the mininum entraiment rate in terms
@@ -20,18 +20,19 @@
   use_scale_dep     = 1,            != 0/1: turn ON/OFF the scale dependence approach
   sig_factor        = 0.22,         != exponential factor for the sigma determination (orig = 0.1)
 
+  use_cold_start    = 1
   use_pass_cloudvol = 0,
   use_lcl_ctrl_entr = 0,
   use_rhu_ctrl_entr = 0,
   use_shear_ctrl_entr=0,
   use_cwv_ctrl_entr = 0,
   convection_tracer = 1,           != 0/1:  turn on/off the "convection" tracer
-  add_coldpool_clos = 0,           ! add the the mass flux associated to the W @ leading of the gust front
+  add_coldpool_clos = 4,           ! add the the mass flux associated to the W @ leading of the gust front
   add_coldpool_trig = 0,           ! add triggering criteria based on cold pool presence
-  use_memory      = 0,
+  use_memory        = 0,
 
   tau_ocea_cp       = 3600.,       != cold pool lifetime over the ocean
-  tau_land_cp       = 1800.,       != cold pool lifetime over land
+  tau_land_cp       = 3600.,       != cold pool lifetime over land
   mx_buoy1          = 250.5,       ! J/kg
   mx_buoy2          = 20004.0,     ! J/kg
 
@@ -50,8 +51,8 @@
 !---
 !--- controls rainfall evaporation
   use_rebcb         = 1,               != 0/1: turn ON/OFF rainfall evap below cloud base
-   cum_MAX_EDT_LAND  = 0.5, 0.0, 0.3,   !-(deep ,shallow ,congestus)
-  cum_MAX_EDT_OCEAN = 0.6, 0.0, 0.4,
+  cum_MAX_EDT_LAND  = 0.50, 0.0, 0.3,   !-(deep ,shallow ,congestus)
+  cum_MAX_EDT_OCEAN = 0.45, 0.0, 0.4,
 !----
 
 !---- boundary condition specification
@@ -69,7 +70,7 @@
   use_random_num      = 0., != stochastic pertubation for the height of maximum Zu
   use_smooth_prof     = 1,  != 1 makes the normalized mass flux, entr and detraiment profiles smoother
   cum_use_smooth_tend = 2,2,2,  != integer number of layers for smoothing the tendencies
-  overshoot       = 0.6,  != real value ~0.0 to 0.2
+  overshoot           = 0.6,  != real value ~0.0 to 0.2
 
   use_linear_subcl_mf = 1,  !-- for shallow convection only
   beta_sh             = 2.2,!-- for shallow convection only

namelist_monan/namelist.atmosphere

@@ -62,7 +62,7 @@
     config_radtsw_interval = '00:30:00'
     config_conv_interval = '00:15:00'
     config_bucket_update = 'none'
-    config_physics_suite = 'convection_permitting_monan'
+    config_physics_suite = 'mesoscale_reference_monan'
     config_radt_cld_scheme = 'cld_fraction_monan'
     config_mynn_edmf = 0
 /

namelist_monan/namelist.atmosphere.TEMPLATE

@@ -62,7 +62,8 @@
     config_radtsw_interval = '00:30:00'
     config_conv_interval = '#CONFIG_CONV_INTERVAL#'
     config_bucket_update = 'none'
-    config_physics_suite = 'convection_permitting_monan'     
+    config_physics_suite = 'mesoscale_reference_monan'
+    config_radt_cld_scheme = 'cld_fraction_monan'
     config_mynn_edmf = 0
 /
 &gf_monan

src/core_atmosphere/diagnostics/mpas_pv_diagnostics.F

@@ -344,7 +344,7 @@ subroutine normalizeVector(vals, sz)
       integer :: i
       real (kind=RKIND) :: mag
 
-      mag = 0.0_RKIND !sqrt(sum(squares))
+      mag = 1.e-12 !0.0_RKIND !sqrt(sum(squares))
       do i=1,sz
          mag = mag+vals(i)*vals(i)
       end do