Skip to content

Resolves building issues (WRF/WRF-chem) with Intel compilers (ifx/icx) #1942

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
weiwangncar merged 10 commits into from
Feb 20, 2024
Merged

Resolves building issues (WRF/WRF-chem) with Intel compilers (ifx/icx) #1942

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6a42bb0
Resolves building issues (WRF/WRF-chem) with Intel compilers (ifx/icx)
ahheo Nov 28, 2023
7361882
restore icc stanza & add icx stanza
ahheo Nov 30, 2023
44e42de
remove an empty line in code.c to trigger a reg test.
weiwangncar Dec 5, 2023
bf6f746
Merge branch 'release-v4.5.2' into CL_test
ahheo Dec 11, 2023
26964a0
remove duplicated type declaration in gen_comms.c
ahheo Dec 11, 2023
7649cf6
Update gen_kpp.c
jordanschnell Feb 12, 2024
911facc
changes suggested by islas
ahheo Feb 16, 2024
82447aa
changes suggested by islas #2
ahheo Feb 18, 2024
30eaaa4
Revert "changes suggested by islas #2"
ahheo Feb 19, 2024
401c8e4
removing previous logic of compiler detection (compile) and revising …
ahheo Feb 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions arch/configure.defaults
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,12 +304,12 @@ DESCRIPTION = INTEL ($SFC/$SCC)
DMPARALLEL = # 1
OMPCPP = # -D_OPENMP
OMP = # -qopenmp -fpp -auto
OMPCC = # -qopenmp -fpp -auto
SFC = ifort
SCC = icc
CCOMP = icc
DM_FC = mpif90 -f90=$(SFC)
DM_CC = mpicc -cc=$(SCC)
OMPCC = # -qopenmp
SFC = ifx # ifort
SCC = icx # icc
CCOMP = icx # icc
DM_FC = mpiifx #mpif90 -f90=$(SFC)
DM_CC = mpiicx #mpicc -cc=$(SCC)

@weiwangncar weiwangncar Nov 29, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahheo Should not change this option. Add another option like it is in PR#1893.

@ahheo ahheo Nov 30, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK. Well, what should I do with this PR for the next step? Should I convert it as a draft and make a new commit and submit this PR again?

@weiwangncar weiwangncar Nov 30, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahheo Please continue to modify this PR.

@ahheo ahheo Dec 1, 2023

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@weiwangncar I have made this modification following your suggestion: restoring the changed option and adding another option as PR #1893 , by another commit 7361882. Well, the commit still failed in WRF regression test, and I was not able to check the details. Sorry that this is my first time making a PR, and I am still learning the procedures to make things work.

@weiwangncar weiwangncar Dec 1, 2023

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@ahheo The failure of the regression tests is not your fault. We currently have some trouble running the tests on the Cloud. We are working to resolve the issues.

FC = CONFIGURE_FC
CC = CONFIGURE_CC
LD = $(FC)
Expand Down
5 changes: 3 additions & 2 deletions chem/KPP/kpp/kpp-2.1/src/code.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

#include "gdata.h"
#include "code.h"
#include "scan.h"
#include <time.h>
#include <unistd.h>
#include <string.h>
Expand Down Expand Up @@ -193,7 +194,7 @@ char *p;
p = outBuf;
while( *p )
*p++ &= ~0x80;
fprintf( currentFile, outBuf );
fprintf( currentFile, "%s", outBuf );
outBuffer = outBuf;
*outBuffer = 0;
}
Expand All @@ -205,7 +206,7 @@ char *p;
p = buf;
while( *p )
*p++ &= ~0x80;
fprintf( currentFile, buf );
fprintf( currentFile, "%s", buf );
}

void WriteDelim()
Expand Down
19 changes: 15 additions & 4 deletions chem/KPP/kpp/kpp-2.1/src/code.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@
#define _CODE_H_

#include <stdlib.h>
#include <unistd.h>
#include "gdef.h"

