Skip to content

Commit 7674dbb

Browse files
committed
Code cleanup for PR168
1. Consolidate .gitignore files 2. Remove LIS_ESMF_DYNAMIC 3. Remove from unused arguments from LIS_quilt_obs_domain 4. Remove duplicate decompose_nx_ny, decompose_npes, cut, inner_factors 5. Remove postprocessing from LIS_ESMF_Extensions.F90 6. Cleanup copyright statement in nuopc_cpl_mode 7. Cleanup NUOPC build documentation 8. Move NUOPC analysis to utils/nuopc_post
1 parent 9060887 commit 7674dbb

17 files changed

+49
-1454
lines changed

.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
*.o
22
*.mod
33
*.d
4+
lis/runmodes/nuopc_cpl_mode/VERSION
5+
lis/runmodes/nuopc_cpl_mode/liblis_nuopc.a

lis/arch/Config.pl

-18
Original file line numberDiff line numberDiff line change
@@ -350,12 +350,6 @@
350350
exit 0;
351351
}
352352
}
353-
elsif (defined($ENV{LIS_ESMF_DYNAMIC})) {
354-
print "ESMFMKFILE will be define during compile using the environment.\n\n";
355-
$use_esmf_dynamic = 1;
356-
$sys_esmflib_path = "\$(subst lib,mod,\$(ESMF_LIBSDIR))";
357-
$sys_esmfmod_path = "\$(ESMF_LIBSDIR)";
358-
}
359353
else{
360354
print "--------------ERROR---------------------\n";
361355
print "Please specify the ESMF library paths using\n";
@@ -991,12 +985,6 @@
991985
if($use_esmf_trace == 1){
992986
$fflags77 = $fflags77." -DESMF_TRACE";
993987
$fflags = $fflags." -DESMF_TRACE";
994-
if($use_esmf_dynamic == 1) {
995-
# $ldflags= "\$(ESMF_TRACE_STATICLINKOPTS) ".$ldflags;
996-
# $ldflags= $ldflags." \$(ESMF_TRACE_STATICLINKLIBS)";
997-
# $lib_flags= "\$(ESMF_TRACE_STATICLINKOPTS) ".$lib_flags;
998-
# $lib_paths= $lib_paths." \$(ESMF_TRACE_STATICLINKLIBS)";
999-
}
1000988
else {
1001989
if (not(open(ESMFMKFILE, $sys_esmfmkfile))) {
1002990
print "--------------ERROR---------------------\n";
@@ -1049,12 +1037,6 @@
10491037
#
10501038

10511039
open(conf_file,">configure.lis");
1052-
if($use_esmf_dynamic == 1) {
1053-
printf conf_file "%s\n","ifneq (\$(origin ESMFMKFILE), environment)";
1054-
printf conf_file "%s\n","\$(error Environment variable ESMFMKFILE required.)";
1055-
printf conf_file "%s\n","endif";
1056-
printf conf_file "%s\n","include \$(ESMFMKFILE)";
1057-
}
10581040
printf conf_file "%s%s\n","FC = $sys_fc";
10591041
printf conf_file "%s%s\n","FC77 = $sys_fc";
10601042
printf conf_file "%s%s\n","LD = $sys_fc";

0 commit comments

Comments
 (0)