diff --git a/d1.comm b/d1.comm
index 4361441..3f0e8cf 100644
--- a/d1.comm
+++ b/d1.comm
@@ -69,16 +69,21 @@ RESU=MECA_STATIQUE(MODELE=MODE,
                    CHAM_MATER=MATE,
                    EXCIT=_F(CHARGE=CHAR,),);
 
-RESU=CALC_ELEM(reuse =RESU,
+RESU=CALC_CHAMP(reuse =RESU,
                MODELE=MODE,
                CHAM_MATER=MATE,
                RESULTAT=RESU,
-               OPTION=('SIGM_ELNO','EPSI_ELNO','SIEF_ELNO','SIEQ_ELNO',),
+               CONTRAINTE=('SIGM_ELNO','SIEF_ELNO',),
+               DEFORMATION=('EPME_ELNO',),
+               CRITERES=('SIEQ_ELNO',),
                EXCIT=_F(CHARGE=CHAR,),);
 
-RESU=CALC_NO(reuse =RESU,
+RESU=CALC_CHAMP(reuse =RESU,
              RESULTAT=RESU,
-             OPTION=('EPSI_NOEU','SIEF_NOEU','SIGM_NOEU','SIEQ_NOEU',),);
+             CONTRAINTE=('SIEF_NOEU','SIGM_NOEU',),
+             DEFORMATION=('EPME_NOEU',),
+             CRITERES=('SIEQ_NOEU',),
+             );
 
 IMPR_RESU(FORMAT='MED',
           UNITE=80,
diff --git a/d3.comm b/d3.comm
index def1c5d..7487ba3 100644
--- a/d3.comm
+++ b/d3.comm
@@ -69,16 +69,21 @@ RESU=MECA_STATIQUE(MODELE=MODE,
                    CHAM_MATER=MATE,
                    EXCIT=_F(CHARGE=CHAR,),);
 
-RESU=CALC_ELEM(reuse =RESU,
+RESU=CALC_CHAMP(reuse =RESU,
                MODELE=MODE,
                CHAM_MATER=MATE,
                RESULTAT=RESU,
-               OPTION=('SIGM_ELNO','EPSI_ELNO','SIEF_ELNO','SIEQ_ELNO',),
+               CONTRAINTE=('SIGM_ELNO','SIEF_ELNO',),
+               DEFORMATION=('EPME_ELNO',),
+               CRITERES=('SIEQ_ELNO',),
                EXCIT=_F(CHARGE=CHAR,),);
 
-RESU=CALC_NO(reuse =RESU,
+RESU=CALC_CHAMP(reuse =RESU,
              RESULTAT=RESU,
-             OPTION=('EPSI_NOEU','SIEF_NOEU','SIGM_NOEU','SIEQ_NOEU',),);
+             CONTRAINTE=('SIEF_NOEU','SIGM_NOEU',),
+             DEFORMATION=('EPME_NOEU',),
+             CRITERES=('SIEQ_NOEU',),
+             );
 
 IMPR_RESU(FORMAT='MED',
           UNITE=80,
diff --git a/d4.comm b/d4.comm
index 2c0ad33..a252f50 100644
--- a/d4.comm
+++ b/d4.comm
@@ -69,16 +69,21 @@ RESU=MECA_STATIQUE(MODELE=MODE,
                    CHAM_MATER=MATE,
                    EXCIT=_F(CHARGE=CHAR,),);
 
-RESU=CALC_ELEM(reuse =RESU,
+RESU=CALC_CHAMP(reuse =RESU,
                MODELE=MODE,
                CHAM_MATER=MATE,
                RESULTAT=RESU,
-               OPTION=('SIGM_ELNO','EPSI_ELNO','SIEF_ELNO','SIEQ_ELNO',),
+               CONTRAINTE=('SIGM_ELNO','SIEF_ELNO',),
+               DEFORMATION=('EPME_ELNO',),
+               CRITERES=('SIEQ_ELNO',),
                EXCIT=_F(CHARGE=CHAR,),);
 
-RESU=CALC_NO(reuse =RESU,
+RESU=CALC_CHAMP(reuse =RESU,
              RESULTAT=RESU,
-             OPTION=('EPSI_NOEU','SIEF_NOEU','SIGM_NOEU','SIEQ_NOEU',),);
+             CONTRAINTE=('SIEF_NOEU','SIGM_NOEU',),
+             DEFORMATION=('EPME_NOEU',),
+             CRITERES=('SIEQ_NOEU',),
+             );
 
 IMPR_RESU(FORMAT='MED',
           UNITE=80,
diff --git a/d5.comm b/d5.comm
index bcd0f2c..590d657 100644
--- a/d5.comm
+++ b/d5.comm
@@ -69,16 +69,21 @@ RESU=MECA_STATIQUE(MODELE=MODE,
                    CHAM_MATER=MATE,
                    EXCIT=_F(CHARGE=CHAR,),);
 
-RESU=CALC_ELEM(reuse =RESU,
+RESU=CALC_CHAMP(reuse =RESU,
                MODELE=MODE,
                CHAM_MATER=MATE,
                RESULTAT=RESU,
-               OPTION=('SIGM_ELNO','EPSI_ELNO','SIEF_ELNO','SIEQ_ELNO',),
+               CONTRAINTE=('SIGM_ELNO','SIEF_ELNO',),
+               DEFORMATION=('EPME_ELNO',),
+               CRITERES=('SIEQ_ELNO',),
                EXCIT=_F(CHARGE=CHAR,),);
 
-RESU=CALC_NO(reuse =RESU,
+RESU=CALC_CHAMP(reuse =RESU,
              RESULTAT=RESU,
-             OPTION=('EPSI_NOEU','SIEF_NOEU','SIGM_NOEU','SIEQ_NOEU',),);
+             CONTRAINTE=('SIEF_NOEU','SIGM_NOEU',),
+             DEFORMATION=('EPME_NOEU',),
+             CRITERES=('SIEQ_NOEU',),
+             );
 
 IMPR_RESU(FORMAT='MED',
           UNITE=80,
diff --git a/d6.comm b/d6.comm
index dd83b3b..b6d7f6d 100644
--- a/d6.comm
+++ b/d6.comm
@@ -68,16 +68,21 @@ RESU=MECA_STATIQUE(MODELE=MODE,
                    CHAM_MATER=MATE,
                    EXCIT=_F(CHARGE=CHAR,),);
 
-RESU=CALC_ELEM(reuse =RESU,
+RESU=CALC_CHAMP(reuse =RESU,
                MODELE=MODE,
                CHAM_MATER=MATE,
                RESULTAT=RESU,
-               OPTION=('SIGM_ELNO','EPSI_ELNO','SIEF_ELNO','SIEQ_ELNO',),
+               CONTRAINTE=('SIGM_ELNO','SIEF_ELNO',),
+               DEFORMATION=('EPME_ELNO',),
+               CRITERES=('SIEQ_ELNO',),
                EXCIT=_F(CHARGE=CHAR,),);
 
-RESU=CALC_NO(reuse =RESU,
+RESU=CALC_CHAMP(reuse =RESU,
              RESULTAT=RESU,
-             OPTION=('EPSI_NOEU','SIEF_NOEU','SIGM_NOEU','SIEQ_NOEU',),);
+             CONTRAINTE=('SIEF_NOEU','SIGM_NOEU',),
+             DEFORMATION=('EPME_NOEU',),
+             CRITERES=('SIEQ_NOEU',),
+             );
 
 IMPR_RESU(FORMAT='MED',
           UNITE=80,
diff --git a/regular.comm b/regular.comm
index ac0d6ce..64526f8 100644
--- a/regular.comm
+++ b/regular.comm
@@ -67,16 +67,21 @@ RESU=MECA_STATIQUE(MODELE=MODE,
                    CHAM_MATER=MATE,
                    EXCIT=_F(CHARGE=CHAR,),);
 
-RESU=CALC_ELEM(reuse =RESU,
+RESU=CALC_CHAMP(reuse =RESU,
                MODELE=MODE,
                CHAM_MATER=MATE,
                RESULTAT=RESU,
-               OPTION=('SIGM_ELNO','EPSI_ELNO','SIEF_ELNO','SIEQ_ELNO',),
+               CONTRAINTE=('SIGM_ELNO','SIEF_ELNO',),
+               DEFORMATION=('EPME_ELNO',),
+               CRITERES=('SIEQ_ELNO',),
                EXCIT=_F(CHARGE=CHAR,),);
 
-RESU=CALC_NO(reuse =RESU,
+RESU=CALC_CHAMP(reuse =RESU,
              RESULTAT=RESU,
-             OPTION=('EPSI_NOEU','SIEF_NOEU','SIGM_NOEU','SIEQ_NOEU',),);
+             CONTRAINTE=('SIEF_NOEU','SIGM_NOEU',),
+             DEFORMATION=('EPME_NOEU',),
+             CRITERES=('SIEQ_NOEU',),
+             );
 
 IMPR_RESU(FORMAT='MED',
           UNITE=80,