#define MAX_DEPTH 10
Expand Down Expand Up @@ -167,10 +168,10 @@ void CommentFncBegin( int f, int *vars );
void CommentFunctionBegin( int f, ... );
void CommentFunctionEnd( int f );

void Use_C();
void Use_F();
void Use_F90();
void Use_MATLAB();
void Use_C( char *rootFileName );
void Use_F( char *rootFileName );
void Use_F90( char *rootFileName );
void Use_MATLAB( char *rootFileName );

extern void (*WriteElm)( NODE *n );
extern void (*WriteSymbol)( int op );
Expand All @@ -188,4 +189,14 @@ extern void (*FunctionEnd)( int f );

void WriteDelim();

/* >>> CL: code_matlab.c */
extern void MATLAB_Inline( char *fmt, ... );
/* >>> CL: code_F90.c */
extern void F90_Inline( char *fmt, ... );
/* >>> CL: code_F77.c */
extern void F77_Inline( char *fmt, ... );
/* >>> CL: gen.c */
extern int EqnString( int eq, char * buf );
/* <<< CL */

#endif
5 changes: 3 additions & 2 deletions chem/KPP/kpp/kpp-2.1/src/code_c.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

#include "gdata.h"
#include "code.h"
#include "scan.h"
#include <string.h>

#define MAX_LINE 120
Expand Down Expand Up @@ -366,7 +367,7 @@ char dummy_val[100]; /* used just to avoid strange behaviour of
case CONST: bprintf("#define %-20s %-10s ", var->name, val );
break;
default:
printf( "Invalid constant", var->type );
printf( "Invalid constant %d", var->type );
break;
}
if( varTable[ v ]->comment )
Expand Down Expand Up @@ -484,7 +485,7 @@ char buf[ 1000 ];
FlushBuf();
}

void Use_C()
void Use_C( char *rootFileName )
{
WriteElm = C_WriteElm;
WriteSymbol = C_WriteSymbol;
Expand Down
2 changes: 1 addition & 1 deletion chem/KPP/kpp/kpp-2.1/src/code_f77.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ char buf[ 1000 ];
}

/*************************************************************************************************/
void Use_F()
void Use_F( char *rootFileName )
{
WriteElm = F77_WriteElm;
WriteSymbol = F77_WriteSymbol;
Expand Down
2 changes: 1 addition & 1 deletion chem/KPP/kpp/kpp-2.1/src/code_f90.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -699,7 +699,7 @@ char buf[ 1000 ];
}

/*************************************************************************************************/
void Use_F90()
void Use_F90( char *rootFileName )
{
WriteElm = F90_WriteElm;
WriteSymbol = F90_WriteSymbol;
Expand Down
3 changes: 2 additions & 1 deletion chem/KPP/kpp/kpp-2.1/src/code_matlab.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@

#include "gdata.h"
#include "code.h"
#include "scan.h"
#include <string.h>
#include <time.h>

Expand Down Expand Up @@ -673,7 +674,7 @@ char buf[ 1000 ];
}

