fixed printing and numbering affils that got lost in previous MRs

inggrid.cls

@@ -303,28 +303,20 @@
 
 \newcommand\affiliation[1]{%
   \begingroup
+  \global\stepcounter{affiliations}%
   \setkeys{affiliation}{#1}
-  \global\csedef{@department\aff@id}{\expandafter\aff@department}%
-  \global\csedef{@organization\aff@id}{\expandafter\aff@organization}%
-  \global\csedef{@streetaddress\aff@id}{\expandafter\aff@streetaddress}%
-  \global\csedef{@city\aff@id}{\expandafter\aff@city}%
+  \global\csedef{@id\theaffiliations}{\expandafter\aff@id}%
+  \global\csedef{@department\theaffiliations}{\expandafter\aff@department}%
+  \global\csedef{@organization\theaffiliations}{\expandafter\aff@organization}%
+  \global\csedef{@streetaddress\theaffiliations}{\expandafter\aff@streetaddress}%
+  \global\csedef{@city\theaffiliations}{\expandafter\aff@city}%
   \endgroup
 }
 
 \newcommand\printauthor[1]{%
   \printfield{givennames}{#1}{}~\printfield{surname}{#1}{}
   \ifcsvoid{@orcid#1}{\unskip}{\unskip\,\orcidlink{\csuse{@orcid#1}}}
-  \ifcsvoid{@affiliation#1}
-  {}
-  {%
-    \ifcsvoid{@affilmarker\csuse{@affiliation#1}}
-    {%
-      \stepcounter{affiliations}%
-      \csedef{@affilmarker\csuse{@affiliation#1}}{\theaffiliations}%
-      \csedef{@affilnum\theaffiliations}{\csuse{@affiliation#1}}%
-    }{}%
-  }%
-  \unskip\,\textsuperscript{\csuse{@affilmarker\csuse{@affiliation#1}}}%
+  \unskip\,\textsuperscript{\csuse{@affiliation#1}}%
 }
 
 \newcommand\printcorrespondingauthor{
@@ -362,7 +354,7 @@
 }
 
 \newcommand\printaffiliation[1]{%
-  \printfield{affilmarker}{#1}{.\;}%
+\printfield{id}{#1}{.\;}%
   \printfield{department}{#1}{, }%
   \printfield{organization}{#1}{, }%
   \printfield{streetaddress}{#1}{, }%
@@ -388,7 +380,7 @@
 \newcommand\printaffiliations{
   \setcounter{counter}{0}
   \@whilenum\value{counter}<\value{affiliations}\do
-  {\stepcounter{counter}\printaffiliation{\csuse{@affilnum\thecounter}}\par}
+  {\stepcounter{counter}\printaffiliation{\thecounter}\par}
 }
 
 \newcommand\printcontributions{