Changeset 2451 for CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO

Timestamp:

03/27/15 13:27:43 (9 years ago)

Author:

aclsce

Message:

Modifications to use new NEMO revision in IPSLCM6_rc1 configuration.

• Removed any SOURCES/NEMO not needed anymore (modifs commited in NEMO reference version).
• Adapted *.xml, namelist, AA_make, *.card, *.driver related to NEMO to fit with new NEMO reference version.
• Removed files not needed anymore : files related to L19 LMDZ vertical levels

Location:

CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO

Files:

• arch-X64_ADA.fcm (modified) (1 diff)
• arch-X64_CURIE.fcm (modified) (1 diff)
• bld.cfg (deleted)
• bld_preproagr.cfg (deleted)
• bldxag.cfg (deleted)
• cpl_oasis3.F90 (deleted)
• diaptr.F90 (deleted)
• diaptr_oce.F90 (deleted)
• iom.F90 (deleted)
• limistate.F90 (deleted)
• p4zopt.F90 (modified) (4 diffs)
• sbccpl.F90 (deleted)
• sbcmod.F90 (deleted)
• step_oce.F90 (deleted)
• traadv_cen2.F90 (deleted)
• traadv_muscl.F90 (deleted)
• traadv_muscl2.F90 (deleted)
• traadv_qck.F90 (deleted)
• traadv_tvd.F90 (deleted)
• traadv_ubs.F90 (deleted)
• traldf_bilap.F90 (deleted)
• traldf_bilapg.F90 (deleted)
• traldf_iso.F90 (deleted)
• traldf_iso_grif.F90 (deleted)
• traldf_lap.F90 (deleted)
• trc_oce.F90 (deleted)
• zdftke.F90 (deleted)

CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/arch-X64_ADA.fcm

@@ -39 +39 @@
 %OASIS_LIB           -L%OASIS_HOME/lib -lpsmile.MPI1 -lscrip -lmct -lmpeu
 
+%CPP               cpp
 %FC                  mpiifort -c -cpp
 # for Ada
-%FCFLAGS             -DCPP_PARA -i4 -r8 -O3
+%FCFLAGS             -DCPP_PARA -i4 -r8 -O3 -xAVX -fp-model precise
 %FFLAGS              %FCFLAGS
 %LD                  mpiifort

CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/arch-X64_CURIE.fcm

@@ -39 +39 @@
 %OASIS_LIB           -L%OASIS_HOME/lib -lpsmile.MPI1 -lscrip -lmct -lmpeu
 
+%CPP                 cpp
 %FC                  mpif90 -c -cpp
 # for Curie Fat Node

CONFIG/UNIFORM/v6/IPSLCM6/SOURCES/NEMO/p4zopt.F90

@@ -49 +49 @@
    REAL(wp), DIMENSION(3,jp_rgb), PUBLIC ::   xkrgb   !: tabulated attenuation coefficients for RGB absorption
 
-     
+
+   
    !!* Substitution
 #  include "top_substitute.h90"
@@ -101 +102 @@
                zchl = ( trn(ji,jj,jk,jpnch) + trn(ji,jj,jk,jpdch) + rtrn ) * 1.e6
                zchl = MIN(  10. , MAX( 0.05, zchl )  )
-               irgb = MAX ( 1, MIN ( jp_rgb, NINT( 41 + 20.* LOG10( zchl ) + rtrn )))
-               !                                                         
+               irgb = MAX ( 1, MIN ( jp_rgb, NINT( 41 + 20.* LOG10( zchl ) + rtrn )))               !                                                         
                zekb(ji,jj,jk) = xkrgb(1,irgb) * fse3t(ji,jj,jk)
                zekg(ji,jj,jk) = xkrgb(2,irgb) * fse3t(ji,jj,jk)
@@ -207 +207 @@
               IF( etot(ji,jj,jk) * tmask(ji,jj,jk) >= 0.0043 * qsr(ji,jj) )  THEN
                  neln(ji,jj) = jk+1                    ! Euphotic level : 1rst T-level strictly below Euphotic layer
-                 !                                     ! nb: ensure the compatibility with nmld_trc definition in trd_mld_trc_zint
+                 !                                     ! nb: ensure the compatibility with nmld_trc definition in trd_mxl_trc_zint
                  heup(ji,jj) = fsdepw(ji,jj,jk+1)      ! Euphotic layer depth
               ENDIF
@@ -254 +254 @@
       END DO
 
-      IF( ln_diatrc ) THEN        ! save output diagnostics
-        !
-        IF( lk_iomput ) THEN
-           IF( jnt == nrdttrc ) THEN
-              CALL iom_put( "Heup", heup(:,:  ) * tmask(:,:,1) )  ! euphotic layer deptht
-              CALL iom_put( "PAR" , emoy(:,:,:) * tmask(:,:,:) )  ! Photosynthetically Available Radiation
-           ENDIF
-        ELSE
-           trc2d(:,:,  jp_pcs0_2d + 10) = heup(:,:  ) * tmask(:,:,1)  
-           trc3d(:,:,:,jp_pcs0_3d + 3)  = etot(:,:,:) * tmask(:,:,:)
+      IF( lk_iomput ) THEN
+        IF( jnt == nrdttrc  ) THEN
+           IF( iom_use( "Heup" ) ) CALL iom_put( "Heup", heup(:,:  ) * tmask(:,:,1) )  ! euphotic layer deptht
+           IF( iom_use( "PAR"  ) ) CALL iom_put( "PAR" , emoy(:,:,:) * tmask(:,:,:) )  ! Photosynthetically Available Radiation
         ENDIF
-        !
+      ELSE
+         IF( ln_diatrc ) THEN        ! save output diagnostics
+            trc2d(:,:,  jp_pcs0_2d + 10) = heup(:,:  ) * tmask(:,:,1)  
+            trc3d(:,:,:,jp_pcs0_3d + 3)  = etot(:,:,:) * tmask(:,:,:)
+         ENDIF
       ENDIF
       !