Changeset 8535

Timestamp:

2017-09-18T18:36:54+02:00 (7 years ago)

Author:

jpalmier

Message:

JPALM -- trdtrc -- found ATF trend bug relative to TRC case

Location:

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM

Files:

• CONFIG/SHARED/field_def_bgc.xml (modified) (6 diffs)
• NEMO/OPA_SRC/TRA/tranxt.F90 (modified) (3 diffs)

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/CONFIG/SHARED/field_def_bgc.xml

@@ -1416 +1416 @@
           <field field_ref="SMS_CFC11"     name="SMS_CFC11"     standard_name="CFC-11_Concentration"                  />
           <field field_ref="SMS_CFC11_INV" name="SMS_CFC11_INV" standard_name="CFC-11_Concentration"                  />
-          <field field_ref="ATF_CFC11"     name="ATF_CFC11"     standard_name="CFC-11_Concentration"                  />
+          <field field_ref="ATF_CFC11"     name="ATF_CFC11"     standard_name="CFC-11_Concentration"                  /> 
           <field field_ref="ISO_CFC11"     name="ISO_CFC11"     standard_name="CFC-11_Concentration"                  />
    </field_group>
@@ -1437 +1437 @@
           <field field_ref="SMS_CFC12"     name="SMS_CFC12"     standard_name="CFC-12_Concentration"                  />
           <field field_ref="SMS_CFC12_INV" name="SMS_CFC12_INV" standard_name="CFC-12_Concentration"                  />
-          <field field_ref="ATF_CFC12"     name="ATF_CFC12"     standard_name="CFC-12_Concentration"                  />
+          <field field_ref="ATF_CFC12"     name="ATF_CFC12"     standard_name="CFC-12_Concentration"                  /> 
           <field field_ref="ISO_CFC12"     name="ISO_CFC12"     standard_name="CFC-12_Concentration"                  />
    </field_group>
@@ -1458 +1458 @@
           <field field_ref="SMS_SF6"      name="SMS_SF6"      standard_name="SF6_Concentration"                     />
           <field field_ref="SMS_SF6_INV"  name="SMS_SF6_INV"  standard_name="SF6_Concentration"                     />
-          <field field_ref="ATF_SF6"      name="ATF_SF6"      standard_name="SF6_Concentration"                     />
+          <field field_ref="ATF_SF6"      name="ATF_SF6"      standard_name="SF6_Concentration"                     /> 
           <field field_ref="ISO_SF6"      name="ISO_SF6"      standard_name="SF6_Concentration"                     />
    </field_group>
@@ -1479 +1479 @@
           <field field_ref="SMS_Age"      name="SMS_Age"      standard_name="sea_water_age_since_surface_contact"   />
           <field field_ref="SMS_Age_INV"  name="SMS_Age_INV"  standard_name="sea_water_age_since_surface_contact"   />
-          <field field_ref="ATF_Age"      name="ATF_Age"      standard_name="sea_water_age_since_surface_contact"   />
+          <field field_ref="ATF_Age"      name="ATF_Age"      standard_name="sea_water_age_since_surface_contact"   /> 
           <field field_ref="ISO_Age"      name="ISO_Age"      standard_name="sea_water_age_since_surface_contact"   />
    </field_group>
@@ -1500 +1500 @@
           <field field_ref="SMS_IDTRA"      name="SMS_IDTRA"      standard_name="IDTRA_Concentration"               />
           <field field_ref="SMS_IDTRA_INV"  name="SMS_IDTRA_INV"  standard_name="IDTRA_Concentration"               />
-          <field field_ref="ATF_IDTRA"      name="ATF_IDTRA"      standard_name="IDTRA_Concentration"               />
+          <field field_ref="ATF_IDTRA"      name="ATF_IDTRA"      standard_name="IDTRA_Concentration"               /> 
           <field field_ref="ISO_IDTRA"      name="ISO_IDTRA"      standard_name="IDTRA_Concentration"               />
    </field_group>
@@ -1521 +1521 @@
           <field field_ref="SMS_C14B"      name="SMS_C14B"      standard_name="C14b_Concentration"               />
           <field field_ref="SMS_C14B_INV"  name="SMS_C14B_INV"  standard_name="C14b_Concentration"               />
-          <field field_ref="ATF_C14B"      name="ATF_C14B"      standard_name="C14b_Concentration"               />
+          <field field_ref="ATF_C14B"      name="ATF_C14B"      standard_name="C14b_Concentration"               /> 
           <field field_ref="ISO_C14B"      name="ISO_C14B"      standard_name="C14b_Concentration"               />
    </field_group>

branches/NERC/dev_r5518_GO6_package_trdtrc/NEMOGCM/NEMO/OPA_SRC/TRA/tranxt.F90

@@ -49 +49 @@
    USE agrif_opa_interp
 #endif
+
 
    IMPLICIT NONE
@@ -314 +315 @@
       IF( kt == kit000 )  THEN
          IF(lwp) WRITE(numout,*)
-         IF(lwp) WRITE(numout,*) 'tra_nxt_vvl : time stepping', cdtype
+         IF(lwp) WRITE(numout,*) 'tra_nxt_vvl : time stepping ', cdtype
          IF(lwp) WRITE(numout,*) '~~~~~~~~~~~'
       ENDIF
@@ -340 +341 @@
       DO jn = 1, kjpt      
          DO jk = 1, jpkm1
-            zfact = 1._wp / r2dtra(jk)
+            !! zfact = 1._wp / r2dtra(jk)
+            zfact = 0.5_wp *p2dt(jk)
             zfact1 = atfp * p2dt(jk)
             zfact2 = zfact1 / rau0