adding laura_branch

inogs · Jul 21, 2016 · 0ed471f · 0ed471f
1 parent a320bf2
commit 0ed471f
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 13 deletions.
diff --git a/Makefile b/Makefile
@@ -58,8 +58,7 @@ OBJSTR  =  \
 	grd_str.o\
 	eof_str.o\
 	ctl_str.o\
-	rcfl_mod.o\
-	mpi_alloc.o
+	rcfl_mod.o
 
 PHYSOBS  =  \
 	get_obs_sla.o\
@@ -140,7 +139,6 @@ OBJS    =  \
 	cnv_ctv_ad.o\
 	cnv_inn.o\
 	wrt_dia.o\
-	mpi_utils.o\
 	clean_mem.o\
 	tao_minimizer.o\
     oceanvar.o
@@ -178,6 +176,13 @@ libnc-medlevel.a :
 		cd $(LIBNCMEDLEV) && $(MAKE)
 
 clean:
+	$(RM) *.o *.mod cpp.* *.L
+	cd $(LIBFEXIT) && $(MAKE) erase
+	cd ..
+	cd $(LIBNCMEDLEV) && $(MAKE) erase
+	cd ..
+
+erase:
 	$(RM) *.o *.mod cpp.* *.L $(EXEC)
 	cd $(LIBFEXIT) && $(MAKE) erase
 	cd ..

diff --git a/def_nml.f90 b/def_nml.f90
@@ -152,7 +152,7 @@ subroutine def_nml
 
   grd%nchl = nchl
   chl%dep  = chl_dep
-  drv%argo = 0 !1
+  drv%argo = 1
 
   write(drv%dia,*) '------------------------------------------------------------'
 

diff --git a/get_obs_arg.f90 b/get_obs_arg.f90
@@ -76,8 +76,8 @@ subroutine get_obs_arg
   close (511)
 
   ! DECOMMENT FOLLOWING TWO LINES TO MAKE FILTER TEST
-  ! arg%res(:) = 1
-  ! arg%err(:) = 1.d-2
+  arg%res(:) = 1
+  arg%err(:) = 1.d-2
 
 
   ! ---

diff --git a/get_obs_chl.f90 b/get_obs_chl.f90
@@ -122,8 +122,8 @@ subroutine get_obs_chl
   enddo
 
   ! DECOMMENT FOLLOWING TWO LINES TO MAKE FILTER TEST
-  ! chl%res(:) = 0.
-  ! chl%err(:) = 1.
+  chl%res(:) = 0.
+  chl%err(:) = 1.
 
   DEALLOCATE( chl_mis )
   DEALLOCATE( chl_err )

diff --git a/oceanvar.f90 b/oceanvar.f90
@@ -118,8 +118,8 @@ subroutine oceanvar
 
         ! ---
         ! Minimize the cost function (inner loop)
-        ! call min_cfn
-        call tao_minimizer
+        call min_cfn
+        ! call tao_minimizer
         write(drv%dia,*) 'out of min_cfn'
 
         if(ktr.eq.drv%ntr)then

diff --git a/rdeofs.f90 b/rdeofs.f90
@@ -100,8 +100,8 @@ subroutine rdeofs
   if (stat /= nf90_noerr) call netcdf_err(stat)
 
   ! DECOMMENT FOLLOWING TWO LINES TO MAKE FILTER TEST
-  ! ros%evc(:,:,:) = 1.
-  ! ros%eva(:,:) = 1.
+  ros%evc(:,:,:) = 1.
+  ros%eva(:,:) = 1.
 
   stat = nf90_close(ncid)  
 

diff --git a/wrt_dia.f90 b/wrt_dia.f90
@@ -60,7 +60,15 @@ subroutine wrt_dia
      do k=1,grd%km
         do j=1,grd%jm
            do i=1,grd%im
-              Dump_chl(i,j,k) = REAL(grd%chl(i,j,k,l), 4 )
+              if (drv%argo .eq. 1) then
+                 if (grd%msk(i,j,k) .eq. 0) then
+                    Dump_chl(i,j,k) = -1.
+                 else
+                    Dump_chl(i,j,k) = REAL(grd%chl(i,j,k,l), 4)
+                 endif
+              else
+                 Dump_chl(i,j,k) = REAL(grd%chl(i,j,k,l), 4 )
+              endif
            enddo
         enddo
      enddo