Changeset 2775

Timestamp:

Jul 6, 2022, 3:40:12 PM (2 years ago)

Author:

aslmd

Message:

modified the default configuration in WRFV3 arch so that executing configure creates a configure.wrf that is compliant with planetary applications directly without the need to patch. a by-product is that there no longer a weird mix of NETCDF env variable and harcoded stuff when patching, from now on setting the NETCDF environment variable is enough (as usually in WRF). the link to compiled LMDZ physics library is done through the libo_links folder that contains only ciclad right now but can be populated with configurations. for the moment the changes to default is only applicable to ifort cases but it is easy to broaden this to other cases by working on arch/configure_new.defaults.

Location:

trunk/WRF.COMMON/WRFV3

Files:

• arch/Config_new.pl (modified) (3 diffs)
• arch/configure_new.defaults (modified) (2 diffs)
• arch/postamble_new (modified) (2 diffs)
• libo_links (added)

trunk/WRF.COMMON/WRFV3/arch/Config_new.pl

@@ -34 +34 @@
 $sw_ompparallel = "" ;
 $sw_stubmpi = "" ;
-$sw_usenetcdff = "" ;    # for 3.6.2 and greater, the fortran bindings might be in a separate lib file
+$sw_usenetcdff = "-lnetcdff" ;    # for 3.6.2 and greater, the fortran bindings might be in a separate lib file
 $sw_time = "" ;          # name of a timer to time fortran compiles, e.g. timex or time
 $sw_ifort_r8 = 0 ;
@@ -68 +68 @@
     $sw_opt_level = substr( $ARGV[0], 11 ) ;
   }
-  if ( substr( $ARGV[0], 1, 11 ) eq "USENETCDFF=" )
-  {
-    $sw_usenetcdff = substr( $ARGV[0], 12 ) ;
-  }
+#  if ( substr( $ARGV[0], 1, 11 ) eq "USENETCDFF=" )
+#  {
+#    $sw_usenetcdff = substr( $ARGV[0], 12 ) ;
+#  }
   if ( substr( $ARGV[0], 1, 5 ) eq "time=" )
   {
@@ -321 +321 @@
         $_ =~ s:CONFIGURE_NETCDF_FLAG:-DNETCDF: ;
         if ( $sw_os == Interix ) {
-          $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf/libwrfio_nf.a -L$sw_netcdf_path/lib -lnetcdf $sw_usenetcdff : ;
+          $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf/libwrfio_nf.a -L$sw_netcdf_path/lib -lnetcdf $sw_usenetcdff $sw_netcdf_path/lib/libnetcdf.a : ;
         } else {
-          $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:-L\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf -lwrfio_nf -L$sw_netcdf_path/lib -lnetcdf $sw_usenetcdff : ;
+          $_ =~ s:CONFIGURE_NETCDF_LIB_PATH:-L\$\(WRF_SRC_ROOT_DIR\)/external/io_netcdf -lwrfio_nf -L$sw_netcdf_path/lib -lnetcdf $sw_usenetcdff $sw_netcdf_path/lib/libnetcdf.a : ;
         }
          }

trunk/WRF.COMMON/WRFV3/arch/configure_new.defaults

@@ -192 +192 @@
 CC              =       CONFIGURE_CC
 LD              =       $(FC)
-RWORDSIZE       =       CONFIGURE_RWORDSIZE
-PROMOTION       =       -i4
-ARCH_LOCAL      =       -DNONSTANDARD_SYSTEM_FUNC
-CFLAGS_LOCAL    =       -w -O3 -ip
+RWORDSIZE       =       8
+PROMOTION       =       -i4 -real-size 64
+ARCH_LOCAL      =       -DNEWPHYS -DNONSTANDARD_SYSTEM_FUNC
+CFLAGS_LOCAL    =       -w -O3 -mcmodel=large -shared-intel -ip
 LDFLAGS_LOCAL   =       -ip
 CPLUSPLUSLIB    =       
 ESMF_LDFLAG     =       $(CPLUSPLUSLIB)
-FCOPTIM         =       -O3
+FCOPTIM         =       -O3 -mcmodel=large -shared-intel
 FCREDUCEDOPT    =       $(FCOPTIM)
 FCNOOPT         =       -O0
@@ -207 +207 @@
 FCSUFFIX        =
 BYTESWAPIO      =       -convert big_endian
-FCBASEOPTS      =       -w -ftz -align all -fno-alias -fp-model precise $(FCDEBUG) $(FORMAT_FREE) $(BYTESWAPIO)
+FCBASEOPTS      =       -w -ftz -align all -fno-alias -fp-model precise $(FCDEBUG) $(FORMAT_FREE) $(BYTESWAPIO) -mkl=parallel
 MODULE_SRCH_FLAG =     
 TRADFLAG        =      -traditional
-CPP             =      /lib/cpp -C -P
+CPP             =      /lib/cpp -P
 AR              =      ar
 ARFLAGS         =      ru

trunk/WRF.COMMON/WRFV3/arch/postamble_new

@@ -33 +33 @@
                       -I$(WRF_SRC_ROOT_DIR)/phys \
                       -I$(WRF_SRC_ROOT_DIR)/chem -I$(WRF_SRC_ROOT_DIR)/inc \
+                      -I$(WRF_SRC_ROOT_DIR)/libo_links/.config/inc \
+                      -ICONFIGURE_NETCDF_PATH/include \
                       CONFIGURE_CRTM_INC \
                       CONFIGURE_RTTOV_INC
@@ -49 +51 @@
 
 LIB_EXTERNAL    = \
-                     CONFIGURE_NETCDF_LIB_PATH CONFIGURE_PNETCDF_LIB_PATH CONFIGURE_GRIB2_LIB
+                     CONFIGURE_NETCDF_LIB_PATH CONFIGURE_PNETCDF_LIB_PATH CONFIGURE_GRIB2_LIB \
+                     -L$(WRF_SRC_ROOT_DIR)/libo_links/.config/lib -llmdz \
+                     -lnetcdf 
 
 LIB             =    $(LIB_BUNDLED) $(LIB_EXTERNAL) $(LIB_LOCAL)