/*************************************************************************************************/
void Use_MATLAB()
void Use_MATLAB( char *rootFileName )
{
WriteElm = MATLAB_WriteElm;
WriteSymbol = MATLAB_WriteSymbol;
Expand Down
8 changes: 4 additions & 4 deletions chem/KPP/kpp/kpp-2.1/src/gdata.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@

#include <stdio.h>

#define MAX_EQN 1200 /* mz_rs_20050130 */
#define MAX_SPECIES 500 /* mz_rs_20050130 */
#define MAX_SPNAME 30
#define MAX_EQN 50000 /* 1200 *//* CL *//* mz_rs_20050130 */
#define MAX_SPECIES 10000 /* 500 *//* CL *//* mz_rs_20050130 */
#define MAX_SPNAME 50 /* 30 *//* CL */
#define MAX_IVAL 40
/* MAX_EQNTAG = max length of equation ID in eqn file */
#define MAX_EQNTAG 32
Expand Down Expand Up @@ -196,7 +196,7 @@ void CmdDriver( char *cmd );
void CmdRun( char *cmd );
void CmdStochastic( char *cmd );

void Generate();
void Generate( char *rootFileName );

char * FileName( char *name, char* env, char *dir, char *ext );

Expand Down
47 changes: 27 additions & 20 deletions chem/KPP/kpp/kpp-2.1/src/gen.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,8 @@
******************************************************************************/


#include <string.h>
#include <math.h>
#include "gdata.h"
#include "code.h"
#include "scan.h"
Expand Down Expand Up @@ -610,11 +612,12 @@ char buf1[100], buf2[100];
if( VarNr == 0 ) return;

if (useLang != MATLAB_LANG) /* Matlab generates an additional file per function */

if ( useWRFConform )
UseFile( integratorFile );
else
UseFile( functionFile );
{
if ( useWRFConform ){
UseFile( integratorFile );}
else{
UseFile( functionFile ); }
}

if ( useWRFConform )
{
Expand Down Expand Up @@ -756,11 +759,12 @@ char buf1[100], buf2[100];
if( VarNr == 0 ) return;

if (useLang != MATLAB_LANG) /* Matlab generates an additional file per function */

if ( useWRFConform )
UseFile( integratorFile );
else
UseFile( functionFile );
{
if ( useWRFConform ) {
UseFile( integratorFile ); }
else {
UseFile( functionFile ); }
}

if ( useWRFConform )
{
Expand Down Expand Up @@ -1099,12 +1103,14 @@ char buf1[100], buf2[100];
if (useJacobian == JAC_OFF) return;

if (useLang != MATLAB_LANG) /* Matlab generates an additional file per function */
{

if ( useWRFConform ){
UseFile( integratorFile );}
else {
UseFile( jacobianFile );}
}

if ( useWRFConform )
UseFile( integratorFile );
else
UseFile( jacobianFile );

if ( useWRFConform ){
sprintf( buf1, "%s_Jac_SP", rootFileName );
Jac_SP = DefFnc( buf1, 4,
Expand Down Expand Up @@ -1932,7 +1938,7 @@ char buf1[100];
sprintf( buf1, "%s_KppSolve", rootFileName );
}else{
UseFile( linalgFile );
sprintf( buf1, "KppSolve", rootFileName );
sprintf( buf1, "%s_KppSolve", rootFileName );
}

SOLVE = DefFnc( buf1, 2, "sparse back substitution");
Expand Down Expand Up @@ -2165,7 +2171,8 @@ int UPDATE_RCONST;
F77_Inline(" INCLUDE '%s_Global.h'", rootFileName);
MATLAB_Inline("global SUN TEMP RCONST");

if ( (useLang==F77_LANG) )
/* if ( (useLang==F77_LANG) ) *//*commented to suppress warning*/
Comment thread
ahheo marked this conversation as resolved.
Outdated
if ( useLang==F77_LANG )
IncludeCode( "%s/util/UserRateLaws_FcnHeader", Home );

NewLines(1);
Expand Down Expand Up @@ -3380,14 +3387,14 @@ case 't':
break;

default:
printf("\n Unrecognized option '%s' in GenerateF90Modules\n", where);
printf("\n Unrecognized option '%c' in GenerateF90Modules\n", where);
break;
}
}


/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
void Generate()
void Generate( char *rootFileName )
{
int i, j;
int n;
Expand All @@ -3414,7 +3421,7 @@ int n;
break;
case MATLAB_LANG: Use_MATLAB( rootFileName );
break;
default: printf("\n Language no '%s' unknown\n",useLang );
default: printf("\n Language no '%d' unknown\n",useLang );
}
printf("\nKPP is initializing the code generation.");
InitGen();
Expand Down
2 changes: 1 addition & 1 deletion chem/KPP/kpp/kpp-2.1/src/gen_org.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3075,7 +3075,7 @@ case 't':


/*~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~*/
void Generate()
void Generate( char *rootFileName )
{
int i, j;
int n;
Expand Down
2 changes: 1 addition & 1 deletion chem/KPP/kpp/kpp-2.1/src/kpp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,7 +457,7 @@ for (i=0; i<SpcNr; i++)
}

/*******************************************************************/
int Postprocess( char * root )
void Postprocess( char * root )
{
char buf[ 1024 ];
char cmd[500];
Expand Down
29 changes: 27 additions & 2 deletions chem/KPP/kpp/kpp-2.1/src/scan.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,11 @@
#define _SCAN_H_

#include <stdio.h>
#include <ctype.h>
#include "gdef.h"

/* mz_rs_20050518+ value increased */
#define MAX_INLINE 30000
#define MAX_INLINE 50000 /* 30000 *//* CL further increased */
/* #define MAX_INLINE 4000 */
/* mz_rs_20050518- */

Expand Down Expand Up @@ -97,7 +98,7 @@ void WriteSpecies();
void WriteMatrices();
void WriteOptions();

void yyerror() ;
void yyerror( char * str ) ;
void ParserErrorMessage() ;

char * AppendString( char * s1, char * s2, int * len, int addlen );
Expand All @@ -107,4 +108,28 @@ void AddInlineCode( char * context, char * code );
int yyerrflag ;
#endif

/* >>> CL: scanner.c */
extern void CmdStoicmat( char *cmd );
extern void CheckAll();
extern void LookAtAll();
extern void TransportAll();
extern void DefineInitializeNbr( char *cmd );
extern void DefineXGrid( char *cmd );
extern void DefineYGrid( char *cmd );
extern void DefineZGrid( char *cmd );
extern void SparseData( char *cmd );
extern void AddUseFile( char *fname );
extern void WRFConform();
extern int ParseEquationFile( char * filename );

/* >>> CL: scan.l */
extern int EqNoCase( char *s1, char *s2 );

/* >>> CL: scan.y */
extern int yylex(void);
/* <<< CL */

/* <<< CL */


#endif
3 changes: 1 addition & 2 deletions chem/KPP/kpp/kpp-2.1/src/scan.l
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@
******************************************************************************/



%s CMD_STATE INC_STATE MOD_STATE INT_STATE
%s PRM_STATE DSP_STATE SSP_STATE INI_STATE EQN_STATE EQNTAG_STATE
%s RATE_STATE LMP_STATE CR_IGNORE SC_IGNORE ATM_STATE LKT_STATE INL_STATE
Expand All @@ -43,7 +42,7 @@
#include "scan.h"
#include "y.tab.h"

void*malloc() ;
// void*malloc() ;
Comment thread
ahheo marked this conversation as resolved.
Outdated
void Include ( char * filename );
int EndInclude();

Expand Down
8 changes: 6 additions & 2 deletions chem/KPP/kpp/kpp-2.1/src/scan.y
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,14 +38,15 @@
#include <string.h>
#include <unistd.h>
#include "scan.h"
#include "gdata.h"

#define __YYSCLASS

#define YYDEBUG 1
extern char yytext[];
extern FILE * yyin;
/* extern int yyerrstatus; */

int nError = 0;
int nWarning = 0;

Expand All @@ -65,7 +66,10 @@
%}

%union{
char str[80];
/* >>> CL: debug */
/* char str[80]; */
Comment thread
ahheo marked this conversation as resolved.
Outdated
char str[500];
/* <<< CL */
};

%token JACOBIAN DOUBLE FUNCTION DEFVAR DEFRAD DEFFIX SETVAR SETRAD SETFIX
Expand Down
2 changes: 1 addition & 1 deletion chem/KPP/util/wkc/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ include ../../configure.kpp

CFLAGS = #-ansi
LDFLAGS =
DEBUG = -g
DEBUG = -O0 #-g
OBJ = registry_kpp.o my_strtok.o data.o type.o misc.o reg_parse.o \
gen_kpp.o get_wrf_chem_specs.o gen_kpp_mech_dr.o gen_kpp_interface.o \
get_kpp_chem_specs.o compare_kpp_to_species.o get_wrf_radicals.o \
Expand Down
Loading